From f8e7976ec2b9443095d0f5dca4da037ab32ddaad Mon Sep 17 00:00:00 2001
From: UchiTesting <56003633+UchiTesting@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:07:32 +0100
Subject: [PATCH 001/364] style(locale): Translate French locale further (#896)

- Picked a few of the 1st lines from TRANSLATION.md
- Updated a few others. Prune to Elaguer for instance.
---
 src/Resources/Locales/fr_FR.axaml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 12b08d08..8a37c52e 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -61,6 +61,7 @@
   <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetch ${0}$ vers ${1}$...</x:String>
   <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Terminer ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.Merge" xml:space="preserve">Fusionner ${0}$ dans ${1}$...</x:String>
+  <x:String x:Key="Text.BranchCM.MergeMultiBranches" xml:space="preserve">Fusionner les {0} branches sélectionnées dans celle en cours</x:String>
   <x:String x:Key="Text.BranchCM.Pull" xml:space="preserve">Tirer ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.PullInto" xml:space="preserve">Tirer ${0}$ dans ${1}$...</x:String>
   <x:String x:Key="Text.BranchCM.Push" xml:space="preserve">Pousser ${0}$</x:String>
@@ -87,9 +88,11 @@
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Mettre en stash et réappliquer</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick de ce commit</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Ajouter la source au message de commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit :</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commit tous les changements</x:String>
   <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">Ligne principale :</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">Habituellement, on ne peut pas cherry-pick un commit car on ne sait pas quel côté devrait être considéré comme principal. Cette option permet de rejouer les changements relatifs au parent spécifié.</x:String>
   <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">Supprimer les stashes</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Vous essayez de supprimer tous les stashes. Êtes-vous sûr de vouloir continuer ?</x:String>
@@ -104,12 +107,15 @@
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Éditeur</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Récupérer ce commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick ce commit</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick ...</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copier les informations</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">Copier le SHA</x:String>
   <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Action personnalisée</x:String>
   <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Rebase interactif de ${0}$ ici</x:String>
+  <x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Fusionner dans ${0}$</x:String>
+  <x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Fusionner ...</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebaser ${0}$ ici</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Réinitialiser ${0}$ ici</x:String>
   <x:String x:Key="Text.CommitCM.Revert" xml:space="preserve">Annuler le commit</x:String>
@@ -121,6 +127,7 @@
   <x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">Rechercher les changements...</x:String>
   <x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">FICHIERS</x:String>
   <x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">Fichier LFS</x:String>
+  <x:String x:Key="Text.CommitDetail.Files.Search" xml:space="preserve">Rechercher des fichiers...</x:String>
   <x:String x:Key="Text.CommitDetail.Files.Submodule" xml:space="preserve">Sous-module</x:String>
   <x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">INFORMATIONS</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">AUTEUR</x:String>
@@ -158,6 +165,8 @@
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Activer --prune pour fetch</x:String>
   <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Activer --signoff pour commit</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SUIVI DES PROBLÈMES</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Ajouter une règle d'exemple Gitee</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Ajouter une règle d'exemple pour Pull Request Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Ajouter une règle d'exemple Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Ajouter une règle d'exemple Jira</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Ajouter une règle d'exemple pour Incidents GitLab</x:String>
@@ -247,6 +256,7 @@
   <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Coloration syntaxique</x:String>
   <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Retour à la ligne</x:String>
   <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Ouvrir dans l'outil de fusion</x:String>
+  <x:String x:Key="Text.Diff.UseBlockNavigation" xml:space="preserve">Activer la navigation par blocs</x:String>
   <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Voir toutes les lignes</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Réduit le nombre de ligne visibles</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Augmente le nombre de ligne visibles</x:String>
@@ -268,6 +278,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (sans récupération)</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 toutes les branches distantes</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Outrepasser les vérifications de refs</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch sans les tags</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote :</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Récupérer les changements distants</x:String>
@@ -276,6 +287,7 @@
   <x:String x:Key="Text.FileCM.DiscardMulti" xml:space="preserve">Rejeter {0} fichiers...</x:String>
   <x:String x:Key="Text.FileCM.DiscardSelectedLines" xml:space="preserve">Rejeter les changements dans les lignes sélectionnées</x:String>
   <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">Ouvrir l'outil de fusion externe</x:String>
+  <x:String x:Key="Text.FileCM.ResolveUsing" xml:space="preserve">Résoudre en utilisant ${0}$</x:String>
   <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">Enregistrer en tant que patch...</x:String>
   <x:String x:Key="Text.FileCM.Stage" xml:space="preserve">Indexer</x:String>
   <x:String x:Key="Text.FileCM.StageMulti" xml:space="preserve">Indexer {0} fichiers</x:String>
@@ -329,7 +341,7 @@
   <x:String x:Key="Text.GitLFS.Locks.Title" xml:space="preserve">Verrous LFS</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Unlock" xml:space="preserve">Déverouiller</x:String>
   <x:String x:Key="Text.GitLFS.Locks.UnlockForce" xml:space="preserve">Forcer le déverouillage</x:String>
-  <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Prune</x:String>
+  <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Elaguer</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Lancer `git lfs prune` pour supprimer les anciens fichier LFS du stockage local</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Pull</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Pull les objets LFS</x:String>
@@ -353,6 +365,7 @@
   <x:String x:Key="Text.Hotkeys" xml:space="preserve">Référence des raccourcis clavier</x:String>
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Annuler le popup en cours</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Cloner un nouveau dépôt</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Fermer la page en cours</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Aller à la page précédente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Aller à la page suivante</x:String>
@@ -518,7 +531,7 @@
   <x:String x:Key="Text.RemoteCM.Edit" xml:space="preserve">Editer...</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">Ouvrir dans le navigateur</x:String>
-  <x:String x:Key="Text.RemoteCM.Prune" xml:space="preserve">Prune</x:String>
+  <x:String x:Key="Text.RemoteCM.Prune" xml:space="preserve">Elaguer</x:String>
   <x:String x:Key="Text.RemoveWorktree" xml:space="preserve">Confirmer la suppression du Worktree</x:String>
   <x:String x:Key="Text.RemoveWorktree.Force" xml:space="preserve">Activer l'option `--force`</x:String>
   <x:String x:Key="Text.RemoveWorktree.Target" xml:space="preserve">Cible :</x:String>
@@ -528,7 +541,7 @@
   <x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.Repository.Abort" xml:space="preserve">ABORT</x:String>
   <x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">Fetch automatique des changements depuis les dépôts...</x:String>
-  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Nettoyage(GC &amp; Prune)</x:String>
+  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Nettoyage(GC &amp; Elaguage)</x:String>
   <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">Lancer `git gc` pour ce repository.</x:String>
   <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Tout effacer</x:String>
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configurer ce repository</x:String>
@@ -541,6 +554,7 @@
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Naviguer vers le HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Activer l'option '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Créer une branche</x:String>
+  <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Mettre la branche courante en surbrillance dans le graph</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Ouvrir dans {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Ouvrir dans un outil externe</x:String>
   <x:String x:Key="Text.Repository.Refresh" xml:space="preserve">Rafraîchir</x:String>
@@ -562,7 +576,7 @@
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Ouvrir dans un terminal</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREES</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">AJOUTER WORKTREE</x:String>
-  <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">PRUNE</x:String>
+  <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">ELAGUER</x:String>
   <x:String x:Key="Text.RepositoryURL" xml:space="preserve">URL du repository Git</x:String>
   <x:String x:Key="Text.Reset" xml:space="preserve">Reset branche actuelle à la révision</x:String>
   <x:String x:Key="Text.Reset.Mode" xml:space="preserve">Reset Mode:</x:String>

From 91883c9f1164401781bcbded893af95e4faccab5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:07:46 +0000
Subject: [PATCH 002/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 527f5c31..acbf22ff 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.55%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.79%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.33%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.42%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.55%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.33%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.42%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index c8bc7efe..9de52a48 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -35,25 +35,12 @@
 
 </details>
 
-### fr_FR.axaml: 92.79%
+### fr_FR.axaml: 94.69%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.BranchCM.MergeMultiBranches
-- Text.CherryPick.AppendSourceToMessage
-- Text.CherryPick.Mainline.Tips
-- Text.CommitCM.CherryPickMultiple
-- Text.CommitCM.Merge
-- Text.CommitCM.MergeMultiple
-- Text.CommitDetail.Files.Search
-- Text.Configure.IssueTracker.AddSampleGiteeIssue
-- Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.Diff.UseBlockNavigation
-- Text.Fetch.Force
-- Text.FileCM.ResolveUsing
-- Text.Hotkeys.Global.Clone
 - Text.InProgress.CherryPick.Head
 - Text.InProgress.Merge.Operating
 - Text.InProgress.Rebase.StoppedAt
@@ -80,7 +67,6 @@
 - Text.Repository.HistoriesOrder
 - Text.Repository.HistoriesOrder.ByDate
 - Text.Repository.HistoriesOrder.Topo
-- Text.Repository.OnlyHighlightCurrentBranchInHistories
 - Text.Repository.Skip
 - Text.Repository.Tags.OrderByCreatorDate
 - Text.Repository.Tags.OrderByNameAsc

From 6e5626f267b8b1651c388d92bdcce5af8045a2b4 Mon Sep 17 00:00:00 2001
From: wl2776 <wl2776@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:11:28 -0800
Subject: [PATCH 003/364] fix: several typos in source code (#895)

---
 src/App.Commands.cs                           |   2 +-
 src/App.JsonCodeGen.cs                        |   2 +-
 src/App.axaml                                 |   2 +-
 src/App.axaml.cs                              |  26 ++--
 src/Converters/IntConverters.cs               |   4 +-
 src/Resources/Locales/de_DE.axaml             | 106 +++++++--------
 src/Resources/Locales/en_US.axaml             | 114 ++++++++--------
 src/Resources/Locales/es_ES.axaml             | 112 ++++++++--------
 src/Resources/Locales/fr_FR.axaml             | 102 +++++++-------
 src/Resources/Locales/it_IT.axaml             | 104 +++++++--------
 src/Resources/Locales/pt_BR.axaml             | 104 +++++++--------
 src/Resources/Locales/ru_RU.axaml             | 112 ++++++++--------
 src/Resources/Locales/zh_CN.axaml             | 112 ++++++++--------
 src/Resources/Locales/zh_TW.axaml             | 110 ++++++++--------
 src/Resources/Styles.axaml                    |   8 +-
 src/ViewModels/BranchCompare.cs               |   4 +-
 src/ViewModels/Clone.cs                       |   4 +-
 src/ViewModels/CommitDetail.cs                |   8 +-
 src/ViewModels/ConfigureWorkspace.cs          |   6 +-
 src/ViewModels/CreateGroup.cs                 |   2 +-
 src/ViewModels/DeleteRepositoryNode.cs        |   2 +-
 src/ViewModels/DiffContext.cs                 |   8 +-
 src/ViewModels/EditRepositoryNode.cs          |   2 +-
 src/ViewModels/Init.cs                        |   2 +-
 src/ViewModels/Launcher.cs                    |   8 +-
 src/ViewModels/MoveRepositoryNode.cs          |   6 +-
 .../{Preference.cs => Preferences.cs}         |  16 +--
 src/ViewModels/Repository.cs                  |   6 +-
 src/ViewModels/RepositoryConfigure.cs         |   2 +-
 src/ViewModels/RevisionCompare.cs             |   4 +-
 src/ViewModels/ScanRepositories.cs            |  10 +-
 src/ViewModels/StashesPage.cs                 |   4 +-
 src/ViewModels/Statistics.cs                  |   8 +-
 src/ViewModels/Welcome.cs                     |  16 +--
 src/ViewModels/WorkingCopy.cs                 |   6 +-
 src/Views/AIAssistant.axaml                   |   2 +-
 src/Views/Blame.axaml                         |   2 +-
 src/Views/BranchCompare.axaml                 |   4 +-
 src/Views/ChromelessWindow.cs                 |   2 +-
 src/Views/CommitBaseInfo.axaml                |   4 +-
 src/Views/CommitChanges.axaml                 |   6 +-
 src/Views/CommitMessageTextBox.axaml          |   2 +-
 src/Views/ConfigureWorkspace.axaml.cs         |   2 +-
 src/Views/DiffView.axaml                      |  24 ++--
 src/Views/Histories.axaml                     |  12 +-
 src/Views/Hotkeys.axaml                       |   8 +-
 src/Views/Launcher.axaml                      |   2 +-
 src/Views/Launcher.axaml.cs                   |  10 +-
 src/Views/LauncherTabBar.axaml                |   6 +-
 src/Views/PopupRunningStatus.axaml            |   2 +-
 .../{Preference.axaml => Preferences.axaml}   | 124 +++++++++---------
 ...eference.axaml.cs => Preferences.axaml.cs} |  38 +++---
 src/Views/Repository.axaml                    |  10 +-
 src/Views/Repository.axaml.cs                 |   6 +-
 src/Views/RepositoryConfigure.axaml           |   8 +-
 src/Views/RevisionCompare.axaml               |   4 +-
 src/Views/RevisionFileContentViewer.axaml     |   2 +-
 src/Views/RevisionFiles.axaml                 |   2 +-
 src/Views/SelfUpdate.axaml.cs                 |   2 +-
 src/Views/StashesPage.axaml                   |   2 +-
 src/Views/StashesPage.axaml.cs                |   2 +-
 src/Views/TextDiffView.axaml                  |  20 +--
 src/Views/Welcome.axaml                       |   2 +-
 src/Views/Welcome.axaml.cs                    |   2 +-
 src/Views/WelcomeToolbar.axaml.cs             |   6 +-
 src/Views/WorkingCopy.axaml                   |  10 +-
 src/Views/WorkingCopy.axaml.cs                |   2 +-
 67 files changed, 737 insertions(+), 737 deletions(-)
 rename src/ViewModels/{Preference.cs => Preferences.cs} (98%)
 rename src/Views/{Preference.axaml => Preferences.axaml} (88%)
 rename src/Views/{Preference.axaml.cs => Preferences.axaml.cs} (88%)

diff --git a/src/App.Commands.cs b/src/App.Commands.cs
index fd140f24..85a75829 100644
--- a/src/App.Commands.cs
+++ b/src/App.Commands.cs
@@ -37,7 +37,7 @@ namespace SourceGit
             }
         }
 
-        public static readonly Command OpenPreferenceCommand = new Command(_ => OpenDialog(new Views.Preference()));
+        public static readonly Command OpenPreferencesCommand = new Command(_ => OpenDialog(new Views.Preferences()));
         public static readonly Command OpenHotkeysCommand = new Command(_ => OpenDialog(new Views.Hotkeys()));
         public static readonly Command OpenAppDataDirCommand = new Command(_ => Native.OS.OpenInFileManager(Native.OS.DataDir));
         public static readonly Command OpenAboutCommand = new Command(_ => OpenDialog(new Views.About()));
diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs
index 70567af5..f37e269c 100644
--- a/src/App.JsonCodeGen.cs
+++ b/src/App.JsonCodeGen.cs
@@ -51,6 +51,6 @@ namespace SourceGit
     [JsonSerializable(typeof(Models.ThemeOverrides))]
     [JsonSerializable(typeof(Models.Version))]
     [JsonSerializable(typeof(Models.RepositorySettings))]
-    [JsonSerializable(typeof(ViewModels.Preference))]
+    [JsonSerializable(typeof(ViewModels.Preferences))]
     internal partial class JsonCodeGen : JsonSerializerContext { }
 }
diff --git a/src/App.axaml b/src/App.axaml
index 55aacb89..76d4baa8 100644
--- a/src/App.axaml
+++ b/src/App.axaml
@@ -35,7 +35,7 @@
       <NativeMenuItem Header="{DynamicResource Text.Hotkeys}" Command="{x:Static s:App.OpenHotkeysCommand}"/>
       <NativeMenuItem Header="{DynamicResource Text.SelfUpdate}" Command="{x:Static s:App.CheckForUpdateCommand}" IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"/>
       <NativeMenuItemSeparator/>
-      <NativeMenuItem Header="{DynamicResource Text.Preference}" Command="{x:Static s:App.OpenPreferenceCommand}" Gesture="⌘+,"/>
+      <NativeMenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" Gesture="⌘+,"/>
       <NativeMenuItem Header="{DynamicResource Text.OpenAppDataDir}" Command="{x:Static s:App.OpenAppDataDirCommand}"/>
       <NativeMenuItemSeparator/>
       <NativeMenuItem Header="{DynamicResource Text.Quit}" Command="{x:Static s:App.QuitCommand}" Gesture="⌘+Q"/>
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 9fac35a6..cca9f2ea 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -41,9 +41,9 @@ namespace SourceGit
 
             try
             {
-                if (TryLaunchedAsRebaseTodoEditor(args, out int exitTodo))
+                if (TryLaunchAsRebaseTodoEditor(args, out int exitTodo))
                     Environment.Exit(exitTodo);
-                else if (TryLaunchedAsRebaseMessageEditor(args, out int exitMessage))
+                else if (TryLaunchAsRebaseMessageEditor(args, out int exitMessage))
                     Environment.Exit(exitMessage);
                 else
                     BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
@@ -298,7 +298,7 @@ namespace SourceGit
         {
             AvaloniaXamlLoader.Load(this);
 
-            var pref = ViewModels.Preference.Instance;
+            var pref = ViewModels.Preferences.Instance;
             pref.PropertyChanged += (_, _) => pref.Save();
 
             SetLocale(pref.Locale);
@@ -312,13 +312,13 @@ namespace SourceGit
             {
                 BindingPlugins.DataValidators.RemoveAt(0);
 
-                if (TryLaunchedAsCoreEditor(desktop))
+                if (TryLaunchAsCoreEditor(desktop))
                     return;
 
-                if (TryLaunchedAsAskpass(desktop))
+                if (TryLaunchAsAskpass(desktop))
                     return;
 
-                TryLaunchedAsNormal(desktop);
+                TryLaunchAsNormal(desktop);
             }
         }
         #endregion
@@ -349,7 +349,7 @@ namespace SourceGit
             File.WriteAllText(file, builder.ToString());
         }
 
-        private static bool TryLaunchedAsRebaseTodoEditor(string[] args, out int exitCode)
+        private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode)
         {
             exitCode = -1;
 
@@ -402,7 +402,7 @@ namespace SourceGit
             return true;
         }
 
-        private static bool TryLaunchedAsRebaseMessageEditor(string[] args, out int exitCode)
+        private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCode)
         {
             exitCode = -1;
 
@@ -436,7 +436,7 @@ namespace SourceGit
             return true;
         }
 
-        private bool TryLaunchedAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
+        private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
         {
             var args = desktop.Args;
             if (args == null || args.Length <= 1 || !args[0].Equals("--core-editor", StringComparison.Ordinal))
@@ -451,7 +451,7 @@ namespace SourceGit
             return true;
         }
 
-        private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
+        private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
         {
             var launchAsAskpass = Environment.GetEnvironmentVariable("SOURCEGIT_LAUNCH_AS_ASKPASS");
             if (launchAsAskpass is not "TRUE")
@@ -467,7 +467,7 @@ namespace SourceGit
             return false;
         }
 
-        private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
+        private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
         {
             Native.OS.SetupEnternalTools();
             Models.AvatarManager.Instance.Start();
@@ -480,7 +480,7 @@ namespace SourceGit
             desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
 
 #if !DISABLE_UPDATE_DETECTION
-            var pref = ViewModels.Preference.Instance;
+            var pref = ViewModels.Preferences.Instance;
             if (pref.ShouldCheck4UpdateOnStartup())
                 Check4Update();
 #endif
@@ -512,7 +512,7 @@ namespace SourceGit
                     // Should not check ignored tag if this is called manually.
                     if (!manually)
                     {
-                        var pref = ViewModels.Preference.Instance;
+                        var pref = ViewModels.Preferences.Instance;
                         if (ver.TagName == pref.IgnoreUpdateTag)
                             return;
                     }
diff --git a/src/Converters/IntConverters.cs b/src/Converters/IntConverters.cs
index 17a88da2..f21c5d24 100644
--- a/src/Converters/IntConverters.cs
+++ b/src/Converters/IntConverters.cs
@@ -23,10 +23,10 @@ namespace SourceGit.Converters
             new FuncValueConverter<int, bool>(v => v != 1);
 
         public static readonly FuncValueConverter<int, bool> IsSubjectLengthBad =
-            new FuncValueConverter<int, bool>(v => v > ViewModels.Preference.Instance.SubjectGuideLength);
+            new FuncValueConverter<int, bool>(v => v > ViewModels.Preferences.Instance.SubjectGuideLength);
 
         public static readonly FuncValueConverter<int, bool> IsSubjectLengthGood =
-            new FuncValueConverter<int, bool>(v => v <= ViewModels.Preference.Instance.SubjectGuideLength);
+            new FuncValueConverter<int, bool>(v => v <= ViewModels.Preferences.Instance.SubjectGuideLength);
 
         public static readonly FuncValueConverter<int, Thickness> ToTreeMargin =
             new FuncValueConverter<int, Thickness>(v => new Thickness(v * 16, 0, 0, 0));
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index a8a585d5..96dced8d 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -367,7 +367,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Zum vorherigen Tab wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Zum nächsten 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.OpenPreference" xml:space="preserve">Einstellungen öffnen</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Einstellungen öffnen</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>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Gestagte Änderungen committen und pushen</x:String>
@@ -441,58 +441,58 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Vor {0} Monaten</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Leztes Jahr</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Vor {0} Jahren</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Einstellungen</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">OPEN AI</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analysierung des Diff Befehl</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">API Schlüssel</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Generiere Nachricht Befehl</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Name</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Server</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modell</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Standard</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Texteditor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Monospace-Schriftart</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Verwende die Monospace-Schriftart nur im Texteditor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Design</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Design-Anpassungen</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Fixe Tab-Breite in Titelleiste</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Verwende nativen Fensterrahmen</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Installationspfad</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Installationspfad zum Diff/Merge Tool</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Tool</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">ALLGEMEIN</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Sprache</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
-  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Zeige Nachfolger in den Commit Details</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Aktiviere Auto-CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Klon Standardordner</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">Benutzer Email</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Installationspfad</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Benutzername</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Globaler Git Benutzername</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git Version</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Diese App setzt Git (>= 2.23.0) voraus</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG SIGNIERUNG</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Commit-Signierung</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Tag-Signierung</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">GPG Format</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">GPG Installationspfad</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Installationspfad zum GPG Programm</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Benutzer Signierungsschlüssel</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">GPG Benutzer Signierungsschlüssel</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">EINBINDUNGEN</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Pfad</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">Einstellungen</x:String>
+  <x:String x:Key="Text.Preferences.AI" xml:space="preserve">OPEN AI</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analysierung des Diff Befehl</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API Schlüssel</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Generiere Nachricht Befehl</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Name</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modell</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
+  <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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Installationspfad zum Diff/Merge Tool</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Tool</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">ALLGEMEIN</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Sprache</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Zeige Nachfolger in den Commit Details</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</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">Aktiviere Auto-CRLF</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Klon Standardordner</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Benutzer Email</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Installationspfad</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Globaler Git Benutzername</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git Version</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Diese App setzt Git (>= 2.23.0) voraus</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG SIGNIERUNG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit-Signierung</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Tag-Signierung</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">GPG Format</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">GPG Installationspfad</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Installationspfad zum GPG Programm</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Benutzer Signierungsschlüssel</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">GPG Benutzer Signierungsschlüssel</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">EINBINDUNGEN</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Pfad</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Remote löschen</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Ziel:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Worktrees löschen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index cc32cc4a..1b0059a5 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -262,7 +262,7 @@
   <x:String x:Key="Text.Discard.All" xml:space="preserve">All local changes in working copy.</x:String>
   <x:String x:Key="Text.Discard.Changes" xml:space="preserve">Changes:</x:String>
   <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">Include ignored files</x:String>
-  <x:String x:Key="Text.Discard.Total" xml:space="preserve">Total {0} changes will be discard</x:String>
+  <x:String x:Key="Text.Discard.Total" xml:space="preserve">{0} changes will be discarded</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">You can't undo this action!!!</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">Bookmark:</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Name" xml:space="preserve">New Name:</x:String>
@@ -366,7 +366,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Go to previous page</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Go to next page</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Create new page</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">Open preference dialog</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Open Preferences dialog</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>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Commit and push staged changes</x:String>
@@ -419,7 +419,7 @@
   <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Move Repository Node</x:String>
   <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Select parent node for:</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">Name:</x:String>
-  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git has NOT been configured. Please to go [Preference] and configure it first.</x:String>
+  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git has NOT been configured. Please to go [Preferences] and configure it first.</x:String>
   <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Open Data Storage Directory</x:String>
   <x:String x:Key="Text.OpenWith" xml:space="preserve">Open with...</x:String>
   <x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
@@ -440,60 +440,60 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} months ago</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Last year</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} years ago</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Preference</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">AI</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analyze Diff Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">API Key</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Generate Subject Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Model</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Name</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Server</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APPEARANCE</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Default</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Monospace Font</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Only use monospace font in text editor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Theme</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Theme Overrides</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Use native window frame</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Install Path</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Input path for diff/merge tool</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Tool</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">GENERAL</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Check for updates on startup</x:String>
-  <x:String x:Key="Text.Preference.General.DateFormat" xml:space="preserve">Date Format</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>
-  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Enable Auto CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Default Clone Dir</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">User Email</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Install Path</x:String>
-  <x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">User Name</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git version</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) is required by this app</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG SIGNING</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Commit GPG signing</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Tag GPG signing</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">GPG Format</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Program Install Path</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Input path for installed gpg program</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">User Signing Key</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">User's gpg signing key</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">INTEGRATION</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Path</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">Preferences</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">Analyze Diff Prompt</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API Key</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Generate Subject Prompt</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Model</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Name</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPEARANCE</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
+  <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">Only use monospace font 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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Input path for diff/merge tool</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Tool</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERAL</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Check for updates on startup</x:String>
+  <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Date Format</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Language</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</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">Enable Auto CRLF</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Default Clone Dir</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">User Email</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Install Path</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">User Name</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git version</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) is required by this app</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG SIGNING</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit GPG signing</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Tag GPG signing</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">GPG Format</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Program Install Path</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Input path for installed gpg program</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">User Signing Key</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">User's gpg signing key</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRATION</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Path</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Prune Remote</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Target:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Prune Worktrees</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 890ff563..7f6bad97 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -369,7 +369,7 @@
   <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.GotoNextTab" xml:space="preserve">Ir a la siguiente página</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.OpenPreference" xml:space="preserve">Abrir diálogo de preferencias</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.Repo" xml:space="preserve">REPOSITORIO</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit cambios staged</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Commit y push cambios staged</x:String>
@@ -443,61 +443,61 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Hace {0} meses</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Último año</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Hace {0} años</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Preferencias</x:String>
-  <x:String x:Key="Text.Preference.Advanced" xml:space="preserve">Opciones Avanzadas</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">OPEN AI</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analizar Diff Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">Clave API</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Generar Subject Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modelo</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Nombre</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Servidor</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APARIENCIA</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Fuente por defecto</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Tamaño de fuente</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Por defecto</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Fuente Monospace</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usar solo fuente monospace en el editor de texto</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Tema</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Sobreescritura de temas</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Usar ancho de pestaña fijo en la barra de título</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Usar marco de ventana nativo</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">HERRAMIENTA DIFF/MERGE</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Ruta de instalación</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Introducir ruta para la herramienta diff/merge</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Herramienta</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">GENERAL</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Buscar actualizaciones al iniciar</x:String>
-  <x:String x:Key="Text.Preference.General.DateFormat" xml:space="preserve">Formato de Fecha</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Idioma</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Commits en el historial</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Mostrar hora del autor en lugar de la hora del commit en el gráfico</x:String>
-  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Mostrar hijos en los detalles de commit</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Longitud de la guía del asunto</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Habilitar Auto CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Directorio de clonado por defecto</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">Email de usuario</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Email global del usuario git</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Ruta de instalación</x:String>
-  <x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">Habilitar verificación HTTP SSL</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Nombre de usuario</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Nombre global del usuario git</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Versión de Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Se requiere Git (>= 2.23.0) para esta aplicación</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">FIRMA GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Firma GPG en commit</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Firma GPG en etiqueta</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">Formato GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Ruta de instalación del programa</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Introducir ruta para el programa gpg instalado</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Clave de firma del usuario</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">Clave de firma gpg del usuario</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">INTEGRACIÓN</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Ruta</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">Preferencias</x:String>
+  <x:String x:Key="Text.Preferences.Advanced" xml:space="preserve">Opciones Avanzadas</x:String>
+  <x:String x:Key="Text.Preferences.AI" xml:space="preserve">OPEN AI</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analizar Diff Prompt</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Clave API</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Generar Subject Prompt</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modelo</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nombre</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Servidor</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APARIENCIA</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Fuente por defecto</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Tamaño de fuente</x:String>
+  <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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Introducir ruta para la herramienta diff/merge</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Herramienta</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERAL</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Buscar actualizaciones al iniciar</x:String>
+  <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Formato de Fecha</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Idioma</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commits en el historial</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostrar hora del autor en lugar de la hora del commit en el gráfico</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Mostrar hijos en los detalles de commit</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Longitud de la guía del asunto</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">Habilitar Auto CRLF</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Directorio de clonado por defecto</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email de usuario</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global del usuario git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Ruta de instalación</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Habilitar verificación HTTP SSL</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nombre de usuario</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nombre global del usuario git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versión de Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Se requiere Git (>= 2.23.0) para esta aplicación</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">FIRMA GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Firma GPG en commit</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG en etiqueta</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Formato GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Ruta de instalación del programa</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Introducir ruta para el programa gpg instalado</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Clave de firma del usuario</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Clave de firma gpg del usuario</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRACIÓN</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Ruta</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Podar Remoto</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destino:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Podar Worktrees</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 8a37c52e..1bfd5284 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -370,7 +370,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Aller à la page précédente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Aller à la page suivante</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Créer une nouvelle page</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">Ouvrir le dialogue des préférences</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Ouvrir le dialogue des préférences</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">DÉPÔT</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit les changements de l'index</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Commit et pousser les changements de l'index</x:String>
@@ -435,56 +435,56 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">il y a {0} mois</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'an dernier</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">il y a {0} ans</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Préférences</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">IA</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analyser Diff Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">Clé d'API</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Générer le sujet de Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modèle</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Nom</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Serveur</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APPARENCE</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Police par défaut</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Taille de police par défaut</x:String>
-  <x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Taille de police de l'éditeur</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Police monospace</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">N'utiliser que des polices monospace pour l'éditeur de texte</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Thème</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Dérogations de thème</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Utiliser des onglets de taille fixe dans la barre de titre</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Utiliser un cadre de fenêtre natif</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">OUTIL DIFF/MERGE</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Chemin d'installation</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Saisir le chemin d'installation de l'outil diff/merge</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Outil</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">GÉNÉRAL</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Vérifier les mises à jour au démarrage</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Historique de commits</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Afficher l'heure de l'auteur au lieu de l'heure de validation dans le graphique</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Guide de longueur du sujet</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Activer auto CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Répertoire de clônage par défaut</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">E-mail utilsateur</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">E-mail utilsateur global</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Chemin d'installation</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Nom d'utilisateur</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Nom d'utilisateur global</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Version de Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Cette application requière Git (>= 2.23.0)</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">SIGNATURE GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Signature GPG de commit</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Signature GPG de tag</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">Format GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Chemin d'installation du programme</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Saisir le chemin d'installation vers le programme GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Clé de signature de l'utilisateur</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">Clé de signature GPG de l'utilisateur</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">INTEGRATION</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Chemin</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">Préférences</x:String>
+  <x:String x:Key="Text.Preferences.AI" xml:space="preserve">IA</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analyser Diff Prompt</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Clé d'API</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Générer le sujet de Prompt</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modèle</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nom</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Serveur</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPARENCE</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Police par défaut</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFontSize" xml:space="preserve">Taille de police par défaut</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorFontSize" xml:space="preserve">Taille de police de l'é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>
+  <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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Saisir le chemin d'installation de l'outil diff/merge</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Outil</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">GÉNÉRAL</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Vérifier les mises à jour au démarrage</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Language</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Historique de commits</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Afficher l'heure de l'auteur au lieu de l'heure de validation dans le graphique</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Guide de longueur du sujet</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">Activer auto CRLF</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Répertoire de clônage par défaut</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">E-mail utilsateur</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">E-mail utilsateur global</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Chemin d'installation</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nom d'utilisateur</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nom d'utilisateur global</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Version de Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Cette application requière Git (>= 2.23.0)</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">SIGNATURE GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Signature GPG de commit</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Signature GPG de tag</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Format GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Chemin d'installation du programme</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Saisir le chemin d'installation vers le programme GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Clé de signature de l'utilisateur</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Clé de signature GPG de l'utilisateur</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRATION</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Chemin</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Élaguer une branche distant</x:String> <!-- If it is indeed about a branch -->
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Cible :</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Élaguer les Worktrees</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 3022ffe9..e63a4737 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -360,7 +360,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Vai alla pagina precedente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Vai alla pagina successiva</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.OpenPreference" xml:space="preserve">Apri la finestra di preferenze</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Apri la finestra di preferenze</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">Conferma le modifiche in fase</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Conferma e invia le modifiche in fase</x:String>
@@ -425,57 +425,57 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} mesi fa</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'anno scorso</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} anni fa</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Preferenze</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">AI</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analizza il Prompt Differenza</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">Chiave API</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Genera Prompt Soggetto</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modello</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Nome</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Server</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">ASPETTO</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Font Predefinito</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Dimensione Font Predefinita</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Dimensione Font Editor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Font Monospaziato</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usa solo font monospaziato nell'editor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Tema</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Sostituzioni Tema</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Usa larghezza fissa per i tab nella barra del titolo</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Usa cornice finestra nativa</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">STRUMENTO DI DIFFERENZA/UNIONE</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Percorso Installazione</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Inserisci il percorso per lo strumento di differenza/unione</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Strumento</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">GENERALE</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Controlla aggiornamenti all'avvio</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Lingua</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Numero massimo di commit nella cronologia</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Mostra l'orario dell'autore anziché quello del commit nel grafico</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Lunghezza Guida Soggetto</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Abilita Auto CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Cartella predefinita per cloni</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">Email Utente</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Email globale utente Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Percorso Installazione</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Nome Utente</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Nome globale utente Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Versione di Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) è richiesto da questa applicazione</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">FIRMA GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Firma GPG per commit</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Firma GPG per tag</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">Formato GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Percorso Programma Installato</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Inserisci il percorso per il programma GPG installato</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Chiave Firma Utente</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">Chiave GPG dell'utente per la firma</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">INTEGRAZIONE</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINALE</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminale</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Percorso</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">Preferenze</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">Analizza il Prompt Differenza</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Chiave API</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Genera Prompt Soggetto</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modello</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nome</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">ASPETTO</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Font Predefinito</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
+  <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>
+  <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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Inserisci il percorso per lo strumento di differenza/unione</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Strumento</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERALE</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Controlla aggiornamenti all'avvio</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Lingua</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Numero massimo di commit nella cronologia</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostra l'orario dell'autore anziché quello del commit nel grafico</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Lunghezza Guida Soggetto</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">Abilita Auto CRLF</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Cartella predefinita per cloni</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email Utente</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email globale utente Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Percorso Installazione</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome Utente</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome globale utente Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versione di Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) è richiesto da questa applicazione</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">FIRMA GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Firma GPG per commit</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG per tag</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Formato GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Percorso Programma Installato</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Inserisci il percorso per il programma GPG installato</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Chiave Firma Utente</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Chiave GPG dell'utente per la firma</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRAZIONE</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINALE</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminale</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Percorso</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Potatura Remota</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destinazione:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Potatura Worktrees</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index fb3694ef..5d29caca 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -383,7 +383,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Ir para a página anterior</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Ir para a próxima página</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Criar nova página</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">Abrir diálogo de preferências</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Abrir diálogo de preferências</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITÓRIO</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commitar mudanças preparadas</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Commitar e enviar mudanças preparadas</x:String>
@@ -448,57 +448,57 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} meses atrás</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Ano passado</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} anos atrás</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Preferências</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">INTELIGÊNCIA ARTIFICIAL</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Prompt para Analisar Diff</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">Chave da API</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Prompt para Gerar Título</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modelo</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Nome</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Servidor</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APARÊNCIA</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Fonte Padrão</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Tamanho da Fonte</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Padrão</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Fonte Monoespaçada</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usar fonte monoespaçada apenas no editor de texto</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Tema</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Substituições de Tema</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Usar largura fixa de aba na barra de título</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Usar moldura de janela nativa</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">FERRAMENTA DE DIFF/MERGE</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Caminho de Instalação</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Insira o caminho para a ferramenta de diff/merge</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Ferramenta</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">GERAL</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Verificar atualizações na inicialização</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Idioma</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Commits do Histórico</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Exibir data do autor em vez da data do commit no gráfico</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Comprimento do Guia de Assunto</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Habilitar Auto CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Diretório de Clone Padrão</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">Email do Usuário</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Email global do usuário git</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Caminho de Instalação</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Nome do Usuário</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Nome global do usuário git</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Versão do Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) é necessário para este aplicativo</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">ASSINATURA GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">Assinatura GPG de commit</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">Assinatura GPG de tag</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">Formato GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Caminho de Instalação do Programa</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Insira o caminho para o programa gpg instalado</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Chave de Assinatura do Usuário</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">Chave de assinatura gpg do usuário</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">INTEGRAÇÃO</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" xml:space="preserve">Caminho</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">Preferências</x:String>
+  <x:String x:Key="Text.Preferences.AI" xml:space="preserve">INTELIGÊNCIA ARTIFICIAL</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Prompt para Analisar Diff</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Chave da API</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Prompt para Gerar Título</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modelo</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nome</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Servidor</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APARÊNCIA</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Fonte Padrão</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Tamanho da Fonte</x:String>
+  <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>
+  <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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Insira o caminho para a ferramenta de diff/merge</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Ferramenta</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">GERAL</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Verificar atualizações na inicialização</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Idioma</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commits do Histórico</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Exibir data do autor em vez da data do commit no gráfico</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Comprimento do Guia de Assunto</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">Habilitar Auto CRLF</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Diretório de Clone Padrão</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email do Usuário</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global do usuário git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Caminho de Instalação</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome do Usuário</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome global do usuário git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versão do Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) é necessário para este aplicativo</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">ASSINATURA GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Assinatura GPG de commit</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Assinatura GPG de tag</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Formato GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Caminho de Instalação do Programa</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Insira o caminho para o programa gpg instalado</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Chave de Assinatura do Usuário</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Chave de assinatura gpg do usuário</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRAÇÃO</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Caminho</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Prunar Remoto</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Alvo:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Podar Worktrees</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index ee84d679..725f378c 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -266,7 +266,7 @@
   <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.Total" xml:space="preserve">Всего {0} изменений будут отменены</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.EditRepositoryNode.Bookmark" xml:space="preserve">Закладка:</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Name" xml:space="preserve">Новое имя:</x:String>
@@ -370,7 +370,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" 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.NewTab" xml:space="preserve">Создать новую вкладку</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">Открыть диалоговое окно настроек</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" 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>
@@ -444,60 +444,60 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} месяцев назад</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">В прошлом году</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} лет назад</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">Параметры</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">ОТКРЫТЬ ИИ</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">Ключ API</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Запрос на анализ различий</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Произвести запрос на тему</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Модель</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">Имя:</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Сервер</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">ВИД</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Шрифт по умолчанию</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Размер шрифта</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">По умолчанию</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Редактор</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Моноширный шрифт</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">В текстовом редакторе используется только моноширный шрифт</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Тема</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Переопределение темы</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Использовать фиксированную ширину табуляции в строке заголовка.</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Использовать системное окно</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">ИНСТРУМЕНТ РАЗЛИЧИЙ/СЛИЯНИЯ</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Путь установки</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Введите путь для инструмента различия/слияния</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Инструмент</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">ОСНОВНЫЕ</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Проверить обновления при старте</x:String>
-  <x:String x:Key="Text.Preference.General.DateFormat" xml:space="preserve">Формат даты</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Язык</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Максимальная длина истории</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Показывать время автора вместо времени ревизии на графике</x:String>
-  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Показать наследника в деталях комментария</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Длина темы ревизии</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Включить автозавершение CRLF</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">Каталог клонирования по умолчанию</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">Электроная почта пользователя</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Общая электроная почта пользователя git</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Путь установки</x:String>
-  <x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">Разрешить верификацию HTTP SSL</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">Имя пользователя</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Общее имя пользователя git</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Версия Git</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">Для работы программы требуется версия Git (>= 2.23.0)</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG ПОДПИСЬ</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">GPG подпись ревизии</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">GPG подпись метки</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">Формат GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">Путь установки программы</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Введите путь для установленной программы GPG</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">Ключ подписи пользователя</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">Ключ GPG подписи пользователя</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">ВНЕДРЕНИЕ</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">ОБОЛОЧКА/ТЕРМИНАЛ</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">Оболочка/Терминал</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" 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">ОТКРЫТЬ ИИ</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Ключ API</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Запрос на анализ различий</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.Server" 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.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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Введите путь для инструмента различия/слияния</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.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.ShowChildren" xml:space="preserve">Показать наследника в деталях комментария</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Длина темы ревизии</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.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.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.Git.Invalid" xml:space="preserve">Для работы программы требуется версия Git (>= 2.23.0)</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.TagEnabled" 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.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.Type" xml:space="preserve">Оболочка/Терминал</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" 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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c7dede50..81d0d80f 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -369,7 +369,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" 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.NewTab" xml:space="preserve">新建页面</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">打开偏好设置面板</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" 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>
@@ -443,61 +443,61 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0}个月前</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">一年前</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0}年前</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">偏好设置</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">AI</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">Analyze Diff Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">API密钥</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">Generate Subject Prompt</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">模型</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">配置名称</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">服务地址</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">外观配置</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">缺省字体</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">字体大小</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">默认</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">代码编辑器</x:String>
-  <x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">代码字体大小</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">等宽字体</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">仅在文本编辑器中使用等宽字体</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">主题</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">主题自定义</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">主标签使用固定宽度</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系统默认窗体样式</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">对比/合并工具</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">安装路径</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">填写工具可执行文件所在位置</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">工具</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">通用配置</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">启动时检测软件更新</x:String>
-  <x:String x:Key="Text.Preference.General.DateFormat" xml:space="preserve">日期时间格式</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">显示语言</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">最大历史提交数</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">在提交路线图中显示修改时间而非提交时间</x:String>
-  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">在提交详情页中显示子提交列表</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">SUBJECT字数检测</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT配置</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">自动换行转换</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">默认克隆路径</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">邮箱</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">默认GIT用户邮箱</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">安装路径</x:String>
-  <x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">启用HTTP SSL验证</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">用户名</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">默认GIT用户名</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git 版本</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.23.0</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG签名</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">启用提交签名</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">启用标签签名</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">签名格式</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">签名程序位置</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">签名程序所在路径</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">用户签名KEY</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">输入签名提交所使用的KEY</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">第三方工具集成</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">终端/SHELL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">终端/SHELL</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" 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">Analyze Diff Prompt</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">Generate Subject Prompt</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.Server" 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.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.EditorFontSize" 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>
+  <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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">填写工具可执行文件所在位置</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.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.ShowChildren" xml:space="preserve">在提交详情页中显示子提交列表</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">SUBJECT字数检测</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">默认克隆路径</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.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.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.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.23.0</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">启用提交签名</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">启用标签签名</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">签名格式</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">签名程序所在路径</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">用户签名KEY</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">输入签名提交所使用的KEY</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">第三方工具集成</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">终端/SHELL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">终端/SHELL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 429febeb..4fb4f375 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -369,7 +369,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" 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.NewTab" xml:space="preserve">新增頁面</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.OpenPreference" xml:space="preserve">開啟偏好設定面板</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" 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>
@@ -443,60 +443,60 @@
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} 個月前</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">一年前</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} 年前</x:String>
-  <x:String x:Key="Text.Preference" xml:space="preserve">偏好設定</x:String>
-  <x:String x:Key="Text.Preference.AI" xml:space="preserve">AI</x:String>
-  <x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">伺服器</x:String>
-  <x:String x:Key="Text.Preference.AI.ApiKey" xml:space="preserve">API 金鑰</x:String>
-  <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">模型</x:String>
-  <x:String x:Key="Text.Preference.AI.Name" xml:space="preserve">名稱</x:String>
-  <x:String x:Key="Text.Preference.AI.AnalyzeDiffPrompt" xml:space="preserve">分析變更差異提示詞</x:String>
-  <x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">產生提交訊息提示詞</x:String>
-  <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">外觀設定</x:String>
-  <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">預設字型</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">字型大小</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">預設</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">程式碼</x:String>
-  <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">等寬字型</x:String>
-  <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">僅在文字編輯器中使用等寬字型</x:String>
-  <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">佈景主題</x:String>
-  <x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">自訂主題</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">使用固定寬度的分頁標籤</x:String>
-  <x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系統原生預設視窗樣式</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">對比/合併工具</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">安裝路徑</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">填寫可執行檔案所在路徑</x:String>
-  <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">工具</x:String>
-  <x:String x:Key="Text.Preference.General" xml:space="preserve">一般設定</x:String>
-  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">啟動時檢查軟體更新</x:String>
-  <x:String x:Key="Text.Preference.General.DateFormat" xml:space="preserve">日期時間格式</x:String>
-  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">顯示語言</x:String>
-  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">最大歷史提交數</x:String>
-  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">在提交路線圖中顯示修改時間而非提交時間</x:String>
-  <x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">在提交詳細資訊中顯示後續提交</x:String>
-  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">提交標題字數偵測</x:String>
-  <x:String x:Key="Text.Preference.Git" xml:space="preserve">Git 設定</x:String>
-  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">自動換行轉換</x:String>
-  <x:String x:Key="Text.Preference.Git.DefaultCloneDir" xml:space="preserve">預設複製 (clone) 路徑</x:String>
-  <x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">電子郵件</x:String>
-  <x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">預設 Git 使用者電子郵件</x:String>
-  <x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">安裝路徑</x:String>
-  <x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">啟用 HTTP SSL 驗證</x:String>
-  <x:String x:Key="Text.Preference.Git.User" xml:space="preserve">使用者名稱</x:String>
-  <x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">預設 Git 使用者名稱</x:String>
-  <x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git 版本</x:String>
-  <x:String x:Key="Text.Preference.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.23.0</x:String>
-  <x:String x:Key="Text.Preference.GPG" xml:space="preserve">GPG 簽章</x:String>
-  <x:String x:Key="Text.Preference.GPG.CommitEnabled" xml:space="preserve">啟用提交簽章</x:String>
-  <x:String x:Key="Text.Preference.GPG.TagEnabled" xml:space="preserve">啟用標籤簽章</x:String>
-  <x:String x:Key="Text.Preference.GPG.Format" xml:space="preserve">GPG 簽章格式</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path" xml:space="preserve">可執行檔案路徑</x:String>
-  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">填寫 gpg.exe 所在路徑</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">使用者簽章金鑰</x:String>
-  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">填寫簽章提交所使用的金鑰</x:String>
-  <x:String x:Key="Text.Preference.Integration" xml:space="preserve">第三方工具整合</x:String>
-  <x:String x:Key="Text.Preference.Shell" xml:space="preserve">終端機/Shell</x:String>
-  <x:String x:Key="Text.Preference.Shell.Type" xml:space="preserve">終端機/Shell</x:String>
-  <x:String x:Key="Text.Preference.Shell.Path" 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.Server" xml:space="preserve">伺服器</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API 金鑰</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.AnalyzeDiffPrompt" xml:space="preserve">分析變更差異提示詞</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" 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.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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">填寫可執行檔案所在路徑</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.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.ShowChildren" xml:space="preserve">在提交詳細資訊中顯示後續提交</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">提交標題字數偵測</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>
+  <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.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.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.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.23.0</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">啟用提交簽章</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">啟用標籤簽章</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.exe 所在路徑</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">填寫簽章提交所使用的金鑰</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">第三方工具整合</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">終端機/Shell</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">終端機/Shell</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" 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>
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 14423fc6..6335c635 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -159,7 +159,7 @@
 
   <Style Selector="ContentPresenter">
     <Setter Property="FontFamily" Value="{DynamicResource Fonts.Default}"/>
-    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize}"/>
+    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}"/>
   </Style>
 
   <Style Selector="ToolTip">
@@ -280,10 +280,10 @@
     <Setter Property="VerticalAlignment" Value="Center"/>
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="FontFamily" Value="{DynamicResource Fonts.Default}"/>
-    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize}"/>
+    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}"/>
   </Style>
   <Style Selector="TextBlock.small">
-    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"/>
+    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"/>
   </Style>
   <Style Selector="TextBlock.bold">
     <Setter Property="FontWeight" Value="Bold"/>
@@ -413,7 +413,7 @@
     <Setter Property="BorderBrush" Value="Transparent"/>
   </Style>
   <Style Selector="TextBlock.tab_header">
-    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"/>
+    <Setter Property="FontSize" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"/>
     <Setter Property="FontWeight" Value="Bold"/>
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="Opacity" Value=".56"/>
diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs
index 7716eb29..b3c0009c 100644
--- a/src/ViewModels/BranchCompare.cs
+++ b/src/ViewModels/BranchCompare.cs
@@ -129,8 +129,8 @@ namespace SourceGit.ViewModels
             diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
             diffWithMerger.Click += (_, ev) =>
             {
-                var toolType = Preference.Instance.ExternalMergeToolType;
-                var toolPath = Preference.Instance.ExternalMergeToolPath;
+                var toolType = Preferences.Instance.ExternalMergeToolType;
+                var toolPath = Preferences.Instance.ExternalMergeToolPath;
                 var opt = new Models.DiffOption(_based.Head, _to.Head, change);
 
                 Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, opt));
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
index e7d3e8ef..98d3bf41 100644
--- a/src/ViewModels/Clone.cs
+++ b/src/ViewModels/Clone.cs
@@ -129,7 +129,7 @@ namespace SourceGit.ViewModels
 
                 CallUIThread(() =>
                 {
-                    var node = Preference.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
+                    var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
                     var launcher = App.GetLauncer();
                     var page = null as LauncherPage;
                     foreach (var one in launcher.Pages)
@@ -153,7 +153,7 @@ namespace SourceGit.ViewModels
         private string _remote = string.Empty;
         private bool _useSSH = false;
         private string _sshKey = string.Empty;
-        private string _parentFolder = Preference.Instance.GitDefaultCloneDir;
+        private string _parentFolder = Preferences.Instance.GitDefaultCloneDir;
         private string _local = string.Empty;
         private string _extraArgs = string.Empty;
     }
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index bf9f57c9..01f39b35 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -344,8 +344,8 @@ namespace SourceGit.ViewModels
             diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
             diffWithMerger.Click += (_, ev) =>
             {
-                var toolType = Preference.Instance.ExternalMergeToolType;
-                var toolPath = Preference.Instance.ExternalMergeToolPath;
+                var toolType = Preferences.Instance.ExternalMergeToolType;
+                var toolPath = Preferences.Instance.ExternalMergeToolPath;
                 var opt = new Models.DiffOption(_commit, change);
 
                 Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt));
@@ -646,11 +646,11 @@ namespace SourceGit.ViewModels
 
             _cancelToken = new Commands.Command.CancelToken();
 
-            if (Preference.Instance.ShowChildren)
+            if (Preferences.Instance.ShowChildren)
             {
                 Task.Run(() =>
                 {
-                    var max = Preference.Instance.MaxHistoryCommits;
+                    var max = Preferences.Instance.MaxHistoryCommits;
                     var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { Cancel = _cancelToken };
                     var children = cmdChildren.Result();
                     if (!cmdChildren.Cancel.Requested)
diff --git a/src/ViewModels/ConfigureWorkspace.cs b/src/ViewModels/ConfigureWorkspace.cs
index 23b0a1ae..6dc0f82e 100644
--- a/src/ViewModels/ConfigureWorkspace.cs
+++ b/src/ViewModels/ConfigureWorkspace.cs
@@ -31,13 +31,13 @@ namespace SourceGit.ViewModels
         public ConfigureWorkspace()
         {
             Workspaces = new AvaloniaList<Workspace>();
-            Workspaces.AddRange(Preference.Instance.Workspaces);
+            Workspaces.AddRange(Preferences.Instance.Workspaces);
         }
 
         public void Add()
         {
             var workspace = new Workspace() { Name = $"Unnamed {DateTime.Now:yyyy-MM-dd HH:mm:ss}" };
-            Preference.Instance.Workspaces.Add(workspace);
+            Preferences.Instance.Workspaces.Add(workspace);
             Workspaces.Add(workspace);
             Selected = workspace;
         }
@@ -47,7 +47,7 @@ namespace SourceGit.ViewModels
             if (_selected == null || _selected.IsActive)
                 return;
 
-            Preference.Instance.Workspaces.Remove(_selected);
+            Preferences.Instance.Workspaces.Remove(_selected);
             Workspaces.Remove(_selected);
         }
 
diff --git a/src/ViewModels/CreateGroup.cs b/src/ViewModels/CreateGroup.cs
index cb94a0f6..9d680a2c 100644
--- a/src/ViewModels/CreateGroup.cs
+++ b/src/ViewModels/CreateGroup.cs
@@ -21,7 +21,7 @@ namespace SourceGit.ViewModels
 
         public override Task<bool> Sure()
         {
-            Preference.Instance.AddNode(new RepositoryNode()
+            Preferences.Instance.AddNode(new RepositoryNode()
             {
                 Id = Guid.NewGuid().ToString(),
                 Name = _name,
diff --git a/src/ViewModels/DeleteRepositoryNode.cs b/src/ViewModels/DeleteRepositoryNode.cs
index 7cd0df5c..de8d6e1d 100644
--- a/src/ViewModels/DeleteRepositoryNode.cs
+++ b/src/ViewModels/DeleteRepositoryNode.cs
@@ -18,7 +18,7 @@ namespace SourceGit.ViewModels
 
         public override Task<bool> Sure()
         {
-            Preference.Instance.RemoveNode(_node, true);
+            Preferences.Instance.RemoveNode(_node, true);
             Welcome.Instance.Refresh();
             return null;
         }
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 87b1a6de..05bedca4 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -75,7 +75,7 @@ namespace SourceGit.ViewModels
 
         public void ToggleFullTextDiff()
         {
-            Preference.Instance.UseFullTextDiff = !Preference.Instance.UseFullTextDiff;
+            Preferences.Instance.UseFullTextDiff = !Preferences.Instance.UseFullTextDiff;
             LoadDiffContent();
         }
 
@@ -93,8 +93,8 @@ namespace SourceGit.ViewModels
 
         public void OpenExternalMergeTool()
         {
-            var toolType = Preference.Instance.ExternalMergeToolType;
-            var toolPath = Preference.Instance.ExternalMergeToolPath;
+            var toolType = Preferences.Instance.ExternalMergeToolType;
+            var toolPath = Preferences.Instance.ExternalMergeToolPath;
             Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, _option));
         }
 
@@ -112,7 +112,7 @@ namespace SourceGit.ViewModels
                 // NOTE: Here we override the UnifiedLines value (if UseFullTextDiff is on).
                 // There is no way to tell a git-diff to use "ALL lines of context",
                 // so instead we set a very high number for the "lines of context" parameter.
-                var numLines = Preference.Instance.UseFullTextDiff ? 999999999 : _unifiedLines;
+                var numLines = Preferences.Instance.UseFullTextDiff ? 999999999 : _unifiedLines;
                 var latest = new Commands.Diff(_repo, _option, numLines, _ignoreWhitespace).Result();
                 var info = new Info(_option, numLines, _ignoreWhitespace, latest);
                 if (_info != null && info.IsSame(_info))
diff --git a/src/ViewModels/EditRepositoryNode.cs b/src/ViewModels/EditRepositoryNode.cs
index c4ae2335..db0e099c 100644
--- a/src/ViewModels/EditRepositoryNode.cs
+++ b/src/ViewModels/EditRepositoryNode.cs
@@ -49,7 +49,7 @@ namespace SourceGit.ViewModels
 
             if (needSort)
             {
-                Preference.Instance.SortByRenamedNode(_node);
+                Preferences.Instance.SortByRenamedNode(_node);
                 Welcome.Instance.Refresh();
             }
 
diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs
index e22d1289..80a75b9a 100644
--- a/src/ViewModels/Init.cs
+++ b/src/ViewModels/Init.cs
@@ -38,7 +38,7 @@ namespace SourceGit.ViewModels
 
                 CallUIThread(() =>
                 {
-                    Preference.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
+                    Preferences.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
                     Welcome.Instance.Refresh();
                 });
 
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index da487b21..57a1c404 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -51,7 +51,7 @@ namespace SourceGit.ViewModels
             Pages = new AvaloniaList<LauncherPage>();
             AddNewTab();
 
-            var pref = Preference.Instance;
+            var pref = Preferences.Instance;
             if (string.IsNullOrEmpty(startupRepo))
             {
                 ActiveWorkspace = pref.GetActiveWorkspace();
@@ -117,7 +117,7 @@ namespace SourceGit.ViewModels
 
         public void Quit(double width, double height)
         {
-            var pref = Preference.Instance;
+            var pref = Preferences.Instance;
             pref.Layout.LauncherWidth = width;
             pref.Layout.LauncherHeight = height;
             pref.Save();
@@ -355,7 +355,7 @@ namespace SourceGit.ViewModels
 
         public ContextMenu CreateContextForWorkspace()
         {
-            var pref = Preference.Instance;
+            var pref = Preferences.Instance;
             var menu = new ContextMenu();
 
             for (var i = 0; i < pref.Workspaces.Count; i++)
@@ -481,7 +481,7 @@ namespace SourceGit.ViewModels
 
             _ignoreIndexChange = true;
 
-            var pref = Preference.Instance;
+            var pref = Preferences.Instance;
             foreach (var w in pref.Workspaces)
                 w.IsActive = false;
 
diff --git a/src/ViewModels/MoveRepositoryNode.cs b/src/ViewModels/MoveRepositoryNode.cs
index 766d2e78..3f74d5a7 100644
--- a/src/ViewModels/MoveRepositoryNode.cs
+++ b/src/ViewModels/MoveRepositoryNode.cs
@@ -33,7 +33,7 @@ namespace SourceGit.ViewModels
                 Depth = 0,
                 Id = Guid.NewGuid().ToString()
             });
-            MakeRows(Preference.Instance.RepositoryNodes, 1);
+            MakeRows(Preferences.Instance.RepositoryNodes, 1);
 
             View = new Views.MoveRepositoryNode() { DataContext = this };
         }
@@ -42,8 +42,8 @@ namespace SourceGit.ViewModels
         {
             if (_selected != null)
             {
-                var node = Preference.Instance.FindNode(_selected.Id);
-                Preference.Instance.MoveNode(Target, node, true);
+                var node = Preferences.Instance.FindNode(_selected.Id);
+                Preferences.Instance.MoveNode(Target, node, true);
                 Welcome.Instance.Refresh();
             }
 
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preferences.cs
similarity index 98%
rename from src/ViewModels/Preference.cs
rename to src/ViewModels/Preferences.cs
index 00bd3a44..5cd7c8a4 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preferences.cs
@@ -9,10 +9,10 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
-    public class Preference : ObservableObject
+    public class Preferences : ObservableObject
     {
         [JsonIgnore]
-        public static Preference Instance
+        public static Preferences Instance
         {
             get
             {
@@ -479,23 +479,23 @@ namespace SourceGit.ViewModels
                 return;
 
             var file = Path.Combine(Native.OS.DataDir, "preference.json");
-            var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
+            var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preferences);
             File.WriteAllText(file, data);
         }
 
-        private static Preference Load()
+        private static Preferences Load()
         {
             var path = Path.Combine(Native.OS.DataDir, "preference.json");
             if (!File.Exists(path))
-                return new Preference();
+                return new Preferences();
 
             try
             {
-                return JsonSerializer.Deserialize(File.ReadAllText(path), JsonCodeGen.Default.Preference);
+                return JsonSerializer.Deserialize(File.ReadAllText(path), JsonCodeGen.Default.Preferences);
             }
             catch
             {
-                return new Preference();
+                return new Preferences();
             }
         }
 
@@ -637,7 +637,7 @@ namespace SourceGit.ViewModels
             return builder.ToString();
         }
 
-        private static Preference _instance = null;
+        private static Preferences _instance = null;
         private static bool _isLoading = false;
 
         private string _locale = "en_US";
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 5a91d9d4..c317c2b8 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -949,7 +949,7 @@ namespace SourceGit.ViewModels
             Dispatcher.UIThread.Invoke(() => _histories.IsLoading = true);
 
             var builder = new StringBuilder();
-            builder.Append($"-{Preference.Instance.MaxHistoryCommits} ");
+            builder.Append($"-{Preferences.Instance.MaxHistoryCommits} ");
 
             if (_settings.EnableTopoOrderInHistories)
                 builder.Append("--topo-order ");
@@ -1118,7 +1118,7 @@ namespace SourceGit.ViewModels
             var root = Path.GetFullPath(Path.Combine(_fullpath, submodule));
             var normalizedPath = root.Replace("\\", "/");
 
-            var node = Preference.Instance.FindNode(normalizedPath);
+            var node = Preferences.Instance.FindNode(normalizedPath);
             if (node == null)
             {
                 node = new RepositoryNode()
@@ -1147,7 +1147,7 @@ namespace SourceGit.ViewModels
 
         public void OpenWorktree(Models.Worktree worktree)
         {
-            var node = Preference.Instance.FindNode(worktree.FullPath);
+            var node = Preferences.Instance.FindNode(worktree.FullPath);
             if (node == null)
             {
                 node = new RepositoryNode()
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index cd726d67..88a485bc 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -146,7 +146,7 @@ namespace SourceGit.ViewModels
                 Remotes.Add(remote.Name);
 
             AvailableOpenAIServices = new List<string>() { "---" };
-            foreach (var service in Preference.Instance.OpenAIServices)
+            foreach (var service in Preferences.Instance.OpenAIServices)
                 AvailableOpenAIServices.Add(service.Name);
 
             if (AvailableOpenAIServices.IndexOf(PreferedOpenAIService) == -1)
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
index ce10844e..77a408e0 100644
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@@ -150,8 +150,8 @@ namespace SourceGit.ViewModels
             diffWithMerger.Click += (_, ev) =>
             {
                 var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change);
-                var toolType = Preference.Instance.ExternalMergeToolType;
-                var toolPath = Preference.Instance.ExternalMergeToolPath;
+                var toolType = Preferences.Instance.ExternalMergeToolType;
+                var toolPath = Preferences.Instance.ExternalMergeToolPath;
 
                 Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, opt));
                 ev.Handled = true;
diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs
index be8af5ab..5c023587 100644
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@@ -18,7 +18,7 @@ namespace SourceGit.ViewModels
 
         public ScanRepositories(string rootDir)
         {
-            GetManagedRepositories(Preference.Instance.RepositoryNodes, _managed);
+            GetManagedRepositories(Preferences.Instance.RepositoryNodes, _managed);
 
             RootDir = rootDir;
             View = new Views.ScanRepositories() { DataContext = this };
@@ -50,17 +50,17 @@ namespace SourceGit.ViewModels
                         var parent = new DirectoryInfo(f).Parent!.FullName.Replace("\\", "/");
                         if (parent.Equals(normalizedRoot, StringComparison.Ordinal))
                         {
-                            Preference.Instance.FindOrAddNodeByRepositoryPath(f, null, false);
+                            Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false);
                         }
                         else if (parent.StartsWith(normalizedRoot, StringComparison.Ordinal))
                         {
                             var relative = parent.Substring(normalizedRoot.Length).TrimStart('/');
-                            var group = FindOrCreateGroupRecursive(Preference.Instance.RepositoryNodes, relative);
-                            Preference.Instance.FindOrAddNodeByRepositoryPath(f, group, false);
+                            var group = FindOrCreateGroupRecursive(Preferences.Instance.RepositoryNodes, relative);
+                            Preferences.Instance.FindOrAddNodeByRepositoryPath(f, group, false);
                         }
                     }
 
-                    Preference.Instance.AutoRemoveInvalidNode();
+                    Preferences.Instance.AutoRemoveInvalidNode();
                     Welcome.Instance.Refresh();
                 });
 
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 44223b6e..3ddb2b65 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -161,8 +161,8 @@ namespace SourceGit.ViewModels
             diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
             diffWithMerger.Click += (_, ev) =>
             {
-                var toolType = Preference.Instance.ExternalMergeToolType;
-                var toolPath = Preference.Instance.ExternalMergeToolPath;
+                var toolType = Preferences.Instance.ExternalMergeToolType;
+                var toolPath = Preferences.Instance.ExternalMergeToolPath;
                 var opt = new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, change);
 
                 Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt));
diff --git a/src/ViewModels/Statistics.cs b/src/ViewModels/Statistics.cs
index 6caa2d95..68098a63 100644
--- a/src/ViewModels/Statistics.cs
+++ b/src/ViewModels/Statistics.cs
@@ -33,12 +33,12 @@ namespace SourceGit.ViewModels
 
         public uint SampleColor
         {
-            get => Preference.Instance.StatisticsSampleColor;
+            get => Preferences.Instance.StatisticsSampleColor;
             set
             {
-                if (value != Preference.Instance.StatisticsSampleColor)
+                if (value != Preferences.Instance.StatisticsSampleColor)
                 {
-                    Preference.Instance.StatisticsSampleColor = value;
+                    Preferences.Instance.StatisticsSampleColor = value;
                     OnPropertyChanged(nameof(SampleBrush));
                     _selectedReport?.ChangeColor(value);
                 }
@@ -54,7 +54,7 @@ namespace SourceGit.ViewModels
         {
             Task.Run(() =>
             {
-                var result = new Commands.Statistics(repo, Preference.Instance.MaxHistoryCommits).Result();
+                var result = new Commands.Statistics(repo, Preferences.Instance.MaxHistoryCommits).Result();
                 Dispatcher.UIThread.Invoke(() =>
                 {
                     _data = result;
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index daedc4c5..e6d64469 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -38,17 +38,17 @@ namespace SourceGit.ViewModels
         {
             if (string.IsNullOrWhiteSpace(_searchFilter))
             {
-                foreach (var node in Preference.Instance.RepositoryNodes)
+                foreach (var node in Preferences.Instance.RepositoryNodes)
                     ResetVisibility(node);
             }
             else
             {
-                foreach (var node in Preference.Instance.RepositoryNodes)
+                foreach (var node in Preferences.Instance.RepositoryNodes)
                     SetVisibilityBySearch(node);
             }
 
             var rows = new List<RepositoryNode>();
-            MakeTreeRows(rows, Preference.Instance.RepositoryNodes);
+            MakeTreeRows(rows, Preferences.Instance.RepositoryNodes);
             Rows.Clear();
             Rows.AddRange(rows);
         }
@@ -85,7 +85,7 @@ namespace SourceGit.ViewModels
 
         public void InitRepository(string path, RepositoryNode parent, string reason)
         {
-            if (!Preference.Instance.IsGitConfigured())
+            if (!Preferences.Instance.IsGitConfigured())
             {
                 App.RaiseException(string.Empty, App.Text("NotConfigured"));
                 return;
@@ -98,7 +98,7 @@ namespace SourceGit.ViewModels
 
         public void Clone()
         {
-            if (!Preference.Instance.IsGitConfigured())
+            if (!Preferences.Instance.IsGitConfigured())
             {
                 App.RaiseException(string.Empty, App.Text("NotConfigured"));
                 return;
@@ -111,7 +111,7 @@ namespace SourceGit.ViewModels
 
         public void OpenTerminal()
         {
-            if (!Preference.Instance.IsGitConfigured())
+            if (!Preferences.Instance.IsGitConfigured())
                 App.RaiseException(string.Empty, App.Text("NotConfigured"));
             else
                 Native.OS.OpenTerminal(null);
@@ -119,7 +119,7 @@ namespace SourceGit.ViewModels
 
         public void ScanDefaultCloneDir()
         {
-            var defaultCloneDir = Preference.Instance.GitDefaultCloneDir;
+            var defaultCloneDir = Preferences.Instance.GitDefaultCloneDir;
             if (string.IsNullOrEmpty(defaultCloneDir))
             {
                 App.RaiseException(string.Empty, "The default clone directory hasn't been configured!");
@@ -151,7 +151,7 @@ namespace SourceGit.ViewModels
 
         public void MoveNode(RepositoryNode from, RepositoryNode to)
         {
-            Preference.Instance.MoveNode(from, to, true);
+            Preferences.Instance.MoveNode(from, to, true);
             Refresh();
         }
 
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index b0f608aa..67fd6990 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -465,8 +465,8 @@ namespace SourceGit.ViewModels
 
         public async void UseExternalMergeTool(Models.Change change)
         {
-            var toolType = Preference.Instance.ExternalMergeToolType;
-            var toolPath = Preference.Instance.ExternalMergeToolPath;
+            var toolType = Preferences.Instance.ExternalMergeToolType;
+            var toolPath = Preferences.Instance.ExternalMergeToolPath;
 
             _repo.SetWatcherEnabled(false);
             await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
@@ -1601,7 +1601,7 @@ namespace SourceGit.ViewModels
 
         private IList<Models.OpenAIService> GetPreferedOpenAIServices()
         {
-            var services = Preference.Instance.OpenAIServices;
+            var services = Preferences.Instance.OpenAIServices;
             if (services == null || services.Count == 0)
                 return [];
 
diff --git a/src/Views/AIAssistant.axaml b/src/Views/AIAssistant.axaml
index 528d0e5b..a273b240 100644
--- a/src/Views/AIAssistant.axaml
+++ b/src/Views/AIAssistant.axaml
@@ -45,7 +45,7 @@
     <TextBlock Grid.Row="2"
                x:Name="ProgressMessage"
                Margin="16"
-               FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+               FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                HorizontalAlignment="Center"
                Text="Generating commit message... Please wait!"
                TextTrimming="CharacterEllipsis"/>
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index 9d3afd77..1ddb18fb 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -57,7 +57,7 @@
                          Background="Transparent"
                          Foreground="{DynamicResource Brush.FG1}"
                          FontFamily="{DynamicResource Fonts.Monospace}"
-                         FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
+                         FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
                          BlameData="{Binding Data}"/>
       
       <!-- Not supported mask (for binary files) -->
diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml
index b0e227c2..04b77306 100644
--- a/src/Views/BranchCompare.axaml
+++ b/src/Views/BranchCompare.axaml
@@ -126,12 +126,12 @@
             <v:ChangeViewModeSwitcher Grid.Column="1"
                                       Width="14" Height="14"
                                       HorizontalAlignment="Right"
-                                      ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
+                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
           </Grid>
 
           <!-- Changes -->
           <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
-            <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode}"
+            <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                     Changes="{Binding VisibleChanges}"
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                     ContextRequested="OnChangeContextRequested"/>
diff --git a/src/Views/ChromelessWindow.cs b/src/Views/ChromelessWindow.cs
index 107a7ba3..647c657e 100644
--- a/src/Views/ChromelessWindow.cs
+++ b/src/Views/ChromelessWindow.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Views
     {
         public bool UseSystemWindowFrame
         {
-            get => OperatingSystem.IsLinux() && ViewModels.Preference.Instance.UseSystemWindowFrame;
+            get => OperatingSystem.IsLinux() && ViewModels.Preferences.Instance.UseSystemWindowFrame;
         }
 
         protected override Type StyleKeyOverride => typeof(Window);
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 96d40383..bb083d82 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -25,7 +25,7 @@
               </DockPanel>
               <SelectableTextBlock Text="{Binding AuthorTimeStr}"
                                    Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                                    Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
@@ -41,7 +41,7 @@
               </DockPanel>
               <SelectableTextBlock Text="{Binding CommitterTimeStr}"
                                    Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                                    Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 1c7b34bd..377be944 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -9,7 +9,7 @@
              x:DataType="vm:CommitDetail">
   <Grid>
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.CommitDetailChangesLeftWidth, Mode=TwoWay}" MinWidth="200"/>
+      <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.CommitDetailChangesLeftWidth, Mode=TwoWay}" MinWidth="200"/>
       <ColumnDefinition Width="4"/>
       <ColumnDefinition Width="*" MinWidth="100"/>
     </Grid.ColumnDefinitions>
@@ -40,13 +40,13 @@
         <v:ChangeViewModeSwitcher Grid.Column="1"
                                   Width="18" Height="18"
                                   Margin="4,0,0,0"
-                                  ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
+                                  ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
       </Grid>
 
       <!-- 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:Preference.Instance}, Path=CommitChangeViewMode}"
+                                ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                 Changes="{Binding VisibleChanges}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                 ContextRequested="OnChangeContextRequested"/>
diff --git a/src/Views/CommitMessageTextBox.axaml b/src/Views/CommitMessageTextBox.axaml
index 88862a8a..44d5d5fb 100644
--- a/src/Views/CommitMessageTextBox.axaml
+++ b/src/Views/CommitMessageTextBox.axaml
@@ -44,7 +44,7 @@
           <TextBlock Classes="primary" Margin="2,0,0,0" FontSize="11" Text="{Binding #ThisControl.Subject.Length}" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthGood}}"/>
           <TextBlock Classes="primary" Margin="2,0,0,0" FontSize="11" Foreground="DarkGoldenrod" Text="{Binding #ThisControl.Subject.Length}" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthBad}}"/>
           <TextBlock Classes="primary" FontSize="11" Text="/"/>
-          <TextBlock Classes="primary" FontSize="11" Text="{Binding Source={x:Static vm:Preference.Instance}, Path=SubjectGuideLength}"/>
+          <TextBlock Classes="primary" FontSize="11" Text="{Binding Source={x:Static vm:Preferences.Instance}, Path=SubjectGuideLength}"/>
           <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/ConfigureWorkspace.axaml.cs b/src/Views/ConfigureWorkspace.axaml.cs
index e2cc1cb2..012c2e85 100644
--- a/src/Views/ConfigureWorkspace.axaml.cs
+++ b/src/Views/ConfigureWorkspace.axaml.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            ViewModels.Preference.Instance.Save();
+            ViewModels.Preferences.Instance.Save();
             base.OnClosing(e);
         }
     }
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 550265ab..23a141c3 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -46,7 +46,7 @@
               <Border.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
                   <Binding Path="IsTextDiff"/>
-                  <Binding Source="{x:Static vm:Preference.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/>
+                  <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/>
                 </MultiBinding>
               </Border.IsVisible>
               
@@ -63,7 +63,7 @@
             
             <ToggleButton Classes="line_path"
                           Width="28"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseBlockNavigationInDiffView, Mode=TwoWay}"
+                          IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseBlockNavigationInDiffView, Mode=TwoWay}"
                           IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.UseBlockNavigation}">
               <Path Width="13" Height="13" Data="{StaticResource Icons.CodeBlock}" Margin="0,3,0,0"/>
@@ -75,7 +75,7 @@
                     IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Incr}">
               <Button.IsEnabled>
-                <Binding Source="{x:Static vm:Preference.Instance}" Path="UseFullTextDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
+                <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseFullTextDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
               </Button.IsEnabled>
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Incr}"/>
             </Button>
@@ -88,7 +88,7 @@
               <Button.IsEnabled>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
                   <Binding Path="UnifiedLines" Mode="OneWay" Converter="{x:Static c:IntConverters.IsGreaterThanFour}"/>
-                  <Binding Source="{x:Static vm:Preference.Instance}" Path="UseFullTextDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
+                  <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseFullTextDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
                 </MultiBinding>
               </Button.IsEnabled>
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Decr}"/>
@@ -97,7 +97,7 @@
             <ToggleButton Classes="line_path"
                           Width="28"
                           Command="{Binding ToggleFullTextDiff}"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFullTextDiff, Mode=OneWay}"
+                          IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFullTextDiff, Mode=OneWay}"
                           IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.All}">
               <Path Width="13" Height="13" Data="{StaticResource Icons.Lines.All}" Margin="0,3,0,0"/>
@@ -106,7 +106,7 @@
             <ToggleButton Classes="line_path"
                           Width="28"
                           Background="Transparent"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting, Mode=TwoWay}"
+                          IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting, Mode=TwoWay}"
                           IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.SyntaxHighlight}">
               <Path Width="13" Height="13" Data="{StaticResource Icons.SyntaxHighlight}" Margin="0,3,0,0"/>
@@ -114,12 +114,12 @@
 
             <ToggleButton Classes="line_path"
                           Width="28"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap, Mode=TwoWay}"
+                          IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableDiffViewWordWrap, Mode=TwoWay}"
                           ToolTip.Tip="{DynamicResource Text.Diff.ToggleWordWrap}">
               <ToggleButton.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
                   <Binding Path="IsTextDiff"/>
-                  <Binding Source="{x:Static vm:Preference.Instance}" Path="UseSideBySideDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
+                  <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseSideBySideDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
                 </MultiBinding>
               </ToggleButton.IsVisible>
               
@@ -135,7 +135,7 @@
 
             <ToggleButton Classes="line_path"
                           Width="28"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView, Mode=TwoWay}"
+                          IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView, Mode=TwoWay}"
                           IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.ShowHiddenSymbols}">
               <Path Width="11" Height="11" Stretch="Uniform" Data="{StaticResource Icons.HiddenSymbol}" Margin="0,1,0,0"/>
@@ -143,7 +143,7 @@
 
             <ToggleButton Classes="line_path"
                           Width="28" Height="18"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=TwoWay}"
+                          IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSideBySideDiff, Mode=TwoWay}"
                           IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.SideBySide}">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Layout}" Margin="0,2,0,0"/>
@@ -259,8 +259,8 @@
           <!-- Text Diff -->
           <DataTemplate DataType="m:TextDiff">
             <v:TextDiffView
-              UseSideBySideDiff="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"
-              UseBlockNavigation="{Binding Source={x:Static vm:Preference.Instance}, Path=UseBlockNavigationInDiffView, Mode=OneWay}"
+              UseSideBySideDiff="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"
+              UseBlockNavigation="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseBlockNavigationInDiffView, Mode=OneWay}"
               BlockNavigationIndicator="{Binding #BlockNavigationIndicator.Text, Mode=OneWayToSource}"/>
           </DataTemplate>
 
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 95f98e61..5cde532f 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -10,7 +10,7 @@
              x:Class="SourceGit.Views.Histories"
              x:DataType="vm:Histories"
              x:Name="ThisControl">
-  <v:LayoutableGrid UseHorizontal="{Binding Source={x:Static vm:Preference.Instance}, Path=UseTwoColumnsLayoutInHistories}">
+  <v:LayoutableGrid UseHorizontal="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseTwoColumnsLayoutInHistories}">
     <v:LayoutableGrid.RowDefinitions>
       <RowDefinition Height="{Binding TopArea, Mode=TwoWay}" MinHeight="100"/>
       <RowDefinition Height="3"/>
@@ -51,11 +51,11 @@
               <TextBlock Classes="table_header"
                          Margin="6,0,0,0"
                          Text="{DynamicResource Text.Histories.Header.Time}"
-                         IsVisible="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowAuthorTimeInGraph, Converter={x:Static BoolConverters.Not}, Mode=OneWay}"/>
+                         IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowAuthorTimeInGraph, Converter={x:Static BoolConverters.Not}, Mode=OneWay}"/>
               <TextBlock Classes="table_header"
                          Margin="6,0,0,0"
                          Text="{DynamicResource Text.Histories.Header.AuthorTime}"
-                         IsVisible="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowAuthorTimeInGraph, Mode=OneWay}"/>
+                         IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowAuthorTimeInGraph, Mode=OneWay}"/>
             </StackPanel>
           </Grid>
         </Border>
@@ -193,9 +193,9 @@
                                            HorizontalAlignment="Center"
                                            FontWeight="{Binding FontWeight}"
                                            Opacity="{Binding Opacity}"
-                                           UseAuthorTime="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowAuthorTimeInGraph, Mode=OneWay}"
-                                           ShowAsDateTime="{Binding Source={x:Static vm:Preference.Instance}, Path=!DisplayTimeAsPeriodInHistories}"
-                                           DateTimeFormat="{Binding Source={x:Static vm:Preference.Instance}, Path=DateTimeFormat}"/>
+                                           UseAuthorTime="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowAuthorTimeInGraph, Mode=OneWay}"
+                                           ShowAsDateTime="{Binding Source={x:Static vm:Preferences.Instance}, Path=!DisplayTimeAsPeriodInHistories}"
+                                           DateTimeFormat="{Binding Source={x:Static vm:Preferences.Instance}, Path=DateTimeFormat}"/>
                   </Border>
                 </Grid>
               </DataTemplate>
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 19f9dc78..1ce4bb9a 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -42,12 +42,12 @@
         <TextBlock Text="{DynamicResource Text.Hotkeys.Global}"
                    Foreground="{DynamicResource Brush.FG2}"
                    FontWeight="Bold"
-                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
+                   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" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+\,}"/>
-          <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreference}"/>
+          <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="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
@@ -71,7 +71,7 @@
         <TextBlock Text="{DynamicResource Text.Hotkeys.Repo}"
                    Foreground="{DynamicResource Brush.FG2}"
                    FontWeight="Bold"
-                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
+                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20,20,20,20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
@@ -124,7 +124,7 @@
         <TextBlock Text="{DynamicResource Text.Hotkeys.TextEditor}"
                    Foreground="{DynamicResource Brush.FG2}"
                    FontWeight="Bold"
-                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
+                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="150,*">
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index a0691c4c..771ccce5 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -35,7 +35,7 @@
       <Button Grid.Column="0" Classes="icon_button" VerticalAlignment="Bottom" Margin="6,0,2,3" IsVisible="{OnPlatform True, macOS=False}">
         <Button.Flyout>
           <MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
-            <MenuItem Header="{DynamicResource Text.Preference}" Command="{x:Static s:App.OpenPreferenceCommand}" InputGesture="Ctrl+Shift+P">
+            <MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+Shift+P">
               <MenuItem.Icon>
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
               </MenuItem.Icon>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 2345958c..39abb71b 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -34,14 +34,14 @@ namespace SourceGit.Views
             get
             {
                 if (OperatingSystem.IsLinux())
-                    return !ViewModels.Preference.Instance.UseSystemWindowFrame;
+                    return !ViewModels.Preferences.Instance.UseSystemWindowFrame;
                 return OperatingSystem.IsWindows();
             }
         }
 
         public Launcher()
         {
-            var layout = ViewModels.Preference.Instance.Layout;
+            var layout = ViewModels.Preferences.Instance.Layout;
             if (layout.LauncherWindowState != WindowState.Maximized)
             {
                 Width = layout.LauncherWidth;
@@ -81,7 +81,7 @@ namespace SourceGit.Views
         {
             base.OnOpened(e);
 
-            var state = ViewModels.Preference.Instance.Layout.LauncherWindowState;
+            var state = ViewModels.Preferences.Instance.Layout.LauncherWindowState;
             if (state == WindowState.Maximized || state == WindowState.FullScreen)
                 WindowState = WindowState.Maximized;
         }
@@ -99,7 +99,7 @@ namespace SourceGit.Views
                 if (OperatingSystem.IsMacOS())
                     HasLeftCaptionButton = state != WindowState.FullScreen;
 
-                ViewModels.Preference.Instance.Layout.LauncherWindowState = state;
+                ViewModels.Preferences.Instance.Layout.LauncherWindowState = state;
             }
         }
 
@@ -115,7 +115,7 @@ namespace SourceGit.Views
             // Ctrl+Shift+P opens preference dialog (macOS use hotkeys in system menu bar)
             if (!OperatingSystem.IsMacOS() && e.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift) && e.Key == Key.P)
             {
-                App.OpenDialog(new Preference());
+                App.OpenDialog(new Preferences());
                 e.Handled = true;
                 return;
             }
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 40a2efe6..5be41a13 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -49,7 +49,7 @@
                   </Grid>
                 </ToolTip.Tip>
                 
-                <Grid Width="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
+                <Grid Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
                   <Path Grid.Column="0"
                         Width="12" Height="12" Margin="12,0"
                         Fill="{Binding Node.Bookmark, Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
@@ -65,7 +65,7 @@
                   <TextBlock Grid.Column="1"
                              Classes="primary"
                              HorizontalAlignment="Stretch" VerticalAlignment="Center"
-                             FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                             FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                              TextAlignment="Center"
                              Text="{Binding Node.Name}"
                              IsVisible="{Binding Node.IsRepository}"
@@ -73,7 +73,7 @@
                   <TextBlock Grid.Column="1"
                              Classes="primary"
                              HorizontalAlignment="Stretch" VerticalAlignment="Center"
-                             FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                             FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                              TextAlignment="Center"
                              Text="{DynamicResource Text.PageTabBar.Welcome.Title}"
                              IsVisible="{Binding !Node.IsRepository}"
diff --git a/src/Views/PopupRunningStatus.axaml b/src/Views/PopupRunningStatus.axaml
index 0522e46b..c2d86f51 100644
--- a/src/Views/PopupRunningStatus.axaml
+++ b/src/Views/PopupRunningStatus.axaml
@@ -18,7 +18,7 @@
     <TextBlock x:Name="TxtDesc"
                HorizontalAlignment="Stretch"
                TextWrapping="Wrap"
-               FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+               FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                FontStyle="Italic"
                Text="{Binding #ThisControl.Description}"/>
     
diff --git a/src/Views/Preference.axaml b/src/Views/Preferences.axaml
similarity index 88%
rename from src/Views/Preference.axaml
rename to src/Views/Preferences.axaml
index 1c01578a..7f3633ad 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preferences.axaml
@@ -8,11 +8,11 @@
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                    x:Class="SourceGit.Views.Preference"
-                    x:DataType="vm:Preference"
+                    x:Class="SourceGit.Views.Preferences"
+                    x:DataType="vm:Preferences"
                     x:Name="ThisControl"
                     Icon="/App.ico"
-                    Title="{DynamicResource Text.Preference}"
+                    Title="{DynamicResource Text.Preferences}"
                     SizeToContent="WidthAndHeight"
                     CanResize="False"
                     WindowStartupLocation="CenterScreen">
@@ -30,7 +30,7 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <TextBlock Classes="bold"
-                 Text="{DynamicResource Text.Preference}"
+                 Text="{DynamicResource Text.Preferences}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
@@ -44,11 +44,11 @@
       <TabControl>
         <TabItem>
           <TabItem.Header>
-            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.General}"/>
           </TabItem.Header>
           <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.General.Locale}"
+                       Text="{DynamicResource Text.Preferences.General.Locale}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <ComboBox Grid.Row="0" Grid.Column="1"
@@ -60,7 +60,7 @@
                       SelectedItem="{Binding Locale, Mode=TwoWay, Converter={x:Static c:StringConverters.ToLocale}}"/>
 
             <TextBlock Grid.Row="1" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.General.DateFormat}"
+                       Text="{DynamicResource Text.Preferences.General.DateFormat}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <ComboBox Grid.Row="1" Grid.Column="1"
@@ -80,7 +80,7 @@
             </ComboBox>
             
             <TextBlock Grid.Row="2" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Git.DefaultCloneDir}"
+                       Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="2" Grid.Column="1"
@@ -95,7 +95,7 @@
             </TextBox>
 
             <TextBlock Grid.Row="3" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
+                       Text="{DynamicResource Text.Preferences.General.SubjectGuideLength}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <NumericUpDown Grid.Row="3" Grid.Column="1"
@@ -108,7 +108,7 @@
                            Value="{Binding SubjectGuideLength, Mode=TwoWay}"/>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
+                       Text="{DynamicResource Text.Preferences.General.MaxHistoryCommits}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <Grid Grid.Row="4" Grid.Column="1" ColumnDefinitions="*,64">
@@ -128,29 +128,29 @@
 
             <CheckBox Grid.Row="5" Grid.Column="1"
                       Height="32"
-                      Content="{DynamicResource Text.Preference.General.ShowAuthorTime}"
-                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowAuthorTimeInGraph, Mode=TwoWay}"/>
+                      Content="{DynamicResource Text.Preferences.General.ShowAuthorTime}"
+                      IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowAuthorTimeInGraph, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="6" Grid.Column="1"
                       Height="32"
-                      Content="{DynamicResource Text.Preference.General.ShowChildren}"
-                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowChildren, Mode=TwoWay}"/>
+                      Content="{DynamicResource Text.Preferences.General.ShowChildren}"
+                      IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowChildren, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
-                      Content="{DynamicResource Text.Preference.General.Check4UpdatesOnStartup}"
+                      Content="{DynamicResource Text.Preferences.General.Check4UpdatesOnStartup}"
                       IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"
-                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=Check4UpdatesOnStartup, Mode=TwoWay}"/>
+                      IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=Check4UpdatesOnStartup, Mode=TwoWay}"/>
           </Grid>
         </TabItem>
 
         <TabItem>
           <TabItem.Header>
-            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Appearance}"/>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
           </TabItem.Header>
           <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Appearance.Theme}"
+                       Text="{DynamicResource Text.Preferences.Appearance.Theme}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <ComboBox Grid.Row="0" Grid.Column="1"
@@ -167,7 +167,7 @@
             </ComboBox>
 
             <TextBlock Grid.Row="1" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Appearance.DefaultFont}"
+                       Text="{DynamicResource Text.Preferences.Appearance.DefaultFont}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="1" Grid.Column="1"
@@ -176,7 +176,7 @@
                      Text="{Binding DefaultFontFamily, Mode=TwoWay}"/>
 
             <TextBlock Grid.Row="2" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Appearance.MonospaceFont}"
+                       Text="{DynamicResource Text.Preferences.Appearance.MonospaceFont}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="2" Grid.Column="1"
@@ -185,7 +185,7 @@
                      Text="{Binding MonospaceFontFamily, Mode=TwoWay}"/>
 
             <TextBlock Grid.Row="3" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Appearance.FontSize}"
+                       Text="{DynamicResource Text.Preferences.Appearance.FontSize}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,8,*">
@@ -198,7 +198,7 @@
                            Value="{Binding DefaultFontSize, Mode=TwoWay}">
                 <NumericUpDown.InnerLeftContent>
                   <Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource Brush.Border1}">
-                    <TextBlock Margin="4,0" Text="{DynamicResource Text.Preference.Appearance.FontSize.Default}"/>
+                    <TextBlock Margin="4,0" Text="{DynamicResource Text.Preferences.Appearance.FontSize.Default}"/>
                   </Border>
                 </NumericUpDown.InnerLeftContent>
               </NumericUpDown>
@@ -211,14 +211,14 @@
                              Value="{Binding EditorFontSize, Mode=TwoWay}">
                 <NumericUpDown.InnerLeftContent>
                   <Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource Brush.Border1}">
-                    <TextBlock Margin="4,0" Text="{DynamicResource Text.Preference.Appearance.FontSize.Editor}"/>
+                    <TextBlock Margin="4,0" Text="{DynamicResource Text.Preferences.Appearance.FontSize.Editor}"/>
                   </Border>
                 </NumericUpDown.InnerLeftContent>
               </NumericUpDown>
             </Grid>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Appearance.ThemeOverrides}"
+                       Text="{DynamicResource Text.Preferences.Appearance.ThemeOverrides}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="4" Grid.Column="1"
@@ -233,18 +233,18 @@
             </TextBox>
 
             <CheckBox Grid.Row="5" Grid.Column="1"
-                      Content="{DynamicResource Text.Preference.Appearance.OnlyUseMonoFontInEditor}"
+                      Content="{DynamicResource Text.Preferences.Appearance.OnlyUseMonoFontInEditor}"
                       IsChecked="{Binding OnlyUseMonoFontInEditor, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="6" Grid.Column="1"
                       Height="32"
-                      Content="{DynamicResource Text.Preference.Appearance.UseFixedTabWidth}"
-                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
+                      Content="{DynamicResource Text.Preferences.Appearance.UseFixedTabWidth}"
+                      IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
-                      Content="{DynamicResource Text.Preference.Appearance.UseNativeWindowFrame}"
-                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSystemWindowFrame, Mode=OneTime}"
+                      Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
+                      IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSystemWindowFrame, Mode=OneTime}"
                       IsVisible="{OnPlatform False, Linux=True}"
                       IsCheckedChanged="OnUseNativeWindowFrameChanged"/>
           </Grid>
@@ -252,12 +252,12 @@
 
         <TabItem>
           <TabItem.Header>
-            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Git}"/>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Git}"/>
           </TabItem.Header>
 
           <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Git.Path}"
+                       Text="{DynamicResource Text.Preferences.Git.Path}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="0" Grid.Column="1"
@@ -273,7 +273,7 @@
             </TextBox>
 
             <TextBlock Grid.Row="1" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Git.Version}"
+                       Text="{DynamicResource Text.Preferences.Git.Version}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
@@ -282,34 +282,34 @@
                          IsVisible="{Binding #ThisControl.GitVersion, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
 
               <Border Background="Transparent"
-                      ToolTip.Tip="{DynamicResource Text.Preference.Git.Invalid}"
+                      ToolTip.Tip="{DynamicResource Text.Preferences.Git.Invalid}"
                       IsVisible="{Binding #ThisControl.ShowGitVersionWarning}">
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
               </Border>
             </StackPanel>
 
             <TextBlock Grid.Row="2" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Git.User}"
+                       Text="{DynamicResource Text.Preferences.Git.User}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="2" Grid.Column="1"
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.DefaultUser, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
+                     Watermark="{DynamicResource Text.Preferences.Git.User.Placeholder}"/>
 
             <TextBlock Grid.Row="3" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Git.Email}"
+                       Text="{DynamicResource Text.Preferences.Git.Email}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="3" Grid.Column="1"
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.DefaultEmail, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
+                     Watermark="{DynamicResource Text.Preferences.Git.Email.Placeholder}"/>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.Git.CRLF}"
+                       Text="{DynamicResource Text.Preferences.Git.CRLF}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <ComboBox Grid.Row="4" Grid.Column="1"
@@ -330,19 +330,19 @@
 
             <CheckBox Grid.Row="5" Grid.Column="1"
                       Height="32"
-                      Content="{DynamicResource Text.Preference.Git.SSLVerify}"
+                      Content="{DynamicResource Text.Preferences.Git.SSLVerify}"
                       IsChecked="{Binding #ThisControl.EnableHTTPSSLVerify, Mode=TwoWay}"/>
           </Grid>
         </TabItem>
 
         <TabItem>
           <TabItem.Header>
-            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.GPG}"/>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.GPG}"/>
           </TabItem.Header>
 
           <Grid Margin="8" RowDefinitions="32,Auto,32,32,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.GPG.Format}"
+                       Text="{DynamicResource Text.Preferences.GPG.Format}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <ComboBox Grid.Row="0" Grid.Column="1"
@@ -362,7 +362,7 @@
             </ComboBox>
 
             <TextBlock Grid.Row="1" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.GPG.Path}"
+                       Text="{DynamicResource Text.Preferences.GPG.Path}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"
                        IsVisible="{Binding #ThisControl.GPGFormat.NeedFindProgram}"/>
@@ -370,7 +370,7 @@
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.GPGExecutableFile, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preference.GPG.Path.Placeholder}"
+                     Watermark="{DynamicResource Text.Preferences.GPG.Path.Placeholder}"
                      IsVisible="{Binding #ThisControl.GPGFormat.NeedFindProgram}">
               <TextBox.InnerRightContent>
                 <Button Classes="icon_button" Width="30" Height="30" Click="SelectGPGExecutable">
@@ -380,34 +380,34 @@
             </TextBox>
 
             <TextBlock Grid.Row="2" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.GPG.UserKey}"
+                       Text="{DynamicResource Text.Preferences.GPG.UserKey}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
             <TextBox Grid.Row="2" Grid.Column="1"
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.GPGUserKey, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"/>
+                     Watermark="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"/>
 
             <CheckBox Grid.Row="3" Grid.Column="1"
-                      Content="{DynamicResource Text.Preference.GPG.CommitEnabled}"
+                      Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
                       IsChecked="{Binding #ThisControl.EnableGPGCommitSigning, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="4" Grid.Column="1"
-                      Content="{DynamicResource Text.Preference.GPG.TagEnabled}"
+                      Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                       IsChecked="{Binding #ThisControl.EnableGPGTagSigning, Mode=TwoWay}"/>
           </Grid>
         </TabItem>
 
         <TabItem>
           <TabItem.Header>
-            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Integration}"/>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Integration}"/>
           </TabItem.Header>
 
           <StackPanel Margin="8" MaxWidth="580" Orientation="Vertical" Grid.IsSharedSizeScope="True">
             <StackPanel Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Terminal}"/>
-              <TextBlock Classes="bold" Margin="4,0,0,0" Text="{DynamicResource Text.Preference.Shell}"/>
+              <TextBlock Classes="bold" Margin="4,0,0,0" Text="{DynamicResource Text.Preferences.Shell}"/>
             </StackPanel>
             <Rectangle Margin="0,8" Fill="{DynamicResource Brush.Border2}" Height=".6" HorizontalAlignment="Stretch"/>
             <Grid Margin="8,0,0,0" RowDefinitions="32,Auto">
@@ -417,7 +417,7 @@
               </Grid.ColumnDefinitions>
 
               <TextBlock Grid.Row="0" Grid.Column="0"
-                         Text="{DynamicResource Text.Preference.Shell.Type}"
+                         Text="{DynamicResource Text.Preferences.Shell.Type}"
                          HorizontalAlignment="Right"
                          Margin="0,0,16,0"/>
               <ComboBox Grid.Row="0" Grid.Column="1"
@@ -437,7 +437,7 @@
               </ComboBox>
 
               <TextBlock Grid.Row="1" Grid.Column="0"
-                         Text="{DynamicResource Text.Preference.Shell.Path}"
+                         Text="{DynamicResource Text.Preferences.Shell.Path}"
                          HorizontalAlignment="Right"
                          Margin="0,0,16,0"
                          IsVisible="{OnPlatform True, macOS=False}"/>
@@ -456,7 +456,7 @@
 
             <StackPanel Orientation="Horizontal" Margin="0,24,0,0">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Diff}"/>
-              <TextBlock Classes="bold" Margin="4,0,0,0" Text="{DynamicResource Text.Preference.DiffMerge}"/>
+              <TextBlock Classes="bold" Margin="4,0,0,0" Text="{DynamicResource Text.Preferences.DiffMerge}"/>
             </StackPanel>
             <Rectangle Margin="0,8" Fill="{DynamicResource Brush.Border2}" Height=".6" HorizontalAlignment="Stretch"/>
             <Grid Margin="8,0,0,8" RowDefinitions="32,Auto">
@@ -466,7 +466,7 @@
               </Grid.ColumnDefinitions>
 
               <TextBlock Grid.Row="0" Grid.Column="0"
-                         Text="{DynamicResource Text.Preference.DiffMerge.Type}"
+                         Text="{DynamicResource Text.Preferences.DiffMerge.Type}"
                          HorizontalAlignment="Right"
                          Margin="0,0,16,0"/>
               <ComboBox Grid.Row="0" Grid.Column="1"
@@ -489,7 +489,7 @@
               </ComboBox>
 
               <TextBlock Grid.Row="1" Grid.Column="0"
-                         Text="{DynamicResource Text.Preference.DiffMerge.Path}"
+                         Text="{DynamicResource Text.Preferences.DiffMerge.Path}"
                          HorizontalAlignment="Right"
                          Margin="0,0,16,0"
                          IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
@@ -497,7 +497,7 @@
                        Height="28"
                        CornerRadius="3"
                        Text="{Binding ExternalMergeToolPath, Mode=TwoWay}"
-                       Watermark="{DynamicResource Text.Preference.DiffMerge.Path.Placeholder}"
+                       Watermark="{DynamicResource Text.Preferences.DiffMerge.Path.Placeholder}"
                        IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
                 <TextBox.InnerRightContent>
                   <Button Classes="icon_button" Width="30" Height="30" Click="SelectExternalMergeTool">
@@ -511,7 +511,7 @@
 
         <TabItem>
           <TabItem.Header>
-            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.AI}"/>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.AI}"/>
           </TabItem.Header>
 
           <Grid ColumnDefinitions="200,*" Margin="0,8,0,16" MinHeight="400">
@@ -582,19 +582,19 @@
               <ContentControl.DataTemplates>
                 <DataTemplate DataType="m:OpenAIService">
                   <StackPanel Orientation="Vertical" MaxWidth="680">
-                    <TextBlock Text="{DynamicResource Text.Preference.AI.Name}"/>
+                    <TextBlock Text="{DynamicResource Text.Preferences.AI.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.Preference.AI.Server}"/>
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.Server}"/>
                     <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Server, Mode=TwoWay}"/>
 
-                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preference.AI.Model}"/>
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.Model}"/>
                     <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Model, Mode=TwoWay}"/>
 
-                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preference.AI.ApiKey}"/>
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.ApiKey}"/>
                     <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding ApiKey, Mode=TwoWay}" PasswordChar="*"/>
                     
-                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preference.AI.AnalyzeDiffPrompt}"/>                    
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.AnalyzeDiffPrompt}"/>                    
                     <TextBox Height="120"
                              Margin="0,4,0,0"
                              CornerRadius="3"
@@ -603,7 +603,7 @@
                              AcceptsReturn="true"
                              TextWrapping="Wrap"/>
 
-                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preference.AI.GenerateSubjectPrompt}"/>
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.GenerateSubjectPrompt}"/>
                     <TextBox Height="120"
                              Margin="0,4,0,0"
                              CornerRadius="3"
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preferences.axaml.cs
similarity index 88%
rename from src/Views/Preference.axaml.cs
rename to src/Views/Preferences.axaml.cs
index 05bb724c..2bc5c571 100644
--- a/src/Views/Preference.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -8,7 +8,7 @@ using Avalonia.Platform.Storage;
 
 namespace SourceGit.Views
 {
-    public partial class Preference : ChromelessWindow
+    public partial class Preferences : ChromelessWindow
     {
         public string DefaultUser
         {
@@ -29,7 +29,7 @@ namespace SourceGit.Views
         } = null;
 
         public static readonly StyledProperty<string> GitVersionProperty =
-            AvaloniaProperty.Register<Preference, string>(nameof(GitVersion));
+            AvaloniaProperty.Register<Preferences, string>(nameof(GitVersion));
 
         public string GitVersion
         {
@@ -38,7 +38,7 @@ namespace SourceGit.Views
         }
 
         public static readonly StyledProperty<bool> ShowGitVersionWarningProperty =
-            AvaloniaProperty.Register<Preference, bool>(nameof(ShowGitVersionWarning));
+            AvaloniaProperty.Register<Preferences, bool>(nameof(ShowGitVersionWarning));
 
         public bool ShowGitVersionWarning
         {
@@ -59,7 +59,7 @@ namespace SourceGit.Views
         }
 
         public static readonly StyledProperty<Models.GPGFormat> GPGFormatProperty =
-            AvaloniaProperty.Register<Preference, Models.GPGFormat>(nameof(GPGFormat), Models.GPGFormat.Supported[0]);
+            AvaloniaProperty.Register<Preferences, Models.GPGFormat>(nameof(GPGFormat), Models.GPGFormat.Supported[0]);
 
         public Models.GPGFormat GPGFormat
         {
@@ -68,7 +68,7 @@ namespace SourceGit.Views
         }
 
         public static readonly StyledProperty<string> GPGExecutableFileProperty =
-            AvaloniaProperty.Register<Preference, string>(nameof(GPGExecutableFile));
+            AvaloniaProperty.Register<Preferences, string>(nameof(GPGExecutableFile));
 
         public string GPGExecutableFile
         {
@@ -89,7 +89,7 @@ namespace SourceGit.Views
         } = false;
 
         public static readonly StyledProperty<Models.OpenAIService> SelectedOpenAIServiceProperty =
-            AvaloniaProperty.Register<Preference, Models.OpenAIService>(nameof(SelectedOpenAIService));
+            AvaloniaProperty.Register<Preferences, Models.OpenAIService>(nameof(SelectedOpenAIService));
 
         public Models.OpenAIService SelectedOpenAIService
         {
@@ -97,9 +97,9 @@ namespace SourceGit.Views
             set => SetValue(SelectedOpenAIServiceProperty, value);
         }
 
-        public Preference()
+        public Preferences()
         {
-            var pref = ViewModels.Preference.Instance;
+            var pref = ViewModels.Preferences.Instance;
             DataContext = pref;
 
             if (pref.IsGitConfigured())
@@ -194,7 +194,7 @@ namespace SourceGit.Views
             var selected = await StorageProvider.OpenFilePickerAsync(options);
             if (selected.Count == 1)
             {
-                ViewModels.Preference.Instance.ThemeOverrides = selected[0].Path.LocalPath;
+                ViewModels.Preferences.Instance.ThemeOverrides = selected[0].Path.LocalPath;
             }
 
             e.Handled = true;
@@ -212,7 +212,7 @@ namespace SourceGit.Views
             var selected = await StorageProvider.OpenFilePickerAsync(options);
             if (selected.Count == 1)
             {
-                ViewModels.Preference.Instance.GitInstallPath = selected[0].Path.LocalPath;
+                ViewModels.Preferences.Instance.GitInstallPath = selected[0].Path.LocalPath;
                 UpdateGitVersion();
             }
 
@@ -227,7 +227,7 @@ namespace SourceGit.Views
                 var selected = await StorageProvider.OpenFolderPickerAsync(options);
                 if (selected.Count == 1)
                 {
-                    ViewModels.Preference.Instance.GitDefaultCloneDir = selected[0].Path.LocalPath;
+                    ViewModels.Preferences.Instance.GitDefaultCloneDir = selected[0].Path.LocalPath;
                 }
             }
             catch (Exception ex)
@@ -263,7 +263,7 @@ namespace SourceGit.Views
 
         private async void SelectShellOrTerminal(object _, RoutedEventArgs e)
         {
-            var type = ViewModels.Preference.Instance.ShellOrTerminal;
+            var type = ViewModels.Preferences.Instance.ShellOrTerminal;
             if (type == -1)
                 return;
 
@@ -277,7 +277,7 @@ namespace SourceGit.Views
             var selected = await StorageProvider.OpenFilePickerAsync(options);
             if (selected.Count == 1)
             {
-                ViewModels.Preference.Instance.ShellOrTerminalPath = selected[0].Path.LocalPath;
+                ViewModels.Preferences.Instance.ShellOrTerminalPath = selected[0].Path.LocalPath;
             }
 
             e.Handled = true;
@@ -285,10 +285,10 @@ namespace SourceGit.Views
 
         private async void SelectExternalMergeTool(object _, RoutedEventArgs e)
         {
-            var type = ViewModels.Preference.Instance.ExternalMergeToolType;
+            var type = ViewModels.Preferences.Instance.ExternalMergeToolType;
             if (type < 0 || type >= Models.ExternalMerger.Supported.Count)
             {
-                ViewModels.Preference.Instance.ExternalMergeToolType = 0;
+                ViewModels.Preferences.Instance.ExternalMergeToolType = 0;
                 e.Handled = true;
                 return;
             }
@@ -303,7 +303,7 @@ namespace SourceGit.Views
             var selected = await StorageProvider.OpenFilePickerAsync(options);
             if (selected.Count == 1)
             {
-                ViewModels.Preference.Instance.ExternalMergeToolPath = selected[0].Path.LocalPath;
+                ViewModels.Preferences.Instance.ExternalMergeToolPath = selected[0].Path.LocalPath;
             }
 
             e.Handled = true;
@@ -325,7 +325,7 @@ namespace SourceGit.Views
         {
             if (sender is CheckBox box)
             {
-                ViewModels.Preference.Instance.UseSystemWindowFrame = box.IsChecked == true;
+                ViewModels.Preferences.Instance.UseSystemWindowFrame = box.IsChecked == true;
 
                 var dialog = new ConfirmRestart();
                 App.OpenDialog(dialog);
@@ -342,7 +342,7 @@ namespace SourceGit.Views
         private void OnAddOpenAIService(object sender, RoutedEventArgs e)
         {
             var service = new Models.OpenAIService() { Name = "Unnamed Service" };
-            ViewModels.Preference.Instance.OpenAIServices.Add(service);
+            ViewModels.Preferences.Instance.OpenAIServices.Add(service);
             SelectedOpenAIService = service;
 
             e.Handled = true;
@@ -353,7 +353,7 @@ namespace SourceGit.Views
             if (SelectedOpenAIService == null)
                 return;
 
-            ViewModels.Preference.Instance.OpenAIServices.Remove(SelectedOpenAIService);
+            ViewModels.Preferences.Instance.OpenAIServices.Remove(SelectedOpenAIService);
             SelectedOpenAIService = null;
             e.Handled = true;
         }
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index a6b86c60..d928cc20 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -11,7 +11,7 @@
              x:DataType="vm:Repository">
   <Grid>
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.RepositorySidebarWidth, Mode=TwoWay}" MinWidth="200" MaxWidth="500"/>
+      <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.RepositorySidebarWidth, Mode=TwoWay}" MinWidth="200" MaxWidth="500"/>
       <ColumnDefinition Width="3"/>
       <ColumnDefinition Width="*"/>
     </Grid.ColumnDefinitions>
@@ -115,7 +115,7 @@
                                 Classes="line_path"
                                 Width="26" Height="26"
                                 Background="Transparent"
-                                IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=DisplayTimeAsPeriodInHistories, Mode=TwoWay}"
+                                IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=DisplayTimeAsPeriodInHistories, Mode=TwoWay}"
                                 ToolTip.Tip="{DynamicResource Text.Repository.UseRelativeTimeInHistories}">
                     <Path Width="12" Height="12" Data="{StaticResource Icons.Stopwatch}"/>
                   </ToggleButton>
@@ -238,7 +238,7 @@
               <ToggleButton Grid.Column="3" 
                             Classes="tag_display_mode" 
                             Width="14" 
-                            IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}"
+                            IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}"
                             ToolTip.Tip="{DynamicResource Text.Repository.ShowTagsAsTree}"/>
               <Button Grid.Column="4"
                       Classes="icon_button"
@@ -263,7 +263,7 @@
                       Height="0"
                       Margin="8,0,4,0"
                       Background="Transparent"
-                      ShowTagsAsTree="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowTagsAsTree, Mode=OneWay}"
+                      ShowTagsAsTree="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsAsTree, Mode=OneWay}"
                       Tags="{Binding VisibleTags}"
                       Focusable="False"
                       IsVisible="{Binding IsTagGroupExpanded, Mode=OneWay}"
@@ -694,7 +694,7 @@
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:Histories">
             <v:Histories CurrentBranch="{Binding Repo.CurrentBranch}"
-                         AuthorNameColumnWidth="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.HistoriesAuthorColumnWidth, Mode=TwoWay}"
+                         AuthorNameColumnWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.HistoriesAuthorColumnWidth, Mode=TwoWay}"
                          IssueTrackerRules="{Binding Repo.Settings.IssueTrackerRules}"
                          OnlyHighlightCurrentBranch="{Binding Repo.OnlyHighlightCurrentBranchInHistories}"
                          NavigationId="{Binding NavigationId}"/>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index def82f89..7a54b382 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -407,14 +407,14 @@ namespace SourceGit.Views
                 layout.Header = App.Text("Repository.HistoriesLayout");
                 layout.IsEnabled = false;
 
-                var isHorizontal = ViewModels.Preference.Instance.UseTwoColumnsLayoutInHistories;
+                var isHorizontal = ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories;
                 var horizontal = new MenuItem();
                 horizontal.Header = App.Text("Repository.HistoriesLayout.Horizontal");
                 if (isHorizontal)
                     horizontal.Icon = App.CreateMenuIcon("Icons.Check");
                 horizontal.Click += (_, ev) =>
                 {
-                    ViewModels.Preference.Instance.UseTwoColumnsLayoutInHistories = true;
+                    ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories = true;
                     ev.Handled = true;
                 };
 
@@ -424,7 +424,7 @@ namespace SourceGit.Views
                     vertical.Icon = App.CreateMenuIcon("Icons.Check");
                 vertical.Click += (_, ev) =>
                 {
-                    ViewModels.Preference.Instance.UseTwoColumnsLayoutInHistories = false;
+                    ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories = false;
                     ev.Handled = true;
                 };
 
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 5c1ce989..0aef7aa6 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -105,15 +105,15 @@
           <TextBlock Grid.Row="4" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
-                     Text="{DynamicResource Text.Preference.GPG.UserKey}"/>
+                     Text="{DynamicResource Text.Preferences.GPG.UserKey}"/>
           <TextBox Grid.Row="4" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
-                   Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"
+                   Watermark="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"
                    Text="{Binding GPGUserSigningKey, Mode=TwoWay}"/>
 
           <CheckBox Grid.Row="5" Grid.Column="1"
-                    Content="{DynamicResource Text.Preference.GPG.CommitEnabled}"
+                    Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
                     IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
 
           <CheckBox Grid.Row="6" Grid.Column="1"
@@ -121,7 +121,7 @@
                     IsChecked="{Binding EnableSignOffForCommit, Mode=TwoWay}"/>
 
           <CheckBox Grid.Row="7" Grid.Column="1"
-                    Content="{DynamicResource Text.Preference.GPG.TagEnabled}"
+                    Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
           <CheckBox Grid.Row="8" Grid.Column="1"
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 912fde39..46b667ac 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -91,12 +91,12 @@
           <v:ChangeViewModeSwitcher Grid.Column="1"
                                     Width="14" Height="14"
                                     HorizontalAlignment="Right"
-                                    ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
+                                    ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
         </Grid>
 
         <!-- Changes -->
         <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
-          <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode}"
+          <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                   Changes="{Binding VisibleChanges}"
                                   SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                   ContextRequested="OnChangeContextRequested"/>
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index 5c2501e9..de8b3b75 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -21,7 +21,7 @@
 
     <DataTemplate DataType="m:RevisionTextFile">
       <v:RevisionTextFileView FontFamily="{DynamicResource Fonts.Monospace}"
-                              FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
+                              FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
                               Background="{DynamicResource Brush.Contents}"/>
     </DataTemplate>
 
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index fdb15807..3d5cff38 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -10,7 +10,7 @@
              x:DataType="vm:CommitDetail">
   <Grid>
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.CommitDetailFilesLeftWidth, Mode=TwoWay}" MinWidth="200"/>
+      <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.CommitDetailFilesLeftWidth, Mode=TwoWay}" MinWidth="200"/>
       <ColumnDefinition Width="4"/>
       <ColumnDefinition Width="*" MinWidth="100"/>
     </Grid.ColumnDefinitions>
diff --git a/src/Views/SelfUpdate.axaml.cs b/src/Views/SelfUpdate.axaml.cs
index 0c9ccfc7..d3776aca 100644
--- a/src/Views/SelfUpdate.axaml.cs
+++ b/src/Views/SelfUpdate.axaml.cs
@@ -84,7 +84,7 @@ namespace SourceGit.Views
         private void IgnoreThisVersion(object sender, RoutedEventArgs e)
         {
             if (sender is Button { DataContext: Models.Version ver })
-                ViewModels.Preference.Instance.IgnoreUpdateTag = ver.TagName;
+                ViewModels.Preferences.Instance.IgnoreUpdateTag = ver.TagName;
 
             Close();
             e.Handled = true;
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index 87847c06..028764ca 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -11,7 +11,7 @@
              x:DataType="vm:StashesPage">
   <Grid SizeChanged="OnMainLayoutSizeChanged">
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.StashesLeftWidth, Mode=TwoWay}" MinWidth="300"/>
+      <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.StashesLeftWidth, Mode=TwoWay}" MinWidth="300"/>
       <ColumnDefinition Width="4"/>
       <ColumnDefinition Width="*" MinWidth="300"/>
     </Grid.ColumnDefinitions>
diff --git a/src/Views/StashesPage.axaml.cs b/src/Views/StashesPage.axaml.cs
index af32cb2c..461f9d5d 100644
--- a/src/Views/StashesPage.axaml.cs
+++ b/src/Views/StashesPage.axaml.cs
@@ -15,7 +15,7 @@ namespace SourceGit.Views
             if (grid == null)
                 return;
 
-            var layout = ViewModels.Preference.Instance.Layout;
+            var layout = ViewModels.Preferences.Instance.Layout;
             var width = grid.Bounds.Width;
             var maxLeft = width - 304;
 
diff --git a/src/Views/TextDiffView.axaml b/src/Views/TextDiffView.axaml
index 1dc26bb3..3ea7af14 100644
--- a/src/Views/TextDiffView.axaml
+++ b/src/Views/TextDiffView.axaml
@@ -26,10 +26,10 @@
                                          DeletedHighlightBrush="{DynamicResource Brush.Diff.DeletedHighlight}"
                                          IndicatorForeground="{DynamicResource Brush.FG2}"
                                          FontFamily="{DynamicResource Fonts.Monospace}"
-                                         FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
-                                         UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
-                                         WordWrap="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap}"
-                                         ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
+                                         FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                                         UseSyntaxHighlighting="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting}"
+                                         WordWrap="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableDiffViewWordWrap}"
+                                         ShowHiddenSymbols="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView}"
                                          EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
                                          SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
                                          BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
@@ -58,10 +58,10 @@
                                            DeletedHighlightBrush="{DynamicResource Brush.Diff.DeletedHighlight}"
                                            IndicatorForeground="{DynamicResource Brush.FG2}"
                                            FontFamily="{DynamicResource Fonts.Monospace}"
-                                           FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
-                                           UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
+                                           FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                                           UseSyntaxHighlighting="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting}"
                                            WordWrap="False"
-                                           ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
+                                           ShowHiddenSymbols="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView}"
                                            EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
                                            SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
                                            BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
@@ -80,10 +80,10 @@
                                            DeletedHighlightBrush="{DynamicResource Brush.Diff.DeletedHighlight}"
                                            IndicatorForeground="{DynamicResource Brush.FG2}"
                                            FontFamily="{DynamicResource Fonts.Monospace}"
-                                           FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
-                                           UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
+                                           FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                                           UseSyntaxHighlighting="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting}"
                                            WordWrap="False"
-                                           ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
+                                           ShowHiddenSymbols="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView}"
                                            EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
                                            SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
                                            BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index cdc892f4..265c2cd4 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -158,7 +158,7 @@
                Classes="italic"
                Margin="0,0,8,0"
                HorizontalAlignment="Center" VerticalAlignment="Center"
-               FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+               FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                Text="{DynamicResource Text.Welcome.DragDropTip}"
                Foreground="{DynamicResource Brush.FG2}"/>
   </Grid>
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 500bc571..3400d0d8 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -307,7 +307,7 @@ namespace SourceGit.Views
                 return;
             }
 
-            var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, true);
+            var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, true);
             ViewModels.Welcome.Instance.Refresh();
 
             var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
diff --git a/src/Views/WelcomeToolbar.axaml.cs b/src/Views/WelcomeToolbar.axaml.cs
index 19be5500..f1ff14f3 100644
--- a/src/Views/WelcomeToolbar.axaml.cs
+++ b/src/Views/WelcomeToolbar.axaml.cs
@@ -26,9 +26,9 @@ namespace SourceGit.Views
                 return;
 
             var options = new FolderPickerOpenOptions() { AllowMultiple = false };
-            if (Directory.Exists(ViewModels.Preference.Instance.GitDefaultCloneDir))
+            if (Directory.Exists(ViewModels.Preferences.Instance.GitDefaultCloneDir))
             {
-                var folder = await topLevel.StorageProvider.TryGetFolderFromPathAsync(ViewModels.Preference.Instance.GitDefaultCloneDir);
+                var folder = await topLevel.StorageProvider.TryGetFolderFromPathAsync(ViewModels.Preferences.Instance.GitDefaultCloneDir);
                 options.SuggestedStartLocation = folder;
             }
 
@@ -63,7 +63,7 @@ namespace SourceGit.Views
                 return;
             }
 
-            var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, false);
+            var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, false);
             ViewModels.Welcome.Instance.Refresh();
 
             var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 342ea4e0..74792072 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -11,7 +11,7 @@
              x:DataType="vm:WorkingCopy">
   <Grid SizeChanged="OnMainLayoutSizeChanged">
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.WorkingCopyLeftWidth, Mode=TwoWay}" MinWidth="300"/>
+      <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.WorkingCopyLeftWidth, Mode=TwoWay}" MinWidth="300"/>
       <ColumnDefinition Width="5"/>
       <ColumnDefinition Width="*" MinWidth="300"/>
     </Grid.ColumnDefinitions>
@@ -71,7 +71,7 @@
             <v:ChangeViewModeSwitcher Grid.Column="9"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
-                                      ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"/>
+                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"/>
           </Grid>
         </Border>
 
@@ -82,7 +82,7 @@
                                 IsUnstagedChange="True"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
-                                ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=UnstagedChangeViewMode}"
+                                ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode}"
                                 Changes="{Binding Unstaged}"
                                 SelectedChanges="{Binding SelectedUnstaged, Mode=TwoWay}"
                                 ContextRequested="OnUnstagedContextRequested"
@@ -120,7 +120,7 @@
             <v:ChangeViewModeSwitcher Grid.Column="7"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
-                                      ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/>
+                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/>
           </Grid>
         </Border>
 
@@ -130,7 +130,7 @@
                                 Focusable="True"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
-                                ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=StagedChangeViewMode}"
+                                ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode}"
                                 Changes="{Binding Staged}"
                                 SelectedChanges="{Binding SelectedStaged, Mode=TwoWay}"
                                 ContextRequested="OnStagedContextRequested"
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index df45a7f1..4ae4d779 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -17,7 +17,7 @@ namespace SourceGit.Views
             if (grid == null)
                 return;
 
-            var layout = ViewModels.Preference.Instance.Layout;
+            var layout = ViewModels.Preferences.Instance.Layout;
             var width = grid.Bounds.Width;
             var maxLeft = width - 304;
 

From a205e17bf2e78d0e778c2bcbf97b56788950dae7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:11:41 +0000
Subject: [PATCH 004/364] doc: Update translation status and missing keys

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

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 9de52a48..45b0e171 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,8 +6,8 @@
 
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.Preference.General.DateFormat
-- Text.Preference.Git.SSLVerify
+- Text.Preferences.General.DateFormat
+- Text.Preferences.Git.SSLVerify
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
 - Text.Repository.HistoriesLayout.Vertical
@@ -50,12 +50,12 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
-- Text.Preference.Appearance.FontSize
-- Text.Preference.Appearance.FontSize.Default
-- Text.Preference.Appearance.FontSize.Editor
-- Text.Preference.General.DateFormat
-- Text.Preference.General.ShowChildren
-- Text.Preference.Git.SSLVerify
+- Text.Preferences.Appearance.FontSize
+- Text.Preferences.Appearance.FontSize.Default
+- Text.Preferences.Appearance.FontSize.Editor
+- Text.Preferences.General.DateFormat
+- Text.Preferences.General.ShowChildren
+- Text.Preferences.Git.SSLVerify
 - Text.Repository.CustomActions
 - Text.Repository.FilterCommits
 - Text.Repository.FilterCommits.Default
@@ -111,9 +111,9 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
-- Text.Preference.General.DateFormat
-- Text.Preference.General.ShowChildren
-- Text.Preference.Git.SSLVerify
+- Text.Preferences.General.DateFormat
+- Text.Preferences.General.ShowChildren
+- Text.Preferences.Git.SSLVerify
 - Text.Repository.FilterCommits
 - Text.Repository.FilterCommits.Default
 - Text.Repository.FilterCommits.Exclude
@@ -167,9 +167,9 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
-- Text.Preference.General.DateFormat
-- Text.Preference.General.ShowChildren
-- Text.Preference.Git.SSLVerify
+- Text.Preferences.General.DateFormat
+- Text.Preferences.General.ShowChildren
+- Text.Preferences.Git.SSLVerify
 - Text.Repository.FilterCommits
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal

From 6e6cd7a7f323b873a56b498249f7924ac40adea0 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 10:25:58 +0800
Subject: [PATCH 005/364] enhance: do not show `Initialize Repository` popup
 for bare repositories (#891)

---
 src/Commands/IsBareRepository.cs | 24 ++++++++++++++++++++++++
 src/Views/Welcome.axaml.cs       |  7 +++++++
 2 files changed, 31 insertions(+)
 create mode 100644 src/Commands/IsBareRepository.cs

diff --git a/src/Commands/IsBareRepository.cs b/src/Commands/IsBareRepository.cs
new file mode 100644
index 00000000..f92d0888
--- /dev/null
+++ b/src/Commands/IsBareRepository.cs
@@ -0,0 +1,24 @@
+using System.IO;
+
+namespace SourceGit.Commands
+{
+    public class IsBareRepository : Command
+    {
+        public IsBareRepository(string path)
+        {
+            WorkingDirectory = path;
+            Args = "rev-parse --is-bare-repository";
+        }
+
+        public bool Result()
+        {
+            if (!Directory.Exists(Path.Combine(WorkingDirectory, "refs")) ||
+                !Directory.Exists(Path.Combine(WorkingDirectory, "objects")) ||
+                !File.Exists(Path.Combine(WorkingDirectory, "HEAD")))
+                return false;
+
+            var rs = ReadToEnd();
+            return rs.IsSuccess && rs.StdOut.Trim() == "true";
+        }
+    }
+}
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 3400d0d8..ffb8332b 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -300,6 +300,13 @@ namespace SourceGit.Views
                     return;
             }
 
+            var isBare = new Commands.IsBareRepository(path).Result();
+            if (isBare)
+            {
+                App.RaiseException(string.Empty, $"'{path}' is a bare repository, which is not supported by SourceGit!");
+                return;
+            }
+
             var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
             if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
             {

From 001e813b7e760759276dc8dcd8431292097bbd6a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 10:28:31 +0800
Subject: [PATCH 006/364] version: Release 2025.02

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index d612525a..2d67d4ee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.01
\ No newline at end of file
+2025.02
\ No newline at end of file

From 59e3e4c63557eb92a5001b69adfa7723144a66c7 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Mon, 13 Jan 2025 12:07:24 +0800
Subject: [PATCH 007/364] docs: Update README.md with APT source config changes
 (#897)

- Update APT source configuration to include architecture-specific settings.

Signed-off-by: Gadfly <gadfly@gadfly.vip>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index acbf22ff..9644d186 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ For **Linux** users:
   `deb` how to:
   ```shell
   curl https://codeberg.org/api/packages/yataro/debian/repository.key | sudo tee /etc/apt/keyrings/sourcegit.asc
-  echo "deb [signed-by=/etc/apt/keyrings/sourcegit.asc] https://codeberg.org/api/packages/yataro/debian generic main" | sudo tee /etc/apt/sources.list.d/sourcegit.list
+  echo "deb [signed-by=/etc/apt/keyrings/sourcegit.asc, arch=amd64,arm64] https://codeberg.org/api/packages/yataro/debian generic main" | sudo tee /etc/apt/sources.list.d/sourcegit.list
   sudo apt update
   sudo apt install sourcegit
   ```

From 10d8d3b2efedfcaf358aa9b29b444ae25d460024 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 14:42:07 +0800
Subject: [PATCH 008/364] refactor: branch compare

---
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/en_US.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/fr_FR.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/pt_BR.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 src/ViewModels/Repository.cs      | 89 ++++++++++---------------------
 10 files changed, 27 insertions(+), 71 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 96dced8d..db4fee87 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -50,7 +50,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">Auschecken von ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Mit Branch vergleichen</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Mit HEAD 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>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 1b0059a5..d06f438d 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -47,7 +47,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Compare with Branch</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Compare with HEAD</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>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 7f6bad97..74b2f224 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -50,7 +50,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Comparar con Rama</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar con HEAD</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 Rama</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 1bfd5284..e4bb9c26 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -50,7 +50,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">Récupérer ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Comparer avec la branche</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copier le nom de la branche</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index e63a4737..72e2aa28 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -50,7 +50,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Confronta con Branch</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Confronta con HEAD</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Confronta con Worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copia Nome Branch</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 5d29caca..8b17bdaf 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -75,7 +75,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Comparar com Branch</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar com HEAD</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar com Worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copiar Nome do Branch</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 725f378c..75650a28 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -50,7 +50,6 @@
   <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.CompareWithBranch" xml:space="preserve">Сравнить с веткой</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Сравнить с ГОЛОВОЙ (HEAD)</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/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 81d0d80f..b5541376 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -50,7 +50,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">检出(checkout) ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">与其他分支对比</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</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/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 4fb4f375..d2395e58 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -50,7 +50,6 @@
   <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.BranchCM.Checkout" xml:space="preserve">簽出 (checkout) ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">與其他分支比較</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</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/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index c317c2b8..209c66e1 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.Intrinsics.Arm;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
@@ -1463,13 +1464,6 @@ namespace SourceGit.ViewModels
                 }
 
                 menu.Items.Add(push);
-
-                var compareWithBranch = CreateMenuItemToCompareBranches(branch);
-                if (compareWithBranch != null)
-                {
-                    menu.Items.Add(new MenuItem() { Header = "-" });
-                    menu.Items.Add(compareWithBranch);
-                }
             }
             else
             {
@@ -1540,6 +1534,19 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(merge);
                 menu.Items.Add(rebase);
 
+                var compareWithHead = new MenuItem();
+                compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
+                compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare");
+                compareWithHead.Click += (_, _) =>
+                {
+                    App.OpenDialog(new Views.BranchCompare()
+                    {
+                        DataContext = new BranchCompare(_fullpath, branch, _currentBranch)
+                    });
+                };
+                menu.Items.Add(new MenuItem() { Header = "-" });
+                menu.Items.Add(compareWithHead);
+
                 if (_localChangesCount > 0)
                 {
                     var compareWithWorktree = new MenuItem();
@@ -1556,18 +1563,8 @@ namespace SourceGit.ViewModels
                             _histories.DetailContext = new RevisionCompare(_fullpath, target, null);
                         }
                     };
-                    menu.Items.Add(new MenuItem() { Header = "-" });
                     menu.Items.Add(compareWithWorktree);
                 }
-
-                var compareWithBranch = CreateMenuItemToCompareBranches(branch);
-                if (compareWithBranch != null)
-                {
-                    if (_localChangesCount == 0)
-                        menu.Items.Add(new MenuItem() { Header = "-" });
-
-                    menu.Items.Add(compareWithBranch);
-                }
             }
 
             var detect = Commands.GitFlow.DetectType(_fullpath, _branches, branch.Name);
@@ -1813,7 +1810,19 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(new MenuItem() { Header = "-" });
             }
 
-            var hasCompare = false;
+            var compareWithHead = new MenuItem();
+            compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
+            compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare");
+            compareWithHead.Click += (_, _) =>
+            {
+                App.OpenDialog(new Views.BranchCompare()
+                {
+                    DataContext = new BranchCompare(_fullpath, branch, _currentBranch)
+                });
+            };
+            menu.Items.Add(new MenuItem() { Header = "-" });
+            menu.Items.Add(compareWithHead);
+
             if (_localChangesCount > 0)
             {
                 var compareWithWorktree = new MenuItem();
@@ -1831,19 +1840,8 @@ namespace SourceGit.ViewModels
                     }
                 };
                 menu.Items.Add(compareWithWorktree);
-                hasCompare = true;
             }
 
-            var compareWithBranch = CreateMenuItemToCompareBranches(branch);
-            if (compareWithBranch != null)
-            {
-                menu.Items.Add(compareWithBranch);
-                hasCompare = true;
-            }
-
-            if (hasCompare)
-                menu.Items.Add(new MenuItem() { Header = "-" });
-
             var delete = new MenuItem();
             delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name);
             delete.Icon = App.CreateMenuIcon("Icons.Clear");
@@ -2078,39 +2076,6 @@ namespace SourceGit.ViewModels
             return menu;
         }
 
-        private MenuItem CreateMenuItemToCompareBranches(Models.Branch branch)
-        {
-            if (_branches.Count == 1)
-                return null;
-
-            var compare = new MenuItem();
-            compare.Header = App.Text("BranchCM.CompareWithBranch");
-            compare.Icon = App.CreateMenuIcon("Icons.Compare");
-
-            foreach (var b in _branches)
-            {
-                if (b.FullName != branch.FullName)
-                {
-                    var dup = b;
-                    var target = new MenuItem();
-                    target.Header = b.FriendlyName;
-                    target.Icon = App.CreateMenuIcon(b.IsCurrent ? "Icons.Check" : "Icons.Branch");
-                    target.Click += (_, e) =>
-                    {
-                        App.OpenDialog(new Views.BranchCompare()
-                        {
-                            DataContext = new BranchCompare(_fullpath, branch, dup)
-                        });
-                        e.Handled = true;
-                    };
-
-                    compare.Items.Add(target);
-                }
-            }
-
-            return compare;
-        }
-
         private LauncherPage GetOwnerPage()
         {
             var launcher = App.GetLauncer();

From 88e64a4f3169eeb8b6dccf4ce9ff4327af6759e0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 06:42:23 +0000
Subject: [PATCH 009/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9644d186..bc1581b6 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.55%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.33%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.42%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.55%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.32%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 45b0e171..b2f2b987 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -83,7 +83,7 @@
 
 </details>
 
-### it_IT.axaml: 93.33%
+### it_IT.axaml: 93.32%
 
 
 <details>
@@ -141,7 +141,7 @@
 
 </details>
 
-### pt_BR.axaml: 94.42%
+### pt_BR.axaml: 94.41%
 
 
 <details>

From b10e084c5447aa91cb601a07d7ecf879f2c8d82c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 14:47:18 +0800
Subject: [PATCH 010/364] ux: context menu separator

---
 src/ViewModels/Repository.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 209c66e1..b747556c 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.Intrinsics.Arm;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
@@ -1820,7 +1819,6 @@ namespace SourceGit.ViewModels
                     DataContext = new BranchCompare(_fullpath, branch, _currentBranch)
                 });
             };
-            menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(compareWithHead);
 
             if (_localChangesCount > 0)
@@ -1841,6 +1839,7 @@ namespace SourceGit.ViewModels
                 };
                 menu.Items.Add(compareWithWorktree);
             }
+            menu.Items.Add(new MenuItem() { Header = "-" });
 
             var delete = new MenuItem();
             delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name);

From 458a1ea83c3fec8b72f04f98b19dd2574ccef4c2 Mon Sep 17 00:00:00 2001
From: wl2776 <wl2776@users.noreply.github.com>
Date: Sun, 12 Jan 2025 23:33:13 -0800
Subject: [PATCH 011/364] feature: Exit on Ctrl+Q (#898)

---
 src/Views/Hotkeys.axaml     | 5 ++++-
 src/Views/Launcher.axaml    | 1 +
 src/Views/Launcher.axaml.cs | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 1ce4bb9a..67293b50 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" ColumnDefinitions="150,*">
+        <Grid RowDefinitions="20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+\,}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreferences}"/>
           
@@ -66,6 +66,9 @@
 
           <TextBlock Grid.Row="6" Grid.Column="0" Classes="primary bold" Text="ESC"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CancelPopup}" />
+
+          <TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/>
+          <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Quit}" />
         </Grid>
 
         <TextBlock Text="{DynamicResource Text.Hotkeys.Repo}"
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 771ccce5..55c407b2 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -62,6 +62,7 @@
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
               </MenuItem.Icon>
             </MenuItem>
+            <MenuItem Header="{DynamicResource Text.Quit}" Command="{x:Static s:App.QuitCommand}" InputGesture="Ctrl+Q"/>
           </MenuFlyout>
         </Button.Flyout>
         <Path Width="12" Height="12" Data="{StaticResource Icons.Menu}"/>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 39abb71b..832cca80 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -146,6 +146,12 @@ namespace SourceGit.Views
                     return;
                 }
 
+                if (e.Key == Key.Q) {
+                    App.Quit(0);
+                    e.Handled = true;
+                    return;
+                }
+
                 if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
                     (!OperatingSystem.IsMacOS() && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
                 {

From 632222a776b1a879ffc63e46b98afbf87d0075bb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 15:37:55 +0800
Subject: [PATCH 012/364] ux: add icon for quit menu item

---
 src/Resources/Icons.axaml | 1 +
 src/Views/Launcher.axaml  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index c0c9d8ff..c7e02431 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -86,6 +86,7 @@
   <StreamGeometry x:Key="Icons.Plus">m186 532 287 0 0 287c0 11 9 20 20 20s20-9 20-20l0-287 287 0c11 0 20-9 20-20s-9-20-20-20l-287 0 0-287c0-11-9-20-20-20s-20 9-20 20l0 287-287 0c-11 0-20 9-20 20s9 20 20 20z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Pull">M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Push">M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Quit">M563 555c0 28-23 51-51 51-28 0-51-23-51-51L461 113c0-28 23-51 51-51s51 23 51 51L563 555 563 555zM85 535c0-153 81-287 201-362 24-15 55-8 70 16C371 214 363 245 340 260 248 318 187 419 187 535c0 180 146 325 325 325 180-0 325-146 325-325 0-119-64-223-160-280-24-14-32-46-18-70 14-24 46-32 70-18 125 74 210 211 210 367 0 236-191 427-427 427C276 963 85 772 85 535</StreamGeometry>
   <StreamGeometry x:Key="Icons.Rebase">M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Reference">M467 556c0-0 0-1 0-1C467 555 467 556 467 556zM467 556c0-0 0-0 0-0C467 556 467 556 467 556zM467 556c-0 0-0 0-0 0C467 557 467 557 467 556zM468 549C468 532 468 541 468 549L468 549zM468 549c0 1-0 1-0 2C468 551 468 550 468 549zM468 552c-0 1-0 2-0 3C467 554 468 553 468 552zM736 549C736 532 736 541 736 549L736 549zM289 378l0 179 89 0c-1 80-89 89-89 89l45 45c0 0 129-15 134-134L467 378 289 378zM959 244l0 536c0 99-80 179-179 179L244 959c-99 0-179-80-179-179L65 244c0-99 80-179 179-179l536 0C879 65 959 145 959 244zM869 289c0-74-60-134-134-134L289 155c-74 0-134 60-134 134l0 447c0 74 60 134 134 134l447 0c74 0 134-60 134-134L869 289zM557 557l89 0c-1 80-89 89-89 89l45 45c0 0 129-15 134-134L735 378 557 378 557 557z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Relation">m224 154a166 166 0 00-166 166v192a166 166 0 00166 166h64v-76h-64a90 90 0 01-90-90v-192a90 90 0 0190-90h320a90 90 0 0190 90v192a90 90 0 01-90 90h-128v77h128a166 166 0 00166-167v-192a166 166 0 00-166-166h-320zm166 390a90 90 0 0190-90h128v-76h-128a166 166 0 00-166 166v192a166 166 0 00166 166h320a166 166 0 00166-166v-192a166 166 0 00-166-166h-64v77h64a90 90 0 0190 90v192a90 90 0 01-90 90h-320a90 90 0 01-90-90v-192z</StreamGeometry>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 55c407b2..bfabf6e5 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -62,7 +62,11 @@
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
               </MenuItem.Icon>
             </MenuItem>
-            <MenuItem Header="{DynamicResource Text.Quit}" Command="{x:Static s:App.QuitCommand}" InputGesture="Ctrl+Q"/>
+            <MenuItem Header="{DynamicResource Text.Quit}" Command="{x:Static s:App.QuitCommand}" InputGesture="Ctrl+Q">
+              <MenuItem.Icon>
+                <Path Width="14" Height="14" Data="{StaticResource Icons.Quit}"/>
+              </MenuItem.Icon>
+            </MenuItem>
           </MenuFlyout>
         </Button.Flyout>
         <Path Width="12" Height="12" Data="{StaticResource Icons.Menu}"/>

From 5f4c1bb984c1f2a76d241a0536c30de03b557b27 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 17:37:23 +0800
Subject: [PATCH 013/364] enhance: do not show `Initialize Repository` popup
 for bare repositories (#891)

---
 src/ViewModels/Welcome.cs         | 31 ++++++++++++++++++++++++++
 src/Views/Welcome.axaml.cs        | 36 ++-----------------------------
 src/Views/WelcomeToolbar.axaml.cs | 27 +----------------------
 3 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index e6d64469..5c9c9380 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -83,6 +83,37 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public void OpenOrInitRepository(string path, RepositoryNode parent, bool bMoveExistedNode)
+        {
+            if (!Directory.Exists(path))
+            {
+                if (File.Exists(path))
+                    path = Path.GetDirectoryName(path);
+                else
+                    return;
+            }
+
+            var isBare = new Commands.IsBareRepository(path).Result();
+            if (isBare)
+            {
+                App.RaiseException(string.Empty, $"'{path}' is a bare repository, which is not supported by SourceGit!");
+                return;
+            }
+
+            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
+            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
+            {
+                InitRepository(path, parent, test.StdErr);
+                return;
+            }
+
+            var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, bMoveExistedNode);
+            Refresh();
+
+            var launcher = App.GetLauncer();
+            launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
+        }
+
         public void InitRepository(string path, RepositoryNode parent, string reason)
         {
             if (!Preferences.Instance.IsGitConfigured())
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index ffb8332b..3ab11782 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 
 using Avalonia;
 using Avalonia.Controls;
@@ -197,7 +196,7 @@ namespace SourceGit.Views
                 {
                     foreach (var item in items)
                     {
-                        OpenOrInitRepository(item.Path.LocalPath);
+                        ViewModels.Welcome.Instance.OpenOrInitRepository(item.Path.LocalPath, null, true);
                         break;
                     }
                 }
@@ -261,7 +260,7 @@ namespace SourceGit.Views
                 {
                     foreach (var item in items)
                     {
-                        OpenOrInitRepository(item.Path.LocalPath, to);
+                        ViewModels.Welcome.Instance.OpenOrInitRepository(item.Path.LocalPath, to, true);
                         break;
                     }
                 }
@@ -290,37 +289,6 @@ namespace SourceGit.Views
             }
         }
 
-        private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent = null)
-        {
-            if (!Directory.Exists(path))
-            {
-                if (File.Exists(path))
-                    path = Path.GetDirectoryName(path);
-                else
-                    return;
-            }
-
-            var isBare = new Commands.IsBareRepository(path).Result();
-            if (isBare)
-            {
-                App.RaiseException(string.Empty, $"'{path}' is a bare repository, which is not supported by SourceGit!");
-                return;
-            }
-
-            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
-            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
-            {
-                ViewModels.Welcome.Instance.InitRepository(path, parent, test.StdErr);
-                return;
-            }
-
-            var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, true);
-            ViewModels.Welcome.Instance.Refresh();
-
-            var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
-            launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
-        }
-
         private bool _pressedTreeNode = false;
         private Point _pressedTreeNodePosition = new Point();
         private bool _startDragTreeNode = false;
diff --git a/src/Views/WelcomeToolbar.axaml.cs b/src/Views/WelcomeToolbar.axaml.cs
index f1ff14f3..9e170c1a 100644
--- a/src/Views/WelcomeToolbar.axaml.cs
+++ b/src/Views/WelcomeToolbar.axaml.cs
@@ -4,7 +4,6 @@ using System.IO;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
-using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
@@ -36,7 +35,7 @@ namespace SourceGit.Views
             {
                 var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
                 if (selected.Count == 1)
-                    OpenOrInitRepository(selected[0].Path.LocalPath);
+                    ViewModels.Welcome.Instance.OpenOrInitRepository(selected[0].Path.LocalPath, null, false);
             }
             catch (Exception exception)
             {
@@ -45,30 +44,6 @@ namespace SourceGit.Views
 
             e.Handled = true;
         }
-
-        private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent = null)
-        {
-            if (!Directory.Exists(path))
-            {
-                if (File.Exists(path))
-                    path = Path.GetDirectoryName(path);
-                else
-                    return;
-            }
-
-            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
-            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
-            {
-                ViewModels.Welcome.Instance.InitRepository(path, parent, test.StdErr);
-                return;
-            }
-
-            var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, false);
-            ViewModels.Welcome.Instance.Refresh();
-
-            var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
-            launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
-        }
     }
 }
 

From 011f5258adc4a886a76bdb2f0ecaac1412cf29bf Mon Sep 17 00:00:00 2001
From: Mat <mathis-abdou@outlook.com>
Date: Tue, 14 Jan 2025 03:18:56 +0100
Subject: [PATCH 014/364] fix: LFS locks do not show if user name contains `.`
 character (#902)

---
 src/Commands/LFS.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs
index c9ab7b41..2b7d1de4 100644
--- a/src/Commands/LFS.cs
+++ b/src/Commands/LFS.cs
@@ -7,7 +7,7 @@ namespace SourceGit.Commands
 {
     public partial class LFS
     {
-        [GeneratedRegex(@"^(.+)\s+(\w+)\s+\w+:(\d+)$")]
+        [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
         private static partial Regex REG_LOCK();
 
         class SubCmd : Command

From 99b7086cd04feba2573c0c822f6be881f2f795ed Mon Sep 17 00:00:00 2001
From: Vixb <xzx8023@outlook.com>
Date: Tue, 14 Jan 2025 10:19:27 +0800
Subject: [PATCH 015/364] doc: update default path for windows (#901)

(cherry picked from commit 4456366ea63b277665d7250709928deb1e563675)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc1581b6..2973a65c 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationD
 
 | OS      | PATH                                                |
 |---------|-----------------------------------------------------|
-| Windows | `C:\Users\USER_NAME\AppData\Roaming\SourceGit`      |
+| Windows | `%APPDATA%\SourceGit`                               |
 | Linux   | `${HOME}/.config/SourceGit` or `${HOME}/.sourcegit` |
 | macOS   | `${HOME}/Library/Application Support/SourceGit`     |
 

From d8168c3ba68eeae412c82ed6620087d4251a9307 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 16:14:19 +0800
Subject: [PATCH 016/364] ux: submodule alignment

---
 src/Views/Repository.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index d928cc20..d935d754 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -313,7 +313,7 @@
             </ListBox.Styles>
             <ListBox.ItemTemplate>
               <DataTemplate DataType="m:Submodule">
-                <Grid ColumnDefinitions="Auto,*,8">
+                <Grid ColumnDefinitions="Auto,*,8,8">
                   <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"/>
                   <Path Grid.Column="2"

From cc5f3ebfa53da643355d08e8d06d992ba09d7cc2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 17:10:06 +0800
Subject: [PATCH 017/364] refactor: do not run `git add` for untracked file
 while stashing local changes (#903)

---
 src/Commands/QueryStashChanges.cs | 60 -------------------------------
 src/Commands/QueryStashes.cs      | 22 +++++++++---
 src/Commands/Stash.cs             | 14 ++++++--
 src/Models/Stash.cs               |  3 ++
 src/ViewModels/StashChanges.cs    | 39 +-------------------
 src/ViewModels/StashesPage.cs     | 26 ++++++++++++--
 6 files changed, 56 insertions(+), 108 deletions(-)
 delete mode 100644 src/Commands/QueryStashChanges.cs

diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs
deleted file mode 100644
index 3b8d2db6..00000000
--- a/src/Commands/QueryStashChanges.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace SourceGit.Commands
-{
-    public partial class QueryStashChanges : Command
-    {
-        [GeneratedRegex(@"^(\s?[\w\?]{1,4})\s+(.+)$")]
-        private static partial Regex REG_FORMAT();
-
-        public QueryStashChanges(string repo, string sha)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = $"diff --name-status --pretty=format: {sha}^ {sha}";
-        }
-
-        public List<Models.Change> Result()
-        {
-            Exec();
-            return _changes;
-        }
-
-        protected override void OnReadline(string line)
-        {
-            var match = REG_FORMAT().Match(line);
-            if (!match.Success)
-                return;
-
-            var change = new Models.Change() { Path = match.Groups[2].Value };
-            var status = match.Groups[1].Value;
-
-            switch (status[0])
-            {
-                case 'M':
-                    change.Set(Models.ChangeState.Modified);
-                    _changes.Add(change);
-                    break;
-                case 'A':
-                    change.Set(Models.ChangeState.Added);
-                    _changes.Add(change);
-                    break;
-                case 'D':
-                    change.Set(Models.ChangeState.Deleted);
-                    _changes.Add(change);
-                    break;
-                case 'R':
-                    change.Set(Models.ChangeState.Renamed);
-                    _changes.Add(change);
-                    break;
-                case 'C':
-                    change.Set(Models.ChangeState.Copied);
-                    _changes.Add(change);
-                    break;
-            }
-        }
-
-        private readonly List<Models.Change> _changes = new List<Models.Change>();
-    }
-}
diff --git a/src/Commands/QueryStashes.cs b/src/Commands/QueryStashes.cs
index 6d089f8e..ccf601c5 100644
--- a/src/Commands/QueryStashes.cs
+++ b/src/Commands/QueryStashes.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace SourceGit.Commands
 {
@@ -8,7 +9,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "stash list --pretty=format:%H%n%ct%n%gd%n%s";
+            Args = "stash list --pretty=format:%H%n%P%n%ct%n%gd%n%s";
         }
 
         public List<Models.Stash> Result()
@@ -26,21 +27,32 @@ namespace SourceGit.Commands
                     _stashes.Add(_current);
                     break;
                 case 1:
-                    _current.Time = ulong.Parse(line);
+                    ParseParent(line);
                     break;
                 case 2:
-                    _current.Name = line;
+                    _current.Time = ulong.Parse(line);
                     break;
                 case 3:
+                    _current.Name = line;
+                    break;
+                case 4:
                     _current.Message = line;
                     break;
             }
 
             _nextLineIdx++;
-            if (_nextLineIdx > 3)
+            if (_nextLineIdx > 4)
                 _nextLineIdx = 0;
         }
 
+        private void ParseParent(string data)
+        {
+            if (data.Length < 8)
+                return;
+
+            _current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
+        }
+
         private readonly List<Models.Stash> _stashes = new List<Models.Stash>();
         private Models.Stash _current = null;
         private int _nextLineIdx = 0;
diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index 40c917dd..cee79886 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -11,9 +11,19 @@ namespace SourceGit.Commands
             Context = repo;
         }
 
-        public bool Push(string message)
+        public bool Push(string message, bool includeUntracked = true, bool keepIndex = false)
         {
-            Args = $"stash push -m \"{message}\"";
+            var builder = new StringBuilder();
+            builder.Append("stash push ");
+            if (includeUntracked)
+                builder.Append("--include-untracked ");
+            if (keepIndex)
+                builder.Append("--keep-index ");
+            builder.Append("-m \"");
+            builder.Append(message);
+            builder.Append("\"");
+
+            Args = builder.ToString();
             return Exec();
         }
 
diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs
index 3d395a84..8dca3bdb 100644
--- a/src/Models/Stash.cs
+++ b/src/Models/Stash.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace SourceGit.Models
 {
@@ -6,8 +7,10 @@ namespace SourceGit.Models
     {
         public string Name { get; set; } = "";
         public string SHA { get; set; } = "";
+        public List<string> Parents { get; set; } = [];
         public ulong Time { get; set; } = 0;
         public string Message { get; set; } = "";
+        public bool HasUntracked => Parents.Count == 3;
 
         public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
     }
diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs
index 48c9478e..fd937bdd 100644
--- a/src/ViewModels/StashChanges.cs
+++ b/src/ViewModels/StashChanges.cs
@@ -76,14 +76,11 @@ namespace SourceGit.ViewModels
                     }
                     else
                     {
-                        if (IncludeUntracked)
-                            AddUntracked(_changes);
-                        succ = StashWithChanges(_changes);
+                        succ = new Commands.Stash(_repo.FullPath).Push(Message, IncludeUntracked, KeepIndex);
                     }
                 }
                 else
                 {
-                    AddUntracked(_changes);
                     succ = StashWithChanges(_changes);
                 }
 
@@ -97,40 +94,6 @@ namespace SourceGit.ViewModels
             });
         }
 
-        private void AddUntracked(List<Models.Change> changes)
-        {
-            var toBeAdded = new List<Models.Change>();
-            foreach (var c in changes)
-            {
-                if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked)
-                    toBeAdded.Add(c);
-            }
-
-            if (toBeAdded.Count == 0)
-                return;
-
-            if (Native.OS.GitVersion >= Models.GitVersions.ADD_WITH_PATHSPECFILE)
-            {
-                var paths = new List<string>();
-                foreach (var c in toBeAdded)
-                    paths.Add(c.Path);
-
-                var tmpFile = Path.GetTempFileName();
-                File.WriteAllLines(tmpFile, paths);
-                new Commands.Add(_repo.FullPath, tmpFile).Exec();
-                File.Delete(tmpFile);
-            }
-            else
-            {
-                for (int i = 0; i < toBeAdded.Count; i += 10)
-                {
-                    var count = Math.Min(10, toBeAdded.Count - i);
-                    var step = toBeAdded.GetRange(i, count);
-                    new Commands.Add(_repo.FullPath, step).Exec();
-                }
-            }
-        }
-
         private bool StashWithChanges(List<Models.Change> changes)
         {
             if (changes.Count == 0)
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 3ddb2b65..e5755a91 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -57,8 +57,25 @@ namespace SourceGit.ViewModels
                     {
                         Task.Run(() =>
                         {
-                            var changes = new Commands.QueryStashChanges(_repo.FullPath, value.SHA).Result();
-                            Dispatcher.UIThread.Invoke(() => Changes = changes);
+                            var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
+                            var untracked = new HashSet<string>();
+                            if (value.HasUntracked)
+                            {
+                                var untrackedChanges = new Commands.CompareRevisions(_repo.FullPath, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", value.Parents[2]).Result();
+                                foreach (var c in untrackedChanges)
+                                {
+                                    untracked.Add(c.Path);
+                                    changes.Add(c);
+                                }
+                            }
+
+                            changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
+
+                            Dispatcher.UIThread.Invoke(() =>
+                            {
+                                Changes = changes;
+                                _untrackedChanges = untracked;
+                            });
                         });
                     }
                 }
@@ -84,8 +101,10 @@ namespace SourceGit.ViewModels
                 {
                     if (value == null)
                         DiffContext = null;
+                    else if (_untrackedChanges.Contains(value.Path))
+                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption("4b825dc642cb6eb9a060e54bf8d69288fbee4904", _selectedStash.Parents[2], value), _diffContext);
                     else
-                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, value), _diffContext);
+                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, value), _diffContext);
                 }
             }
         }
@@ -254,6 +273,7 @@ namespace SourceGit.ViewModels
         private List<Models.Stash> _visibleStashes = new List<Models.Stash>();
         private string _searchFilter = string.Empty;
         private Models.Stash _selectedStash = null;
+        private HashSet<string> _untrackedChanges = new HashSet<string>();
         private List<Models.Change> _changes = null;
         private Models.Change _selectedChange = null;
         private DiffContext _diffContext = null;

From b9b52205906df9bfe33b5c3d7698fd1246888d9e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 19:49:50 +0800
Subject: [PATCH 018/364] feature: `bare` repository support

---
 src/ViewModels/CreateBranch.cs     |  7 ++++-
 src/ViewModels/Launcher.cs         | 21 +++++++-------
 src/ViewModels/Repository.cs       | 18 ++++++++++++
 src/ViewModels/ScanRepositories.cs | 25 +++++++++++++----
 src/ViewModels/Welcome.cs          | 22 +++++++--------
 src/Views/CreateBranch.axaml       | 44 ++++++++++++++++--------------
 6 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index 64806a49..b67a453a 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -31,6 +31,11 @@ namespace SourceGit.ViewModels
             set => _repo.Settings.CheckoutBranchOnCreateBranch = value;
         }
 
+        public bool IsBareRepository
+        {
+            get => _repo.IsBare;
+        }
+
         public CreateBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
@@ -84,7 +89,7 @@ namespace SourceGit.ViewModels
             return Task.Run(() =>
             {
                 var succ = false;
-                if (CheckoutAfterCreated)
+                if (CheckoutAfterCreated && !_repo.IsBare)
                 {
                     var changes = new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).Result();
                     var needPopStash = false;
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 57a1c404..6761eccf 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -280,19 +280,20 @@ namespace SourceGit.ViewModels
                 return;
             }
 
-            var gitDir = new Commands.QueryGitDir(node.Id).Result();
-            if (string.IsNullOrEmpty(gitDir))
+            var isBare = new Commands.IsBareRepository(node.Id).Result();
+            var gitDir = node.Id;
+            if (!isBare)
             {
-                var ctx = page == null ? ActivePage.Node.Id : page.Node.Id;
-                App.RaiseException(ctx, "Given path is not a valid git repository!");
-                return;
+                gitDir = new Commands.QueryGitDir(node.Id).Result();
+                if (string.IsNullOrEmpty(gitDir))
+                {
+                    var ctx = page == null ? ActivePage.Node.Id : page.Node.Id;
+                    App.RaiseException(ctx, "Given path is not a valid git repository!");
+                    return;
+                }
             }
 
-            var repo = new Repository()
-            {
-                FullPath = node.Id,
-                GitDir = gitDir,
-            };
+            var repo = new Repository(isBare, node.Id, gitDir);
             repo.Open();
 
             if (page == null)
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index b747556c..6dfa67ca 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -18,6 +18,11 @@ namespace SourceGit.ViewModels
 {
     public class Repository : ObservableObject, Models.IRepository
     {
+        public bool IsBare
+        {
+            get;
+        }
+
         public string FullPath
         {
             get => _fullpath;
@@ -448,6 +453,13 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _isAutoFetching, value);
         }
 
+        public Repository(bool isBare, string path, string gitDir)
+        {
+            IsBare = isBare;
+            FullPath = path;
+            GitDir = gitDir;
+        }
+
         public void Open()
         {
             var settingsFile = Path.Combine(_gitDir, "sourcegit.settings");
@@ -995,6 +1007,9 @@ namespace SourceGit.ViewModels
 
         public void RefreshWorkingCopyChanges()
         {
+            if (IsBare)
+                return;
+
             var changes = new Commands.QueryLocalChanges(_fullpath, _settings.IncludeUntrackedInLocalChanges).Result();
             if (_workingCopy == null)
                 return;
@@ -1010,6 +1025,9 @@ namespace SourceGit.ViewModels
 
         public void RefreshStashes()
         {
+            if (IsBare)
+                return;
+
             var stashes = new Commands.QueryStashes(_fullpath).Result();
             Dispatcher.UIThread.Invoke(() =>
             {
diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs
index 5c023587..8d14e36e 100644
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@@ -34,7 +34,7 @@ namespace SourceGit.ViewModels
                 watch.Start();
 
                 var rootDir = new DirectoryInfo(RootDir);
-                var founded = new List<string>();
+                var founded = new List<FoundRepository>();
                 GetUnmanagedRepositories(rootDir, founded, new EnumerationOptions()
                 {
                     AttributesToSkip = FileAttributes.Hidden | FileAttributes.System,
@@ -47,16 +47,16 @@ namespace SourceGit.ViewModels
 
                     foreach (var f in founded)
                     {
-                        var parent = new DirectoryInfo(f).Parent!.FullName.Replace("\\", "/");
+                        var parent = new DirectoryInfo(f.Path).Parent!.FullName.Replace("\\", "/");
                         if (parent.Equals(normalizedRoot, StringComparison.Ordinal))
                         {
-                            Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false);
+                            Preferences.Instance.FindOrAddNodeByRepositoryPath(f.Path, null, false);
                         }
                         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);
+                            Preferences.Instance.FindOrAddNodeByRepositoryPath(f.Path, group, false);
                         }
                     }
 
@@ -85,7 +85,7 @@ namespace SourceGit.ViewModels
             }
         }
 
-        private void GetUnmanagedRepositories(DirectoryInfo dir, List<string> outs, EnumerationOptions opts, int depth = 0)
+        private void GetUnmanagedRepositories(DirectoryInfo dir, List<FoundRepository> outs, EnumerationOptions opts, int depth = 0)
         {
             var subdirs = dir.GetDirectories("*", opts);
             foreach (var subdir in subdirs)
@@ -111,12 +111,19 @@ namespace SourceGit.ViewModels
                     {
                         var normalized = test.StdOut.Trim().Replace("\\", "/");
                         if (!_managed.Contains(normalized))
-                            outs.Add(normalized);
+                            outs.Add(new FoundRepository(normalized, false));
                     }
 
                     continue;
                 }
 
+                var isBare = new Commands.IsBareRepository(subdir.FullName).Result();
+                if (isBare)
+                {
+                    outs.Add(new FoundRepository(normalizedSelf, true));
+                    continue;
+                }
+
                 if (depth < 5)
                     GetUnmanagedRepositories(subdir, outs, opts, depth + 1);
             }
@@ -161,6 +168,12 @@ namespace SourceGit.ViewModels
             return added;
         }
 
+        private record FoundRepository(string path, bool isBare)
+        {
+            public string Path { get; set; } = path;
+            public bool IsBare { get; set; } = isBare;
+        }
+
         private HashSet<string> _managed = new HashSet<string>();
     }
 }
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 5c9c9380..95f7f010 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -94,20 +94,20 @@ namespace SourceGit.ViewModels
             }
 
             var isBare = new Commands.IsBareRepository(path).Result();
-            if (isBare)
+            var repoRoot = path;
+            if (!isBare)
             {
-                App.RaiseException(string.Empty, $"'{path}' is a bare repository, which is not supported by SourceGit!");
-                return;
+                var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
+                if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
+                {
+                    InitRepository(path, parent, test.StdErr);
+                    return;
+                }
+
+                repoRoot = test.StdOut.Trim();
             }
 
-            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
-            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
-            {
-                InitRepository(path, parent, test.StdErr);
-                return;
-            }
-
-            var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, bMoveExistedNode);
+            var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(repoRoot, parent, bMoveExistedNode);
             Refresh();
 
             var launcher = App.GetLauncer();
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 43f4e50c..d8b89eb4 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -18,8 +18,8 @@
       <Grid.RowDefinitions>
         <RowDefinition Height="32"/>
         <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto" MinHeight="32"/>
-        <RowDefinition Height="32"/>
+        <RowDefinition Height="Auto"/>
+        <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -67,27 +67,31 @@
       <TextBlock Grid.Row="2" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
-                 Text="{DynamicResource Text.CreateBranch.LocalChanges}"/>
-      <WrapPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
-                     x:Name="RadioDoNothing"
-                     GroupName="LocalChanges"
-                     Margin="0,0,8,0"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
-                     x:Name="RadioStashAndReply"
-                     GroupName="LocalChanges"
-                     Margin="0,0,8,0"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
-                     x:Name="RadioDiscard"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-      </WrapPanel>
+                 Text="{DynamicResource Text.CreateBranch.LocalChanges}"
+                 IsVisible="{Binding !IsBareRepository}"/>
+      <Border Grid.Row="2" Grid.Column="1" MinHeight="32" IsVisible="{Binding !IsBareRepository}">
+        <WrapPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
+          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
+                       x:Name="RadioDoNothing"
+                       GroupName="LocalChanges"
+                       Margin="0,0,8,0"
+                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                       x:Name="RadioStashAndReply"
+                       GroupName="LocalChanges"
+                       Margin="0,0,8,0"
+                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
+                       x:Name="RadioDiscard"
+                       GroupName="LocalChanges"
+                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+        </WrapPanel>
+      </Border>
       
       <CheckBox Grid.Row="3" Grid.Column="1"
                 Content="{DynamicResource Text.CreateBranch.Checkout}"
-                IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"/>
+                IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"
+                IsVisible="{Binding !IsBareRepository}"/>
     </Grid>
   </StackPanel>
 </UserControl>

From a112d212dc75977af74118b86240a88f92afa8f3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 20:41:03 +0800
Subject: [PATCH 019/364] enhance: disable pull/stash/apply/git-flow/git-lfs
 buttons in `bare` repository

---
 src/Views/CreateBranch.axaml         |  2 +-
 src/Views/RepositoryToolbar.axaml    | 10 +++++-----
 src/Views/RepositoryToolbar.axaml.cs |  6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index d8b89eb4..49bfda8d 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -70,7 +70,7 @@
                  Text="{DynamicResource Text.CreateBranch.LocalChanges}"
                  IsVisible="{Binding !IsBareRepository}"/>
       <Border Grid.Row="2" Grid.Column="1" MinHeight="32" IsVisible="{Binding !IsBareRepository}">
-        <WrapPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
+        <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
           <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
                        x:Name="RadioDoNothing"
                        GroupName="LocalChanges"
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
index 2562775a..55e0109a 100644
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@@ -42,7 +42,7 @@
           <Path Width="14" Height="14" Data="{StaticResource Icons.Fetch}"/>
         </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}">
+        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" IsVisible="{Binding !IsBare}" IsEnabled="{Binding !IsBare}" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}">
           <ToolTip.Tip>
             <StackPanel Orientation="Vertical">
               <TextBlock Text="{DynamicResource Text.Pull}"/>
@@ -64,7 +64,7 @@
           <Path Width="14" Height="14" Data="{StaticResource Icons.Push}"/>
         </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="StashAll">
+        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="StashAll" IsVisible="{Binding !IsBare}">
           <ToolTip.Tip>
             <StackPanel Orientation="Vertical">
               <TextBlock Text="{DynamicResource Text.Stash}"/>
@@ -75,7 +75,7 @@
           <Path Width="14" Height="14" Data="{StaticResource Icons.Stashes.Add}"/>
         </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" ToolTip.Tip="{DynamicResource Text.Apply}">
+        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply}">
           <Path Width="14" Height="14" Data="{StaticResource Icons.Diff}"/>
         </Button>
 
@@ -88,11 +88,11 @@
           <Path Width="14" Height="14" Data="{StaticResource Icons.Branch.Add}"/>
         </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitFlowMenu" ToolTip.Tip="{DynamicResource Text.GitFlow}">
+        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitFlowMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitFlow}">
           <Path Width="14" Height="14" Data="{StaticResource Icons.GitFlow}"/>
         </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitLFSMenu" ToolTip.Tip="{DynamicResource Text.GitLFS}">
+        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitLFSMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitLFS}">
           <Path Width="14" Height="14" Data="{StaticResource Icons.LFS}"/>
         </Button>
 
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
index aa78c4d3..66b49fc2 100644
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@@ -59,6 +59,12 @@ namespace SourceGit.Views
             var launcher = this.FindAncestorOfType<Launcher>();
             if (launcher is not null && DataContext is ViewModels.Repository repo)
             {
+                if (repo.IsBare)
+                {
+                    App.RaiseException(repo.FullPath, "Can't run `git pull` in bare repository!");
+                    return;
+                }
+
                 var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
                 launcher.ClearKeyModifier();
                 repo.Pull(startDirectly);

From 5acc6e69287c0861755b74a7b028c6f1802297e1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jan 2025 20:46:39 +0800
Subject: [PATCH 020/364] enhance: double-click commit in histories of a bare
 repository

---
 src/ViewModels/Histories.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index b890b76e..ec880b24 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -213,7 +213,7 @@ namespace SourceGit.ViewModels
             {
                 if (firstRemoteBranch != null)
                     _repo.ShowPopup(new CreateBranch(_repo, firstRemoteBranch));
-                else
+                else if (!_repo.IsBare)
                     _repo.ShowPopup(new CheckoutCommit(_repo, commit));
             }
         }

From a9327274c6ba847545d969dbf8758e5937e26858 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 17:25:18 +0800
Subject: [PATCH 021/364] enhance: disable `LOCAL CHANGES` and `STASHES` for
 bare repository (#899)

---
 src/Views/Repository.axaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index d935d754..00f9f6ce 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -40,7 +40,7 @@
         <!-- Page Switcher for Right Panel -->
         <Border Grid.Row="0" Margin="8,0,4,0" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" CornerRadius="6">
           <Border CornerRadius="6" ClipToBounds="True">
-            <ListBox Background="Transparent" SelectedIndex="{Binding SelectedViewIndex, Mode=TwoWay}">
+            <ListBox Background="Transparent" SelectedIndex="{Binding SelectedViewIndex, Mode=TwoWay}" SelectionMode="AlwaysSelected">
               <ListBox.Styles>
                 <Style Selector="Path.icon">
                   <Setter Property="Width" Value="12"/>
@@ -128,7 +128,7 @@
                 </Grid>
               </ListBoxItem>
 
-              <ListBoxItem>
+              <ListBoxItem IsVisible="{Binding !IsBare}">
                 <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Changes}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/>
@@ -143,7 +143,7 @@
                 </Grid>
               </ListBoxItem>
 
-              <ListBoxItem>
+              <ListBoxItem IsVisible="{Binding !IsBare}">
                 <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Stashes}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Stashes}"/>

From 766b60d05ece44e40bc29b8561b69efea5b6c971 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 17:53:26 +0800
Subject: [PATCH 022/364] enhance: disable unused context menus for `bare`
 repository (#899)

---
 src/ViewModels/CommitDetail.cs    |  49 +--
 src/ViewModels/Histories.cs       | 499 +++++++++++++++---------------
 src/ViewModels/Repository.cs      | 209 +++++++------
 src/Views/RepositoryToolbar.axaml |   2 +-
 4 files changed, 397 insertions(+), 362 deletions(-)

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 01f39b35..d90e97d6 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -420,34 +420,37 @@ namespace SourceGit.ViewModels
             menu.Items.Add(patch);
             menu.Items.Add(new MenuItem { Header = "-" });
 
-            var resetToThisRevision = new MenuItem();
-            resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
-            resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
-            resetToThisRevision.Click += (_, ev) =>
+            if (!_repo.IsBare)
             {
-                new Commands.Checkout(_repo.FullPath).FileWithRevision(change.Path, $"{_commit.SHA}");
-                ev.Handled = true;
-            };
+                var resetToThisRevision = new MenuItem();
+                resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
+                resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
+                resetToThisRevision.Click += (_, ev) =>
+                {
+                    new Commands.Checkout(_repo.FullPath).FileWithRevision(change.Path, $"{_commit.SHA}");
+                    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 += (_, ev) =>
-            {
-                if (change.Index == Models.ChangeState.Renamed)
-                    new Commands.Checkout(_repo.FullPath).FileWithRevision(change.OriginalPath, $"{_commit.SHA}~1");
+                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 += (_, ev) =>
+                {
+                    if (change.Index == Models.ChangeState.Renamed)
+                        new Commands.Checkout(_repo.FullPath).FileWithRevision(change.OriginalPath, $"{_commit.SHA}~1");
 
-                new Commands.Checkout(_repo.FullPath).FileWithRevision(change.Path, $"{_commit.SHA}~1");
-                ev.Handled = true;
-            };
+                    new Commands.Checkout(_repo.FullPath).FileWithRevision(change.Path, $"{_commit.SHA}~1");
+                    ev.Handled = true;
+                };
 
-            menu.Items.Add(resetToThisRevision);
-            menu.Items.Add(resetToFirstParent);
-            menu.Items.Add(new MenuItem { Header = "-" });
+                menu.Items.Add(resetToThisRevision);
+                menu.Items.Add(resetToFirstParent);
+                menu.Items.Add(new MenuItem { Header = "-" });
 
-            if (File.Exists(Path.Combine(fullPath)))
-                TryToAddContextMenuItemsForGitLFS(menu, change.Path);
+                if (File.Exists(Path.Combine(fullPath)))
+                    TryToAddContextMenuItemsForGitLFS(menu, change.Path);
+            }
 
             var copyPath = new MenuItem();
             copyPath.Header = App.Text("CopyPath");
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index ec880b24..b5754d33 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -253,36 +253,39 @@ namespace SourceGit.ViewModels
 
                 var multipleMenu = new ContextMenu();
 
-                if (canCherryPick)
+                if (!_repo.IsBare)
                 {
-                    var cherryPickMultiple = new MenuItem();
-                    cherryPickMultiple.Header = App.Text("CommitCM.CherryPickMultiple");
-                    cherryPickMultiple.Icon = App.CreateMenuIcon("Icons.CherryPick");
-                    cherryPickMultiple.Click += (_, e) =>
+                    if (canCherryPick)
                     {
-                        if (_repo.CanCreatePopup())
-                            _repo.ShowPopup(new CherryPick(_repo, selected));
-                        e.Handled = true;
-                    };
-                    multipleMenu.Items.Add(cherryPickMultiple);
-                }
+                        var cherryPickMultiple = new MenuItem();
+                        cherryPickMultiple.Header = App.Text("CommitCM.CherryPickMultiple");
+                        cherryPickMultiple.Icon = App.CreateMenuIcon("Icons.CherryPick");
+                        cherryPickMultiple.Click += (_, e) =>
+                        {
+                            if (_repo.CanCreatePopup())
+                                _repo.ShowPopup(new CherryPick(_repo, selected));
+                            e.Handled = true;
+                        };
+                        multipleMenu.Items.Add(cherryPickMultiple);
+                    }
 
-                if (canMerge)
-                {
-                    var mergeMultiple = new MenuItem();
-                    mergeMultiple.Header = App.Text("CommitCM.MergeMultiple");
-                    mergeMultiple.Icon = App.CreateMenuIcon("Icons.Merge");
-                    mergeMultiple.Click += (_, e) =>
+                    if (canMerge)
                     {
-                        if (_repo.CanCreatePopup())
-                            _repo.ShowPopup(new MergeMultiple(_repo, selected));
-                        e.Handled = true;
-                    };
-                    multipleMenu.Items.Add(mergeMultiple);
-                }
+                        var mergeMultiple = new MenuItem();
+                        mergeMultiple.Header = App.Text("CommitCM.MergeMultiple");
+                        mergeMultiple.Icon = App.CreateMenuIcon("Icons.Merge");
+                        mergeMultiple.Click += (_, e) =>
+                        {
+                            if (_repo.CanCreatePopup())
+                                _repo.ShowPopup(new MergeMultiple(_repo, selected));
+                            e.Handled = true;
+                        };
+                        multipleMenu.Items.Add(mergeMultiple);
+                    }
 
-                if (canCherryPick || canMerge)
-                    multipleMenu.Items.Add(new MenuItem() { Header = "-" });
+                    if (canCherryPick || canMerge)
+                        multipleMenu.Items.Add(new MenuItem() { Header = "-" });
+                }                
 
                 var saveToPatchMultiple = new MenuItem();
                 saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff");
@@ -394,25 +397,48 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(new MenuItem() { Header = "-" });
             }
 
-            if (current.Head != commit.SHA)
+            if (!_repo.IsBare)
             {
-                var reset = new MenuItem();
-                reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name);
-                reset.Icon = App.CreateMenuIcon("Icons.Reset");
-                reset.Click += (_, e) =>
+                if (current.Head != commit.SHA)
                 {
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new Reset(_repo, current, commit));
-                    e.Handled = true;
-                };
-                menu.Items.Add(reset);
+                    var reset = new MenuItem();
+                    reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name);
+                    reset.Icon = App.CreateMenuIcon("Icons.Reset");
+                    reset.Click += (_, e) =>
+                    {
+                        if (_repo.CanCreatePopup())
+                            _repo.ShowPopup(new Reset(_repo, current, commit));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(reset);
 
-                if (commit.IsMerged)
+                    if (commit.IsMerged)
+                    {
+                        var squash = new MenuItem();
+                        squash.Header = App.Text("CommitCM.SquashCommitsSinceThis");
+                        squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
+                        squash.Click += (_, e) =>
+                        {
+                            if (_repo.LocalChangesCount > 0)
+                            {
+                                App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
+                                return;
+                            }
+
+                            if (_repo.CanCreatePopup())
+                                _repo.ShowPopup(new Squash(_repo, commit, commit.SHA));
+
+                            e.Handled = true;
+                        };
+                        menu.Items.Add(squash);
+                    }
+                }
+                else
                 {
-                    var squash = new MenuItem();
-                    squash.Header = App.Text("CommitCM.SquashCommitsSinceThis");
-                    squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
-                    squash.Click += (_, e) =>
+                    var reword = new MenuItem();
+                    reword.Header = App.Text("CommitCM.Reword");
+                    reword.Icon = App.CreateMenuIcon("Icons.Edit");
+                    reword.Click += (_, e) =>
                     {
                         if (_repo.LocalChangesCount > 0)
                         {
@@ -421,169 +447,149 @@ namespace SourceGit.ViewModels
                         }
 
                         if (_repo.CanCreatePopup())
-                            _repo.ShowPopup(new Squash(_repo, commit, commit.SHA));
+                            _repo.ShowPopup(new Reword(_repo, commit));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(reword);
+
+                    var squash = new MenuItem();
+                    squash.Header = App.Text("CommitCM.Squash");
+                    squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
+                    squash.IsEnabled = commit.Parents.Count == 1;
+                    squash.Click += (_, e) =>
+                    {
+                        if (_repo.LocalChangesCount > 0)
+                        {
+                            App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
+                            return;
+                        }
+
+                        if (commit.Parents.Count == 1)
+                        {
+                            var parent = _commits.Find(x => x.SHA == commit.Parents[0]);
+                            if (parent != null && _repo.CanCreatePopup())
+                                _repo.ShowPopup(new Squash(_repo, parent, commit.SHA));
+                        }
 
                         e.Handled = true;
                     };
                     menu.Items.Add(squash);
                 }
-            }
-            else
-            {
-                var reword = new MenuItem();
-                reword.Header = App.Text("CommitCM.Reword");
-                reword.Icon = App.CreateMenuIcon("Icons.Edit");
-                reword.Click += (_, e) =>
+
+                if (!commit.IsMerged)
                 {
-                    if (_repo.LocalChangesCount > 0)
-                    {
-                        App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
-                        return;
-                    }
-
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new Reword(_repo, commit));
-                    e.Handled = true;
-                };
-                menu.Items.Add(reword);
-
-                var squash = new MenuItem();
-                squash.Header = App.Text("CommitCM.Squash");
-                squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
-                squash.IsEnabled = commit.Parents.Count == 1;
-                squash.Click += (_, e) =>
-                {
-                    if (_repo.LocalChangesCount > 0)
-                    {
-                        App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
-                        return;
-                    }
-
-                    if (commit.Parents.Count == 1)
-                    {
-                        var parent = _commits.Find(x => x.SHA == commit.Parents[0]);
-                        if (parent != null && _repo.CanCreatePopup())
-                            _repo.ShowPopup(new Squash(_repo, parent, commit.SHA));
-                    }
-
-                    e.Handled = true;
-                };
-                menu.Items.Add(squash);
-            }
-
-            if (!commit.IsMerged)
-            {
-                var rebase = new MenuItem();
-                rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name);
-                rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
-                rebase.Click += (_, e) =>
-                {
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new Rebase(_repo, current, commit));
-                    e.Handled = true;
-                };
-                menu.Items.Add(rebase);
-
-                if (!commit.HasDecorators)
-                {
-                    var merge = new MenuItem();
-                    merge.Header = new Views.NameHighlightedTextBlock("CommitCM.Merge", current.Name);
-                    merge.Icon = App.CreateMenuIcon("Icons.Merge");
-                    merge.Click += (_, e) =>
+                    var rebase = new MenuItem();
+                    rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name);
+                    rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
+                    rebase.Click += (_, e) =>
                     {
                         if (_repo.CanCreatePopup())
-                            _repo.ShowPopup(new Merge(_repo, commit, current.Name));
+                            _repo.ShowPopup(new Rebase(_repo, current, commit));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(rebase);
+
+                    if (!commit.HasDecorators)
+                    {
+                        var merge = new MenuItem();
+                        merge.Header = new Views.NameHighlightedTextBlock("CommitCM.Merge", current.Name);
+                        merge.Icon = App.CreateMenuIcon("Icons.Merge");
+                        merge.Click += (_, e) =>
+                        {
+                            if (_repo.CanCreatePopup())
+                                _repo.ShowPopup(new Merge(_repo, commit, current.Name));
+
+                            e.Handled = true;
+                        };
+                        menu.Items.Add(merge);
+                    }
+
+                    var cherryPick = new MenuItem();
+                    cherryPick.Header = App.Text("CommitCM.CherryPick");
+                    cherryPick.Icon = App.CreateMenuIcon("Icons.CherryPick");
+                    cherryPick.Click += (_, e) =>
+                    {
+                        if (_repo.CanCreatePopup())
+                        {
+                            if (commit.Parents.Count <= 1)
+                            {
+                                _repo.ShowPopup(new CherryPick(_repo, [commit]));
+                            }
+                            else
+                            {
+                                var parents = new List<Models.Commit>();
+                                foreach (var sha in commit.Parents)
+                                {
+                                    var parent = _commits.Find(x => x.SHA == sha);
+                                    if (parent == null)
+                                        parent = new Commands.QuerySingleCommit(_repo.FullPath, sha).Result();
+
+                                    if (parent != null)
+                                        parents.Add(parent);
+                                }
+
+                                _repo.ShowPopup(new CherryPick(_repo, commit, parents));
+                            }
+                        }
 
                         e.Handled = true;
                     };
-                    menu.Items.Add(merge);
+                    menu.Items.Add(cherryPick);
+                }
+                else
+                {
+                    var revert = new MenuItem();
+                    revert.Header = App.Text("CommitCM.Revert");
+                    revert.Icon = App.CreateMenuIcon("Icons.Undo");
+                    revert.Click += (_, e) =>
+                    {
+                        if (_repo.CanCreatePopup())
+                            _repo.ShowPopup(new Revert(_repo, commit));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(revert);
                 }
 
-                var cherryPick = new MenuItem();
-                cherryPick.Header = App.Text("CommitCM.CherryPick");
-                cherryPick.Icon = App.CreateMenuIcon("Icons.CherryPick");
-                cherryPick.Click += (_, e) =>
+                if (current.Head != commit.SHA)
                 {
-                    if (_repo.CanCreatePopup())
+                    var checkoutCommit = new MenuItem();
+                    checkoutCommit.Header = App.Text("CommitCM.Checkout");
+                    checkoutCommit.Icon = App.CreateMenuIcon("Icons.Detached");
+                    checkoutCommit.Click += (_, e) =>
                     {
-                        if (commit.Parents.Count <= 1)
-                        {
-                            _repo.ShowPopup(new CherryPick(_repo, [commit]));
-                        }
-                        else
-                        {
-                            var parents = new List<Models.Commit>();
-                            foreach (var sha in commit.Parents)
-                            {
-                                var parent = _commits.Find(x => x.SHA == sha);
-                                if (parent == null)
-                                    parent = new Commands.QuerySingleCommit(_repo.FullPath, sha).Result();
+                        if (_repo.CanCreatePopup())
+                            _repo.ShowPopup(new CheckoutCommit(_repo, commit));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(checkoutCommit);
+                }
 
-                                if (parent != null)
-                                    parents.Add(parent);
-                            }
-
-                            _repo.ShowPopup(new CherryPick(_repo, commit, parents));
-                        }
-                    }
-
-                    e.Handled = true;
-                };
-                menu.Items.Add(cherryPick);
-            }
-            else
-            {
-                var revert = new MenuItem();
-                revert.Header = App.Text("CommitCM.Revert");
-                revert.Icon = App.CreateMenuIcon("Icons.Undo");
-                revert.Click += (_, e) =>
-                {
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new Revert(_repo, commit));
-                    e.Handled = true;
-                };
-                menu.Items.Add(revert);
-            }
-
-            if (current.Head != commit.SHA)
-            {
-                var checkoutCommit = new MenuItem();
-                checkoutCommit.Header = App.Text("CommitCM.Checkout");
-                checkoutCommit.Icon = App.CreateMenuIcon("Icons.Detached");
-                checkoutCommit.Click += (_, e) =>
-                {
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new CheckoutCommit(_repo, commit));
-                    e.Handled = true;
-                };
-                menu.Items.Add(checkoutCommit);
-            }
-
-            menu.Items.Add(new MenuItem() { Header = "-" });
-
-            if (commit.IsMerged && current.Head != commit.SHA)
-            {
-                var interactiveRebase = new MenuItem();
-                interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name);
-                interactiveRebase.Icon = App.CreateMenuIcon("Icons.InteractiveRebase");
-                interactiveRebase.Click += (_, e) =>
-                {
-                    if (_repo.LocalChangesCount > 0)
-                    {
-                        App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
-                        return;
-                    }
-
-                    App.OpenDialog(new Views.InteractiveRebase()
-                    {
-                        DataContext = new InteractiveRebase(_repo, current, commit)
-                    });
-
-                    e.Handled = true;
-                };
-                menu.Items.Add(interactiveRebase);
                 menu.Items.Add(new MenuItem() { Header = "-" });
-            }
+
+                if (commit.IsMerged && current.Head != commit.SHA)
+                {
+                    var interactiveRebase = new MenuItem();
+                    interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name);
+                    interactiveRebase.Icon = App.CreateMenuIcon("Icons.InteractiveRebase");
+                    interactiveRebase.Click += (_, e) =>
+                    {
+                        if (_repo.LocalChangesCount > 0)
+                        {
+                            App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
+                            return;
+                        }
+
+                        App.OpenDialog(new Views.InteractiveRebase()
+                        {
+                            DataContext = new InteractiveRebase(_repo, current, commit)
+                        });
+
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(interactiveRebase);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                }
+            }            
 
             if (current.Head != commit.SHA)
             {
@@ -914,21 +920,24 @@ namespace SourceGit.ViewModels
             submenu.Items.Add(rename);
             submenu.Items.Add(new MenuItem() { Header = "-" });
 
-            var detect = Commands.GitFlow.DetectType(_repo.FullPath, _repo.Branches, current.Name);
-            if (detect.IsGitFlowBranch)
+            if (!_repo.IsBare)
             {
-                var finish = new MenuItem();
-                finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", current.Name);
-                finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
-                finish.Click += (_, e) =>
+                var detect = Commands.GitFlow.DetectType(_repo.FullPath, _repo.Branches, current.Name);
+                if (detect.IsGitFlowBranch)
                 {
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new GitFlowFinish(_repo, current, detect.Type, detect.Prefix));
-                    e.Handled = true;
-                };
-                submenu.Items.Add(finish);
-                submenu.Items.Add(new MenuItem() { Header = "-" });
-            }
+                    var finish = new MenuItem();
+                    finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", current.Name);
+                    finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
+                    finish.Click += (_, e) =>
+                    {
+                        if (_repo.CanCreatePopup())
+                            _repo.ShowPopup(new GitFlowFinish(_repo, current, detect.Type, detect.Prefix));
+                        e.Handled = true;
+                    };
+                    submenu.Items.Add(finish);
+                    submenu.Items.Add(new MenuItem() { Header = "-" });
+                }
+            }            
 
             var copy = new MenuItem();
             copy.Header = App.Text("BranchCM.CopyName");
@@ -951,27 +960,30 @@ namespace SourceGit.ViewModels
 
             FillBranchVisibilityMenu(submenu, branch);
 
-            var checkout = new MenuItem();
-            checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name);
-            checkout.Icon = App.CreateMenuIcon("Icons.Check");
-            checkout.Click += (_, e) =>
+            if (!_repo.IsBare)
             {
-                _repo.CheckoutBranch(branch);
-                e.Handled = true;
-            };
-            submenu.Items.Add(checkout);
+                var checkout = new MenuItem();
+                checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name);
+                checkout.Icon = App.CreateMenuIcon("Icons.Check");
+                checkout.Click += (_, e) =>
+                {
+                    _repo.CheckoutBranch(branch);
+                    e.Handled = true;
+                };
+                submenu.Items.Add(checkout);
 
-            var merge = new MenuItem();
-            merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, current.Name);
-            merge.Icon = App.CreateMenuIcon("Icons.Merge");
-            merge.IsEnabled = !merged;
-            merge.Click += (_, e) =>
-            {
-                if (_repo.CanCreatePopup())
-                    _repo.ShowPopup(new Merge(_repo, branch, current.Name));
-                e.Handled = true;
-            };
-            submenu.Items.Add(merge);
+                var merge = new MenuItem();
+                merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, current.Name);
+                merge.Icon = App.CreateMenuIcon("Icons.Merge");
+                merge.IsEnabled = !merged;
+                merge.Click += (_, e) =>
+                {
+                    if (_repo.CanCreatePopup())
+                        _repo.ShowPopup(new Merge(_repo, branch, current.Name));
+                    e.Handled = true;
+                };
+                submenu.Items.Add(merge);
+            }            
 
             var rename = new MenuItem();
             rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
@@ -996,21 +1008,24 @@ namespace SourceGit.ViewModels
             submenu.Items.Add(delete);
             submenu.Items.Add(new MenuItem() { Header = "-" });
 
-            var detect = Commands.GitFlow.DetectType(_repo.FullPath, _repo.Branches, branch.Name);
-            if (detect.IsGitFlowBranch)
+            if (!_repo.IsBare)
             {
-                var finish = new MenuItem();
-                finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name);
-                finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
-                finish.Click += (_, e) =>
+                var detect = Commands.GitFlow.DetectType(_repo.FullPath, _repo.Branches, branch.Name);
+                if (detect.IsGitFlowBranch)
                 {
-                    if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new GitFlowFinish(_repo, branch, detect.Type, detect.Prefix));
-                    e.Handled = true;
-                };
-                submenu.Items.Add(finish);
-                submenu.Items.Add(new MenuItem() { Header = "-" });
-            }
+                    var finish = new MenuItem();
+                    finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name);
+                    finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
+                    finish.Click += (_, e) =>
+                    {
+                        if (_repo.CanCreatePopup())
+                            _repo.ShowPopup(new GitFlowFinish(_repo, branch, detect.Type, detect.Prefix));
+                        e.Handled = true;
+                    };
+                    submenu.Items.Add(finish);
+                    submenu.Items.Add(new MenuItem() { Header = "-" });
+                }
+            }            
 
             var copy = new MenuItem();
             copy.Header = App.Text("BranchCM.CopyName");
@@ -1104,17 +1119,19 @@ namespace SourceGit.ViewModels
             };
             submenu.Items.Add(push);
 
-            var merge = new MenuItem();
-            merge.Header = new Views.NameHighlightedTextBlock("TagCM.Merge", tag.Name, current.Name);
-            merge.Icon = App.CreateMenuIcon("Icons.Merge");
-            merge.IsEnabled = !merged;
-            merge.Click += (_, e) =>
+            if (!_repo.IsBare && !merged)
             {
-                if (_repo.CanCreatePopup())
-                    _repo.ShowPopup(new Merge(_repo, tag, current.Name));
-                e.Handled = true;
-            };
-            submenu.Items.Add(merge);
+                var merge = new MenuItem();
+                merge.Header = new Views.NameHighlightedTextBlock("TagCM.Merge", tag.Name, current.Name);
+                merge.Icon = App.CreateMenuIcon("Icons.Merge");
+                merge.Click += (_, e) =>
+                {
+                    if (_repo.CanCreatePopup())
+                        _repo.ShowPopup(new Merge(_repo, tag, current.Name));
+                    e.Handled = true;
+                };
+                submenu.Items.Add(merge);
+            }            
 
             var delete = new MenuItem();
             delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 6dfa67ca..8e1e5fb9 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1434,66 +1434,72 @@ namespace SourceGit.ViewModels
 
             if (branch.IsCurrent)
             {
-                var discard = new MenuItem();
-                discard.Header = App.Text("BranchCM.DiscardAll");
-                discard.Icon = App.CreateMenuIcon("Icons.Undo");
-                discard.Click += (_, e) =>
+                if (!IsBare)
                 {
-                    if (CanCreatePopup())
-                        ShowPopup(new Discard(this));
-                    e.Handled = true;
-                };
-
-                menu.Items.Add(discard);
-                menu.Items.Add(new MenuItem() { Header = "-" });
-
-                if (!string.IsNullOrEmpty(branch.Upstream))
-                {
-                    var upstream = branch.Upstream.Substring(13);
-                    var fastForward = new MenuItem();
-                    fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream);
-                    fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
-                    fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
-                    fastForward.Click += (_, e) =>
+                    var discard = new MenuItem();
+                    discard.Header = App.Text("BranchCM.DiscardAll");
+                    discard.Icon = App.CreateMenuIcon("Icons.Undo");
+                    discard.Click += (_, e) =>
                     {
-                        var b = _branches.Find(x => x.FriendlyName == upstream);
-                        if (b == null)
-                            return;
-
                         if (CanCreatePopup())
-                            ShowAndStartPopup(new Merge(this, b, branch.Name));
-
+                            ShowPopup(new Discard(this));
                         e.Handled = true;
                     };
 
-                    var pull = new MenuItem();
-                    pull.Header = new Views.NameHighlightedTextBlock("BranchCM.Pull", upstream);
-                    pull.Icon = App.CreateMenuIcon("Icons.Pull");
-                    pull.Click += (_, e) =>
-                    {
-                        if (CanCreatePopup())
-                            ShowPopup(new Pull(this, null));
-                        e.Handled = true;
-                    };
+                    menu.Items.Add(discard);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
 
-                    menu.Items.Add(fastForward);
-                    menu.Items.Add(pull);
-                }
+                    if (!string.IsNullOrEmpty(branch.Upstream))
+                    {
+                        var upstream = branch.Upstream.Substring(13);
+                        var fastForward = new MenuItem();
+                        fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream);
+                        fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
+                        fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
+                        fastForward.Click += (_, e) =>
+                        {
+                            var b = _branches.Find(x => x.FriendlyName == upstream);
+                            if (b == null)
+                                return;
+
+                            if (CanCreatePopup())
+                                ShowAndStartPopup(new Merge(this, b, branch.Name));
+
+                            e.Handled = true;
+                        };
+
+                        var pull = new MenuItem();
+                        pull.Header = new Views.NameHighlightedTextBlock("BranchCM.Pull", upstream);
+                        pull.Icon = App.CreateMenuIcon("Icons.Pull");
+                        pull.Click += (_, e) =>
+                        {
+                            if (CanCreatePopup())
+                                ShowPopup(new Pull(this, null));
+                            e.Handled = true;
+                        };
+
+                        menu.Items.Add(fastForward);
+                        menu.Items.Add(pull);
+                    }
+                }                
 
                 menu.Items.Add(push);
             }
             else
             {
-                var checkout = new MenuItem();
-                checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name);
-                checkout.Icon = App.CreateMenuIcon("Icons.Check");
-                checkout.Click += (_, e) =>
+                if (!IsBare)
                 {
-                    CheckoutBranch(branch);
-                    e.Handled = true;
-                };
-                menu.Items.Add(checkout);
-                menu.Items.Add(new MenuItem() { Header = "-" });
+                    var checkout = new MenuItem();
+                    checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name);
+                    checkout.Icon = App.CreateMenuIcon("Icons.Check");
+                    checkout.Click += (_, e) =>
+                    {
+                        CheckoutBranch(branch);
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(checkout);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                }                
 
                 var worktree = _worktrees.Find(x => x.Branch == branch.FullName);
                 var upstream = _branches.Find(x => x.FullName == branch.Upstream);
@@ -1528,28 +1534,31 @@ namespace SourceGit.ViewModels
 
                 menu.Items.Add(push);
 
-                var merge = new MenuItem();
-                merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, _currentBranch.Name);
-                merge.Icon = App.CreateMenuIcon("Icons.Merge");
-                merge.Click += (_, e) =>
+                if (!IsBare)
                 {
-                    if (CanCreatePopup())
-                        ShowPopup(new Merge(this, branch, _currentBranch.Name));
-                    e.Handled = true;
-                };
+                    var merge = new MenuItem();
+                    merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, _currentBranch.Name);
+                    merge.Icon = App.CreateMenuIcon("Icons.Merge");
+                    merge.Click += (_, e) =>
+                    {
+                        if (CanCreatePopup())
+                            ShowPopup(new Merge(this, branch, _currentBranch.Name));
+                        e.Handled = true;
+                    };
 
-                var rebase = new MenuItem();
-                rebase.Header = new Views.NameHighlightedTextBlock("BranchCM.Rebase", _currentBranch.Name, branch.Name);
-                rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
-                rebase.Click += (_, e) =>
-                {
-                    if (CanCreatePopup())
-                        ShowPopup(new Rebase(this, _currentBranch, branch));
-                    e.Handled = true;
-                };
+                    var rebase = new MenuItem();
+                    rebase.Header = new Views.NameHighlightedTextBlock("BranchCM.Rebase", _currentBranch.Name, branch.Name);
+                    rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
+                    rebase.Click += (_, e) =>
+                    {
+                        if (CanCreatePopup())
+                            ShowPopup(new Rebase(this, _currentBranch, branch));
+                        e.Handled = true;
+                    };
 
-                menu.Items.Add(merge);
-                menu.Items.Add(rebase);
+                    menu.Items.Add(merge);
+                    menu.Items.Add(rebase);
+                }                
 
                 var compareWithHead = new MenuItem();
                 compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
@@ -1584,21 +1593,24 @@ namespace SourceGit.ViewModels
                 }
             }
 
-            var detect = Commands.GitFlow.DetectType(_fullpath, _branches, branch.Name);
-            if (detect.IsGitFlowBranch)
+            if (!IsBare)
             {
-                var finish = new MenuItem();
-                finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name);
-                finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
-                finish.Click += (_, e) =>
+                var detect = Commands.GitFlow.DetectType(_fullpath, _branches, branch.Name);
+                if (detect.IsGitFlowBranch)
                 {
-                    if (CanCreatePopup())
-                        ShowPopup(new GitFlowFinish(this, branch, detect.Type, detect.Prefix));
-                    e.Handled = true;
-                };
-                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(finish);
-            }
+                    var finish = new MenuItem();
+                    finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name);
+                    finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
+                    finish.Click += (_, e) =>
+                    {
+                        if (CanCreatePopup())
+                            ShowPopup(new GitFlowFinish(this, branch, detect.Type, detect.Prefix));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(finish);
+                }
+            }            
 
             var rename = new MenuItem();
             rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
@@ -1649,26 +1661,29 @@ namespace SourceGit.ViewModels
             menu.Items.Add(createTag);
             menu.Items.Add(new MenuItem() { Header = "-" });
 
-            var remoteBranches = new List<Models.Branch>();
-            foreach (var b in _branches)
+            if (!IsBare)
             {
-                if (!b.IsLocal)
-                    remoteBranches.Add(b);
-            }
-
-            if (remoteBranches.Count > 0)
-            {
-                var tracking = new MenuItem();
-                tracking.Header = App.Text("BranchCM.Tracking");
-                tracking.Icon = App.CreateMenuIcon("Icons.Track");
-                tracking.Click += (_, e) =>
+                var remoteBranches = new List<Models.Branch>();
+                foreach (var b in _branches)
                 {
-                    if (CanCreatePopup())
-                        ShowPopup(new SetUpstream(this, branch, remoteBranches));
-                    e.Handled = true;
-                };
-                menu.Items.Add(tracking);
-            }
+                    if (!b.IsLocal)
+                        remoteBranches.Add(b);
+                }
+
+                if (remoteBranches.Count > 0)
+                {
+                    var tracking = new MenuItem();
+                    tracking.Header = App.Text("BranchCM.Tracking");
+                    tracking.Icon = App.CreateMenuIcon("Icons.Track");
+                    tracking.Click += (_, e) =>
+                    {
+                        if (CanCreatePopup())
+                            ShowPopup(new SetUpstream(this, branch, remoteBranches));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(tracking);
+                }
+            }            
 
             var archive = new MenuItem();
             archive.Icon = App.CreateMenuIcon("Icons.Archive");
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
index 55e0109a..a409d8d0 100644
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@@ -13,7 +13,7 @@
           <Path Width="14" Height="14" Data="{StaticResource Icons.Explore}" Margin="0,2,0,0"/>
         </Button>
 
-        <Button Classes="icon_button" Width="32" Click="OpenWithExternalTools" ToolTip.Tip="{DynamicResource Text.Repository.OpenWithExternalTools}">
+        <Button Classes="icon_button" Width="32" Click="OpenWithExternalTools" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Repository.OpenWithExternalTools}">
           <Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/>
         </Button>
         

From f2b1c06bb81f36d94f7c5442bce6875963f84977 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 17:57:31 +0800
Subject: [PATCH 023/364] enhance: disable `checkout branch` via
 double-clicking branch tree node (#899)

---
 src/ViewModels/Repository.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 8e1e5fb9..28f32da5 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1062,6 +1062,9 @@ namespace SourceGit.ViewModels
                 }
             }
 
+            if (IsBare)
+                return;
+
             if (!CanCreatePopup())
                 return;
 

From 6f407fb086f6894379fc106cbcc2f5e3f89b4f3a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 18:07:55 +0800
Subject: [PATCH 024/364] enhance: enable `--index` option in `git stash pop`
 command by default (#903)

---
 src/Commands/Stash.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index cee79886..1cbf4b2a 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -75,13 +75,13 @@ namespace SourceGit.Commands
 
         public bool Apply(string name)
         {
-            Args = $"stash apply -q {name}";
+            Args = $"stash apply --index -q {name}";
             return Exec();
         }
 
         public bool Pop(string name)
         {
-            Args = $"stash pop -q {name}";
+            Args = $"stash pop --index -q {name}";
             return Exec();
         }
 

From 765286ec0b67926bbc3c41002989a1bc0b753d62 Mon Sep 17 00:00:00 2001
From: Nils van Rijsinge <nilspvr@pm.me>
Date: Tue, 14 Jan 2025 11:11:11 +0100
Subject: [PATCH 025/364] localization: add missing de_DE keys (#905)

Configure.IssueTracker Gittee 22ba8b3acf9525a5d569f3ab326712b1b972b994
General.DateFormat c058b4744b773bcc6a238ff3db4b88f9597e4169
Git.SSLVerify 1596ca71a5617e17193560c8cfe87e185bd4803c
Repository.HistoriesLayout 26ebd5ae7e22d411940229559b66bc855975ed49 6b5e8c588d2b9471eb01858a618532be0555448e
OnlyHighlightCurrentBranchInHistories, UseRelativeTimeInHistories 26ebd5ae7e22d411940229559b66bc855975ed49
Tags.Order..., Tags.Sort 08a128cd87e4029d1ebcbfdc5ec8be8a48acfec8
SetUpstream 6fe4d8162b1712c9f8b2a62e93be93186269f77c
---
 src/Resources/Locales/de_DE.axaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index db4fee87..5143fc37 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -163,6 +163,8 @@
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Aktivere --prune beim fetchen</x:String>
   <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Aktiviere --signoff für Commits</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TICKETSYSTEM</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Beispiel für Gitee Issue Regel einfügen</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Beispiel für Gitee Pull Request Regel einfügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Beispiel für Github-Regel hinzufügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Beispiel für Jira-Regel hinzufügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Beispiel für Gitlab Issue Regel einfügen</x:String>
@@ -465,6 +467,7 @@
   <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Tool</x:String>
   <x:String x:Key="Text.Preferences.General" xml:space="preserve">ALLGEMEIN</x:String>
   <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
+  <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Datumsformat</x:String>
   <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Sprache</x:String>
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
@@ -476,6 +479,7 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Benutzer Email</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Installationspfad</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Aktiviere HTTP SSL Verifizierung</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Globaler Git Benutzername</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git Version</x:String>
@@ -562,12 +566,17 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Aufheben</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Im Graph ausblenden</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Im Graph filtern</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertikal</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">COMMIT SORTIERUNG</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Zeitpunkt (--date-order)</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologie (--topo-order)</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Aktiviere '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Erstelle Branch</x:String>
+  <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Nur aktuellen Branch im Graphen hervorheben</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Öffne in {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Öffne in externen Tools</x:String>
   <x:String x:Key="Text.Repository.Refresh" xml:space="preserve">Aktualisiern</x:String>
@@ -587,7 +596,12 @@
   <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">SUBMODUL AKTUALISIEREN</x:String>
   <x:String x:Key="Text.Repository.Tags" xml:space="preserve">TAGS</x:String>
   <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">NEUER TAG</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">Nach Erstellungsdatum</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">Nach Namen (Aufsteigend)</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">Nach Namen (Absteigend)</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Sortiere</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Öffne im Terminal</x:String>
+  <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Verwende relative Zeitangaben in Verlauf</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREES</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">WORKTREE HINZUFÜGEN</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">PRUNE</x:String>
@@ -615,6 +629,10 @@
   <x:String x:Key="Text.SelfUpdate.IgnoreThisVersion" xml:space="preserve">Diese Version überspringen</x:String>
   <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Software Update</x:String>
   <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">Es sind momentan kein Updates verfügbar.</x:String>
+  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Setze verfolgten Branch</x:String>
+  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Upstream Verfolgung aufheben</x:String>
+  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">Upstream:</x:String>
   <x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">SHA kopieren</x:String>
   <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Zum Commit wechseln</x:String>
   <x:String x:Key="Text.Squash" xml:space="preserve">Squash Commits</x:String>

From 5b425c4ed0c87bf251c1a72378a8047a057dbbaa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 10:11:25 +0000
Subject: [PATCH 026/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 21 ++-------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 2973a65c..e922c476 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.55%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.32%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-100.00%25-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.32%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index b2f2b987..aa42d82b 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,27 +1,10 @@
-### de_DE.axaml: 97.55%
+### de_DE.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Configure.IssueTracker.AddSampleGiteeIssue
-- Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.Preferences.General.DateFormat
-- Text.Preferences.Git.SSLVerify
-- Text.Repository.HistoriesLayout
-- Text.Repository.HistoriesLayout.Horizontal
-- Text.Repository.HistoriesLayout.Vertical
-- Text.Repository.HistoriesOrder
-- Text.Repository.OnlyHighlightCurrentBranchInHistories
-- Text.Repository.Tags.OrderByCreatorDate
-- Text.Repository.Tags.OrderByNameAsc
-- Text.Repository.Tags.OrderByNameDes
-- Text.Repository.Tags.Sort
-- Text.Repository.UseRelativeTimeInHistories
-- Text.SetUpstream
-- Text.SetUpstream.Local
-- Text.SetUpstream.Unset
-- Text.SetUpstream.Upstream
+
 
 </details>
 

From c8aecc00cc5940ba36e6934c57b6142307f04b8b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 20:39:44 +0800
Subject: [PATCH 027/364] ux: use `Grid` instead of `DockPanel`

---
 src/Views/CommitBaseInfo.axaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index bb083d82..fe1ead84 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -19,10 +19,10 @@
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Author}"/>
             <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
-              <DockPanel Margin="0,10,0,8" ClipToBounds="True">
-                <SelectableTextBlock Text="{Binding Author.Name}" Margin="2,0,8,0"/>
-                <SelectableTextBlock Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
-              </DockPanel>
+              <Grid Margin="0,10,0,8" ColumnDefinitions="Auto,*" ClipToBounds="True">
+                <SelectableTextBlock Grid.Column="0" Text="{Binding Author.Name}" Margin="2,0,8,0"/>
+                <SelectableTextBlock Grid.Column="1" Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+              </Grid>
               <SelectableTextBlock Text="{Binding AuthorTimeStr}"
                                    Margin="2,0,0,0"
                                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
@@ -35,10 +35,10 @@
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Committer}"/>
             <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
-              <DockPanel Margin="0,10,0,8" ClipToBounds="True">
-                <SelectableTextBlock Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
-                <SelectableTextBlock Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
-              </DockPanel>
+              <Grid Margin="0,10,0,8" ColumnDefinitions="Auto,*" ClipToBounds="True">
+                <SelectableTextBlock Grid.Column="0" Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
+                <SelectableTextBlock Grid.Column="1" Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+              </Grid>
               <SelectableTextBlock Text="{Binding CommitterTimeStr}"
                                    Margin="2,0,0,0"
                                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"

From 1c8d4d312ad96cf3e229a11616e3371b996c7d20 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 21:02:32 +0800
Subject: [PATCH 028/364] fix: `SelectableTextBlock` does not re-draw after
 `Text` property changed (#906)

---
 src/Views/CommitBaseInfo.axaml           | 24 ++++++++++++------------
 src/Views/EnhancedSelectableTextBlock.cs | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 src/Views/EnhancedSelectableTextBlock.cs

diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index fe1ead84..c92a3612 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -20,13 +20,13 @@
             <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
               <Grid Margin="0,10,0,8" ColumnDefinitions="Auto,*" ClipToBounds="True">
-                <SelectableTextBlock Grid.Column="0" Text="{Binding Author.Name}" Margin="2,0,8,0"/>
-                <SelectableTextBlock Grid.Column="1" Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="0" Text="{Binding Author.Name}" Margin="2,0,8,0"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="1" Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
               </Grid>
-              <SelectableTextBlock Text="{Binding AuthorTimeStr}"
-                                   Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-                                   Foreground="{DynamicResource Brush.FG2}"/>
+              <v:EnhancedSelectableTextBlock Text="{Binding AuthorTimeStr}"
+                                             Margin="2,0,0,0"
+                                             FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                             Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
 
@@ -36,13 +36,13 @@
             <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
               <Grid Margin="0,10,0,8" ColumnDefinitions="Auto,*" ClipToBounds="True">
-                <SelectableTextBlock Grid.Column="0" Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
-                <SelectableTextBlock Grid.Column="1" Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="0" Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="1" Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
               </Grid>
-              <SelectableTextBlock Text="{Binding CommitterTimeStr}"
-                                   Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-                                   Foreground="{DynamicResource Brush.FG2}"/>
+              <v:EnhancedSelectableTextBlock Text="{Binding CommitterTimeStr}"
+                                             Margin="2,0,0,0"
+                                             FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                             Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
         </UniformGrid>
diff --git a/src/Views/EnhancedSelectableTextBlock.cs b/src/Views/EnhancedSelectableTextBlock.cs
new file mode 100644
index 00000000..183b7021
--- /dev/null
+++ b/src/Views/EnhancedSelectableTextBlock.cs
@@ -0,0 +1,20 @@
+using System;
+
+using Avalonia;
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public class EnhancedSelectableTextBlock : SelectableTextBlock
+    {
+        protected override Type StyleKeyOverride => typeof(SelectableTextBlock);
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == TextProperty)
+                UpdateLayout();
+        }
+    }
+}

From 53ec53a6eebddef0f76ce18fc615f84b4f165034 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Jan 2025 21:26:31 +0800
Subject: [PATCH 029/364] project: upgrade
 `LiveChartsCore.SkiaSharpView.Avalonia` to `2.0.0-rc5`

---
 src/SourceGit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 64168b2e..7c098207 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc4.5" />
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5" />
     <PackageReference Include="TextMateSharp" Version="1.0.65" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.65" />
   </ItemGroup>

From 8a472cb4724684ce8b1f9fce2051ecb9805b44c7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 15 Jan 2025 10:42:35 +0800
Subject: [PATCH 030/364] fix: sometimes tags did not update after deleting
 selected tag (#908)

---
 src/Models/Watcher.cs        |  5 +++++
 src/ViewModels/DeleteTag.cs  |  6 +++++-
 src/ViewModels/Repository.cs | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index c63f0e55..7a6c5163 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -72,6 +72,11 @@ namespace SourceGit.Models
             _updateBranch = DateTime.Now.ToFileTime() - 1;
         }
 
+        public void MarkTagDirtyManually()
+        {
+            _updateTags = DateTime.Now.ToFileTime() - 1;
+        }
+
         public void MarkWorkingCopyDirtyManually()
         {
             _updateWC = DateTime.Now.ToFileTime() - 1;
diff --git a/src/ViewModels/DeleteTag.cs b/src/ViewModels/DeleteTag.cs
index 7d631a38..7b53e798 100644
--- a/src/ViewModels/DeleteTag.cs
+++ b/src/ViewModels/DeleteTag.cs
@@ -33,7 +33,11 @@ namespace SourceGit.ViewModels
             {
                 var remotes = ShouldPushToRemote ? _repo.Remotes : null;
                 var succ = Commands.Tag.Delete(_repo.FullPath, Target.Name, remotes);
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() =>
+                {
+                    _repo.MarkTagsDirtyManually();
+                    _repo.SetWatcherEnabled(true);
+                });
                 return succ;
             });
         }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 28f32da5..7f619f1e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -771,6 +771,19 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public void MarkTagsDirtyManually()
+        {
+            if (_watcher == null)
+            {
+                Task.Run(RefreshTags);
+                Task.Run(RefreshCommits);
+            }
+            else
+            {
+                _watcher.MarkTagDirtyManually();
+            }
+        }
+
         public void MarkWorkingCopyDirtyManually()
         {
             if (_watcher == null)

From b00c81c996a3a1aa7fff29d36867dcf850f59511 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 20 Jan 2025 10:05:43 +0800
Subject: [PATCH 031/364] version: Release 2025.03

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 2d67d4ee..d5cfddc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.02
\ No newline at end of file
+2025.03
\ No newline at end of file

From 6482ef227abe6d40f019756d5599095754a9d5bf Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Tue, 21 Jan 2025 13:58:07 +0800
Subject: [PATCH 032/364] fix: prevent target branch HEAD from being changed
 when adding worktree (#919)

* fix: prevent target branch HEAD from being changed when adding worktree

Signed-off-by: Gadfly <gadfly@gadfly.vip>

* fix: worktree path validator trigger error

Signed-off-by: Gadfly <gadfly@gadfly.vip>

---------

Signed-off-by: Gadfly <gadfly@gadfly.vip>
---
 src/Commands/Worktree.cs      | 2 ++
 src/ViewModels/AddWorktree.cs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Commands/Worktree.cs b/src/Commands/Worktree.cs
index 7516b1e3..27c0e28e 100644
--- a/src/Commands/Worktree.cs
+++ b/src/Commands/Worktree.cs
@@ -73,6 +73,8 @@ namespace SourceGit.Commands
 
             if (!string.IsNullOrEmpty(tracking))
                 Args += tracking;
+            else if (!string.IsNullOrEmpty(name) && !createNew)
+                Args += name;
 
             _outputHandler = outputHandler;
             return Exec();
diff --git a/src/ViewModels/AddWorktree.cs b/src/ViewModels/AddWorktree.cs
index cf736029..6c1c7481 100644
--- a/src/ViewModels/AddWorktree.cs
+++ b/src/ViewModels/AddWorktree.cs
@@ -12,7 +12,7 @@ namespace SourceGit.ViewModels
         public string Path
         {
             get => _path;
-            set => SetProperty(ref _path, value);
+            set => SetProperty(ref _path, value, true);
         }
 
         public bool CreateNewBranch

From 90c04f1db2869e53fc0c5f8434e17c3907c3d5e6 Mon Sep 17 00:00:00 2001
From: aikawayataro <aikawayataro@protonmail.com>
Date: Tue, 21 Jan 2025 12:01:09 +0000
Subject: [PATCH 033/364] fix: `_` is not parsed in template variable name
 (#920)

---
 src/Models/TemplateEngine.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/TemplateEngine.cs b/src/Models/TemplateEngine.cs
index 6b5f525d..8472750c 100644
--- a/src/Models/TemplateEngine.cs
+++ b/src/Models/TemplateEngine.cs
@@ -313,7 +313,7 @@ namespace SourceGit.Models
 
         private static bool IsNameChar(char c)
         {
-            return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9');
+            return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_';
         }
 
         // (?) notice or log if variable is not found

From cb4ad63ba358ca66de2dbb6391074fd8ea6f797d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Jan 2025 10:51:37 +0800
Subject: [PATCH 034/364] fix: discarding changes with selected changes should
 never be traited as `Discard all changes` (#904)

---
 src/ViewModels/WorkingCopy.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 67fd6990..0a33bff5 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -417,12 +417,7 @@ namespace SourceGit.ViewModels
         public void Discard(List<Models.Change> changes)
         {
             if (_repo.CanCreatePopup())
-            {
-                if (changes.Count == _unstaged.Count && _staged.Count == 0)
-                    _repo.ShowPopup(new Discard(_repo));
-                else
-                    _repo.ShowPopup(new Discard(_repo, changes));
-            }
+                _repo.ShowPopup(new Discard(_repo, changes));
         }
 
         public async void UseTheirs(List<Models.Change> changes)

From 6ae66095c267798c2bc76817eeeb6c145008e72f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Jan 2025 10:55:38 +0800
Subject: [PATCH 035/364] project: upgrade
 `LiveChartsCore.SkiaSharpView.Avalonia` to `2.0.0-rc5.1`

---
 src/SourceGit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 7c098207..dfd00a98 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5" />
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.1" />
     <PackageReference Include="TextMateSharp" Version="1.0.65" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.65" />
   </ItemGroup>

From 75288e7a310ff041ad54184d2389665e9dedfdee Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Jan 2025 11:19:48 +0800
Subject: [PATCH 036/364] =?UTF-8?q?ci:=20replacing=20`100%`=20and=20`100.0?=
 =?UTF-8?q?0%`=20with=20`=E2=88=9A`=20for=20translation=20progress=20in=20?=
 =?UTF-8?q?README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/scripts/localization-check.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/scripts/localization-check.js b/build/scripts/localization-check.js
index 45db82be..76b5036b 100644
--- a/build/scripts/localization-check.js
+++ b/build/scripts/localization-check.js
@@ -25,7 +25,7 @@ async function calculateTranslationRate() {
     const files = (await fs.readdir(localesDir)).filter(file => file !== 'en_US.axaml' && file.endsWith('.axaml'));
 
     // Add en_US badge first
-    badges.push(`[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md)`);
+    badges.push(`[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md)`);
 
     for (const file of files) {
         const filePath = path.join(localesDir, file);
@@ -40,8 +40,12 @@ async function calculateTranslationRate() {
 
         // Add badges
         const locale = file.replace('.axaml', '').replace('_', '__');
-        const badgeColor = translationRate === 100 ? 'brightgreen' : translationRate >= 75 ? 'yellow' : 'red';
-        badges.push(`[![${locale}](https://img.shields.io/badge/${locale}-${translationRate.toFixed(2)}%25-${badgeColor})](TRANSLATION.md)`);
+        if (translationRate === 100) {
+            badges.push(`[![${locale}](https://img.shields.io/badge/${locale}-%E2%88%9A-brightgreen)](TRANSLATION.md)`);
+        } else {
+            const badgeColor = translationRate >= 75 ? 'yellow' : 'red';
+            badges.push(`[![${locale}](https://img.shields.io/badge/${locale}-${translationRate.toFixed(2)}%25-${badgeColor})](TRANSLATION.md)`);
+        }        
     }
 
     console.log(translationRates.join('\n\n'));

From cd0b2326f5fc0d7cbe0865b6b9703a8116f5e1d7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Jan 2025 11:23:38 +0800
Subject: [PATCH 037/364] localization: update en_US

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

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d06f438d..3e66935f 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -273,7 +273,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (without checkout)</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 all remotes</x:String>
-  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Override refs check</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Force to override refs check</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch without tags</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Fetch Remote Changes</x:String>

From cce08fb086214a4f742104a0418c2e0bb82f3518 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 03:23:54 +0000
Subject: [PATCH 038/364] doc: Update translation status and missing keys

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e922c476..4908fd5a 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-100.00%25-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.32%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.32%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)

From e033a93dd814293247c4bf2201eab715fe29642f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Jan 2025 11:36:53 +0800
Subject: [PATCH 039/364] localization: update `Text.Fetch.Force`

---
 src/Resources/Locales/en_US.axaml | 2 +-
 src/Resources/Locales/zh_CN.axaml | 2 +-
 src/Resources/Locales/zh_TW.axaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 3e66935f..a07de46b 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -273,7 +273,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (without checkout)</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 all remotes</x:String>
-  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Force to override refs check</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Force override local refs</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch without tags</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Fetch Remote Changes</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index b5541376..3c087a91 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -276,7 +276,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">快进(fast-forward，无需checkout)</x:String>
   <x:String x:Key="Text.Fetch" xml:space="preserve">拉取(fetch)</x:String>
   <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">拉取所有的远程仓库</x:String>
-  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">覆盖REF检查</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">强制覆盖本地REFs</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不拉取远程标签</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">远程仓库 ：</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">拉取远程仓库内容</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index d2395e58..4697541d 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -276,7 +276,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">快進 (fast-forward，無需 checkout)</x:String>
   <x:String x:Key="Text.Fetch" xml:space="preserve">提取 (fetch)</x:String>
   <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">提取所有的遠端存放庫</x:String>
-  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">覆寫 REFs 檢查</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">強制覆寫本機 REFs</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不提取遠端標籤</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">遠端存放庫:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">提取遠端存放庫內容</x:String>

From 620f411e9989f9397d9ff9944ac753cbf40e2650 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Jan 2025 11:42:14 +0800
Subject: [PATCH 040/364] code_style: move `RevisionTextFileView`

---
 src/Views/RevisionFileContentViewer.axaml.cs | 110 +++++++++++++++++++
 src/Views/RevisionFiles.axaml.cs             | 110 -------------------
 2 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/Views/RevisionFileContentViewer.axaml.cs b/src/Views/RevisionFileContentViewer.axaml.cs
index bca6a082..c74f2db2 100644
--- a/src/Views/RevisionFileContentViewer.axaml.cs
+++ b/src/Views/RevisionFileContentViewer.axaml.cs
@@ -1,7 +1,117 @@
+using System;
+
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+
+using AvaloniaEdit;
+using AvaloniaEdit.Document;
+using AvaloniaEdit.Editing;
+using AvaloniaEdit.TextMate;
 
 namespace SourceGit.Views
 {
+    public class RevisionTextFileView : TextEditor
+    {
+        protected override Type StyleKeyOverride => typeof(TextEditor);
+
+        public RevisionTextFileView() : base(new TextArea(), new TextDocument())
+        {
+            IsReadOnly = true;
+            ShowLineNumbers = true;
+            WordWrap = false;
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+            VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+
+            TextArea.LeftMargins[0].Margin = new Thickness(8, 0);
+            TextArea.TextView.Margin = new Thickness(4, 0);
+            TextArea.TextView.Options.EnableHyperlinks = false;
+            TextArea.TextView.Options.EnableEmailHyperlinks = false;
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            TextArea.TextView.ContextRequested += OnTextViewContextRequested;
+            UpdateTextMate();
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            base.OnUnloaded(e);
+
+            TextArea.TextView.ContextRequested -= OnTextViewContextRequested;
+
+            if (_textMate != null)
+            {
+                _textMate.Dispose();
+                _textMate = null;
+            }
+
+            GC.Collect();
+        }
+
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+
+            if (DataContext is Models.RevisionTextFile source)
+            {
+                UpdateTextMate();
+                Text = source.Content;
+            }
+            else
+            {
+                Text = string.Empty;
+            }
+        }
+
+        private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
+        {
+            var selected = SelectedText;
+            if (string.IsNullOrEmpty(selected))
+                return;
+
+            var copy = new MenuItem() { Header = App.Text("Copy") };
+            copy.Click += (_, ev) =>
+            {
+                App.CopyText(selected);
+                ev.Handled = true;
+            };
+
+            if (this.FindResource("Icons.Copy") is Geometry geo)
+            {
+                copy.Icon = new Avalonia.Controls.Shapes.Path()
+                {
+                    Width = 10,
+                    Height = 10,
+                    Stretch = Stretch.Uniform,
+                    Data = geo,
+                };
+            }
+
+            var menu = new ContextMenu();
+            menu.Items.Add(copy);
+            menu.Open(TextArea.TextView);
+
+            e.Handled = true;
+        }
+
+        private void UpdateTextMate()
+        {
+            if (_textMate == null)
+                _textMate = Models.TextMateHelper.CreateForEditor(this);
+
+            if (DataContext is Models.RevisionTextFile file)
+                Models.TextMateHelper.SetGrammarByFileName(_textMate, file.FileName);
+        }
+
+        private TextMate.Installation _textMate = null;
+    }
+
     public partial class RevisionFileContentViewer : UserControl
     {
         public RevisionFileContentViewer()
diff --git a/src/Views/RevisionFiles.axaml.cs b/src/Views/RevisionFiles.axaml.cs
index f748fb0d..12dfe23a 100644
--- a/src/Views/RevisionFiles.axaml.cs
+++ b/src/Views/RevisionFiles.axaml.cs
@@ -1,118 +1,8 @@
-using System;
-
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-
-using AvaloniaEdit;
-using AvaloniaEdit.Document;
-using AvaloniaEdit.Editing;
-using AvaloniaEdit.TextMate;
 
 namespace SourceGit.Views
 {
-    public class RevisionTextFileView : TextEditor
-    {
-        protected override Type StyleKeyOverride => typeof(TextEditor);
-
-        public RevisionTextFileView() : base(new TextArea(), new TextDocument())
-        {
-            IsReadOnly = true;
-            ShowLineNumbers = true;
-            WordWrap = false;
-            HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
-            VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
-
-            TextArea.LeftMargins[0].Margin = new Thickness(8, 0);
-            TextArea.TextView.Margin = new Thickness(4, 0);
-            TextArea.TextView.Options.EnableHyperlinks = false;
-            TextArea.TextView.Options.EnableEmailHyperlinks = false;
-        }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            TextArea.TextView.ContextRequested += OnTextViewContextRequested;
-            UpdateTextMate();
-        }
-
-        protected override void OnUnloaded(RoutedEventArgs e)
-        {
-            base.OnUnloaded(e);
-
-            TextArea.TextView.ContextRequested -= OnTextViewContextRequested;
-
-            if (_textMate != null)
-            {
-                _textMate.Dispose();
-                _textMate = null;
-            }
-
-            GC.Collect();
-        }
-
-        protected override void OnDataContextChanged(EventArgs e)
-        {
-            base.OnDataContextChanged(e);
-
-            if (DataContext is Models.RevisionTextFile source)
-            {
-                UpdateTextMate();
-                Text = source.Content;
-            }
-            else
-            {
-                Text = string.Empty;
-            }
-        }
-
-        private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
-        {
-            var selected = SelectedText;
-            if (string.IsNullOrEmpty(selected))
-                return;
-
-            var copy = new MenuItem() { Header = App.Text("Copy") };
-            copy.Click += (_, ev) =>
-            {
-                App.CopyText(selected);
-                ev.Handled = true;
-            };
-
-            if (this.FindResource("Icons.Copy") is Geometry geo)
-            {
-                copy.Icon = new Avalonia.Controls.Shapes.Path()
-                {
-                    Width = 10,
-                    Height = 10,
-                    Stretch = Stretch.Uniform,
-                    Data = geo,
-                };
-            }
-
-            var menu = new ContextMenu();
-            menu.Items.Add(copy);
-            menu.Open(TextArea.TextView);
-
-            e.Handled = true;
-        }
-
-        private void UpdateTextMate()
-        {
-            if (_textMate == null)
-                _textMate = Models.TextMateHelper.CreateForEditor(this);
-
-            if (DataContext is Models.RevisionTextFile file)
-                Models.TextMateHelper.SetGrammarByFileName(_textMate, file.FileName);
-        }
-
-        private TextMate.Installation _textMate = null;
-    }
-
     public partial class RevisionFiles : UserControl
     {
         public RevisionFiles()

From e242119a036709469270e9be0049996202bbd9e2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 23 Jan 2025 16:11:07 +0800
Subject: [PATCH 041/364] fix: searching by `Author & Committer` does not work
 when the committer is different with author

---
 src/Commands/QueryCommits.cs      | 8 ++++++--
 src/Models/Commit.cs              | 3 ++-
 src/Resources/Locales/de_DE.axaml | 3 ++-
 src/Resources/Locales/en_US.axaml | 3 ++-
 src/Resources/Locales/es_ES.axaml | 3 ++-
 src/Resources/Locales/fr_FR.axaml | 3 ++-
 src/Resources/Locales/it_IT.axaml | 3 ++-
 src/Resources/Locales/pt_BR.axaml | 3 ++-
 src/Resources/Locales/ru_RU.axaml | 3 ++-
 src/Resources/Locales/zh_CN.axaml | 3 ++-
 src/Resources/Locales/zh_TW.axaml | 3 ++-
 src/ViewModels/Repository.cs      | 9 ++++++---
 src/Views/Repository.axaml        | 3 ++-
 13 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
index 6318f331..312c068f 100644
--- a/src/Commands/QueryCommits.cs
+++ b/src/Commands/QueryCommits.cs
@@ -18,9 +18,13 @@ namespace SourceGit.Commands
         {
             string search = onlyCurrentBranch ? string.Empty : "--branches --remotes ";
 
-            if (method == Models.CommitSearchMethod.ByUser)
+            if (method == Models.CommitSearchMethod.ByAuthor)
             {
-                search += $"-i --author=\"{filter}\" --committer=\"{filter}\"";
+                search += $"-i --author=\"{filter}\"";
+            }
+            else if (method == Models.CommitSearchMethod.ByCommitter)
+            {
+                search += $"-i --committer=\"{filter}\"";
             }
             else if (method == Models.CommitSearchMethod.ByFile)
             {
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index 9bc7f0c3..f015130a 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -8,7 +8,8 @@ namespace SourceGit.Models
 {
     public enum CommitSearchMethod
     {
-        ByUser,
+        ByAuthor,
+        ByCommitter,
         ByMessage,
         ByFile,
     }
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 5143fc37..b771d080 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -583,10 +583,11 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTES</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">REMOTE HINZUFÜGEN</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Commit suchen</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Autor</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">Dateiname</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Commit-Nachricht</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Autor &amp; Committer</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Aktueller Branch</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Zeige Tags als Baum</x:String>
   <x:String x:Key="Text.Repository.Skip" xml:space="preserve">ÜBERSPRINGEN</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index a07de46b..3cfff3d0 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -580,10 +580,11 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTES</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">ADD REMOTE</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Author</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">File</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Author &amp; Committer</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Current Branch</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Show Tags as Tree</x:String>
   <x:String x:Key="Text.Repository.Skip" xml:space="preserve">SKIP</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 74b2f224..8e470eb6 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -584,10 +584,11 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTOS</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">AÑADIR REMOTO</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Buscar Commit</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Autor</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">Archivo</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Mensaje</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Autor &amp; Committer</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Rama Actual</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Mostrar Etiquetas como Árbol</x:String>
   <x:String x:Key="Text.Repository.Skip" xml:space="preserve">OMITIR</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index e4bb9c26..71dab9dd 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -560,10 +560,11 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">DEPOTS DISTANTS</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">AJOUTER DEPOT DISTANT</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Rechercher un commit</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Auteur</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">Fichier</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Auteur &amp; Committer</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Branche actuelle</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Voir les Tags en tant qu'arbre</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistiques</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 72e2aa28..c986c133 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -552,10 +552,11 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTI</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">AGGIUNGI REMOTO</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Cerca Commit</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Autore</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committente</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">File</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Messaggio</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Autore &amp; Committente</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Branch Corrente</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Mostra Tag come Albero</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistiche</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 8b17bdaf..e0fdcce0 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -579,10 +579,11 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTOS</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">ADICIONAR REMOTO</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Pesquisar Commit</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Autor</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">Arquivo</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Mensagem</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Autor &amp; Committer</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Branch Atual</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Exibir Tags como Árvore</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Estatísticas</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 75650a28..690512e8 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -585,10 +585,11 @@
   <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.ByFile" 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.BySHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Автор и исполнитель</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" 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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 3c087a91..d12fa07c 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -584,10 +584,11 @@
   <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.ByFile" 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.BySHA" xml:space="preserve">提交指纹</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 4697541d..6be685bb 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -583,10 +583,11 @@
   <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.ByFile" 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.BySHA" xml:space="preserve">提交編號</x:String>
-  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" 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>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 7f619f1e..4a606c9e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -733,12 +733,15 @@ namespace SourceGit.ViewModels
                             visible.Add(commit);
                         break;
                     case 1:
-                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByUser, _onlySearchCommitsInCurrentBranch).Result();
+                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByAuthor, _onlySearchCommitsInCurrentBranch).Result();
                         break;
                     case 2:
-                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByMessage, _onlySearchCommitsInCurrentBranch).Result();
+                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByCommitter, _onlySearchCommitsInCurrentBranch).Result();
                         break;
                     case 3:
+                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByMessage, _onlySearchCommitsInCurrentBranch).Result();
+                        break;
+                    case 4:
                         visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByFile, _onlySearchCommitsInCurrentBranch).Result();
                         break;
                 }
@@ -2382,7 +2385,7 @@ namespace SourceGit.ViewModels
         private bool _isSearching = false;
         private bool _isSearchLoadingVisible = false;
         private bool _isSearchCommitSuggestionOpen = false;
-        private int _searchCommitFilterType = 2;
+        private int _searchCommitFilterType = 3;
         private bool _onlySearchCommitsInCurrentBranch = false;
         private string _searchCommitFilter = string.Empty;
         private List<Models.Commit> _searchedCommits = new List<Models.Commit>();
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 00f9f6ce..a3aa6f25 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -479,7 +479,8 @@
                     SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}">
             <ComboBox.Items>
               <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}" FontSize="12"/>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.ByUser}" FontSize="12"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByAuthor}" FontSize="12"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByCommitter}" FontSize="12"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}" FontSize="12"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByFile}" FontSize="12"/>
             </ComboBox.Items>

From cc111baf01dbf0ecd449c797463d1d49f306976d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 08:11:28 +0000
Subject: [PATCH 042/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4908fd5a..a0d9d974 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.32%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.33%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.42%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index aa42d82b..86325215 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -66,7 +66,7 @@
 
 </details>
 
-### it_IT.axaml: 93.32%
+### it_IT.axaml: 93.33%
 
 
 <details>
@@ -124,7 +124,7 @@
 
 </details>
 
-### pt_BR.axaml: 94.41%
+### pt_BR.axaml: 94.42%
 
 
 <details>

From ab080b53b12f7f2a0dd88abc0d7abd74085228ec Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Jan 2025 11:40:44 +0800
Subject: [PATCH 043/364] enhance: exclude indicators or empty blocks in diff
 text view while copying text (#924)

---
 src/Views/TextDiffView.axaml.cs | 74 ++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index cca3751d..bd01a0a4 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -669,6 +669,8 @@ namespace SourceGit.Views
             TextArea.TextView.PointerWheelChanged += OnTextViewPointerWheelChanged;
             TextArea.TextView.VisualLinesChanged += OnTextViewVisualLinesChanged;
 
+            TextArea.AddHandler(KeyDownEvent, OnTextAreaKeyDown, RoutingStrategies.Tunnel);
+
             UpdateTextMate();
             OnTextViewVisualLinesChanged(null, null);
         }
@@ -677,6 +679,8 @@ namespace SourceGit.Views
         {
             base.OnUnloaded(e);
 
+            TextArea.RemoveHandler(KeyDownEvent, OnTextAreaKeyDown);
+
             TextArea.TextView.ContextRequested -= OnTextViewContextRequested;
             TextArea.TextView.PointerEntered -= OnTextViewPointerChanged;
             TextArea.TextView.PointerMoved -= OnTextViewPointerChanged;
@@ -732,6 +736,21 @@ namespace SourceGit.Views
             }
         }
 
+        private void OnTextAreaKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyModifiers.Equals(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
+            {
+                if (e.Key == Key.C)
+                {
+                    CopyWithoutIndicators();
+                    e.Handled = true;
+                }
+            }
+
+            if (!e.Handled)
+                base.OnKeyDown(e);
+        }
+
         private void OnBlockNavigationPropertyChanged(object _1, PropertyChangedEventArgs _2)
         {
             TextArea?.TextView?.Redraw();
@@ -748,7 +767,7 @@ namespace SourceGit.Views
             copy.Icon = App.CreateMenuIcon("Icons.Copy");
             copy.Click += (_, ev) =>
             {
-                App.CopyText(SelectedText);
+                CopyWithoutIndicators();
                 ev.Handled = true;
             };
 
@@ -941,6 +960,59 @@ namespace SourceGit.Views
             }
         }
 
+        private void CopyWithoutIndicators()
+        {
+            var selection = TextArea.Selection;
+            if (selection.IsEmpty)
+            {
+                App.CopyText(string.Empty);
+                return;
+            }
+
+            var lines = GetLines();
+            var startIdx = Math.Min(selection.StartPosition.Line - 1, lines.Count - 1);
+            var endIdx = Math.Min(selection.EndPosition.Line - 1, lines.Count - 1);
+
+            if (startIdx == endIdx)
+            {
+                var line = lines[startIdx];
+                if (line.Type == Models.TextDiffLineType.Indicator ||
+                    line.Type == Models.TextDiffLineType.None)
+                {
+                    App.CopyText(string.Empty);
+                    return;
+                }
+
+                App.CopyText(SelectedText);
+                return;
+            }
+
+            var builder = new StringBuilder();
+            for (var i = startIdx; i <= endIdx; i++)
+            {
+                var line = lines[i];
+                if (line.Type == Models.TextDiffLineType.Indicator ||
+                    line.Type == Models.TextDiffLineType.None)
+                    continue;
+
+                if (i == startIdx && selection.StartPosition.Column > 1)
+                {
+                    builder.AppendLine(line.Content.Substring(selection.StartPosition.Column - 1));
+                    continue;
+                }
+                
+                if (i == endIdx && selection.EndPosition.Column < line.Content.Length)
+                {
+                    builder.AppendLine(line.Content.Substring(0, selection.EndPosition.Column));
+                    continue;
+                }
+
+                builder.AppendLine(line.Content);
+            }
+
+            App.CopyText(builder.ToString());
+        }
+
         private TextMate.Installation _textMate = null;
         private TextLocation _lastSelectStart = TextLocation.Empty;
         private TextLocation _lastSelectEnd = TextLocation.Empty;

From 37c4545875cd9f7f18a43830e97d78f725850e44 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Jan 2025 12:10:56 +0800
Subject: [PATCH 044/364] feature: branch name allows spaces and auto replace
 spaces with dashes (#917)

---
 src/Converters/StringConverters.cs |  3 +++
 src/Resources/Locales/en_US.axaml  |  1 +
 src/Resources/Locales/zh_CN.axaml  |  1 +
 src/Resources/Locales/zh_TW.axaml  |  1 +
 src/ViewModels/CreateBranch.cs     | 26 +++++++++++++++++++-------
 src/Views/CreateBranch.axaml       | 13 ++++++++++---
 6 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index e6f4237c..5e4608c5 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -78,5 +78,8 @@ namespace SourceGit.Converters
                     return v.Substring(13);
                 return v;
             });
+
+        public static readonly FuncValueConverter<string, bool> ContainsSpaces =
+            new FuncValueConverter<string, bool>(v => v != null && v.Contains(' '));
     }
 }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 3cfff3d0..40409b9e 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -201,6 +201,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">New Branch Name:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Enter branch name.</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Spaces will be replaced with dashes.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Create Local Branch</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">Create Tag...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">New Tag At:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index d12fa07c..cdbdcc94 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -204,6 +204,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</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.Name.WarnSpace" xml:space="preserve">空格将被替换为'-'符号</x:String>
   <x:String x:Key="Text.CreateBranch.Title" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 6be685bb..52f4754f 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -204,6 +204,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</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.Name.WarnSpace" xml:space="preserve">空格將以英文破折號取代</x:String>
   <x:String x:Key="Text.CreateBranch.Title" 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>
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index b67a453a..a9698a07 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -6,7 +6,7 @@ namespace SourceGit.ViewModels
     public class CreateBranch : Popup
     {
         [Required(ErrorMessage = "Branch name is required!")]
-        [RegularExpression(@"^[\w\-/\.#]+$", ErrorMessage = "Bad branch name format!")]
+        [RegularExpression(@"^[\w \-/\.#]+$", ErrorMessage = "Bad branch name format!")]
         [CustomValidation(typeof(CreateBranch), nameof(ValidateBranchName))]
         public string Name
         {
@@ -74,9 +74,10 @@ namespace SourceGit.ViewModels
             if (creator == null)
                 return new ValidationResult("Missing runtime context to create branch!");
 
+            var fixedName = creator.FixName(name);
             foreach (var b in creator._repo.Branches)
             {
-                if (b.FriendlyName == name)
+                if (b.FriendlyName == fixedName)
                     return new ValidationResult("A branch with same name already exists!");
             }
 
@@ -86,6 +87,8 @@ namespace SourceGit.ViewModels
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+
+            var fixedName = FixName(_name);
             return Task.Run(() =>
             {
                 var succ = false;
@@ -114,8 +117,8 @@ namespace SourceGit.ViewModels
                         }
                     }
 
-                    SetProgressDescription($"Create new branch '{_name}'");
-                    succ = new Commands.Checkout(_repo.FullPath).Branch(_name, _baseOnRevision, SetProgressDescription);
+                    SetProgressDescription($"Create new branch '{fixedName}'");
+                    succ = new Commands.Checkout(_repo.FullPath).Branch(fixedName, _baseOnRevision, SetProgressDescription);
 
                     if (needPopStash)
                     {
@@ -125,15 +128,15 @@ namespace SourceGit.ViewModels
                 }
                 else
                 {
-                    SetProgressDescription($"Create new branch '{_name}'");
-                    succ = Commands.Branch.Create(_repo.FullPath, _name, _baseOnRevision);
+                    SetProgressDescription($"Create new branch '{fixedName}'");
+                    succ = Commands.Branch.Create(_repo.FullPath, fixedName, _baseOnRevision);
                 }
 
                 CallUIThread(() =>
                 {
                     if (succ && CheckoutAfterCreated)
                     {
-                        var fake = new Models.Branch() { IsLocal = true, FullName = $"refs/heads/{_name}" };
+                        var fake = new Models.Branch() { IsLocal = true, FullName = $"refs/heads/{fixedName}" };
                         if (BasedOn is Models.Branch based && !based.IsLocal)
                             fake.Upstream = based.FullName;
 
@@ -153,6 +156,15 @@ namespace SourceGit.ViewModels
             });
         }
 
+        private string FixName(string name)
+        {
+            if (!name.Contains(' '))
+                return name;
+
+            var parts = name.Split(' ', System.StringSplitOptions.RemoveEmptyEntries);
+            return string.Join("-", parts);
+        }
+
         private readonly Repository _repo = null;
         private string _name = null;
         private readonly string _baseOnRevision = null;
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 49bfda8d..dff42516 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -20,6 +20,7 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto"/>
         <RowDefinition Height="Auto"/>
+        <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -63,13 +64,19 @@
                Text="{Binding Name, Mode=TwoWay}"
                Watermark="{DynamicResource Text.CreateBranch.Name.Placeholder}"
                v:AutoFocusBehaviour.IsEnabled="True"/>
+      <StackPanel Grid.Row="2" Grid.Column="1"
+                  Orientation="Horizontal"
+                  IsVisible="{Binding Name, Converter={x:Static c:StringConverters.ContainsSpaces}}">
+        <Path Width="10" Height="10" Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
+        <TextBlock Classes="small" Text="{DynamicResource Text.CreateBranch.Name.WarnSpace}" Margin="4,0,0,0"/>
+      </StackPanel>
 
-      <TextBlock Grid.Row="2" Grid.Column="0"
+      <TextBlock Grid.Row="3" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.CreateBranch.LocalChanges}"
                  IsVisible="{Binding !IsBareRepository}"/>
-      <Border Grid.Row="2" Grid.Column="1" MinHeight="32" IsVisible="{Binding !IsBareRepository}">
+      <Border Grid.Row="3" Grid.Column="1" MinHeight="32" IsVisible="{Binding !IsBareRepository}">
         <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
           <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
                        x:Name="RadioDoNothing"
@@ -88,7 +95,7 @@
         </WrapPanel>
       </Border>
       
-      <CheckBox Grid.Row="3" Grid.Column="1"
+      <CheckBox Grid.Row="4" Grid.Column="1"
                 Content="{DynamicResource Text.CreateBranch.Checkout}"
                 IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"
                 IsVisible="{Binding !IsBareRepository}"/>

From 0192e941f0740f9f8360c1eac0cd781c1c276e2d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 04:11:14 +0000
Subject: [PATCH 045/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index a0d9d974..3a6d9e50 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.69%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.33%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.42%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.86%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.57%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.21%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.29%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.86%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 86325215..d6ca1a67 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,29 +1,30 @@
-### de_DE.axaml: 100.00%
+### de_DE.axaml: 99.86%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.CreateBranch.Name.WarnSpace
 
 </details>
 
-### es_ES.axaml: 100.00%
+### es_ES.axaml: 99.86%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.CreateBranch.Name.WarnSpace
 
 </details>
 
-### fr_FR.axaml: 94.69%
+### fr_FR.axaml: 94.57%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.CreateBranch.Name.WarnSpace
 - Text.InProgress.CherryPick.Head
 - Text.InProgress.Merge.Operating
 - Text.InProgress.Rebase.StoppedAt
@@ -66,7 +67,7 @@
 
 </details>
 
-### it_IT.axaml: 93.33%
+### it_IT.axaml: 93.21%
 
 
 <details>
@@ -82,6 +83,7 @@
 - Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
 - Text.Configure.OpenAI.Preferred
 - Text.Configure.OpenAI.Preferred.Tip
+- Text.CreateBranch.Name.WarnSpace
 - Text.Diff.UseBlockNavigation
 - Text.Fetch.Force
 - Text.FileCM.ResolveUsing
@@ -124,7 +126,7 @@
 
 </details>
 
-### pt_BR.axaml: 94.42%
+### pt_BR.axaml: 94.29%
 
 
 <details>
@@ -137,6 +139,7 @@
 - Text.CommitDetail.Info.Children
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
+- Text.CreateBranch.Name.WarnSpace
 - Text.Diff.UseBlockNavigation
 - Text.Fetch.Force
 - Text.FileCM.ResolveUsing
@@ -174,13 +177,13 @@
 
 </details>
 
-### ru_RU.axaml: 100.00%
+### ru_RU.axaml: 99.86%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.CreateBranch.Name.WarnSpace
 
 </details>
 

From 49ee9c8e33294930822a75911862f32ab5509bef Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Jan 2025 14:45:49 +0800
Subject: [PATCH 046/364] ux: move `--signoff` toggle from repository
 configuration window to commit options bar

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml     |  1 -
 src/Resources/Locales/en_US.axaml     |  2 +-
 src/Resources/Locales/es_ES.axaml     |  1 -
 src/Resources/Locales/fr_FR.axaml     |  1 -
 src/Resources/Locales/it_IT.axaml     |  1 -
 src/Resources/Locales/pt_BR.axaml     |  1 -
 src/Resources/Locales/ru_RU.axaml     |  1 -
 src/Resources/Locales/zh_CN.axaml     |  2 +-
 src/Resources/Locales/zh_TW.axaml     |  2 +-
 src/ViewModels/RepositoryConfigure.cs |  6 ------
 src/ViewModels/WorkingCopy.cs         |  6 ++++++
 src/Views/RepositoryConfigure.axaml   | 10 +++-------
 src/Views/WorkingCopy.axaml           | 24 ++++++++++++++++++++----
 13 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index b771d080..77799713 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -161,7 +161,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(n)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Standard Remote</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Aktivere --prune beim fetchen</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Aktiviere --signoff für Commits</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TICKETSYSTEM</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Beispiel für Gitee Issue Regel einfügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Beispiel für Gitee Pull Request Regel einfügen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 40409b9e..64b5e5a2 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -158,7 +158,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Default Remote</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Enable --prune on fetch</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Enable --signoff for commit</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE TRACKER</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Add Sample Gitee Issue Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Add Sample Gitee Pull Request Rule</x:String>
@@ -719,6 +718,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO RECENT INPUT MESSAGES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO COMMIT TEMPLATES</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">STAGED</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGE</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">UNSTAGE ALL</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 8e470eb6..441d4d63 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -161,7 +161,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto por Defecto</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Habilitar --prune para fetch</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Habilitar --signoff para commit</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SEGUIMIENTO DE INCIDENCIAS</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Añadir Regla de Ejemplo para Incidencias de Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Añadir Regla de Ejemplo para Pull Requests de Gitee</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 71dab9dd..4eef3815 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -162,7 +162,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">minute(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Dépôt par défaut</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Activer --prune pour fetch</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Activer --signoff pour commit</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SUIVI DES PROBLÈMES</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Ajouter une règle d'exemple Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Ajouter une règle d'exemple pour Pull Request Gitee</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index c986c133..e63ed323 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -156,7 +156,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto/i</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto Predefinito</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Abilita --prune durante il fetch</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Abilita --signoff per i commit</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TRACCIAMENTO ISSUE</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Aggiungi Regola Esempio per GitHub</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi Regola Esempio per Jira</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index e0fdcce0..7979d1b2 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -181,7 +181,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto padrão</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Habilita --prune ao buscar</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">Habilita --signoff para commits</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">RASTREADOR DE PROBLEMAS</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Adicionar Regra de Exemplo do Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Adicionar Regra de Exemplo do Jira</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 690512e8..1d6e9215 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -159,7 +159,6 @@
   <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.EnableSignOff" xml:space="preserve">Разрешить '--signoff' для ревизии</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Внешний репозиторий по умолчанию</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Разрешить '--prune' при скачивании</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ОТСЛЕЖИВАНИЕ ПРОБЛЕМ</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index cdbdcc94..4e1320d6 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -160,7 +160,6 @@
   <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.DefaultRemote" xml:space="preserve">默认远程</x:String>
-  <x:String x:Key="Text.Configure.Git.EnableSignOff" xml:space="preserve">提交信息追加署名 (--signoff)</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪（--prune）</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE追踪</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">新增匹配Gitee议题规则</x:String>
@@ -723,6 +722,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.SignOff" xml:space="preserve">署名</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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 52f4754f..760f958d 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -160,7 +160,6 @@
   <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.EnableSignOff" xml:space="preserve">提交訊息追加署名 (--signoff)</x:String>
   <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理 (--prune)</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">Issue 追蹤</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">新增符合 Gitee 議題規則</x:String>
@@ -722,6 +721,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.SignOff" xml:space="preserve">署名</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>
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index 88a485bc..9cafde0a 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -60,12 +60,6 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _httpProxy, value);
         }
 
-        public bool EnableSignOffForCommit
-        {
-            get => _repo.Settings.EnableSignOffForCommit;
-            set => _repo.Settings.EnableSignOffForCommit = value;
-        }
-
         public bool EnablePruneOnFetch
         {
             get => _repo.Settings.EnablePruneOnFetch;
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 0a33bff5..0a1c9a47 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -62,6 +62,12 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _isCommitting, value);
         }
 
+        public bool EnableSignOff
+        {
+            get => _repo.Settings.EnableSignOffForCommit;
+            set => _repo.Settings.EnableSignOffForCommit = value;
+        }
+
         public bool UseAmend
         {
             get => _useAmend;
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 0aef7aa6..8ba242d5 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -45,7 +45,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" ColumnDefinitions="Auto,*">
           <TextBlock Grid.Row="0" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
@@ -117,18 +117,14 @@
                     IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
 
           <CheckBox Grid.Row="6" Grid.Column="1"
-                    Content="{DynamicResource Text.Configure.Git.EnableSignOff}"
-                    IsChecked="{Binding EnableSignOffForCommit, Mode=TwoWay}"/>
-
-          <CheckBox Grid.Row="7" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="8" Grid.Column="1"
+          <CheckBox Grid.Row="7" Grid.Column="1"
                     Content="{DynamicResource Text.Configure.Git.EnablePruneOnFetch}"
                     IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"/>
 
-          <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal">
+          <StackPanel Grid.Row="8" 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/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 74792072..7f493b6a 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -258,7 +258,7 @@
       <v:CommitMessageTextBox Grid.Row="2" Text="{Binding CommitMessage, Mode=TwoWay}"/>
 
       <!-- Commit Options -->
-      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto">
+      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
         <Button Grid.Column="0"
                 Classes="icon_button"
                 Margin="4,0,0,0" Padding="0"
@@ -293,10 +293,26 @@
                   Height="24"
                   Margin="8,0,0,0"
                   HorizontalAlignment="Left"
-                  IsChecked="{Binding UseAmend, Mode=TwoWay}"
-                  Content="{DynamicResource Text.WorkingCopy.Amend}"/>
+                  IsChecked="{Binding EnableSignOff, Mode=TwoWay}"
+                  Content="{DynamicResource Text.WorkingCopy.SignOff}"
+                  ToolTip.Tip="--signoff"
+                  ToolTip.Placement="Top"
+                  ToolTip.VerticalOffset="0"/>
 
-        <v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
+        <CheckBox Grid.Column="4"
+                  Height="24"
+                  Margin="12,0,0,0"
+                  HorizontalAlignment="Left"
+                  IsChecked="{Binding UseAmend, Mode=TwoWay}"
+                  Content="{DynamicResource Text.WorkingCopy.Amend}"
+                  ToolTip.Tip="--amend"
+                  ToolTip.Placement="Top"
+                  ToolTip.VerticalOffset="0"/>
+
+        <v:LoadingIcon Grid.Column="5"
+                       Width="18" Height="18"
+                       HorizontalAlignment="Right"
+                       IsVisible="{Binding IsCommitting}"/>
         
         <SplitButton Grid.Column="6"
                      Content="{DynamicResource Text.Repository.Continue}"

From 4f6a87817735001b5437207fd341a2525ff94b4e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 06:46:07 +0000
Subject: [PATCH 047/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3a6d9e50..5cfea7b3 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.86%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.57%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.21%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.29%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.86%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.73%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.43%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.07%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.16%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index d6ca1a67..91e445eb 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,24 +1,26 @@
-### de_DE.axaml: 99.86%
+### de_DE.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.CreateBranch.Name.WarnSpace
+- Text.WorkingCopy.SignOff
 
 </details>
 
-### es_ES.axaml: 99.86%
+### es_ES.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.CreateBranch.Name.WarnSpace
+- Text.WorkingCopy.SignOff
 
 </details>
 
-### fr_FR.axaml: 94.57%
+### fr_FR.axaml: 94.43%
 
 
 <details>
@@ -64,10 +66,11 @@
 - Text.SetUpstream.Upstream
 - Text.SHALinkCM.NavigateTo
 - Text.WorkingCopy.CommitToEdit
+- Text.WorkingCopy.SignOff
 
 </details>
 
-### it_IT.axaml: 93.21%
+### it_IT.axaml: 93.07%
 
 
 <details>
@@ -123,10 +126,11 @@
 - Text.SHALinkCM.CopySHA
 - Text.SHALinkCM.NavigateTo
 - Text.WorkingCopy.CommitToEdit
+- Text.WorkingCopy.SignOff
 
 </details>
 
-### pt_BR.axaml: 94.29%
+### pt_BR.axaml: 94.16%
 
 
 <details>
@@ -174,16 +178,18 @@
 - Text.SetUpstream.Upstream
 - Text.SHALinkCM.NavigateTo
 - Text.WorkingCopy.CommitToEdit
+- Text.WorkingCopy.SignOff
 
 </details>
 
-### ru_RU.axaml: 99.86%
+### ru_RU.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.CreateBranch.Name.WarnSpace
+- Text.WorkingCopy.SignOff
 
 </details>
 

From 733ffe1af28a8e4c07e394dee1baa0b117f89777 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Jan 2025 17:14:44 +0800
Subject: [PATCH 048/364] localization: update `Text.WorkingCopy.Amend` since
 we already add `--amend` as tooltip

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/es_ES.axaml | 2 +-
 src/Resources/Locales/zh_CN.axaml | 2 +-
 src/Resources/Locales/zh_TW.axaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 441d4d63..31e2c5e5 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -707,7 +707,7 @@
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignorar archivos *{0} en la misma carpeta</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignorar archivos en la misma carpeta</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignorar solo este archivo</x:String>
-  <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Enmendar (Amend)</x:String>
+  <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Enmendar</x:String>
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Puedes stagear este archivo ahora.</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 4e1320d6..7a798a0a 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -708,7 +708,7 @@
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">忽略同目录下所有 *{0} 文件</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" 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">修补(--amend)</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.Commit" xml:space="preserve">提交</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交并推送</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 760f958d..7e3bb2d5 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -707,7 +707,7 @@
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">忽略同路徑下所有 *{0} 檔案</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" 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">修補 (--amend)</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.Commit" xml:space="preserve">提  交</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</x:String>

From aad42a8297dba7dbb67e8bf5b807063d46c77004 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 25 Jan 2025 11:14:15 +0800
Subject: [PATCH 049/364] feature: select the cursor line by triple-click
 (#927)

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

diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
index 0ae3d6cf..a6eee1b3 100644
--- a/src/Views/CommitMessagePresenter.cs
+++ b/src/Views/CommitMessagePresenter.cs
@@ -172,8 +172,11 @@ namespace SourceGit.Views
 
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
+            var point = e.GetCurrentPoint(this);
+
             if (_lastHover != null)
             {
+                var link = _lastHover.Link;
                 e.Pointer.Capture(null);
 
                 if (_lastHover.IsCommitSHA)
@@ -181,9 +184,6 @@ namespace SourceGit.Views
                     var parentView = this.FindAncestorOfType<CommitBaseInfo>();
                     if (parentView is { DataContext: ViewModels.CommitDetail detail })
                     {
-                        var point = e.GetCurrentPoint(this);
-                        var link = _lastHover.Link;
-
                         if (point.Properties.IsLeftButtonPressed)
                         {
                             detail.NavigateTo(_lastHover.Link);
@@ -217,9 +217,6 @@ namespace SourceGit.Views
                 }
                 else
                 {
-                    var point = e.GetCurrentPoint(this);
-                    var link = _lastHover.Link;
-
                     if (point.Properties.IsLeftButtonPressed)
                     {
                         Native.OS.OpenBrowser(link);
@@ -255,6 +252,49 @@ namespace SourceGit.Views
                 return;
             }
 
+            if (point.Properties.IsLeftButtonPressed && e.ClickCount == 3)
+            {
+                var text = Inlines?.Text;
+                if (string.IsNullOrEmpty(text))
+                {
+                    e.Handled = true;
+                    return;
+                }
+
+                var position = e.GetPosition(this) - new Point(Padding.Left, Padding.Top);
+                var x = Math.Min(Math.Max(position.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0));
+                var y = Math.Min(Math.Max(position.Y, 0), Math.Max(TextLayout.Height, 0));
+                position = new Point(x, y);
+
+                var textPos = TextLayout.HitTestPoint(position).TextPosition;
+                var lineStart = 0;
+                var lineEnd = text.IndexOf('\n', lineStart);
+                if (lineEnd <= 0)
+                {
+                    lineEnd = text.Length;
+                }
+                else
+                {
+                    while (lineEnd < textPos)
+                    {
+                        lineStart = lineEnd + 1;
+                        lineEnd = text.IndexOf('\n', lineStart);
+                        if (lineEnd == -1)
+                        {
+                            lineEnd = text.Length;
+                            break;
+                        }
+                    }
+                }
+
+                SetCurrentValue(SelectionStartProperty, lineStart);
+                SetCurrentValue(SelectionEndProperty, lineEnd);
+
+                e.Pointer.Capture(this);
+                e.Handled = true;
+                return;
+            }
+
             base.OnPointerPressed(e);
         }
 

From fa07bb5b5a65ff53cdc8d3eb4a74b17e8ea20874 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 25 Jan 2025 12:06:48 +0800
Subject: [PATCH 050/364] refactor: move per-repository config `Enable --prune
 on fetch` to global git config `fetch.prune` (#908)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Fetch.cs                 | 5 +----
 src/Commands/Pull.cs                  | 4 +---
 src/Models/RepositorySettings.cs      | 6 ------
 src/Resources/Locales/de_DE.axaml     | 2 +-
 src/Resources/Locales/en_US.axaml     | 2 +-
 src/Resources/Locales/es_ES.axaml     | 2 +-
 src/Resources/Locales/fr_FR.axaml     | 2 +-
 src/Resources/Locales/it_IT.axaml     | 2 +-
 src/Resources/Locales/pt_BR.axaml     | 2 +-
 src/Resources/Locales/ru_RU.axaml     | 2 +-
 src/Resources/Locales/zh_CN.axaml     | 2 +-
 src/Resources/Locales/zh_TW.axaml     | 2 +-
 src/ViewModels/AddRemote.cs           | 2 +-
 src/ViewModels/Fetch.cs               | 5 ++---
 src/ViewModels/Pull.cs                | 2 --
 src/ViewModels/Repository.cs          | 2 +-
 src/ViewModels/RepositoryConfigure.cs | 6 ------
 src/Views/Preferences.axaml           | 7 ++++++-
 src/Views/Preferences.axaml.cs        | 9 +++++++++
 src/Views/RepositoryConfigure.axaml   | 8 ++------
 20 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs
index 1c3e78cb..06ae8cb6 100644
--- a/src/Commands/Fetch.cs
+++ b/src/Commands/Fetch.cs
@@ -4,7 +4,7 @@ namespace SourceGit.Commands
 {
     public class Fetch : Command
     {
-        public Fetch(string repo, string remote, bool noTags, bool prune, bool force, Action<string> outputHandler)
+        public Fetch(string repo, string remote, bool noTags, bool force, Action<string> outputHandler)
         {
             _outputHandler = outputHandler;
             WorkingDirectory = repo;
@@ -21,9 +21,6 @@ namespace SourceGit.Commands
             if (force)
                 Args += "--force ";
 
-            if (prune)
-                Args += "--prune ";
-
             Args += remote;
         }
 
diff --git a/src/Commands/Pull.cs b/src/Commands/Pull.cs
index 732530f5..a4efa4b6 100644
--- a/src/Commands/Pull.cs
+++ b/src/Commands/Pull.cs
@@ -4,7 +4,7 @@ namespace SourceGit.Commands
 {
     public class Pull : Command
     {
-        public Pull(string repo, string remote, string branch, bool useRebase, bool noTags, bool prune, Action<string> outputHandler)
+        public Pull(string repo, string remote, string branch, bool useRebase, bool noTags, Action<string> outputHandler)
         {
             _outputHandler = outputHandler;
             WorkingDirectory = repo;
@@ -17,8 +17,6 @@ namespace SourceGit.Commands
                 Args += "--rebase ";
             if (noTags)
                 Args += "--no-tags ";
-            if (prune)
-                Args += "--prune ";
 
             Args += $"{remote} {branch}";
         }
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 1d0b3c10..d2d0c2f3 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -56,12 +56,6 @@ namespace SourceGit.Models
             set;
         } = DealWithLocalChanges.DoNothing;
 
-        public bool EnablePruneOnFetch
-        {
-            get;
-            set;
-        } = false;
-
         public bool EnableForceOnFetch
         {
             get;
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 77799713..8d92c6cc 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -160,7 +160,6 @@
   <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.DefaultRemote" xml:space="preserve">Standard Remote</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Aktivere --prune beim fetchen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TICKETSYSTEM</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Beispiel für Gitee Issue Regel einfügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Beispiel für Gitee Pull Request Regel einfügen</x:String>
@@ -477,6 +476,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Klon Standardordner</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Benutzer Email</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Aktivere --prune beim fetchen</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Installationspfad</x:String>
   <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Aktiviere HTTP SSL Verifizierung</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 64b5e5a2..28951aa9 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -157,7 +157,6 @@
   <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.DefaultRemote" xml:space="preserve">Default Remote</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Enable --prune on fetch</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE TRACKER</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Add Sample Gitee Issue Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Add Sample Gitee Pull Request Rule</x:String>
@@ -475,6 +474,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Default Clone Dir</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">User Email</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Enable --prune on fetch</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Install Path</x:String>
   <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">User Name</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 31e2c5e5..a760a470 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -160,7 +160,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Fetch remotos automáticamente</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto por Defecto</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Habilitar --prune para fetch</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SEGUIMIENTO DE INCIDENCIAS</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Añadir Regla de Ejemplo para Incidencias de Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Añadir Regla de Ejemplo para Pull Requests de Gitee</x:String>
@@ -478,6 +477,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Directorio de clonado por defecto</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email de usuario</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global del usuario git</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Habilitar --prune para fetch</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Ruta de instalación</x:String>
   <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Habilitar verificación HTTP SSL</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nombre de usuario</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 4eef3815..da20a5ee 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -161,7 +161,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Fetch les dépôts distants automatiquement</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">minute(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Dépôt par défaut</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Activer --prune pour fetch</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SUIVI DES PROBLÈMES</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Ajouter une règle d'exemple Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Ajouter une règle d'exemple pour Pull Request Gitee</x:String>
@@ -466,6 +465,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Répertoire de clônage par défaut</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">E-mail utilsateur</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">E-mail utilsateur global</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Activer --prune pour fetch</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Chemin d'installation</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nom d'utilisateur</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nom d'utilisateur global</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index e63ed323..5a23ad82 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -155,7 +155,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Recupera automaticamente i remoti</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto/i</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto Predefinito</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Abilita --prune durante il fetch</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TRACCIAMENTO ISSUE</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Aggiungi Regola Esempio per GitHub</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi Regola Esempio per Jira</x:String>
@@ -457,6 +456,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Cartella predefinita per cloni</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email Utente</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email globale utente Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Abilita --prune durante il fetch</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Percorso Installazione</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome Utente</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome globale utente Git</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 7979d1b2..d29ace6b 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -180,7 +180,6 @@
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Buscar remotos automaticamente</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto padrão</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Habilita --prune ao buscar</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">RASTREADOR DE PROBLEMAS</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Adicionar Regra de Exemplo do Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Adicionar Regra de Exemplo do Jira</x:String>
@@ -480,6 +479,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Diretório de Clone Padrão</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email do Usuário</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global do usuário git</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Habilita --prune ao buscar</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Caminho de Instalação</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome do Usuário</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome global do usuário git</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 1d6e9215..53a97549 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -160,7 +160,6 @@
   <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.DefaultRemote" xml:space="preserve">Внешний репозиторий по умолчанию</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">Разрешить '--prune' при скачивании</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ОТСЛЕЖИВАНИЕ ПРОБЛЕМ</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</x:String>
@@ -478,6 +477,7 @@
   <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">Разрешить '--prune' при скачивании</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.User" xml:space="preserve">Имя пользователя</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 7a798a0a..ea181b50 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -160,7 +160,6 @@
   <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.DefaultRemote" xml:space="preserve">默认远程</x:String>
-  <x:String x:Key="Text.Configure.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪（--prune）</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE追踪</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合并请求规则</x:String>
@@ -479,6 +478,7 @@
   <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">拉取更新时启用修剪（--prune）</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.User" xml:space="preserve">用户名</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 7e3bb2d5..077a8b0b 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -160,7 +160,6 @@
   <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.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理 (--prune)</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">Issue 追蹤</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 合併請求規則</x:String>
@@ -478,6 +477,7 @@
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">預設複製 (clone) 路徑</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">拉取變更時進行清理 (--prune)</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.User" xml:space="preserve">使用者名稱</x:String>
diff --git a/src/ViewModels/AddRemote.cs b/src/ViewModels/AddRemote.cs
index 2ca7449f..d6424572 100644
--- a/src/ViewModels/AddRemote.cs
+++ b/src/ViewModels/AddRemote.cs
@@ -100,7 +100,7 @@ namespace SourceGit.ViewModels
                 {
                     SetProgressDescription("Fetching from added remote ...");
                     new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", _useSSH ? SSHKey : null);
-                    new Commands.Fetch(_repo.FullPath, _name, false, false, false, SetProgressDescription).Exec();
+                    new Commands.Fetch(_repo.FullPath, _name, false, false, SetProgressDescription).Exec();
                 }
                 CallUIThread(() =>
                 {
diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs
index 2d907edd..d816d0b8 100644
--- a/src/ViewModels/Fetch.cs
+++ b/src/ViewModels/Fetch.cs
@@ -47,7 +47,6 @@ namespace SourceGit.ViewModels
             _repo.SetWatcherEnabled(false);
 
             var notags = _repo.Settings.FetchWithoutTags;
-            var prune = _repo.Settings.EnablePruneOnFetch;
             var force = _repo.Settings.EnableForceOnFetch;
             return Task.Run(() =>
             {
@@ -56,13 +55,13 @@ namespace SourceGit.ViewModels
                     foreach (var remote in _repo.Remotes)
                     {
                         SetProgressDescription($"Fetching remote: {remote.Name}");
-                        new Commands.Fetch(_repo.FullPath, remote.Name, notags, prune, force, SetProgressDescription).Exec();
+                        new Commands.Fetch(_repo.FullPath, remote.Name, notags, force, SetProgressDescription).Exec();
                     }
                 }
                 else
                 {
                     SetProgressDescription($"Fetching remote: {SelectedRemote.Name}");
-                    new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, notags, prune, force, SetProgressDescription).Exec();
+                    new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, notags, force, SetProgressDescription).Exec();
                 }
 
                 CallUIThread(() =>
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index e7c62980..52f98d87 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -151,7 +151,6 @@ namespace SourceGit.ViewModels
                         _repo.FullPath,
                         _selectedRemote.Name,
                         NoTags,
-                        _repo.Settings.EnablePruneOnFetch,
                         false,
                         SetProgressDescription).Exec();
 
@@ -184,7 +183,6 @@ namespace SourceGit.ViewModels
                         _selectedBranch.Name,
                         UseRebase,
                         NoTags,
-                        _repo.Settings.EnablePruneOnFetch,
                         SetProgressDescription).Exec();
                 }
 
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 4a606c9e..926fd6b6 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -2361,7 +2361,7 @@ namespace SourceGit.ViewModels
 
             Dispatcher.UIThread.Invoke(() => IsAutoFetching = true);
             foreach (var remote in remotes)
-                new Commands.Fetch(_fullpath, remote, false, _settings.EnablePruneOnFetch, false, null) { RaiseError = false }.Exec();
+                new Commands.Fetch(_fullpath, remote, false, false, null) { RaiseError = false }.Exec();
             _lastFetchTime = DateTime.Now;
             Dispatcher.UIThread.Invoke(() => IsAutoFetching = false);
         }
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index 9cafde0a..a7c04937 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -60,12 +60,6 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _httpProxy, value);
         }
 
-        public bool EnablePruneOnFetch
-        {
-            get => _repo.Settings.EnablePruneOnFetch;
-            set => _repo.Settings.EnablePruneOnFetch = value;
-        }
-
         public bool EnableAutoFetch
         {
             get => _repo.Settings.EnableAutoFetch;
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 7f3633ad..1d282ad9 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -255,7 +255,7 @@
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Git}"/>
           </TabItem.Header>
 
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Git.Path}"
                        HorizontalAlignment="Right"
@@ -329,6 +329,11 @@
             </ComboBox>
 
             <CheckBox Grid.Row="5" Grid.Column="1"
+                      Height="32"
+                      Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
+                      IsChecked="{Binding #ThisControl.EnablePruneOnFetch, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="6" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Git.SSLVerify}"
                       IsChecked="{Binding #ThisControl.EnableHTTPSSLVerify, Mode=TwoWay}"/>
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 2bc5c571..4696b4a7 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -28,6 +28,12 @@ namespace SourceGit.Views
             set;
         } = null;
 
+        public bool EnablePruneOnFetch
+        {
+            get;
+            set;
+        }
+
         public static readonly StyledProperty<string> GitVersionProperty =
             AvaloniaProperty.Register<Preferences, string>(nameof(GitVersion));
 
@@ -114,6 +120,8 @@ namespace SourceGit.Views
                     GPGUserKey = signingKey;
                 if (config.TryGetValue("core.autocrlf", out var crlf))
                     CRLFMode = Models.CRLFMode.Supported.Find(x => x.Value == crlf);
+                if (config.TryGetValue("fetch.prune", out var pruneOnFetch))
+                    EnablePruneOnFetch = (pruneOnFetch == "true");
                 if (config.TryGetValue("commit.gpgsign", out var gpgCommitSign))
                     EnableGPGCommitSigning = (gpgCommitSign == "true");
                 if (config.TryGetValue("tag.gpgsign", out var gpgTagSign))
@@ -157,6 +165,7 @@ namespace SourceGit.Views
             SetIfChanged(config, "user.email", DefaultEmail, "");
             SetIfChanged(config, "user.signingkey", GPGUserKey, "");
             SetIfChanged(config, "core.autocrlf", CRLFMode != null ? CRLFMode.Value : null, null);
+            SetIfChanged(config, "fetch.prune", EnablePruneOnFetch ? "true" : "false", "false");
             SetIfChanged(config, "commit.gpgsign", EnableGPGCommitSigning ? "true" : "false", "false");
             SetIfChanged(config, "tag.gpgsign", EnableGPGTagSigning ? "true" : "false", "false");
             SetIfChanged(config, "http.sslverify", EnableHTTPSSLVerify ? "" : "false", "");
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 8ba242d5..5e9374f9 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -45,7 +45,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" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="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"
@@ -120,11 +120,7 @@
                     Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="7" Grid.Column="1"
-                    Content="{DynamicResource Text.Configure.Git.EnablePruneOnFetch}"
-                    IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"/>
-
-          <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal">
+          <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal">
             <CheckBox x:Name="AutoFetchCheckBox"
                       Content="{DynamicResource Text.Configure.Git.AutoFetch}"
                       IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>

From 6a1026c992e6de0e31dd7766c73e98c33bce0005 Mon Sep 17 00:00:00 2001
From: Erica Buckmann <erica@ericas.site>
Date: Sun, 26 Jan 2025 03:42:13 +0100
Subject: [PATCH 051/364] feature: Add Ghostty to macOS terminals. (#928)

---
 src/Models/ShellOrTerminal.cs               |   1 +
 src/Native/MacOS.cs                         |   2 ++
 src/Resources/Images/ShellIcons/ghostty.png | Bin 0 -> 4485 bytes
 3 files changed, 3 insertions(+)
 create mode 100644 src/Resources/Images/ShellIcons/ghostty.png

diff --git a/src/Models/ShellOrTerminal.cs b/src/Models/ShellOrTerminal.cs
index 1decdcfa..4f0222e8 100644
--- a/src/Models/ShellOrTerminal.cs
+++ b/src/Models/ShellOrTerminal.cs
@@ -42,6 +42,7 @@ namespace SourceGit.Models
                     new ShellOrTerminal("mac-terminal", "Terminal", ""),
                     new ShellOrTerminal("iterm2", "iTerm", ""),
                     new ShellOrTerminal("warp", "Warp", ""),
+                    new ShellOrTerminal("ghostty", "Ghostty", "")
                 };
             }
             else
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index c9e6abad..633ef5eb 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -44,6 +44,8 @@ namespace SourceGit.Native
                     return "iTerm";
                 case "warp":
                     return "Warp";
+                case "ghostty":
+                    return "Ghostty";
             }
 
             return string.Empty;
diff --git a/src/Resources/Images/ShellIcons/ghostty.png b/src/Resources/Images/ShellIcons/ghostty.png
new file mode 100644
index 0000000000000000000000000000000000000000..e394a5170a959872e9c716ab1a83019b26a03dc1
GIT binary patch
literal 4485
zcmV;05qj>4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000q8Nkl<Zc-rlo
zX{=q<b;o~upL6ehqh}j~{qTehZXAXthKhtCU<zRn&?XQ9DO1H{(T1ubRhkbeQu>J$
zfkIIWYExQ<qVOSM5Df|rgDWu`GZ|x>!NxY&#?NoK?+)ke)pNJ@){^eimHn<%sZ#wH
zTW8;M_BovO-)sHX+V5<07>98fhjAGHk715E<`}xfajRFaKBc(-*m?8j&F}B;pI#|o
ztxZjV_<X=b#B<hKBO-KwM4)|)F#_P6%bU$+R;$&<hKGmuee%gCA8p*Y@y+$?*S`cb
znIg<3mt4XW@%>wFx#i|F&ph*+rBaFiEBNrk4|hKD$RiKkSpfKgLxh<=eL9DTqyDYH
z#TQ?^1{Aw@?`CXljC#FJp67Hzbbt;sf6#lhFIa0y)0E!cUS`dj#o*u|5j%J89J%SH
zn{EXj<PcyMELd<z?*8J7FRov*WXUXmO`A6H*kh0J)?06}Z{I$u)v6}|gm(K3Al{hp
zOC<h?2C1<kVTj(#WD@)_NfLT`dc5&NLqn`tvxdtrznqA*YuElA@KX)~(|X83Fyozf
z-uY<RvSl*>?z-zP?z!h4zWnk_inu4SV0}vfMYN~=TnBpEXITjY1i@fXcrEY^EVX*W
zPr#|Cp32>K-_42@D*(9k(o5F@{|KFtauD2m@4df@#@~MX?X*Jd*kg}n`d}~HKih?e
zRV~085CaB+HOhoIx`48&q=j?Nx555|MN5w3l~-Qj?6c42>8GFOt6%*p4?q0yy^9ww
z{w=VD4lt`$t%A-t?d`YUegWXY2Os2`Yp><R<B#Wq58kFakuz`cS<IckigINDAqQiy
z*6KT2i-;gD+V8;6u0_P5_6R6rkx4+}gZ#b5L{43JhA?tqJ3F>KPqVs{mB+1M@4o#k
zU%s4Yo_WTHN8u4q0vC1V0fm_SC<vW*t;I(#;=|4FQEl|{hu``kGiEO%YmOt5lavx_
zjf{Q6b*goTb3!Re=<iFJJ-tFHEs<v#;-bsv0GQzZ7_<-GKyct;0%1x3f)AOQbCxr-
z<aFNO@Cfg3dVy7|R`SLhZ}7ka4{+OUw{gW4S6o<x#A4uMn2hv;4?gG^`)8bS#<>7b
zKKUfuwryp`^g+g|4ZiY?TNs#r6vJO`B`uf17`A;pN?-ppPCjuF%NEb2ueZX;=mZ~Z
z+0CmPw_~ZZXnsE~m!dhmHz24E5c(>LA^_?!pu!o)$@m`9axcf7bOoa$yV>;q`^=xe
zz`yhL*I!Rjqj1hS=X?jab4nhta^=dCmo8nJ0&Li@0c#AqcJH8X?(s~UF~otw^-ATG
zYNNrYyJ}pp=4;$~{TW4w97(T%h>-@o^4iDz!~HL?{*|{`e)J$FG30p$BA_lE<PKGT
zi2`U5bk>y&@nmGR0~njKaQU~`^2&##sbTx}?LJGLcG_v2bka$uOgRJ!@mSH<*XMKm
z=bwM>38-f<f7U{pSrrmT!{vPXd5zm{zL=lhdOA6<V+0ya5CLnUrwnUOUF_QpKYoJ$
z{PjAPFP@H&<6MT<2u+1(I9L!th#rvZ80S#m5fG?W_fe?~LeDJf^$D7p<Fn5`17P98
zg-fSQz|5I5=K<{Bzn}5(acq*1q-Deyn)w7ag>Bmp@PqH1=Z)Vq0tbenrvxG@-s5%H
zJq+{bz<qyz5&K6Du<oVT7&@Yttl0>{sHskfWV8|Ba=@r)21LRv4lk5R36UmQmQj?-
z08E=UZB~&IOF;9G2}sj)0AONb!spn;T8vG|U4|oPWVFVTq50f+!?)R+!>oQFg->@t
ze;E%aD)5_k088Q4n=j?fjhm^~M=_G&g)tb4QlLE%Vt6oF5LGj59?l!@C3)_s)oK6~
zC3`Q>4-6kN0ZEdid7jf~G!Th1k$?eXoG0LW-#v|?qZ0n;lv_BWXN>#){VrCon9b|k
zzz7_>3{pVAA9oDH?4f?nJpCk|c<NbZPP63Bzj%CkH3*G+H154|lLb@)0fHZk0dd|7
zLeZ20r74AgF(zpdkmupS65P@VPBI4j%FJIh#Ex<J!F3n%&v)L(>0iH$wSW0NPXGS3
zRI85v_{EcCnUJI@&G9i7{K1KQ<J_+>v}7o}x+9ki7ylm$)q@Cepp~H#Ab|iOOq7l3
zG`@R_2n(30)&Zqvvq`Ht7iP#NU@V@1feKAh3K`&UZ#<v*0||eA)t_?5Pd?^1mt4ho
zway(s{uvWBq14wyv&b4(to;$+y67vEdi&_<NpRBe9+2f3;0;7QU5x{akcUa=5CS5I
z?^q&n!Gry=8v>Hn%~^=iSgSk0CWbVzP^uJe3@5Gm3pV`jU%2MaZsh8}TFYo}FJ*f9
z-5bwSpQvLJixr_+nZcHwkmXQL6C^y(h37{^LsbJLa3Sp?sAH0Z=&6FPDVj|$h)g*P
zIOj#gH!WKe8jW$!XgN)(Hyu0n!pW;waoyz)a?aI%!q$E8={9^en6Lxb$^haZO<`gT
zW|p9tgNY&;7B%96aR}imh=iYl*3)eSge+l6sMYp^%l+@*`h+l^G6DYPxW*SJo&;+u
zI44wVBlJ{e_*{En46gZ`8>r>*>z84`LMeq@pf(24uEgT|nFEJGY#GSGl)xCU?Ny-#
z6G<^Z4x#JG3Wg`vdJ?M>qtxnEuqBWzt`@xwg%?bn08tUawVDelCaHKAt~IJS!5j9{
z2CxPOQoJphi|?)4WgO&z0Kp=r3}j#`7;7OsKSIl2?VHfY3W)fW+^A1b_g>k=+8%O~
zA|kOxBDy9Zkf1Rtk|3spbJlx6Bgd0qz`M3JYKH?2TMM~^ro$5`F7dN(NCR1dQ368B
zbzy03yzq+4$)#v{gFLH~Wp!`3F_75aC|wAGgftj*Z0ZCQhWi_{W>Xn82GcTLQgWBz
z#NY&+da8<;7D66Iln_ruh8IUC2~H&Bc0x@cfWx^w{`Q8tJi|$jxD0TfB%71~L5vLq
zCNYY-4FSE`i->cY2C*OsF1H}yj3E~g%|@D`4QNE`c`<l{CaR-2Q>R{?AZupP-Gh=l
z1nZCBz*rE1*rnk0!$E|IA0xpe7YZwNf4T|*Pk?iRdVmiB@BXz~#*7{dDYOW#l%SSD
zCeT-c)Zk}%B7>e3QVX>PBqiuCiT{I2sba}<i*pGgzJ$fYfYp4CE`|tIUXC&zs1*yr
z14JOke>`^Y0ePk#Ab8_N62919W5-*s^X)&rkaaZ}8G{uIVDW5tYdh>2g{5<0**w_t
z1?<`nbLPYGbKy4|-lLJHl*C{FYrQD6)ixG`17bf{*CG##Cqaw^4@guyRQ$aAcP)Y{
zAW;MjxD?kg3=H)1(63%#-poPHyLdJG`zs9Z*vX48?c~JOD_Jye02$rKb1!UT)d@>E
zV$N)4RI1$n^Ot$zzcw;$T0hN+I!GBL$B34;o@^h}0tnta#3B&J=rt3)KoUG8ilD@F
z?n&rY1OtPD7bI)IC1g!QPil}#${qJS!PCEegE_PMcx&sI?A$%Ui7Q`b!Q25p{A`TP
z#ku86X0m)}7N71sz&l&_GJ9q((x~CG6cGzJB*r=dIJBgV@vRFWh#?Ra)&WVlmPX->
z@9%BtngAdBDuRfV$n%7nkKu&b(|g#sZ4dbt<JSjA9of&89mBj^7~a>{%Yvf@+4E(U
zj|(zNi7=-apErbNO@f#v5RDT9fUyR_0=a4cc^d%^R09G5fYt%ghN*^tA}ogD1A~ND
zki3k~4!K|xp<+vzG{Mziyxt@wAx%?g8pem4fTh1w_IbQMo+HlU@)CmajiCGn1H?3#
zVhF<LT|Psi21wKlL0i%$g6ak80o@fsVX;DZ;RKNseEkkC17o!GgLpI;lcROJK_m}9
zO^8*aIW&?%5`Ks49#;GDew-E<q68R{=oL`}yVd|{u~)RfCKxY9WsFonG8HXvtObum
zUpgpqbWOwto)QF$2{Y>9g-;2=B%0cc1<46FfMg-=<JeY91I<bF*e<hx65zsGIy^8g
zP<p^r!mTP&(I6pFXONPv^NIcF(x66|(6{Kh1WZosi^&Kv5Xeyiz=5QJ%u+BOC7|0n
zz`MT}KyVHW21}y12?#FCtU=<-0!WxS4GZmpy1#}@@Bj;d_GQwi1AR6so;D$Riy#QZ
z5bin)Nbmp+0gTTA_y+2(Mh!I@0vgW%iFUDgC;`Mpj~bOggjiMkNSp`?2QG~|6f&0*
z(A8o{3dCyAInj#Dq#@p7S)$j_7gtwBKq3K=B&)`R+18q0!%7KOGWEk_?8l=8(JavR
zC$X+Vpe2GD27u0_RaX^3jfgEGUPF&<=amE^^jUfxg%TK`-eVHtL<kzjBGMfJu@p8&
zg4=nqQ}>RwI3{R-V9*$jV^p||Uegy3wnW8m^C-~sB1Dn}hw;al1riLcW|1(oyHZ#~
zKxf}+`ZYlWgIdQLKK?hk79d_w;fhA<P&G(YA`vm|A{qJ;c+#CEkw7u3m|Ye^ng*i_
zIdSNWB^YDC86tE>iG79Yq<;4k6WmlfM2XSIsL3dl5EVnKgzM~k4e*A5o9Z7$o1u>O
z21_*5SWf~rQ4KJ3h*^tTXwmCNQ>9L-9uY)SC=v=G4;`$bp+c$4V!-K=I0N!25m2w!
zt1b4dwIspVSPdeYqd^Us>;c-32J4~CXdTp6@@niW;<ff;9PZ-xO+R@B0X3jHB?79|
z>fTzdMv^3yD-}GX4hYx;Tn-46XT!9swXWz?)b!9shN7+d5!YtFL!oN{q>e~Nl0dm!
z_90x@asa4JiGbqM^2f!E%$YN%^?4ZpEBnc_VQghVC{uG)@-~Ym|F(c@OMA)W;i4g<
z{SN6>3|fwt5NROU=eS(x>+5G=V8DOfE_SqiLI<Rs6msw0y{{EFO0mVn9C5@Efq*?U
zs&7*2TM4!oTpe&73~pC@%Va|wljFKQ4QipIX!j(Gv1OWLn=#oYnmH_-GuKbv=;$cB
zcJ10g2bi<YItx1E`C^~Y>8)KNzx?IDvS-g;N|kBI;B}OzeKQD7u0p6Uu9YJyYGK8v
z`CEiePVdKwsQ8L{kLrR}oOyj0&As>2!<$rVaNc?6QEcaB>(;Fl8(dEYUWLgpt*xeX
z#&@s2`s&Au-6DR!&Et<hPEQ$fGac7+0qMXg*wRezegVO_*w>O*Q<i#$hJ=JsiuUp1
z`+}0>Km>7B@`<hFqfgOm-e!CPTDxD1_x2j_?6c3V2fj%MnARqugW%PI$*&t@c;Uqt
z`Te?eq!!YWAu~rqvJjF13{m9J8O9QON(^d5`x%8kL;G!`1Y84gd$8F@l<b(F`N6?y
zTzB2I-u;W6<gMBN2Jqi>fGNO1u=2_)uY9lACk()Auf4{)b-$-pn}8Ud2CQwfWAbEn
zK<E3QLzWPTOLT`~>C$CfaKZV^ojaFS*gpE`qdy1!8al(Yc3d9<&cE!k%bq&==%Y!J
z#BZE@_ucmjaoNep$N}p08vYX+f=HXBX-_LW0U;98whvgZ1L0aEP=EW{q*N}`+uP6V
z*|Rz3nB}Zoc^s8Wg^`gFo_gx3hk&a%2u#bML&Rz4o_p>;tt`+=i`H7ddn{~~kAFdK
z-{R6~`@3$A*2R~9roXTKx+0$U6HzLaC??RSyRfCtZ;gBIx#xZc{Deb*VQQGUXwjk{
zo^ZkmR~>oekxN^<#f#=&#u$Sd4cgZ|{-~k;*x{Z|q_q<fzg~I6i?ltldGqFHUVr`d
zUjWZ>h%j`AqYBo~DC&c+&6qJ`S;79Cf`tB}m5ni0L=0+BB)}g#ctRwlv(ZY3E6^-Z
zD?IN&Vf<(N_U(J8*vz>eco{_(1ayyHpaP^?4gIe{fE;K76F_$OpMD+2VI0O`bcz1~
X%eN{;oMfWs00000NkvXXu0mjfhAE4D

literal 0
HcmV?d00001


From dd254ebf4f4c5420e875f857697dd0c1245380bf Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 26 Jan 2025 14:55:44 +0800
Subject: [PATCH 052/364] ux: new attached property `MenuItemExtension.Command`
 for MenuItem

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml |  4 ++--
 src/Resources/Locales/en_US.axaml |  4 ++--
 src/Resources/Locales/es_ES.axaml |  4 ++--
 src/Resources/Locales/pt_BR.axaml |  4 ++--
 src/Resources/Locales/ru_RU.axaml |  4 ++--
 src/Resources/Locales/zh_CN.axaml |  4 ++--
 src/Resources/Locales/zh_TW.axaml |  4 ++--
 src/Resources/Styles.axaml        | 15 ++++++++++++++-
 src/Views/MenuItemExtension.cs    | 12 ++++++++++++
 src/Views/Repository.axaml.cs     |  2 ++
 10 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 src/Views/MenuItemExtension.cs

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 8d92c6cc..fe961d14 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -569,8 +569,8 @@
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertikal</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">COMMIT SORTIERUNG</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Zeitpunkt (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologie (--topo-order)</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Zeitpunkt</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologie</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Aktiviere '--first-parent' Option</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 28951aa9..22cfd398 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -567,8 +567,8 @@
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">COMMITS ORDER</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Date (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologically (--topo-order)</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Date</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologically</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOCAL BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navigate to HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Enable '--first-parent' Option</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index a760a470..3e926c63 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -570,8 +570,8 @@
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">ORDEN DE COMMITS</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Fecha de Commit (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topológicamente (--topo-order)</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Fecha de Commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topológicamente</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">RAMAS LOCALES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navegar a HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Habilitar Opción '--first-parent'</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index d29ace6b..dee8565b 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -566,8 +566,8 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Desfazer</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Esconder no gráfico de commit</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Incluir no gráfico de commit</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Data do Commit (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologicamente (--topo-order)</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Data do Commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologicamente</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCHES LOCAIS</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navegar para HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Habilitar opção '--first-parent'</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 53a97549..27a2d360 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -571,8 +571,8 @@
   <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">Дата ревизии (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Топологически (--topo-order)</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.NavigateToCurrentHead" xml:space="preserve">Навигация по ГОЛОВЕ (HEAD)</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Включить опцию --first-parent</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index ea181b50..f2a51970 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -571,8 +571,8 @@
   <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">按提交时间 (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">按拓扑排序 (--topo-order)</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.NavigateToCurrentHead" xml:space="preserve">定位HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">启用 --first-parent 过滤选项</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 077a8b0b..dd7aad39 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -570,8 +570,8 @@
   <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">依提交時間排序 (--date-order)</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">依拓撲排序 (--topo-order)</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.NavigateToCurrentHead" xml:space="preserve">回到 HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">啟用 [--first-parent] 選項</x:String>
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 6335c635..9b43d8af 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:s="using:SourceGit"
         xmlns:vm="using:SourceGit.ViewModels"
+        xmlns:v="using:SourceGit.Views"
         xmlns:c="using:SourceGit.Converters"
         xmlns:ae="using:AvaloniaEdit"
         xmlns:aee="using:AvaloniaEdit.Editing"
@@ -844,7 +845,19 @@
                          HorizontalAlignment="Right"
                          VerticalAlignment="Center"
                          Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                         FontSize="11"/>
+                         FontSize="11"
+                         IsVisible="{TemplateBinding (v:MenuItemExtension.Command), Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
+
+              <TextBlock x:Name="PART_CommandTip"
+                         Grid.Column="2"
+                         Classes="CaptionTextBlockStyle"
+                         Margin="{DynamicResource MenuInputGestureTextMargin}"
+                         Text="{TemplateBinding (v:MenuItemExtension.Command)}"
+                         HorizontalAlignment="Right"
+                         VerticalAlignment="Center"
+                         Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                         FontSize="11"
+                         IsVisible="{TemplateBinding (v:MenuItemExtension.Command), Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
               
               <Path Name="PART_ChevronPath"
                     Width="6"
diff --git a/src/Views/MenuItemExtension.cs b/src/Views/MenuItemExtension.cs
new file mode 100644
index 00000000..1c23b2ea
--- /dev/null
+++ b/src/Views/MenuItemExtension.cs
@@ -0,0 +1,12 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+
+namespace SourceGit.Views
+{
+    public class MenuItemExtension : AvaloniaObject
+    {
+        public static readonly AttachedProperty<string> CommandProperty =
+            AvaloniaProperty.RegisterAttached<MenuItemExtension, MenuItem, string>("Command", string.Empty, false, BindingMode.OneWay);
+    }
+}
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 7a54b382..bb359040 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -434,6 +434,7 @@ namespace SourceGit.Views
 
                 var dateOrder = new MenuItem();
                 dateOrder.Header = App.Text("Repository.HistoriesOrder.ByDate");
+                dateOrder.SetValue(MenuItemExtension.CommandProperty, "--date-order");
                 if (!repo.EnableTopoOrderInHistories)
                     dateOrder.Icon = App.CreateMenuIcon("Icons.Check");
                 dateOrder.Click += (_, ev) =>
@@ -444,6 +445,7 @@ namespace SourceGit.Views
 
                 var topoOrder = new MenuItem();
                 topoOrder.Header = App.Text("Repository.HistoriesOrder.Topo");
+                topoOrder.SetValue(MenuItemExtension.CommandProperty, "--top-order");
                 if (repo.EnableTopoOrderInHistories)
                     topoOrder.Icon = App.CreateMenuIcon("Icons.Check");
                 topoOrder.Click += (_, ev) =>

From 92065dee12dc8f73c82065fc70008d1098387fe4 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 09:49:45 +0800
Subject: [PATCH 053/364] fix: Ensure each ImageView instance calculates its
 own aspect ratio (#929)

* fix: Ensure each ImageView instance calculates its own aspect ratio

- Modified ArrangeOverride methods in ImageView class to independently calculate and apply the aspect ratio based on the instance's image.

Signed-off-by: Gadfly <gadfly@gadfly.vip>

* fix: Make IgnoredWhitespace toggle button visible based on IsTextDiff

---------

Signed-off-by: Gadfly <gadfly@gadfly.vip>
---
 src/Views/DiffView.axaml    |  1 +
 src/Views/ImageContainer.cs | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 23a141c3..aa75c2a0 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -129,6 +129,7 @@
             <ToggleButton Classes="line_path"
                           Width="28"
                           IsChecked="{Binding IgnoreWhitespace, Mode=TwoWay}"
+                          IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.IgnoreWhitespace}">
               <Path Width="14" Height="14" Stretch="Uniform" Data="{StaticResource Icons.Whitespace}"/>
             </ToggleButton>
diff --git a/src/Views/ImageContainer.cs b/src/Views/ImageContainer.cs
index aecea0b2..b62746ed 100644
--- a/src/Views/ImageContainer.cs
+++ b/src/Views/ImageContainer.cs
@@ -92,6 +92,20 @@ namespace SourceGit.Views
 
             return availableSize;
         }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (Image is { } image)
+            {
+                var imageSize = image.Size;
+                var scaleW = finalSize.Width / imageSize.Width;
+                var scaleH = finalSize.Height / imageSize.Height;
+                var scale = Math.Min(scaleW, scaleH);
+                return new Size(scale * imageSize.Width, scale * imageSize.Height);
+            }
+
+            return base.ArrangeOverride(finalSize);
+        }
     }
 
     public class ImageSwipeControl : ImageContainer

From 4f41f44a9fb84af71ccd6a997bef56757f26806e Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 09:51:03 +0800
Subject: [PATCH 054/364] fix: add `--include-untracked` to `stash push` for
 specific changes (#931)

---
 src/Commands/Stash.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index 1cbf4b2a..223bfcd2 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -30,7 +30,7 @@ namespace SourceGit.Commands
         public bool Push(string message, List<Models.Change> changes, bool keepIndex)
         {
             var builder = new StringBuilder();
-            builder.Append("stash push ");
+            builder.Append("stash push --include-untracked ");
             if (keepIndex)
                 builder.Append("--keep-index ");
             builder.Append("-m \"");
@@ -47,7 +47,7 @@ namespace SourceGit.Commands
         public bool Push(string message, string pathspecFromFile, bool keepIndex)
         {
             var builder = new StringBuilder();
-            builder.Append("stash push --pathspec-from-file=\"");
+            builder.Append("stash push --include-untracked --pathspec-from-file=\"");
             builder.Append(pathspecFromFile);
             builder.Append("\" ");
             if (keepIndex)

From 9a9f63a787fb9f2586d7b68224feeb7cfcde0ab6 Mon Sep 17 00:00:00 2001
From: Leonardo <leonardo.cossutta@gmail.com>
Date: Thu, 6 Feb 2025 03:00:12 +0100
Subject: [PATCH 055/364] Add missing keys and general reviewing of the Italian
 translation (#932)

* update italian translation

* ordered italian translation and removed from md file

* revert edits in translations.md
---
 src/Resources/Locales/it_IT.axaml | 264 ++++++++++++++++++------------
 1 file changed, 156 insertions(+), 108 deletions(-)

diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 5a23ad82..95f7bd1d 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -12,7 +12,7 @@
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Il codice sorgente è disponibile su </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Client GUI Git open source e gratuito</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Aggiungi Worktree</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Cosa fare il checkout:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Di cosa fare il checkout:</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branch esistente</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Crea nuovo branch</x:String>
   <x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Posizione:</x:String>
@@ -60,8 +60,9 @@
   <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Recupera ${0}$ in ${1}$...</x:String>
   <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Completa ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.Merge" xml:space="preserve">Unisci ${0}$ in ${1}$...</x:String>
-  <x:String x:Key="Text.BranchCM.Pull" xml:space="preserve">Recupera ${0}$</x:String>
-  <x:String x:Key="Text.BranchCM.PullInto" xml:space="preserve">Recupera ${0}$ in ${1}$...</x:String>
+  <x:String x:Key="Text.BranchCM.MergeMultiBranches" xml:space="preserve">Unisci i {0} branch selezionati in quello corrente</x:String>
+  <x:String x:Key="Text.BranchCM.Pull" xml:space="preserve">Scarica ${0}$</x:String>
+  <x:String x:Key="Text.BranchCM.PullInto" xml:space="preserve">Scarica ${0}$ in ${1}$...</x:String>
   <x:String x:Key="Text.BranchCM.Push" xml:space="preserve">Invia ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.Rebase" xml:space="preserve">Riallinea ${0}$ su ${1}$...</x:String>
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Rinomina ${0}$...</x:String>
@@ -73,7 +74,7 @@
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Ripristina la Revisione Padre</x:String>
   <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Genera messaggio di commit</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">CAMBIA MODALITÀ DI VISUALIZZAZIONE</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Mostra come elenco di file e directory</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Mostra come elenco di file e cartelle</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Mostra come elenco di percorsi</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Mostra come albero del filesystem</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
@@ -84,13 +85,13 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Non fare nulla</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash e Ripristina</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Aggiungi sorgente al messaggio di commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Conferma tutte le modifiche</x:String>
   <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">Mainline:</x:String>
-  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">Di solito non è possibile cherry-pick su una fusione perché non si sa quale lato della fusione deve essere considerato il mainline. Questa opzione consente di riprodurre la modifica relativa al genitore specificato.</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">Di solito non è possibile fare cherry-pick sdi una unione perché non si sa quale lato deve essere considerato il mainline. Questa opzione consente di riprodurre la modifica relativa al genitore specificato.</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">Cancella Stash</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Stai per cancellare tutti gli stash. Sei sicuro di voler continuare?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">Clona Repository Remoto</x:String>
@@ -110,22 +111,26 @@
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copia Info</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">Copia SHA</x:String>
   <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Azione Personalizzata</x:String>
-  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Rebase Interattivo ${0}$ fino a Qui</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Riallinea Interattivamente ${0}$ fino a Qui</x:String>
+  <x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Unisci a ${0}$</x:String>
+  <x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Unisci ...</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Riallinea ${0}$ fino a Qui</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Ripristina ${0}$ fino a Qui</x:String>
   <x:String x:Key="Text.CommitCM.Revert" xml:space="preserve">Annulla Commit</x:String>
   <x:String x:Key="Text.CommitCM.Reword" xml:space="preserve">Modifica</x:String>
   <x:String x:Key="Text.CommitCM.SaveAsPatch" xml:space="preserve">Salva come Patch...</x:String>
-  <x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">Unisci al Genitore</x:String>
-  <x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">Unisci Commit Figli fino a Qui</x:String>
+  <x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">Compatta nel Genitore</x:String>
+  <x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">Compatta Commit Figli fino a Qui</x:String>
   <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">MODIFICHE</x:String>
   <x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">Cerca Modifiche...</x:String>
   <x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">FILE</x:String>
   <x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">File LFS</x:String>
+  <x:String x:Key="Text.CommitDetail.Files.Search" xml:space="preserve">Cerca File...</x:String>
   <x:String x:Key="Text.CommitDetail.Files.Submodule" xml:space="preserve">Sottomodulo</x:String>
   <x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">INFORMAZIONI</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">AUTORE</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Changed" xml:space="preserve">MODIFICATO</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">FIGLI</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">CHI HA COMMITTATO</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Controlla i riferimenti che contengono questo commit</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">IL COMMIT È CONTENUTO DA</x:String>
@@ -156,18 +161,20 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto/i</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto Predefinito</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TRACCIAMENTO ISSUE</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Aggiungi Regola Esempio per GitHub</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi Regola Esempio per Jira</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Aggiungi Regola Esempio per Issue GitLab</x:String>
-  <x:String x:Key="Tracker.AddSampleGitLabMergeRequest" xml:space="preserve">Aggiungi Regola Esempio per Merge Request GitLab</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Aggiungi una regola di esempio per un Issue Gitee</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Aggiungi una regola di esempio per un Pull Request Gitee</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Aggiungi una regola di esempio per GitHub</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi una regola di esempio per Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Aggiungi una regola di esempio per Issue GitLab</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Aggiungi una regola di esempio per una Merge Request GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nuova Regola</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Espressione Regex Issue:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nome Regola:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">URL Risultato:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Utilizza $1, $2 per accedere ai valori dei gruppi regex.</x:String>
   <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">AI</x:String>
-  <x:String x:Key="Text.Configure.OpenAI.Prefered" xml:space="preserve">Servizio Preferito:</x:String>
-  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Se il 'Servizio Preferito' è impostato, SourceGit utilizzerà solo quello per questo repository. In caso contrario, se sono disponibili più servizi, verrà mostrato un menu contestuale per sceglierne uno.</x:String>
+  <x:String x:Key="Text.Configure.OpenAI.Preferred" xml:space="preserve">Servizio preferito:</x:String>
+  <x:String x:Key="Text.Configure.OpenAI.Preferred.Tip" xml:space="preserve">Se il 'Servizio Preferito' é impostato, SourceGit utilizzerà solo quello per questo repository. Altrimenti, se ci sono più servizi disponibili, verrà mostrato un menu contestuale per sceglierne uno.</x:String>
   <x:String x:Key="Text.Configure.Proxy" xml:space="preserve">Proxy HTTP</x:String>
   <x:String x:Key="Text.Configure.Proxy.Placeholder" xml:space="preserve">Proxy HTTP usato da questo repository</x:String>
   <x:String x:Key="Text.Configure.User" xml:space="preserve">Nome Utente</x:String>
@@ -192,9 +199,10 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Non Fare Nulla</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash e Ripristina</x:String>
+  <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nome Nuovo Branch:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Inserisci il nome del branch.</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Gli spazi verranno rimpiazzati con dei trattini.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Crea Branch Locale</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">Crea Tag...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">Nuovo Tag Su:</x:String>
@@ -236,6 +244,7 @@
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Differenza Successiva</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">NESSUNA MODIFICA O SOLO CAMBIAMENTI DI FINE LINEA</x:String>
   <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Differenza Precedente</x:String>
+  <x:String x:Key="Text.Diff.UseBlockNavigation" xml:space="preserve">Abilita la navigazione a blocchi</x:String>
   <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Salva come Patch</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Mostra Simboli Nascosti</x:String>
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Diff Affiancato</x:String>
@@ -266,6 +275,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Avanzamento Veloce (senza verifica)</x:String>
   <x:String x:Key="Text.Fetch" xml:space="preserve">Recupera</x:String>
   <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Recupera da tutti i remoti</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Forza la sovrascrittura dei riferimenti locali</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Recupera senza tag</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Recupera Modifiche Remote</x:String>
@@ -274,15 +284,16 @@
   <x:String x:Key="Text.FileCM.DiscardMulti" xml:space="preserve">Scarta {0} file...</x:String>
   <x:String x:Key="Text.FileCM.DiscardSelectedLines" xml:space="preserve">Scarta Modifiche nelle Righe Selezionate</x:String>
   <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">Apri Strumento di Merge Esterno</x:String>
+  <x:String x:Key="Text.FileCM.ResolveUsing" xml:space="preserve">Risolvi Usando ${0}$</x:String>
   <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">Salva come Patch...</x:String>
-  <x:String x:Key="Text.FileCM.Stage" xml:space="preserve">Staging</x:String>
-  <x:String x:Key="Text.FileCM.StageMulti" xml:space="preserve">Staging {0} file</x:String>
-  <x:String x:Key="Text.FileCM.StageSelectedLines" xml:space="preserve">Staging Modifiche nelle Righe Selezionate</x:String>
-  <x:String x:Key="Text.FileCM.Stash" xml:space="preserve">Stash...</x:String>
-  <x:String x:Key="Text.FileCM.StashMulti" xml:space="preserve">Stash {0} file...</x:String>
-  <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">Rimuovi dallo Staging</x:String>
-  <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">Rimuovi dallo Staging {0} file</x:String>
-  <x:String x:Key="Text.FileCM.UnstageSelectedLines" xml:space="preserve">Rimuovi dallo Staging Modifiche nelle Righe Selezionate</x:String>
+  <x:String x:Key="Text.FileCM.Stage" xml:space="preserve">Stage</x:String>
+  <x:String x:Key="Text.FileCM.StageMulti" xml:space="preserve">Stage di {0} file</x:String>
+  <x:String x:Key="Text.FileCM.StageSelectedLines" xml:space="preserve">Stage delle Modifiche nelle Righe Selezionate</x:String>
+  <x:String x:Key="Text.FileCM.Stash" xml:space="preserve">Stasha...</x:String>
+  <x:String x:Key="Text.FileCM.StashMulti" xml:space="preserve">Stasha {0} file...</x:String>
+  <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">Rimuovi da Stage</x:String>
+  <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">Rimuovi da Stage {0} file</x:String>
+  <x:String x:Key="Text.FileCM.UnstageSelectedLines" xml:space="preserve">Rimuovi le Righe Selezionate da Stage</x:String>
   <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usa Il Loro (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">Usa Il Mio (checkout --ours)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Cronologia File</x:String>
@@ -295,22 +306,22 @@
   <x:String x:Key="Text.GitFlow.FeaturePrefix" xml:space="preserve">Prefisso Feature:</x:String>
   <x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">FLOW - Completa Feature</x:String>
   <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW - Completa Hotfix</x:String>
-  <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Completa Release</x:String>
+  <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Completa Rilascio</x:String>
   <x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">Target:</x:String>
   <x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">Hotfix:</x:String>
   <x:String x:Key="Text.GitFlow.HotfixPrefix" xml:space="preserve">Prefisso Hotfix:</x:String>
   <x:String x:Key="Text.GitFlow.Init" xml:space="preserve">Inizializza Git-Flow</x:String>
   <x:String x:Key="Text.GitFlow.KeepBranchAfterFinish" xml:space="preserve">Mantieni branch</x:String>
   <x:String x:Key="Text.GitFlow.ProductionBranch" xml:space="preserve">Branch di Produzione:</x:String>
-  <x:String x:Key="Text.GitFlow.Release" xml:space="preserve">Release:</x:String>
-  <x:String x:Key="Text.GitFlow.ReleasePrefix" xml:space="preserve">Prefisso Release:</x:String>
+  <x:String x:Key="Text.GitFlow.Release" xml:space="preserve">Rilascio:</x:String>
+  <x:String x:Key="Text.GitFlow.ReleasePrefix" xml:space="preserve">Prefisso Rilascio:</x:String>
   <x:String x:Key="Text.GitFlow.StartFeature" xml:space="preserve">Inizia Feature...</x:String>
   <x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">FLOW - Inizia Feature</x:String>
   <x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">Inizia Hotfix...</x:String>
   <x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">FLOW - Inizia Hotfix</x:String>
   <x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">Inserisci nome</x:String>
-  <x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">Inizia Release...</x:String>
-  <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW - Inizia Release</x:String>
+  <x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">Inizia Rilascio...</x:String>
+  <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW - Inizia Rilascio</x:String>
   <x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">Prefisso Tag Versione:</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">Aggiungi Modello di Tracciamento...</x:String>
@@ -321,28 +332,28 @@
   <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Recupera Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Esegui `git lfs fetch` per scaricare gli oggetti Git LFS. Questo non aggiorna la copia di lavoro.</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Installa hook di Git LFS</x:String>
-  <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Mostra Bloccaggi</x:String>
+  <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Mostra Blocchi</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Nessun File Bloccato</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Lock" xml:space="preserve">Blocca</x:String>
-  <x:String x:Key="Text.GitLFS.Locks.OnlyMine" xml:space="preserve">Mostra solo i miei bloccaggi</x:String>
-  <x:String x:Key="Text.GitLFS.Locks.Title" xml:space="preserve">Bloccaggi LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.OnlyMine" xml:space="preserve">Mostra solo i miei blocchi</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.Title" xml:space="preserve">Blocchi LFS</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Unlock" xml:space="preserve">Sblocca</x:String>
   <x:String x:Key="Text.GitLFS.Locks.UnlockForce" xml:space="preserve">Forza Sblocco</x:String>
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Elimina</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Esegui `git lfs prune` per eliminare vecchi file LFS dallo storage locale</x:String>
-  <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Pull</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Pull Oggetti LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Scarica</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Scarica Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Esegui `git lfs pull` per scaricare tutti i file LFS per il ref corrente e fare il checkout</x:String>
-  <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Push</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Push Oggetti LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Invia</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Invia Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Invia grandi file in coda al punto finale di Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Traccia file con nome '{0}'</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Traccia tutti i file *{0}</x:String>
-  <x:String x:Key="Text.Histories" xml:space="preserve">Storico</x:String>
+  <x:String x:Key="Text.Histories" xml:space="preserve">STORICO</x:String>
   <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTORE</x:String>
   <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">ORA AUTORE</x:String>
-  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAFICO &amp; OGGETTO</x:String>
+  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAFICO E OGGETTO</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">ORA COMMIT</x:String>
   <x:String x:Key="Text.Histories.Selected" xml:space="preserve">{0} COMMIT SELEZIONATI</x:String>
@@ -357,19 +368,19 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Vai alla pagina precedente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Vai alla pagina successiva</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 di preferenze</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.Repo" xml:space="preserve">REPOSITORY</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Conferma le modifiche in fase</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Conferma e invia le modifiche in fase</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Aggiungi tutte le modifiche e conferma</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Committa le modifiche in tsage</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Committa e invia le modifiche in stage</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Fai lo stage di tutte le modifiche e committa</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CreateBranchOnCommit" xml:space="preserve">Crea un nuovo branch dal commit selezionato</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Scarta le modifiche selezionate</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Recupera, avvia direttamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Modalità Dashboard (Predefinita)</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Recupera e integra, avvia direttamente</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Scarica, avvia direttamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Invia, avvia direttamente</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Forza il ricaricamento di questo repository</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Aggiungi/Rimuovi le modifiche selezionate</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Forza l'aggiornamento di questo repository</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Aggiungi/Rimuovi da stage le modifiche selezionate</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modalità ricerca commit</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Passa a 'Modifiche'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Passa a 'Storico'</x:String>
@@ -379,16 +390,20 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Trova il prossimo risultato</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Trova il risultato precedente</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Apri il pannello di ricerca</x:String>
-  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Aggiungi</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Aggiungi in stage</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Rimuovi</x:String>
   <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Inizializza Repository</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Percorso:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick in corso.</x:String>
-  <x:String x:Key="Text.InProgress.Merge" xml:space="preserve">Richiesta di merge in corso.</x:String>
-  <x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">Rebase in corso.</x:String>
-  <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert in corso.</x:String>
-  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Rebase Interattivo</x:String>
+  <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Elaborando il commit</x:String>
+  <x:String x:Key="Text.InProgress.Merge" xml:space="preserve">Unione in corso.</x:String>
+  <x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">Unendo</x:String>
+  <x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">Riallineamento in corso.</x:String>
+  <x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">Interrotto a</x:String>
+  <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Ripristino in corso.</x:String>
+  <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Ripristinando il commit</x:String>
+  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Riallinea Interattivamente</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Branch di destinazione:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Su:</x:String>
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Apri nel Browser</x:String>
@@ -397,11 +412,16 @@
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">AVVISO</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Unisci Branch</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">In:</x:String>
-  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opzione di Merge:</x:String>
+  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opzione di Unione:</x:String>
+  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Sorgente:</x:String>
+  <x:String x:Key="Text.MergeMultiple" xml:space="preserve">Unione (multipla)</x:String>
+  <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Commit di tutte le modifiche</x:String>
+  <x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">Strategia:</x:String>
+  <x:String x:Key="Text.MergeMultiple.Targets" xml:space="preserve">Obiettivi:</x:String>
   <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Sposta Nodo Repository</x:String>
   <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Seleziona nodo padre per:</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">Nome:</x:String>
-  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git NON è configurato. Vai su [Preferenze] e configurarlo prima.</x:String>
+  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git NON è configurato. Prima vai su [Preferenze] per configurarlo.</x:String>
   <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Apri Cartella Dati App</x:String>
   <x:String x:Key="Text.OpenWith" xml:space="preserve">Apri con...</x:String>
   <x:String x:Key="Text.Optional" xml:space="preserve">Opzionale.</x:String>
@@ -426,7 +446,7 @@
   <x:String x:Key="Text.Preferences.AI" xml:space="preserve">AI</x:String>
   <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analizza il Prompt Differenza</x:String>
   <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Chiave API</x:String>
-  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Genera Prompt Soggetto</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Genera Prompt Oggetto</x:String>
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modello</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nome</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
@@ -447,21 +467,24 @@
   <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Strumento</x:String>
   <x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERALE</x:String>
   <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Controlla aggiornamenti all'avvio</x:String>
+  <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Formato data</x:String>
   <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Lingua</x:String>
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Numero massimo di commit nella cronologia</x:String>
-  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostra l'orario dell'autore anziché quello del commit nel grafico</x:String>
-  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Lunghezza Guida Soggetto</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostra nel grafico l'orario dell'autore anziché quello del commit</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Mostra i figli nei dettagli del commit</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Lunghezza Guida Oggetto</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">Abilita Auto CRLF</x:String>
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Cartella predefinita per cloni</x:String>
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email Utente</x:String>
-  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email globale utente Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email utente Git globale</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Abilita --prune durante il fetch</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Percorso Installazione</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome Utente</x:String>
-  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome globale utente Git</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome utente Git globale</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versione di Git</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) è richiesto da questa applicazione</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Questa applicazione richiede Git (&gt;= 2.23.0)</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Abilita la verifica HTTP SSL</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">FIRMA GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Firma GPG per commit</x:String>
   <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG per tag</x:String>
@@ -478,21 +501,21 @@
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destinazione:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Potatura Worktrees</x:String>
   <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Potatura delle informazioni di worktree in `$GIT_DIR/worktrees`</x:String>
-  <x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
+  <x:String x:Key="Text.Pull" xml:space="preserve">Scarica</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch Remoto:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Recupera tutti i branch</x:String>
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">In:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Non fare nulla</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Accantona e Riapplica</x:String>
+  <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Riapplica</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Recupera senza tag</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
-  <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
-  <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Usa rebase anziché merge</x:String>
-  <x:String x:Key="Text.Push" xml:space="preserve">Push</x:String>
-  <x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">Assicurati che i submoduli siano stati spinti</x:String>
-  <x:String x:Key="Text.Push.Force" xml:space="preserve">Forza il push</x:String>
+  <x:String x:Key="Text.Pull.Title" xml:space="preserve">Scarica (Recupera e Unisci)</x:String>
+  <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Riallineare anziché unire</x:String>
+  <x:String x:Key="Text.Push" xml:space="preserve">Invia</x:String>
+  <x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">Assicurati che i sottomoduli siano stati inviati</x:String>
+  <x:String x:Key="Text.Push.Force" xml:space="preserve">Forza l'invio</x:String>
   <x:String x:Key="Text.Push.Local" xml:space="preserve">Branch Locale:</x:String>
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Invia modifiche al remoto</x:String>
@@ -504,10 +527,10 @@
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">Tag:</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">Esci</x:String>
-  <x:String x:Key="Text.Rebase" xml:space="preserve">Rebase Branch Corrente</x:String>
-  <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Accantona &amp; Riapplica modifiche locali</x:String>
+  <x:String x:Key="Text.Rebase" xml:space="preserve">Riallinea Branch Corrente</x:String>
+  <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Stasha e Riapplica modifiche locali</x:String>
   <x:String x:Key="Text.Rebase.On" xml:space="preserve">Su:</x:String>
-  <x:String x:Key="Text.Rebase.Target" xml:space="preserve">Rebase:</x:String>
+  <x:String x:Key="Text.Rebase.Target" xml:space="preserve">Riallinea:</x:String>
   <x:String x:Key="Text.RefetchAvatar" xml:space="preserve">Aggiorna</x:String>
   <x:String x:Key="Text.Remote.AddTitle" xml:space="preserve">Aggiungi Remoto</x:String>
   <x:String x:Key="Text.Remote.EditTitle" xml:space="preserve">Modifica Remoto</x:String>
@@ -530,7 +553,7 @@
   <x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Repository.Abort" xml:space="preserve">ANNULLA</x:String>
   <x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">Recupero automatico delle modifiche dai remoti...</x:String>
-  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Pulizia (GC &amp; Potatura)</x:String>
+  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Pulizia (GC e Potatura)</x:String>
   <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">Esegui il comando `git gc` per questo repository.</x:String>
   <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Cancella tutto</x:String>
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configura questo repository</x:String>
@@ -538,13 +561,24 @@
   <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Azioni Personalizzate</x:String>
   <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Nessuna Azione Personalizzata</x:String>
   <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Abilita opzione '--reflog'</x:String>
-  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Apri nel Browser File</x:String>
-  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Cerca Branch/Tag/Submodule</x:String>
+  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Apri nell'Esplora File</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Cerca Branch/Tag/Sottomodulo</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">FILTRATO DA:</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Visibilità nel grafico</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Non impostato</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Nascondi nel grafico dei commit</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filtra nel grafico dei commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Orizzontale</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Verticale</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">Ordine dei commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Per data del commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologicamente</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCH LOCALI</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Vai a HEAD</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Abilita opzione '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Crea Branch</x:String>
+  <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Evidenzia nel grafico solo il branch corrente</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Apri in {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Apri in Strumenti Esterni</x:String>
   <x:String x:Key="Text.Repository.Refresh" xml:space="preserve">Aggiorna</x:String>
@@ -558,13 +592,19 @@
   <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">Branch Corrente</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Mostra Tag come Albero</x:String>
+  <x:String x:Key="Text.Repository.Skip" xml:space="preserve">SALTA</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistiche</x:String>
-  <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULE</x:String>
-  <x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">AGGIUNGI SUBMODULE</x:String>
-  <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">AGGIORNA SUBMODULE</x:String>
+  <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SOTTOMODULI</x:String>
+  <x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">AGGIUNGI SOTTOMODULI</x:String>
+  <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">AGGIORNA SOTTOMODULI</x:String>
   <x:String x:Key="Text.Repository.Tags" xml:space="preserve">TAG</x:String>
   <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">NUOVO TAG</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">Per data di creazione</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">Per nome (ascendente)</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">Per nome (discendente)</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Ordina</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Apri nel Terminale</x:String>
+  <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Usa tempo relativo nello storico</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREE</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">AGGIUNGI WORKTREE</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">POTATURA</x:String>
@@ -573,10 +613,10 @@
   <x:String x:Key="Text.Reset.Mode" xml:space="preserve">Modalità Reset:</x:String>
   <x:String x:Key="Text.Reset.MoveTo" xml:space="preserve">Sposta a:</x:String>
   <x:String x:Key="Text.Reset.Target" xml:space="preserve">Branch Corrente:</x:String>
-  <x:String x:Key="Text.RevealFile" xml:space="preserve">Mostra nel File Explorer</x:String>
-  <x:String x:Key="Text.Revert" xml:space="preserve">Revert Commit</x:String>
+  <x:String x:Key="Text.RevealFile" xml:space="preserve">Mostra nell'Esplora File</x:String>
+  <x:String x:Key="Text.Revert" xml:space="preserve">Ripristina Commit</x:String>
   <x:String x:Key="Text.Revert.Commit" xml:space="preserve">Commit:</x:String>
-  <x:String x:Key="Text.Revert.CommitChanges" xml:space="preserve">Commit delle modifiche di revert</x:String>
+  <x:String x:Key="Text.Revert.CommitChanges" xml:space="preserve">Commit delle modifiche di ripristino</x:String>
   <x:String x:Key="Text.Reword" xml:space="preserve">Modifica Messaggio di Commit</x:String>
   <x:String x:Key="Text.Reword.Tip" xml:space="preserve">Usa 'Shift+Enter' per inserire una nuova riga. 'Enter' è il tasto rapido per il pulsante OK</x:String>
   <x:String x:Key="Text.Running" xml:space="preserve">In esecuzione. Attendere...</x:String>
@@ -592,27 +632,33 @@
   <x:String x:Key="Text.SelfUpdate.IgnoreThisVersion" xml:space="preserve">Salta questa versione</x:String>
   <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Aggiornamento Software</x:String>
   <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">Non ci sono aggiornamenti disponibili.</x:String>
-  <x:String x:Key="Text.Squash" xml:space="preserve">Squash Commit</x:String>
+  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Imposta il Branch </x:String>
+  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Rimuovi upstream</x:String>
+  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">Upstream:</x:String>
+  <x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">Copia SHA</x:String>
+  <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Vai a</x:String>
+  <x:String x:Key="Text.Squash" xml:space="preserve">Compatta Commit</x:String>
   <x:String x:Key="Text.Squash.Into" xml:space="preserve">In:</x:String>
   <x:String x:Key="Text.SSHKey" xml:space="preserve">Chiave Privata SSH:</x:String>
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Percorso per la chiave SSH privata</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">AVVIA</x:String>
-  <x:String x:Key="Text.Stash" xml:space="preserve">Accantona</x:String>
+  <x:String x:Key="Text.Stash" xml:space="preserve">Stasha</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Includi file non tracciati</x:String>
-  <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Mantieni file indicizzati</x:String>
+  <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Mantieni file in stage</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Messaggio:</x:String>
-  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Opzionale. Nome di questo accantonamento</x:String>
-  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">Solo modifiche indicizzate</x:String>
-  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Sia le modifiche indicizzate che quelle non indicizzate dei file selezionati saranno accantonate!!!</x:String>
-  <x:String x:Key="Text.Stash.Title" xml:space="preserve">Accantona Modifiche Locali</x:String>
+  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Opzionale. Nome di questo stash</x:String>
+  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">Solo modifiche in stage</x:String>
+  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Sia le modifiche in stage che quelle non in stage dei file selezionati saranno stashate!!!</x:String>
+  <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stasha Modifiche Locali</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Applica</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Elimina</x:String>
   <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Estrai</x:String>
-  <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Elimina Accantonamento</x:String>
+  <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Elimina Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Elimina:</x:String>
-  <x:String x:Key="Text.Stashes" xml:space="preserve">Accantonamenti</x:String>
+  <x:String x:Key="Text.Stashes" xml:space="preserve">STASH</x:String>
   <x:String x:Key="Text.Stashes.Changes" xml:space="preserve">MODIFICHE</x:String>
-  <x:String x:Key="Text.Stashes.Stashes" xml:space="preserve">ACCANTONAMENTI</x:String>
+  <x:String x:Key="Text.Stashes.Stashes" xml:space="preserve">STASH</x:String>
   <x:String x:Key="Text.Statistics" xml:space="preserve">Statistiche</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMIT</x:String>
   <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">COMMITTER</x:String>
@@ -621,14 +667,14 @@
   <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMIT:</x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">AUTORI:</x:String>
   <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">PANORAMICA</x:String>
-  <x:String x:Key="Text.Submodule" xml:space="preserve">SUBMODULE</x:String>
-  <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Aggiungi Submodule</x:String>
+  <x:String x:Key="Text.Submodule" xml:space="preserve">SOTTOMODULI</x:String>
+  <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Aggiungi Sottomodulo</x:String>
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Copia Percorso Relativo</x:String>
-  <x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">Recupera submodule annidati</x:String>
-  <x:String x:Key="Text.Submodule.Open" xml:space="preserve">Apri Repository Submodule</x:String>
+  <x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">Recupera sottomoduli annidati</x:String>
+  <x:String x:Key="Text.Submodule.Open" xml:space="preserve">Apri Repository del Sottomodulo</x:String>
   <x:String x:Key="Text.Submodule.RelativePath" xml:space="preserve">Percorso Relativo:</x:String>
   <x:String x:Key="Text.Submodule.RelativePath.Placeholder" xml:space="preserve">Cartella relativa per memorizzare questo modulo.</x:String>
-  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">Elimina Submodule</x:String>
+  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">Elimina Sottomodulo</x:String>
   <x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
   <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copia Nome Tag</x:String>
   <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Copia Messaggio Tag</x:String>
@@ -636,11 +682,11 @@
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Unisci ${0}$ in ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Invia ${0}$...</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
-  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Aggiorna Submodule</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tutti i submodule</x:String>
+  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Aggiorna Sottomoduli</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tutti i sottomoduli</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Inizializza se necessario</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Ricorsivamente</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submodule:</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Sottomodulo:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Usa opzione --remote</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Avviso</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Pagina di Benvenuto</x:String>
@@ -648,7 +694,7 @@
   <x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">Crea Sottogruppo</x:String>
   <x:String x:Key="Text.Welcome.Clone" xml:space="preserve">Clona Repository</x:String>
   <x:String x:Key="Text.Welcome.Delete" xml:space="preserve">Elimina</x:String>
-  <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">TRASCINA &amp; RILASCIA CARTELLA SUPPORTATO. RAGGRUPPAMENTI PERSONALIZZATI SUPPORTATI.</x:String>
+  <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">TRASCINA E RILASCIA CARTELLA SUPPORTATO. RAGGRUPPAMENTI PERSONALIZZATI SUPPORTATI.</x:String>
   <x:String x:Key="Text.Welcome.Edit" xml:space="preserve">Modifica</x:String>
   <x:String x:Key="Text.Welcome.Move" xml:space="preserve">Sposta in un Altro Gruppo</x:String>
   <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">Apri Tutti i Repository</x:String>
@@ -657,34 +703,36 @@
   <x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">Riscansiona Repository nella Cartella Clone Predefinita</x:String>
   <x:String x:Key="Text.Welcome.Search" xml:space="preserve">Cerca Repository...</x:String>
   <x:String x:Key="Text.Welcome.Sort" xml:space="preserve">Ordina</x:String>
-  <x:String x:Key="Text.WorkingCopy" xml:space="preserve">Modifiche</x:String>
+  <x:String x:Key="Text.WorkingCopy" xml:space="preserve">MODIFICHE LOCALI</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">Git Ignore</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">Ignora tutti i file *{0}</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignora i file *{0} nella stessa cartella</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignora i file nella stessa cartella</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignora solo questo file</x:String>
   <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Modifica</x:String>
-  <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Puoi indicizzare questo file ora.</x:String>
+  <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Puoi aggiungere in stage questo file ora.</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT E INVIA</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/Storico</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Attiva evento click</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Indica tutte le modifiche e fai il commit</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Commit vuoto rilevato! Vuoi continuare (--allow-empty)?</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Modifica)</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage di tutte le modifiche e fai il commit</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Trovato un commit vuoto! Vuoi continuare (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLITTI RILEVATI</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">CONFLITTI NEI FILE RISOLTI</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDI FILE NON TRACCIATI</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NESSUN MESSAGGIO RECENTE INSERITO</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NESSUN TEMPLATE DI COMMIT</x:String>
-  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">INDICIZZATI</x:String>
-  <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">RIMUOVI DALL'INDICIZZAZIONE</x:String>
-  <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">RIMUOVI TUTTO DALL'INDICIZZAZIONE</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged" xml:space="preserve">NON INDICIZZATI</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged.Stage" xml:space="preserve">INDICIZZA</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">INDICIZZA TUTTO</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">IN STAGE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">RIMUOVI DA STAGE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">RIMUOVI TUTTO DA STAGE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged" xml:space="preserve">NON IN STAGE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.Stage" xml:space="preserve">FAI LO STAGE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">FAI LO STAGE DI TUTTO</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VISUALIZZA COME NON MODIFICATO</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Template: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Clicca con il tasto destro sul file(i) selezionato, quindi scegli come risolvere i conflitti.</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Clicca con il tasto destro sul(i) file selezionato, quindi scegli come risolvere i conflitti.</x:String>
+  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">SignOff</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">WORKSPACE:</x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configura Workspaces...</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>

From c2950ad20993fe5a7fa674ba181bd8fb565d255a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 02:00:25 +0000
Subject: [PATCH 056/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 54 ++------------------------------------------------
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 5cfea7b3..94e89907 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.73%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.43%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-93.07%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.16%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.73%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.43%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.16%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 91e445eb..0c1b006a 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -70,63 +70,13 @@
 
 </details>
 
-### it_IT.axaml: 93.07%
+### it_IT.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.BranchCM.MergeMultiBranches
-- Text.CommitCM.Merge
-- Text.CommitCM.MergeMultiple
-- Text.CommitDetail.Files.Search
-- Text.CommitDetail.Info.Children
-- Text.Configure.IssueTracker.AddSampleGiteeIssue
-- Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
-- Text.Configure.OpenAI.Preferred
-- Text.Configure.OpenAI.Preferred.Tip
-- Text.CreateBranch.Name.WarnSpace
-- Text.Diff.UseBlockNavigation
-- Text.Fetch.Force
-- Text.FileCM.ResolveUsing
-- Text.InProgress.CherryPick.Head
-- Text.InProgress.Merge.Operating
-- Text.InProgress.Rebase.StoppedAt
-- Text.InProgress.Revert.Head
-- Text.Merge.Source
-- Text.MergeMultiple
-- Text.MergeMultiple.CommitChanges
-- Text.MergeMultiple.Strategy
-- Text.MergeMultiple.Targets
-- Text.Preferences.General.DateFormat
-- Text.Preferences.General.ShowChildren
-- Text.Preferences.Git.SSLVerify
-- Text.Repository.FilterCommits
-- Text.Repository.FilterCommits.Default
-- Text.Repository.FilterCommits.Exclude
-- Text.Repository.FilterCommits.Include
-- Text.Repository.HistoriesLayout
-- Text.Repository.HistoriesLayout.Horizontal
-- Text.Repository.HistoriesLayout.Vertical
-- Text.Repository.HistoriesOrder
-- Text.Repository.HistoriesOrder.ByDate
-- Text.Repository.HistoriesOrder.Topo
-- Text.Repository.OnlyHighlightCurrentBranchInHistories
-- Text.Repository.Skip
-- Text.Repository.Tags.OrderByCreatorDate
-- Text.Repository.Tags.OrderByNameAsc
-- Text.Repository.Tags.OrderByNameDes
-- Text.Repository.Tags.Sort
-- Text.Repository.UseRelativeTimeInHistories
-- Text.SetUpstream
-- Text.SetUpstream.Local
-- Text.SetUpstream.Unset
-- Text.SetUpstream.Upstream
-- Text.SHALinkCM.CopySHA
-- Text.SHALinkCM.NavigateTo
-- Text.WorkingCopy.CommitToEdit
-- Text.WorkingCopy.SignOff
+
 
 </details>
 

From a4157e11e61f68f705556fc0703dbf7ac5fa2989 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:00:35 +0800
Subject: [PATCH 057/364] fix: Improve in-progress rebase handling (#933)

* fix: Improve in-progress rebase handling

* fix: Close merge popup even if there are conflicts (#941)
---
 src/ViewModels/InProgressContexts.cs |  8 ++++++--
 src/ViewModels/Merge.cs              |  4 ++--
 src/ViewModels/WorkingCopy.cs        |  4 ++--
 src/Views/Repository.axaml           | 13 ++++++++++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
index 6099c2b9..2892b7cc 100644
--- a/src/ViewModels/InProgressContexts.cs
+++ b/src/ViewModels/InProgressContexts.cs
@@ -107,8 +107,12 @@ namespace SourceGit.ViewModels
         {
             _gitDir = repo.GitDir;
 
-            var stoppedSHA = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "stopped-sha")).Trim();
-            StoppedAt = new Commands.QuerySingleCommit(repo.FullPath, stoppedSHA).Result() ?? new Models.Commit() { SHA = stoppedSHA };
+            var stoppedSHAPath = Path.Combine(repo.GitDir, "rebase-merge", "stopped-sha");
+            if (File.Exists(stoppedSHAPath))
+            {
+                var stoppedSHA = File.ReadAllText(stoppedSHAPath).Trim();
+                StoppedAt = new Commands.QuerySingleCommit(repo.FullPath, stoppedSHA).Result() ?? new Models.Commit() { SHA = stoppedSHA };
+            }
 
             var ontoSHA = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "onto")).Trim();
             Onto = new Commands.QuerySingleCommit(repo.FullPath, ontoSHA).Result() ?? new Models.Commit() { SHA = ontoSHA };
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index d07ee9b7..174bb1e1 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -61,9 +61,9 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                var succ = new Commands.Merge(_repo.FullPath, _sourceName, SelectedMode.Arg, SetProgressDescription).Exec();
+                new Commands.Merge(_repo.FullPath, _sourceName, SelectedMode.Arg, SetProgressDescription).Exec();
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
-                return succ;
+                return true;
             });
         }
 
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 0a1c9a47..616f244a 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -218,7 +218,7 @@ namespace SourceGit.ViewModels
                     var inProgress = null as InProgressContext;
                     if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD")))
                         inProgress = new CherryPickInProgress(_repo);
-                    else if (File.Exists(Path.Combine(_repo.GitDir, "REBASE_HEAD")) && Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")))
+                    else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply")))
                         inProgress = new RebaseInProgress(_repo);
                     else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
                         inProgress = new RevertInProgress(_repo);
@@ -291,7 +291,7 @@ namespace SourceGit.ViewModels
                 var inProgress = null as InProgressContext;
                 if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD")))
                     inProgress = new CherryPickInProgress(_repo);
-                else if (File.Exists(Path.Combine(_repo.GitDir, "REBASE_HEAD")) && Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")))
+                else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply")))
                     inProgress = new RebaseInProgress(_repo);
                 else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
                     inProgress = new RevertInProgress(_repo);
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index a3aa6f25..74f628c6 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -598,11 +598,18 @@
               <Grid ColumnDefinitions="*,Auto">
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
                   <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Rebase}"/>
-                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Rebase.StoppedAt}"/>
-                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding StoppedAt.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding StoppedAt}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}"
+                             Text="{DynamicResource Text.InProgress.Rebase.StoppedAt}"
+                             IsVisible="{Binding StoppedAt, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange"
+                             Text="{Binding StoppedAt.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                             IsVisible="{Binding StoppedAt, Converter={x:Static ObjectConverters.IsNotNull}}"
+                             ToolTip.Tip="{Binding StoppedAt}" />
                 </StackPanel>
 
-                <Button Grid.Column="1" Classes="flat" FontWeight="Regular" BorderThickness="0" Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Click="OnSkipInProgress"/>
+                <Button Grid.Column="1" Classes="flat" FontWeight="Regular" BorderThickness="0"
+                        Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Click="OnSkipInProgress"
+                        IsVisible="{Binding StoppedAt, Converter={x:Static ObjectConverters.IsNotNull}}" />
               </Grid>
             </DataTemplate>
 

From 3af601256137a828747d5fcd7bed1647ad019181 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:08:12 +0800
Subject: [PATCH 058/364] refactor: Update submodules individually to avoid
 failures (#925) (#936)

* refactor: Update submodules individually to avoid failures (#925)

- Remove `--recurse-submodules` flag from the clone command to simplify the cloning process.
- Refactor submodule update logic to handle updating all submodules in a loop and improve progress description handling.

* fix: Parse submodule list even if submodule status fails (#935)
---
 src/Commands/Clone.cs              |  2 +-
 src/Commands/QuerySubmodules.cs    |  2 --
 src/ViewModels/Clone.cs            |  8 ++++++++
 src/ViewModels/UpdateSubmodules.cs | 27 +++++++++++++--------------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/Commands/Clone.cs b/src/Commands/Clone.cs
index 683b8846..f2faed14 100644
--- a/src/Commands/Clone.cs
+++ b/src/Commands/Clone.cs
@@ -12,7 +12,7 @@ namespace SourceGit.Commands
             WorkingDirectory = path;
             TraitErrorAsOutput = true;
             SSHKey = sshKey;
-            Args = "clone --progress --verbose --recurse-submodules ";
+            Args = "clone --progress --verbose ";
 
             if (!string.IsNullOrEmpty(extraArgs))
                 Args += $"{extraArgs} ";
diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs
index 5fd6e3d5..6ebfa8b1 100644
--- a/src/Commands/QuerySubmodules.cs
+++ b/src/Commands/QuerySubmodules.cs
@@ -24,8 +24,6 @@ namespace SourceGit.Commands
         {
             var submodules = new List<Models.Submodule>();
             var rs = ReadToEnd();
-            if (!rs.IsSuccess)
-                return submodules;
 
             var builder = new StringBuilder();
             var lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
index 98d3bf41..924cbc26 100644
--- a/src/ViewModels/Clone.cs
+++ b/src/ViewModels/Clone.cs
@@ -127,6 +127,14 @@ namespace SourceGit.ViewModels
                     config.Set("remote.origin.sshkey", _sshKey);
                 }
 
+                // individually update submodule (if any)
+                var submoduleList = new Commands.QuerySubmodules(path).Result();
+                foreach (var submodule in submoduleList)
+                {
+                    var update = new Commands.Submodule(path);
+                    update.Update(submodule.Path, true, true, false, SetProgressDescription);
+                }
+
                 CallUIThread(() =>
                 {
                     var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
diff --git a/src/ViewModels/UpdateSubmodules.cs b/src/ViewModels/UpdateSubmodules.cs
index d1c433e2..3553d1b5 100644
--- a/src/ViewModels/UpdateSubmodules.cs
+++ b/src/ViewModels/UpdateSubmodules.cs
@@ -56,25 +56,24 @@ namespace SourceGit.ViewModels
         {
             _repo.SetWatcherEnabled(false);
 
-            string target = string.Empty;
+            List<string> targets;
             if (_updateAll)
-            {
-                ProgressDescription = "Updating submodules ...";
-            }
+                targets = Submodules;
             else
-            {
-                target = SelectedSubmodule;
-                ProgressDescription = $"Updating submodule {target} ...";
-            }
+                targets = [SelectedSubmodule];
 
             return Task.Run(() =>
             {
-                new Commands.Submodule(_repo.FullPath).Update(
-                    target,
-                    EnableInit,
-                    EnableRecursive,
-                    EnableRemote,
-                    SetProgressDescription);
+                foreach (var submodule in targets)
+                {
+                    ProgressDescription = $"Updating submodule {submodule} ...";
+                    new Commands.Submodule(_repo.FullPath).Update(
+                        submodule,
+                        EnableInit,
+                        EnableRecursive,
+                        EnableRemote,
+                        SetProgressDescription);
+                }
 
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return true;

From e78469605824db45c21d256a154d31f5f2c52123 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 10:19:43 +0800
Subject: [PATCH 059/364] enhance: add a checkbox to toggle `Initialize &
 update submodules` after clone

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/Clone.cs           | 17 +++++++++++++----
 src/Views/Clone.axaml             |  7 ++++++-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 22cfd398..5124eb05 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -97,6 +97,7 @@
   <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">Local Name:</x:String>
   <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">Repository name. Optional.</x:String>
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Parent Folder:</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Initialize &amp; update submodules</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Repository URL:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">CLOSE</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index f2a51970..4d2dfedb 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -100,6 +100,7 @@
   <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">初始化并更新子模块</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">远程仓库 ：</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">关闭</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">提交信息编辑器</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index dd7aad39..421dbd26 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -100,6 +100,7 @@
   <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">初始化並複製子模組</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">遠端存放庫:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">關閉</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">提交訊息編輯器</x:String>
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
index 924cbc26..3123d62a 100644
--- a/src/ViewModels/Clone.cs
+++ b/src/ViewModels/Clone.cs
@@ -53,6 +53,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _extraArgs, value);
         }
 
+        public bool InitAndUpdateSubmodules
+        {
+            get;
+            set;
+        } = true;
+
         public Clone(string pageId)
         {
             _pageId = pageId;
@@ -128,11 +134,14 @@ namespace SourceGit.ViewModels
                 }
 
                 // individually update submodule (if any)
-                var submoduleList = new Commands.QuerySubmodules(path).Result();
-                foreach (var submodule in submoduleList)
+                if (InitAndUpdateSubmodules)
                 {
-                    var update = new Commands.Submodule(path);
-                    update.Update(submodule.Path, true, true, false, SetProgressDescription);
+                    var submoduleList = new Commands.QuerySubmodules(path).Result();
+                    foreach (var submodule in submoduleList)
+                    {
+                        var update = new Commands.Submodule(path);
+                        update.Update(submodule.Path, true, true, false, SetProgressDescription);
+                    }
                 }
 
                 CallUIThread(() =>
diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml
index 25c46a00..84d1dd74 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -10,7 +10,7 @@
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock Classes="bold" FontSize="18" Text="{DynamicResource Text.Clone}"/>
 
-    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,32,32,32" ColumnDefinitions="Auto,*">
+    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,32,32,32,32" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Row="0" Grid.Column="0" 
                  HorizontalAlignment="Right" 
                  Margin="0,0,8,0" 
@@ -75,6 +75,11 @@
                CornerRadius="3" 
                Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}" 
                Text="{Binding ExtraArgs, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="5" Grid.Column="1"
+                Content="{DynamicResource Text.Clone.RecurseSubmodules}"
+                IsChecked="{Binding InitAndUpdateSubmodules, Mode=TwoWay}"
+                ToolTip.Tip="--recurse-submodules"/>
     </Grid>
   </StackPanel>
 </UserControl>

From 018a32b95b41b4e34c84053f63ab01866ed82d3b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 02:20:06 +0000
Subject: [PATCH 060/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 94e89907..a2eb2c14 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.73%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.43%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.16%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.59%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.59%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.86%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.03%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.59%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0c1b006a..c96702a1 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,31 +1,34 @@
-### de_DE.axaml: 99.73%
+### de_DE.axaml: 99.59%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### es_ES.axaml: 99.73%
+### es_ES.axaml: 99.59%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### fr_FR.axaml: 94.43%
+### fr_FR.axaml: 94.30%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.InProgress.CherryPick.Head
 - Text.InProgress.Merge.Operating
@@ -70,23 +73,24 @@
 
 </details>
 
-### it_IT.axaml: 100.00%
+### it_IT.axaml: 99.86%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Clone.RecurseSubmodules
 
 </details>
 
-### pt_BR.axaml: 94.16%
+### pt_BR.axaml: 94.03%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.BranchCM.MergeMultiBranches
+- Text.Clone.RecurseSubmodules
 - Text.CommitCM.Merge
 - Text.CommitCM.MergeMultiple
 - Text.CommitDetail.Files.Search
@@ -132,12 +136,13 @@
 
 </details>
 
-### ru_RU.axaml: 99.73%
+### ru_RU.axaml: 99.59%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.WorkingCopy.SignOff
 

From 84533599f1efc0d1a6d99aec668765dc26768dfe Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:22:01 +0800
Subject: [PATCH 061/364] fix: support encoded url in remote (#938)

---
 src/Models/Remote.cs  | 4 ++--
 src/Native/Windows.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Models/Remote.cs b/src/Models/Remote.cs
index 3c452460..dbe8cfa7 100644
--- a/src/Models/Remote.cs
+++ b/src/Models/Remote.cs
@@ -10,10 +10,10 @@ namespace SourceGit.Models
         private static partial Regex REG_HTTPS();
         [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
         private static partial Regex REG_SSH1();
-        [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~]+/[\w\-\.]+(\.git)?$")]
+        [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
         private static partial Regex REG_SSH2();
 
-        [GeneratedRegex(@"^git@([\w\.\-]+):([\w\-/~]+/[\w\-\.]+)\.git$")]
+        [GeneratedRegex(@"^git@([\w\.\-]+):([\w\-/~%]+/[\w\-\.%]+)\.git$")]
         private static partial Regex REG_TO_VISIT_URL_CAPTURE();
 
         private static readonly Regex[] URL_FORMATS = [
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index 10f2970a..11b6bd13 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -152,7 +152,7 @@ namespace SourceGit.Native
 
         public void OpenBrowser(string url)
         {
-            var info = new ProcessStartInfo("cmd", $"/c start {url}");
+            var info = new ProcessStartInfo("cmd", $"/c start \"\" \"{url}\"");
             info.CreateNoWindow = true;
             Process.Start(info);
         }

From 942f3492753bab6fe997a06d7f12bd21c4aa3252 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:22:34 +0800
Subject: [PATCH 062/364] enhance: enhance crash logging with detailed system
 info (#943)

- Enhance crash logging by adding detailed system and process information, including thread name, user, app start time, exception time, and memory usage.
---
 src/App.axaml.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index cca9f2ea..95b396de 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia;
@@ -332,17 +334,16 @@ namespace SourceGit
             builder.Append($"Crash::: {ex.GetType().FullName}: {ex.Message}\n\n");
             builder.Append("----------------------------\n");
             builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n");
-            builder.Append($"OS: {Environment.OSVersion.ToString()}\n");
+            builder.Append($"OS: {Environment.OSVersion}\n");
             builder.Append($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n");
             builder.Append($"Source: {ex.Source}\n");
+            builder.Append($"Thread Name: {Thread.CurrentThread.Name ?? "Unnamed"}\n");
+            builder.Append($"User: {Environment.UserName}\n");
+            builder.Append($"App Start Time: {Process.GetCurrentProcess().StartTime}\n");
+            builder.Append($"Exception Time: {DateTime.Now}\n");
+            builder.Append($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB\n");
             builder.Append($"---------------------------\n\n");
-            builder.Append(ex.StackTrace);
-            while (ex.InnerException != null)
-            {
-                ex = ex.InnerException;
-                builder.Append($"\n\nInnerException::: {ex.GetType().FullName}: {ex.Message}\n");
-                builder.Append(ex.StackTrace);
-            }
+            builder.Append(ex);
 
             var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
             var file = Path.Combine(Native.OS.DataDir, $"crash_{time}.log");

From 3ca4dc488c315c9d44b4fb663ef119d9791afca3 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:31:46 +0800
Subject: [PATCH 063/364] feat: Add stash auto-restore functionality (#947)
 (#948)

---
 src/Commands/Stash.cs             | 18 ++++++++++++------
 src/Models/RepositorySettings.cs  |  6 ++++++
 src/Resources/Locales/en_US.axaml |  2 ++
 src/Resources/Locales/zh_CN.axaml |  2 ++
 src/Resources/Locales/zh_TW.axaml |  2 ++
 src/ViewModels/StashChanges.cs    |  9 +++++++++
 src/Views/StashChanges.axaml      | 10 ++++++++--
 7 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index 223bfcd2..d2e12be8 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -73,21 +73,27 @@ namespace SourceGit.Commands
             return Exec();
         }
 
-        public bool Apply(string name)
+        public bool Apply(string name = null)
         {
-            Args = $"stash apply --index -q {name}";
+            Args = "stash apply -q";
+            if (!string.IsNullOrEmpty(name))
+                Args += $" \"{name}\"";
             return Exec();
         }
 
-        public bool Pop(string name)
+        public bool Pop(string name = null)
         {
-            Args = $"stash pop --index -q {name}";
+            Args = "stash pop -q";
+            if (!string.IsNullOrEmpty(name))
+                Args += $" \"{name}\"";
             return Exec();
         }
 
-        public bool Drop(string name)
+        public bool Drop(string name = null)
         {
-            Args = $"stash drop -q {name}";
+            Args = "stash drop -q";
+            if (!string.IsNullOrEmpty(name))
+                Args += $" \"{name}\"";
             return Exec();
         }
 
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index d2d0c2f3..556c99ea 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -182,6 +182,12 @@ namespace SourceGit.Models
             set;
         } = false;
 
+        public bool AutoRestoreAfterStash
+        {
+            get;
+            set;
+        } = false;
+
         public string PreferedOpenAIService
         {
             get;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5124eb05..631722ad 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -640,6 +640,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Private SSH key store path</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Auto-restore after stashing</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Your working files remain unchanged, but a stash is saved.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Include untracked files</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Keep staged files</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Message:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 4d2dfedb..b220b9ae 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -644,6 +644,8 @@
   <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">贮藏(stash)</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">贮藏后自动恢复工作区</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">工作区文件保持未修改状态，但贮藏内容已保存。</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">包含未跟踪的文件</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">保留暂存区文件</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">信息 ：</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 421dbd26..948cb2a8 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -643,6 +643,8 @@
   <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">擱置變更 (stash)</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">暫存後自動復原工作區</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">工作區檔案保持未修改，但暫存內容已儲存。</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">包含未追蹤的檔案</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">保留已暫存的變更</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">擱置變更訊息:</x:String>
diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs
index fd937bdd..3b5608f7 100644
--- a/src/ViewModels/StashChanges.cs
+++ b/src/ViewModels/StashChanges.cs
@@ -36,6 +36,12 @@ namespace SourceGit.ViewModels
             set => _repo.Settings.KeepIndexWhenStash = value;
         }
 
+        public bool AutoRestore
+        {
+            get => _repo.Settings.AutoRestoreAfterStash;
+            set => _repo.Settings.AutoRestoreAfterStash = value;
+        }
+
         public StashChanges(Repository repo, List<Models.Change> changes, bool hasSelectedFiles)
         {
             _repo = repo;
@@ -84,6 +90,9 @@ namespace SourceGit.ViewModels
                     succ = StashWithChanges(_changes);
                 }
 
+                if (AutoRestore && succ)
+                    succ = new Commands.Stash(_repo.FullPath).Apply();
+
                 CallUIThread(() =>
                 {
                     _repo.MarkWorkingCopyDirtyManually();
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index 772b09e6..2879c7e7 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -11,7 +11,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Stash.Title}"/>
-    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto" ColumnDefinitions="120,*">
+    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0" 
                  HorizontalAlignment="Right" 
                  Margin="8,0" 
@@ -43,7 +43,13 @@
                 IsChecked="{Binding KeepIndex, Mode=TwoWay}"
                 ToolTip.Tip="--keep-index"/>
 
-      <TextBlock Grid.Row="4" Grid.Column="1"
+      <CheckBox Grid.Row="4" Grid.Column="1"
+                Height="32"
+                Content="{DynamicResource Text.Stash.AutoRestore}"
+                IsChecked="{Binding AutoRestore, Mode=TwoWay}"
+                ToolTip.Tip="{DynamicResource Text.Stash.AutoRestore.Tip}"/>
+
+      <TextBlock Grid.Row="5" Grid.Column="1"
                  Margin="0,4,0,0"
                  Text="{DynamicResource Text.Stash.TipForSelectedFiles}"
                  TextWrapping="Wrap"

From 2ee5b4707aca78d64993209f74f640bd1e11c524 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 02:32:00 +0000
Subject: [PATCH 064/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a2eb2c14..b1e07a97 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.59%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.59%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.86%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-94.03%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.59%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.32%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.32%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.05%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.59%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-93.78%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.32%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index c96702a1..30f1f7f7 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.59%
+### de_DE.axaml: 99.32%
 
 
 <details>
@@ -6,11 +6,13 @@
 
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.Stash.AutoRestore
+- Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### es_ES.axaml: 99.59%
+### es_ES.axaml: 99.32%
 
 
 <details>
@@ -18,11 +20,13 @@
 
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.Stash.AutoRestore
+- Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### fr_FR.axaml: 94.30%
+### fr_FR.axaml: 94.05%
 
 
 <details>
@@ -68,22 +72,26 @@
 - Text.SetUpstream.Unset
 - Text.SetUpstream.Upstream
 - Text.SHALinkCM.NavigateTo
+- Text.Stash.AutoRestore
+- Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### it_IT.axaml: 99.86%
+### it_IT.axaml: 99.59%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.Clone.RecurseSubmodules
+- Text.Stash.AutoRestore
+- Text.Stash.AutoRestore.Tip
 
 </details>
 
-### pt_BR.axaml: 94.03%
+### pt_BR.axaml: 93.78%
 
 
 <details>
@@ -131,12 +139,14 @@
 - Text.SetUpstream.Unset
 - Text.SetUpstream.Upstream
 - Text.SHALinkCM.NavigateTo
+- Text.Stash.AutoRestore
+- Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### ru_RU.axaml: 99.59%
+### ru_RU.axaml: 99.32%
 
 
 <details>
@@ -144,6 +154,8 @@
 
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.Stash.AutoRestore
+- Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>

From 65a9406c9ac1cf45f7d9ab17d3d359b414ebf942 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:55:07 +0800
Subject: [PATCH 065/364] fix: adjust SHA regex pattern to min 6 chars (#944)

- Adjust the SHA regex pattern to match commit hashes with a minimum length of 6 characters instead of 10.
---
 src/Views/CommitMessagePresenter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
index a6eee1b3..dc8a3bb7 100644
--- a/src/Views/CommitMessagePresenter.cs
+++ b/src/Views/CommitMessagePresenter.cs
@@ -15,7 +15,7 @@ namespace SourceGit.Views
 {
     public partial class CommitMessagePresenter : SelectableTextBlock
     {
-        [GeneratedRegex(@"\b([0-9a-fA-F]{10,40})\b")]
+        [GeneratedRegex(@"\b([0-9a-fA-F]{6,40})\b")]
         private static partial Regex REG_SHA_FORMAT();
 
         public static readonly StyledProperty<string> MessageProperty =

From 9aba737d9e3f8e3cd3643f5222f863c3b72685ea Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 11:33:55 +0800
Subject: [PATCH 066/364] feat: support compare both revision in FileHistories
 (#786) (#946)

---
 src/Commands/CompareRevisions.cs |  9 +++
 src/Converters/IntConverters.cs  |  3 +
 src/ViewModels/FileHistories.cs  | 99 ++++++++++++++++++++++++++------
 src/Views/FileHistories.axaml    | 71 +++++++++++++++++++++--
 src/Views/FileHistories.axaml.cs | 44 ++++++++++++++
 5 files changed, 206 insertions(+), 20 deletions(-)

diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
index c4674c8e..b09face9 100644
--- a/src/Commands/CompareRevisions.cs
+++ b/src/Commands/CompareRevisions.cs
@@ -18,6 +18,15 @@ namespace SourceGit.Commands
             Args = $"diff --name-status {based} {end}";
         }
 
+        public CompareRevisions(string repo, string start, string end, string path)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+
+            var based = string.IsNullOrEmpty(start) ? "-R" : start;
+            Args = $"diff --name-status {based} {end} -- {path}";
+        }
+
         public List<Models.Change> Result()
         {
             Exec();
diff --git a/src/Converters/IntConverters.cs b/src/Converters/IntConverters.cs
index f21c5d24..1634f94e 100644
--- a/src/Converters/IntConverters.cs
+++ b/src/Converters/IntConverters.cs
@@ -22,6 +22,9 @@ namespace SourceGit.Converters
         public static readonly FuncValueConverter<int, bool> IsNotOne =
             new FuncValueConverter<int, bool>(v => v != 1);
 
+        public static readonly FuncValueConverter<int, bool> IsTwo =
+            new FuncValueConverter<int, bool>(v => v == 2);
+
         public static readonly FuncValueConverter<int, bool> IsSubjectLengthBad =
             new FuncValueConverter<int, bool>(v => v > ViewModels.Preferences.Instance.SubjectGuideLength);
 
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index ede73cd1..40b3cbea 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -31,12 +31,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _commits, value);
         }
 
-        public Models.Commit SelectedCommit
+        public List<Models.Commit> SelectedCommits
         {
-            get => _selectedCommit;
+            get => _selectedCommits;
             set
             {
-                if (SetProperty(ref _selectedCommit, value))
+                if (SetProperty(ref _selectedCommits, value))
                     RefreshViewContent();
             }
         }
@@ -51,6 +51,18 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public Models.Commit StartPoint
+        {
+            get => _startPoint;
+            set => SetProperty(ref _startPoint, value);
+        }
+
+        public Models.Commit EndPoint
+        {
+            get => _endPoint;
+            set => SetProperty(ref _endPoint, value);
+        }
+
         public object ViewContent
         {
             get => _viewContent;
@@ -71,7 +83,7 @@ namespace SourceGit.ViewModels
                     IsLoading = false;
                     Commits = commits;
                     if (commits.Count > 0)
-                        SelectedCommit = commits[0];
+                        SelectedCommits = [commits[0]];
                 });
             });
         }
@@ -83,18 +95,40 @@ namespace SourceGit.ViewModels
 
         public void ResetToSelectedRevision()
         {
-            new Commands.Checkout(_repo.FullPath).FileWithRevision(_file, $"{_selectedCommit.SHA}");
+            if (_selectedCommits is not { Count: 1 })
+                return;
+            new Commands.Checkout(_repo.FullPath).FileWithRevision(_file, $"{_selectedCommits[0].SHA}");
+        }
+
+        public void Swap()
+        {
+            if (_selectedCommits is not { Count: 2 })
+                return;
+
+            (_selectedCommits[0], _selectedCommits[1]) = (_selectedCommits[1], _selectedCommits[0]);
+            RefreshViewContent();
+        }
+
+        public Task<bool> SaveAsPatch(string saveTo)
+        {
+            return Task.Run(() =>
+            {
+                Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo.FullPath, _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo);
+                return true;
+            });
         }
 
         private void RefreshViewContent()
         {
-            if (_selectedCommit == null)
+            if (_selectedCommits == null || _selectedCommits.Count == 0)
             {
-                ViewContent = null;
+                StartPoint = null;
+                EndPoint = null;
+                ViewContent = 0;
                 return;
             }
 
-            if (_isViewContent)
+            if (_isViewContent && _selectedCommits.Count == 1)
                 SetViewContentAsRevisionFile();
             else
                 SetViewContentAsDiff();
@@ -102,7 +136,10 @@ namespace SourceGit.ViewModels
 
         private void SetViewContentAsRevisionFile()
         {
-            var objs = new Commands.QueryRevisionObjects(_repo.FullPath, _selectedCommit.SHA, _file).Result();
+            StartPoint = null;
+            EndPoint = null;
+            var selectedCommit = _selectedCommits[0];
+            var objs = new Commands.QueryRevisionObjects(_repo.FullPath, selectedCommit.SHA, _file).Result();
             if (objs.Count == 0)
             {
                 ViewContent = new FileHistoriesRevisionFile(_file, null);
@@ -115,13 +152,13 @@ namespace SourceGit.ViewModels
                 case Models.ObjectType.Blob:
                     Task.Run(() =>
                     {
-                        var isBinary = new Commands.IsBinary(_repo.FullPath, _selectedCommit.SHA, _file).Result();
+                        var isBinary = new Commands.IsBinary(_repo.FullPath, selectedCommit.SHA, _file).Result();
                         if (isBinary)
                         {
                             var ext = Path.GetExtension(_file);
                             if (IMG_EXTS.Contains(ext))
                             {
-                                var stream = Commands.QueryFileContent.Run(_repo.FullPath, _selectedCommit.SHA, _file);
+                                var stream = Commands.QueryFileContent.Run(_repo.FullPath, selectedCommit.SHA, _file);
                                 var fileSize = stream.Length;
                                 var bitmap = fileSize > 0 ? new Bitmap(stream) : null;
                                 var imageType = Path.GetExtension(_file).TrimStart('.').ToUpper(CultureInfo.CurrentCulture);
@@ -130,7 +167,7 @@ namespace SourceGit.ViewModels
                             }
                             else
                             {
-                                var size = new Commands.QueryFileSize(_repo.FullPath, _file, _selectedCommit.SHA).Result();
+                                var size = new Commands.QueryFileSize(_repo.FullPath, _file, selectedCommit.SHA).Result();
                                 var binaryFile = new Models.RevisionBinaryFile() { Size = size };
                                 Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, binaryFile));
                             }
@@ -138,7 +175,7 @@ namespace SourceGit.ViewModels
                             return;
                         }
 
-                        var contentStream = Commands.QueryFileContent.Run(_repo.FullPath, _selectedCommit.SHA, _file);
+                        var contentStream = Commands.QueryFileContent.Run(_repo.FullPath, selectedCommit.SHA, _file);
                         var content = new StreamReader(contentStream).ReadToEnd();
                         var matchLFS = REG_LFS_FORMAT().Match(content);
                         if (matchLFS.Success)
@@ -181,8 +218,35 @@ namespace SourceGit.ViewModels
 
         private void SetViewContentAsDiff()
         {
-            var option = new Models.DiffOption(_selectedCommit, _file);
-            ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
+            if (_selectedCommits is { Count: 1 })
+            {
+                StartPoint = null;
+                EndPoint = null;
+                var option = new Models.DiffOption(_selectedCommits[0], _file);
+                ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
+            }
+            else if (_selectedCommits is { Count: 2 })
+            {
+                StartPoint = _selectedCommits[0];
+                EndPoint = _selectedCommits[1];
+                _changes = new Commands.CompareRevisions(_repo.FullPath, GetSHA(_selectedCommits[0]), GetSHA(_selectedCommits[1]), _file).Result();
+                if (_changes.Count == 0)
+                {
+                    ViewContent = null;
+                    return;
+                }
+                var option = new Models.DiffOption(GetSHA(_selectedCommits[0]), GetSHA(_selectedCommits[1]), _changes[0]);
+                ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
+            }
+            else
+            {
+                ViewContent = _selectedCommits.Count;
+            }
+        }
+
+        private string GetSHA(object obj)
+        {
+            return obj is Models.Commit commit ? commit.SHA : string.Empty;
         }
 
         [GeneratedRegex(@"^version https://git-lfs.github.com/spec/v\d+\r?\noid sha256:([0-9a-f]+)\r?\nsize (\d+)[\r\n]*$")]
@@ -197,8 +261,11 @@ namespace SourceGit.ViewModels
         private readonly string _file = null;
         private bool _isLoading = true;
         private List<Models.Commit> _commits = null;
-        private Models.Commit _selectedCommit = null;
+        private List<Models.Commit> _selectedCommits = [];
         private bool _isViewContent = false;
         private object _viewContent = null;
+        private Models.Commit _startPoint = null;
+        private Models.Commit _endPoint = null;
+        private List<Models.Change> _changes = null;
     }
 }
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index b0706d24..e3bbac9c 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -13,6 +13,30 @@
                     Icon="/App.ico"
                     Title="{DynamicResource Text.FileHistory}"
                     MinWidth="1280" MinHeight="720">
+  <v:ChromelessWindow.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"/>
+      </Border>
+    </DataTemplate>
+    
+    <DataTemplate DataType="m:Commit">
+      <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"/>
+          <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
+            <TextBlock Text="HEAD" Classes="primary" 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"/>
+        </Grid>
+
+        <TextBlock Grid.Row="1" Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
+      </Grid>
+    </DataTemplate>
+  </v:ChromelessWindow.DataTemplates>
+
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -56,8 +80,8 @@
                Margin="8,4,4,8"
                BorderBrush="{DynamicResource Brush.Border2}"
                ItemsSource="{Binding Commits}"
-               SelectedItem="{Binding SelectedCommit, Mode=TwoWay}"
-               SelectionMode="Single"
+               SelectionMode="Multiple"
+               SelectionChanged="OnRowSelectionChanged"
                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                ScrollViewer.VerticalScrollBarVisibility="Auto">
         <ListBox.Styles>
@@ -113,7 +137,7 @@
                      IsVisible="{Binding IsLoading}"/>
 
       <Grid Grid.Column="2" RowDefinitions="Auto,*,Auto" IsVisible="{Binding !IsLoading}">
-        <StackPanel Grid.Row="0" Margin="0,8" Height="28" HorizontalAlignment="Center" Orientation="Horizontal">
+        <StackPanel Grid.Row="0" Margin="0,8" Height="28" HorizontalAlignment="Center" Orientation="Horizontal" IsVisible="{Binding SelectedCommits.Count, Converter={x:Static c:IntConverters.IsOne}}">
           <RadioButton Classes="switch_button"
                        GroupName="SearchGroup"
                        IsChecked="{Binding !IsViewContent, Mode=OneWay}">
@@ -126,6 +150,29 @@
             <TextBlock Margin="16,0" Text="{DynamicResource Text.FileHistory.FileContent}" FontWeight="Bold"/>
           </RadioButton>
         </StackPanel>
+
+        <!-- Compare Revision Info -->
+        <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto" IsVisible="{Binding SelectedCommits.Count, Converter={x:Static c:IntConverters.IsTwo}}">
+          <!-- Base Revision -->
+          <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
+            <ContentControl Content="{Binding StartPoint}"/>
+          </Border>
+
+          <!-- Swap Buttons -->
+          <Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
+            <Path Width="16" Height="16" Data="{DynamicResource Icons.Compare}"/>
+          </Button>
+
+          <!-- Right Revision -->
+          <Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
+            <ContentControl Content="{Binding EndPoint}"/>
+          </Border>
+
+          <!-- Save As Patch Button -->
+          <Button Grid.Column="3" Classes="icon_button" Width="32" Click="OnSaveAsPatch" ToolTip.Tip="{DynamicResource Text.Diff.SaveAsPatch}">
+            <Path Width="16" Height="16" Data="{DynamicResource Icons.Diff}"/>
+          </Button>
+        </Grid>
         
         <ContentControl Grid.Row="1" Margin="4,4,8,8" Content="{Binding ViewContent}">
           <ContentControl.DataTemplates>
@@ -154,6 +201,21 @@
                 </Grid>
               </Border>
             </DataTemplate>
+
+            <DataTemplate DataType="x:Int32">
+              <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Path Width="128" Height="128"
+                      Data="{StaticResource Icons.Detail}"
+                      HorizontalAlignment="Center"
+                      Fill="{DynamicResource Brush.FG2}"/>
+
+                <TextBlock HorizontalAlignment="Center"
+                           Margin="0,16"
+                           FontSize="24" FontWeight="Bold"
+                           Foreground="{DynamicResource Brush.FG2}"
+                           Text="{Binding Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Histories.Selected'}"/>
+              </StackPanel>
+            </DataTemplate>
           </ContentControl.DataTemplates>
         </ContentControl>
         
@@ -162,7 +224,8 @@
                 Margin="0,0,0,8"
                 HorizontalAlignment="Center"
                 Content="{DynamicResource Text.ChangeCM.CheckoutThisRevision}"
-                Click="OnResetToSelectedRevision"/>
+                Click="OnResetToSelectedRevision"
+                IsVisible="{Binding SelectedCommits.Count, Converter={x:Static c:IntConverters.IsOne}}"/>
       </Grid>
     </Grid>
     
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index 9d74892b..2318cb6c 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -1,6 +1,9 @@
+using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using SourceGit.Models;
 
 namespace SourceGit.Views
 {
@@ -38,5 +41,46 @@ namespace SourceGit.Views
             NotifyDonePanel.IsVisible = false;
             e.Handled = true;
         }
+
+        private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (DataContext is ViewModels.FileHistories vm && sender is ListBox { SelectedItems: IList<object> commits })
+            {
+                var selectedCommits = new List<Models.Commit>();
+                foreach (var commit in commits)
+                {
+                    if (commit is Models.Commit modelCommit)
+                    {
+                        selectedCommits.Add(modelCommit);
+                    }
+                }
+                vm.SelectedCommits = selectedCommits;
+            }
+
+            e.Handled = true;
+        }
+
+        private async void OnSaveAsPatch(object sender, RoutedEventArgs e)
+        {
+            var topLevel = TopLevel.GetTopLevel(this);
+            if (topLevel == null)
+                return;
+
+            var vm = DataContext as ViewModels.FileHistories;
+            if (vm == 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 topLevel.StorageProvider.SaveFilePickerAsync(options);
+            if (storageFile != null)
+                await vm.SaveAsPatch(storageFile.Path.LocalPath);
+            NotifyDonePanel.IsVisible = true;
+
+            e.Handled = true;
+        }
     }
 }

From 38a8490d160b538dc0e782cc16173c9b480df9dc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 13:07:58 +0800
Subject: [PATCH 067/364] code_review: PR #946

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/CompareRevisions.cs |   2 +-
 src/Converters/IntConverters.cs  |   3 -
 src/ViewModels/FileHistories.cs  | 300 ++++++++++++++++++-------------
 src/Views/FileHistories.axaml    | 248 +++++++++++++------------
 src/Views/FileHistories.axaml.cs |  54 ++----
 5 files changed, 316 insertions(+), 291 deletions(-)

diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
index b09face9..8a6f2832 100644
--- a/src/Commands/CompareRevisions.cs
+++ b/src/Commands/CompareRevisions.cs
@@ -24,7 +24,7 @@ namespace SourceGit.Commands
             Context = repo;
 
             var based = string.IsNullOrEmpty(start) ? "-R" : start;
-            Args = $"diff --name-status {based} {end} -- {path}";
+            Args = $"diff --name-status {based} {end} -- \"{path}\"";
         }
 
         public List<Models.Change> Result()
diff --git a/src/Converters/IntConverters.cs b/src/Converters/IntConverters.cs
index 1634f94e..f21c5d24 100644
--- a/src/Converters/IntConverters.cs
+++ b/src/Converters/IntConverters.cs
@@ -22,9 +22,6 @@ namespace SourceGit.Converters
         public static readonly FuncValueConverter<int, bool> IsNotOne =
             new FuncValueConverter<int, bool>(v => v != 1);
 
-        public static readonly FuncValueConverter<int, bool> IsTwo =
-            new FuncValueConverter<int, bool>(v => v == 2);
-
         public static readonly FuncValueConverter<int, bool> IsSubjectLengthBad =
             new FuncValueConverter<int, bool>(v => v > ViewModels.Preferences.Instance.SubjectGuideLength);
 
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 40b3cbea..37e6c8b1 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
+using Avalonia.Collections;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 
@@ -17,129 +18,60 @@ namespace SourceGit.ViewModels
         public object Content { get; set; } = content;
     }
 
-    public partial class FileHistories : ObservableObject
+    public partial class FileHistoriesSingleRevision : ObservableObject
     {
-        public bool IsLoading
+        public bool IsDiffMode
         {
-            get => _isLoading;
-            private set => SetProperty(ref _isLoading, value);
-        }
-
-        public List<Models.Commit> Commits
-        {
-            get => _commits;
-            set => SetProperty(ref _commits, value);
-        }
-
-        public List<Models.Commit> SelectedCommits
-        {
-            get => _selectedCommits;
+            get => _isDiffMode;
             set
             {
-                if (SetProperty(ref _selectedCommits, value))
+                if (SetProperty(ref _isDiffMode, value))
                     RefreshViewContent();
             }
         }
 
-        public bool IsViewContent
-        {
-            get => _isViewContent;
-            set
-            {
-                if (SetProperty(ref _isViewContent, value))
-                    RefreshViewContent();
-            }
-        }
-
-        public Models.Commit StartPoint
-        {
-            get => _startPoint;
-            set => SetProperty(ref _startPoint, value);
-        }
-
-        public Models.Commit EndPoint
-        {
-            get => _endPoint;
-            set => SetProperty(ref _endPoint, value);
-        }
-
         public object ViewContent
         {
             get => _viewContent;
-            private set => SetProperty(ref _viewContent, value);
+            set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistories(Repository repo, string file, string commit = null)
+        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, object prev)
         {
             _repo = repo;
             _file = file;
+            _revision = revision;
 
-            Task.Run(() =>
+            if (prev is FileHistoriesSingleRevision singleRevision)
             {
-                var based = commit ?? string.Empty;
-                var commits = new Commands.QueryCommits(_repo.FullPath, $"--date-order -n 10000 {based} -- \"{file}\"", false).Result();
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    IsLoading = false;
-                    Commits = commits;
-                    if (commits.Count > 0)
-                        SelectedCommits = [commits[0]];
-                });
-            });
-        }
+                _isDiffMode = singleRevision._isDiffMode;
+                _viewContent = singleRevision._viewContent;
+            }
+            else
+            {
+                _isDiffMode = true;
+                _viewContent = null;
+            }
 
-        public void NavigateToCommit(Models.Commit commit)
-        {
-            _repo.NavigateToCommit(commit.SHA);
+            RefreshViewContent();
         }
 
         public void ResetToSelectedRevision()
         {
-            if (_selectedCommits is not { Count: 1 })
-                return;
-            new Commands.Checkout(_repo.FullPath).FileWithRevision(_file, $"{_selectedCommits[0].SHA}");
-        }
-
-        public void Swap()
-        {
-            if (_selectedCommits is not { Count: 2 })
-                return;
-
-            (_selectedCommits[0], _selectedCommits[1]) = (_selectedCommits[1], _selectedCommits[0]);
-            RefreshViewContent();
-        }
-
-        public Task<bool> SaveAsPatch(string saveTo)
-        {
-            return Task.Run(() =>
-            {
-                Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo.FullPath, _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo);
-                return true;
-            });
+            new Commands.Checkout(_repo.FullPath).FileWithRevision(_file, $"{_revision.SHA}");
         }
 
         private void RefreshViewContent()
         {
-            if (_selectedCommits == null || _selectedCommits.Count == 0)
-            {
-                StartPoint = null;
-                EndPoint = null;
-                ViewContent = 0;
-                return;
-            }
-
-            if (_isViewContent && _selectedCommits.Count == 1)
-                SetViewContentAsRevisionFile();
-            else
+            if (_isDiffMode)
                 SetViewContentAsDiff();
+            else
+                SetViewContentAsRevisionFile();
         }
 
         private void SetViewContentAsRevisionFile()
         {
-            StartPoint = null;
-            EndPoint = null;
-            var selectedCommit = _selectedCommits[0];
-            var objs = new Commands.QueryRevisionObjects(_repo.FullPath, selectedCommit.SHA, _file).Result();
+            var objs = new Commands.QueryRevisionObjects(_repo.FullPath, _revision.SHA, _file).Result();
             if (objs.Count == 0)
             {
                 ViewContent = new FileHistoriesRevisionFile(_file, null);
@@ -152,13 +84,13 @@ namespace SourceGit.ViewModels
                 case Models.ObjectType.Blob:
                     Task.Run(() =>
                     {
-                        var isBinary = new Commands.IsBinary(_repo.FullPath, selectedCommit.SHA, _file).Result();
+                        var isBinary = new Commands.IsBinary(_repo.FullPath, _revision.SHA, _file).Result();
                         if (isBinary)
                         {
                             var ext = Path.GetExtension(_file);
                             if (IMG_EXTS.Contains(ext))
                             {
-                                var stream = Commands.QueryFileContent.Run(_repo.FullPath, selectedCommit.SHA, _file);
+                                var stream = Commands.QueryFileContent.Run(_repo.FullPath, _revision.SHA, _file);
                                 var fileSize = stream.Length;
                                 var bitmap = fileSize > 0 ? new Bitmap(stream) : null;
                                 var imageType = Path.GetExtension(_file).TrimStart('.').ToUpper(CultureInfo.CurrentCulture);
@@ -167,7 +99,7 @@ namespace SourceGit.ViewModels
                             }
                             else
                             {
-                                var size = new Commands.QueryFileSize(_repo.FullPath, _file, selectedCommit.SHA).Result();
+                                var size = new Commands.QueryFileSize(_repo.FullPath, _file, _revision.SHA).Result();
                                 var binaryFile = new Models.RevisionBinaryFile() { Size = size };
                                 Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, binaryFile));
                             }
@@ -175,7 +107,7 @@ namespace SourceGit.ViewModels
                             return;
                         }
 
-                        var contentStream = Commands.QueryFileContent.Run(_repo.FullPath, selectedCommit.SHA, _file);
+                        var contentStream = Commands.QueryFileContent.Run(_repo.FullPath, _revision.SHA, _file);
                         var content = new StreamReader(contentStream).ReadToEnd();
                         var matchLFS = REG_LFS_FORMAT().Match(content);
                         if (matchLFS.Success)
@@ -218,35 +150,8 @@ namespace SourceGit.ViewModels
 
         private void SetViewContentAsDiff()
         {
-            if (_selectedCommits is { Count: 1 })
-            {
-                StartPoint = null;
-                EndPoint = null;
-                var option = new Models.DiffOption(_selectedCommits[0], _file);
-                ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
-            }
-            else if (_selectedCommits is { Count: 2 })
-            {
-                StartPoint = _selectedCommits[0];
-                EndPoint = _selectedCommits[1];
-                _changes = new Commands.CompareRevisions(_repo.FullPath, GetSHA(_selectedCommits[0]), GetSHA(_selectedCommits[1]), _file).Result();
-                if (_changes.Count == 0)
-                {
-                    ViewContent = null;
-                    return;
-                }
-                var option = new Models.DiffOption(GetSHA(_selectedCommits[0]), GetSHA(_selectedCommits[1]), _changes[0]);
-                ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
-            }
-            else
-            {
-                ViewContent = _selectedCommits.Count;
-            }
-        }
-
-        private string GetSHA(object obj)
-        {
-            return obj is Models.Commit commit ? commit.SHA : string.Empty;
+            var option = new Models.DiffOption(_revision, _file);
+            ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
         }
 
         [GeneratedRegex(@"^version https://git-lfs.github.com/spec/v\d+\r?\noid sha256:([0-9a-f]+)\r?\nsize (\d+)[\r\n]*$")]
@@ -257,15 +162,152 @@ namespace SourceGit.ViewModels
             ".ico", ".bmp", ".jpg", ".png", ".jpeg", ".webp"
         };
 
+        private Repository _repo = null;
+        private string _file = null;
+        private Models.Commit _revision = null;
+        private bool _isDiffMode = true;
+        private object _viewContent = null;
+    }
+
+    public class FileHistoriesCompareRevisions : ObservableObject
+    {
+        public Models.Commit StartPoint
+        {
+            get => _startPoint;
+            set => SetProperty(ref _startPoint, value);
+        }
+
+        public Models.Commit EndPoint
+        {
+            get => _endPoint;
+            set => SetProperty(ref _endPoint, value);
+        }
+
+        public DiffContext ViewContent
+        {
+            get => _viewContent;
+            set => SetProperty(ref _viewContent, value);
+        }
+
+        public FileHistoriesCompareRevisions(Repository repo, string file, Models.Commit start, Models.Commit end)
+        {
+            _repo = repo;
+            _file = file;
+            _startPoint = start;
+            _endPoint = end;
+            RefreshViewContent();
+        }
+
+        public void Swap()
+        {
+            (StartPoint, EndPoint) = (_endPoint, _startPoint);
+            RefreshViewContent();
+        }
+
+        public Task<bool> SaveAsPatch(string saveTo)
+        {
+            return Task.Run(() =>
+            {
+                Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo.FullPath, _changes, _startPoint.SHA, _endPoint.SHA, saveTo);
+                return true;
+            });
+        }
+
+        private void RefreshViewContent()
+        {
+            Task.Run(() =>
+            {
+                _changes = new Commands.CompareRevisions(_repo.FullPath, _startPoint.SHA, _endPoint.SHA, _file).Result();
+                if (_changes.Count == 0)
+                {
+                    Dispatcher.UIThread.Invoke(() => ViewContent = null);
+                    return;
+                }
+
+                var option = new Models.DiffOption(_startPoint.SHA, _endPoint.SHA, _changes[0]);
+                Dispatcher.UIThread.Invoke(() => ViewContent = new DiffContext(_repo.FullPath, option, _viewContent));
+            });
+        }
+
+        private Repository _repo = null;
+        private string _file = null;
+        private Models.Commit _startPoint = null;
+        private Models.Commit _endPoint = null;
+        private List<Models.Change> _changes = [];
+        private DiffContext _viewContent = null;
+    }
+
+    public class FileHistories : ObservableObject
+    {
+        public bool IsLoading
+        {
+            get => _isLoading;
+            private set => SetProperty(ref _isLoading, value);
+        }
+
+        public List<Models.Commit> Commits
+        {
+            get => _commits;
+            set => SetProperty(ref _commits, value);
+        }
+
+        public AvaloniaList<Models.Commit> SelectedCommits
+        {
+            get;
+            set;
+        } = [];
+
+        public object ViewContent
+        {
+            get => _viewContent;
+            private set => SetProperty(ref _viewContent, value);
+        }
+
+        public FileHistories(Repository repo, string file, string commit = null)
+        {
+            _repo = repo;
+            _file = file;
+
+            Task.Run(() =>
+            {
+                var based = commit ?? string.Empty;
+                var commits = new Commands.QueryCommits(_repo.FullPath, $"--date-order -n 10000 {based} -- \"{file}\"", false).Result();
+                Dispatcher.UIThread.Invoke(() =>
+                {
+                    IsLoading = false;
+                    Commits = commits;
+                });
+            });
+
+            SelectedCommits.CollectionChanged += (_, _) =>
+            {
+                switch (SelectedCommits.Count)
+                {
+                    case 0:
+                        ViewContent = new Models.Null();
+                        break;
+                    case 1:
+                        ViewContent = new FileHistoriesSingleRevision(_repo, _file, SelectedCommits[0], _viewContent);
+                        break;
+                    case 2:
+                        ViewContent = new FileHistoriesCompareRevisions(_repo, _file, SelectedCommits[0], SelectedCommits[1]);
+                        break;
+                    default:
+                        ViewContent = SelectedCommits.Count;
+                        break;
+                }
+            };
+        }
+
+        public void NavigateToCommit(Models.Commit commit)
+        {
+            _repo.NavigateToCommit(commit.SHA);
+        }        
+
         private readonly Repository _repo = null;
         private readonly string _file = null;
         private bool _isLoading = true;
         private List<Models.Commit> _commits = null;
-        private List<Models.Commit> _selectedCommits = [];
-        private bool _isViewContent = false;
         private object _viewContent = null;
-        private Models.Commit _startPoint = null;
-        private Models.Commit _endPoint = null;
-        private List<Models.Change> _changes = null;
     }
 }
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index e3bbac9c..688552e0 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -13,30 +13,6 @@
                     Icon="/App.ico"
                     Title="{DynamicResource Text.FileHistory}"
                     MinWidth="1280" MinHeight="720">
-  <v:ChromelessWindow.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"/>
-      </Border>
-    </DataTemplate>
-    
-    <DataTemplate DataType="m:Commit">
-      <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"/>
-          <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
-            <TextBlock Text="HEAD" Classes="primary" 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"/>
-        </Grid>
-
-        <TextBlock Grid.Row="1" Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
-      </Grid>
-    </DataTemplate>
-  </v:ChromelessWindow.DataTemplates>
-
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -80,8 +56,8 @@
                Margin="8,4,4,8"
                BorderBrush="{DynamicResource Brush.Border2}"
                ItemsSource="{Binding Commits}"
+               SelectedItems="{Binding SelectedCommits, Mode=TwoWay}"
                SelectionMode="Multiple"
-               SelectionChanged="OnRowSelectionChanged"
                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                ScrollViewer.VerticalScrollBarVisibility="Auto">
         <ListBox.Styles>
@@ -131,102 +107,136 @@
                     BorderThickness="1,0,0,0"
                     BorderBrush="{DynamicResource Brush.Border0}"/>
 
-      <v:LoadingIcon Grid.Column="2" 
-                     Width="48" Height="48" 
+      <ContentControl Grid.Column="2" Content="{Binding ViewContent}">
+        <ContentControl.DataTemplates>
+          <DataTemplate DataType="m:Null">
+            <Border/>
+          </DataTemplate>
+
+          <DataTemplate DataType="vm:FileHistoriesSingleRevision">
+            <Grid RowDefinitions="Auto,*,Auto">
+              <StackPanel Grid.Row="0" Margin="0,8" Height="28" HorizontalAlignment="Center" Orientation="Horizontal">
+                <RadioButton Classes="switch_button"
+                             GroupName="SearchGroup"
+                             IsChecked="{Binding IsDiffMode, Mode=OneWay}">
+                  <TextBlock Margin="16,0" Text="{DynamicResource Text.FileHistory.FileChange}" FontWeight="Bold"/>
+                </RadioButton>
+
+                <RadioButton Classes="switch_button"
+                             GroupName="SearchGroup"
+                             IsChecked="{Binding !IsDiffMode, Mode=TwoWay}">
+                  <TextBlock Margin="16,0" Text="{DynamicResource Text.FileHistory.FileContent}" FontWeight="Bold"/>
+                </RadioButton>
+              </StackPanel>
+
+              <ContentControl Grid.Row="1" Margin="4,4,8,8" Content="{Binding ViewContent}">
+                <ContentControl.DataTemplates>
+                  <DataTemplate DataType="vm:DiffContext">
+                    <v:DiffView/>
+                  </DataTemplate>
+
+                  <DataTemplate DataType="vm:FileHistoriesRevisionFile">
+                    <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+                      <Grid RowDefinitions="26,*">
+                        <Border Grid.Row="0"
+                                BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
+                                Background="{DynamicResource Brush.Window}">
+                          <Grid ColumnDefinitions="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"
+                                       TextTrimming="CharacterEllipsis"/>
+                          </Grid>
+                        </Border>
+
+                        <v:RevisionFileContentViewer Grid.Row="1" Content="{Binding Content}"/>
+                      </Grid>
+                    </Border>
+                  </DataTemplate>
+                </ContentControl.DataTemplates>
+              </ContentControl>
+
+              <Button Grid.Row="2"
+                      Classes="flat primary"
+                      Margin="0,0,0,8"
+                      HorizontalAlignment="Center"
+                      Content="{DynamicResource Text.ChangeCM.CheckoutThisRevision}"
+                      Click="OnResetToSelectedRevision"/>
+            </Grid>
+          </DataTemplate>
+
+          <DataTemplate DataType="vm:FileHistoriesCompareRevisions">
+            <Grid RowDefinitions="Auto,*">
+              <Grid Grid.Row="0" Margin="4,6" ColumnDefinitions="*,32,*,Auto">
+                <Grid.DataTemplates>
+                  <DataTemplate DataType="m:Commit">
+                    <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"/>
+                        <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
+                          <TextBlock Text="HEAD" Classes="primary" 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"/>
+                      </Grid>
+
+                      <TextBlock Grid.Row="1" Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
+                    </Grid>
+                  </DataTemplate>
+                </Grid.DataTemplates>
+                
+                <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
+                  <ContentControl Content="{Binding StartPoint}"/>
+                </Border>
+
+                <Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
+                  <Path Width="16" Height="16" Data="{DynamicResource Icons.Compare}"/>
+                </Button>
+
+                <Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
+                  <ContentControl Content="{Binding EndPoint}"/>
+                </Border>
+
+                <Button Grid.Column="3" Classes="icon_button" Width="32" Click="OnSaveAsPatch" ToolTip.Tip="{DynamicResource Text.Diff.SaveAsPatch}">
+                  <Path Width="16" Height="16" Data="{DynamicResource Icons.Diff}"/>
+                </Button>
+              </Grid>
+
+              <ContentControl Grid.Row="1" Margin="4,4,8,8" Content="{Binding ViewContent}">
+                <ContentControl.DataTemplates>
+                  <DataTemplate DataType="vm:DiffContext">
+                    <v:DiffView/>
+                  </DataTemplate>
+                </ContentControl.DataTemplates>
+              </ContentControl>
+            </Grid>
+          </DataTemplate>
+
+          <DataTemplate DataType="x:Int32">
+            <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+              <Path Width="128" Height="128"
+                    Data="{StaticResource Icons.Detail}"
+                    HorizontalAlignment="Center"
+                    Fill="{DynamicResource Brush.FG2}"/>
+
+              <TextBlock HorizontalAlignment="Center"
+                         Margin="0,16"
+                         FontSize="24" FontWeight="Bold"
+                         Foreground="{DynamicResource Brush.FG2}"
+                         Text="{Binding Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Histories.Selected'}"/>
+            </StackPanel>
+          </DataTemplate>
+        </ContentControl.DataTemplates>
+      </ContentControl>
+
+      <v:LoadingIcon Grid.Column="2"
+                     Width="48" Height="48"
                      HorizontalAlignment="Center" VerticalAlignment="Center"
                      IsVisible="{Binding IsLoading}"/>
-
-      <Grid Grid.Column="2" RowDefinitions="Auto,*,Auto" IsVisible="{Binding !IsLoading}">
-        <StackPanel Grid.Row="0" Margin="0,8" Height="28" HorizontalAlignment="Center" Orientation="Horizontal" IsVisible="{Binding SelectedCommits.Count, Converter={x:Static c:IntConverters.IsOne}}">
-          <RadioButton Classes="switch_button"
-                       GroupName="SearchGroup"
-                       IsChecked="{Binding !IsViewContent, Mode=OneWay}">
-            <TextBlock Margin="16,0" Text="{DynamicResource Text.FileHistory.FileChange}" FontWeight="Bold"/>
-          </RadioButton>
-
-          <RadioButton Classes="switch_button"
-                       GroupName="SearchGroup"
-                       IsChecked="{Binding IsViewContent, Mode=TwoWay}">
-            <TextBlock Margin="16,0" Text="{DynamicResource Text.FileHistory.FileContent}" FontWeight="Bold"/>
-          </RadioButton>
-        </StackPanel>
-
-        <!-- Compare Revision Info -->
-        <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto" IsVisible="{Binding SelectedCommits.Count, Converter={x:Static c:IntConverters.IsTwo}}">
-          <!-- Base Revision -->
-          <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
-            <ContentControl Content="{Binding StartPoint}"/>
-          </Border>
-
-          <!-- Swap Buttons -->
-          <Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
-            <Path Width="16" Height="16" Data="{DynamicResource Icons.Compare}"/>
-          </Button>
-
-          <!-- Right Revision -->
-          <Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
-            <ContentControl Content="{Binding EndPoint}"/>
-          </Border>
-
-          <!-- Save As Patch Button -->
-          <Button Grid.Column="3" Classes="icon_button" Width="32" Click="OnSaveAsPatch" ToolTip.Tip="{DynamicResource Text.Diff.SaveAsPatch}">
-            <Path Width="16" Height="16" Data="{DynamicResource Icons.Diff}"/>
-          </Button>
-        </Grid>
-        
-        <ContentControl Grid.Row="1" Margin="4,4,8,8" Content="{Binding ViewContent}">
-          <ContentControl.DataTemplates>
-            <DataTemplate DataType="vm:DiffContext">
-              <v:DiffView/>
-            </DataTemplate>
-            
-            <DataTemplate DataType="vm:FileHistoriesRevisionFile">
-              <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
-                <Grid RowDefinitions="26,*">
-                  <Border Grid.Row="0" 
-                          BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}" 
-                          Background="{DynamicResource Brush.Window}">
-                    <Grid ColumnDefinitions="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" 
-                                 TextTrimming="CharacterEllipsis"/>
-                    </Grid>
-                  </Border>
-                  
-                  <v:RevisionFileContentViewer Grid.Row="1" Content="{Binding Content}"/>
-                </Grid>
-              </Border>
-            </DataTemplate>
-
-            <DataTemplate DataType="x:Int32">
-              <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Path Width="128" Height="128"
-                      Data="{StaticResource Icons.Detail}"
-                      HorizontalAlignment="Center"
-                      Fill="{DynamicResource Brush.FG2}"/>
-
-                <TextBlock HorizontalAlignment="Center"
-                           Margin="0,16"
-                           FontSize="24" FontWeight="Bold"
-                           Foreground="{DynamicResource Brush.FG2}"
-                           Text="{Binding Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Histories.Selected'}"/>
-              </StackPanel>
-            </DataTemplate>
-          </ContentControl.DataTemplates>
-        </ContentControl>
-        
-        <Button Grid.Row="2"
-                Classes="flat primary"
-                Margin="0,0,0,8"
-                HorizontalAlignment="Center"
-                Content="{DynamicResource Text.ChangeCM.CheckoutThisRevision}"
-                Click="OnResetToSelectedRevision"
-                IsVisible="{Binding SelectedCommits.Count, Converter={x:Static c:IntConverters.IsOne}}"/>
-      </Grid>
     </Grid>
     
     <Border Grid.Row="1" x:Name="NotifyDonePanel" Background="Transparent" IsVisible="False" PointerPressed="OnCloseNotifyPanel">
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index 2318cb6c..6f86c70c 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
-using SourceGit.Models;
 
 namespace SourceGit.Views
 {
@@ -25,11 +24,11 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
-        private void OnResetToSelectedRevision(object _, RoutedEventArgs e)
+        private void OnResetToSelectedRevision(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.FileHistories vm)
+            if (sender is Button { DataContext: ViewModels.FileHistoriesSingleRevision single })
             {
-                vm.ResetToSelectedRevision();
+                single.ResetToSelectedRevision();
                 NotifyDonePanel.IsVisible = true;
             }
 
@@ -42,45 +41,22 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
-        private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (DataContext is ViewModels.FileHistories vm && sender is ListBox { SelectedItems: IList<object> commits })
-            {
-                var selectedCommits = new List<Models.Commit>();
-                foreach (var commit in commits)
-                {
-                    if (commit is Models.Commit modelCommit)
-                    {
-                        selectedCommits.Add(modelCommit);
-                    }
-                }
-                vm.SelectedCommits = selectedCommits;
-            }
-
-            e.Handled = true;
-        }
-
         private async void OnSaveAsPatch(object sender, RoutedEventArgs e)
         {
-            var topLevel = TopLevel.GetTopLevel(this);
-            if (topLevel == null)
-                return;
+            if (sender is Button { DataContext: ViewModels.FileHistoriesCompareRevisions compare })
+            {
+                var options = new FilePickerSaveOptions();
+                options.Title = App.Text("FileCM.SaveAsPatch");
+                options.DefaultExtension = ".patch";
+                options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
 
-            var vm = DataContext as ViewModels.FileHistories;
-            if (vm == null)
-                return;
+                var storageFile = await this.StorageProvider.SaveFilePickerAsync(options);
+                if (storageFile != null)
+                    await compare.SaveAsPatch(storageFile.Path.LocalPath);
 
-            var options = new FilePickerSaveOptions();
-            options.Title = App.Text("FileCM.SaveAsPatch");
-            options.DefaultExtension = ".patch";
-            options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
-
-            var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options);
-            if (storageFile != null)
-                await vm.SaveAsPatch(storageFile.Path.LocalPath);
-            NotifyDonePanel.IsVisible = true;
-
-            e.Handled = true;
+                NotifyDonePanel.IsVisible = true;
+                e.Handled = true;
+            }            
         }
     }
 }

From dacbd2a79109342a8987819be188fdae6b7b2fc3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 13:13:45 +0800
Subject: [PATCH 068/364] enhance: auto-select the first revision in file
 histories view

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

diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 37e6c8b1..5ebbf6a6 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -276,6 +276,8 @@ namespace SourceGit.ViewModels
                 {
                     IsLoading = false;
                     Commits = commits;
+                    if (Commits.Count > 0)
+                        SelectedCommits.Add(Commits[0]);
                 });
             });
 

From e9297096dff66549a3ad669e99868657a7ee7568 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 13:30:56 +0800
Subject: [PATCH 069/364] enhance: remember last view mode in file histories
 view

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

diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 5ebbf6a6..ab12e596 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -36,22 +36,13 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, object prev)
+        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)
         {
             _repo = repo;
             _file = file;
             _revision = revision;
-
-            if (prev is FileHistoriesSingleRevision singleRevision)
-            {
-                _isDiffMode = singleRevision._isDiffMode;
-                _viewContent = singleRevision._viewContent;
-            }
-            else
-            {
-                _isDiffMode = true;
-                _viewContent = null;
-            }
+            _isDiffMode = prevIsDiffMode;
+            _viewContent = null;
 
             RefreshViewContent();
         }
@@ -283,13 +274,13 @@ namespace SourceGit.ViewModels
 
             SelectedCommits.CollectionChanged += (_, _) =>
             {
+                if (_viewContent is FileHistoriesSingleRevision singleRevision)
+                    _prevIsDiffMode = singleRevision.IsDiffMode;
+
                 switch (SelectedCommits.Count)
                 {
-                    case 0:
-                        ViewContent = new Models.Null();
-                        break;
                     case 1:
-                        ViewContent = new FileHistoriesSingleRevision(_repo, _file, SelectedCommits[0], _viewContent);
+                        ViewContent = new FileHistoriesSingleRevision(_repo, _file, SelectedCommits[0], _prevIsDiffMode);
                         break;
                     case 2:
                         ViewContent = new FileHistoriesCompareRevisions(_repo, _file, SelectedCommits[0], SelectedCommits[1]);
@@ -309,6 +300,7 @@ namespace SourceGit.ViewModels
         private readonly Repository _repo = null;
         private readonly string _file = null;
         private bool _isLoading = true;
+        private bool _prevIsDiffMode = true;
         private List<Models.Commit> _commits = null;
         private object _viewContent = null;
     }
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index 688552e0..124b2e00 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -109,10 +109,6 @@
 
       <ContentControl Grid.Column="2" Content="{Binding ViewContent}">
         <ContentControl.DataTemplates>
-          <DataTemplate DataType="m:Null">
-            <Border/>
-          </DataTemplate>
-
           <DataTemplate DataType="vm:FileHistoriesSingleRevision">
             <Grid RowDefinitions="Auto,*,Auto">
               <StackPanel Grid.Row="0" Margin="0,8" Height="28" HorizontalAlignment="Center" Orientation="Horizontal">

From dbb1df5f8bca9898fc9387360844756ed870e39c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 15:34:12 +0800
Subject: [PATCH 070/364] fix: single `_` will be traited as a space by image
 shields

Signed-off-by: leo <longshuang@msn.cn>
---
 build/scripts/localization-check.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/scripts/localization-check.js b/build/scripts/localization-check.js
index 76b5036b..ed89a5e8 100644
--- a/build/scripts/localization-check.js
+++ b/build/scripts/localization-check.js
@@ -25,7 +25,7 @@ async function calculateTranslationRate() {
     const files = (await fs.readdir(localesDir)).filter(file => file !== 'en_US.axaml' && file.endsWith('.axaml'));
 
     // Add en_US badge first
-    badges.push(`[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md)`);
+    badges.push(`[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md)`);
 
     for (const file of files) {
         const filePath = path.join(localesDir, file);

From 7089f29b85354abd20d6e7711ec57a0c78bfc6b3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Feb 2025 16:33:55 +0800
Subject: [PATCH 071/364] refactor: re-implement `git stash apply`

* supports `--index` option
* add an option to drop selected stash after applying
* remove `Pop` context menu for stash

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Stash.cs             | 19 +++++-------
 src/Resources/Locales/en_US.axaml |  4 +++
 src/Resources/Locales/zh_CN.axaml |  4 +++
 src/Resources/Locales/zh_TW.axaml |  4 +++
 src/ViewModels/ApplyStash.cs      | 48 +++++++++++++++++++++++++++++++
 src/ViewModels/StashChanges.cs    |  2 +-
 src/ViewModels/StashesPage.cs     | 11 ++-----
 src/Views/ApplyStash.axaml        | 38 ++++++++++++++++++++++++
 src/Views/ApplyStash.axaml.cs     | 13 +++++++++
 9 files changed, 121 insertions(+), 22 deletions(-)
 create mode 100644 src/ViewModels/ApplyStash.cs
 create mode 100644 src/Views/ApplyStash.axaml
 create mode 100644 src/Views/ApplyStash.axaml.cs

diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index d2e12be8..7acfdf38 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -73,27 +73,22 @@ namespace SourceGit.Commands
             return Exec();
         }
 
-        public bool Apply(string name = null)
+        public bool Apply(string name, bool restoreIndex)
         {
-            Args = "stash apply -q";
-            if (!string.IsNullOrEmpty(name))
-                Args += $" \"{name}\"";
+            var opts = restoreIndex ? "--index" : string.Empty;
+            Args = $"stash apply -q {opts} \"{name}\"";
             return Exec();
         }
 
-        public bool Pop(string name = null)
+        public bool Pop(string name)
         {
-            Args = "stash pop -q";
-            if (!string.IsNullOrEmpty(name))
-                Args += $" \"{name}\"";
+            Args = $"stash pop -q \"{name}\"";
             return Exec();
         }
 
-        public bool Drop(string name = null)
+        public bool Drop(string name)
         {
-            Args = "stash drop -q";
-            if (!string.IsNullOrEmpty(name))
-                Args += $" \"{name}\"";
+            Args = $"stash drop -q \"{name}\"";
             return Exec();
         }
 
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 631722ad..b2118a3e 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -34,6 +34,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Warn</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Outputs warnings for a few such errors, but applies</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Whitespace:</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Apply Stash</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Delete after applying</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Reinstate the index's changes</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Archive...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Save Archive To:</x:String>
   <x:String x:Key="Text.Archive.File.Placeholder" xml:space="preserve">Select archive file path</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index b220b9ae..e4a38e9c 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -37,6 +37,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">警告</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" 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">存档(archive) ...</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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 948cb2a8..c2008445 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -37,6 +37,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">警告</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" 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">封存 (archive)...</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>
diff --git a/src/ViewModels/ApplyStash.cs b/src/ViewModels/ApplyStash.cs
new file mode 100644
index 00000000..03ce0f43
--- /dev/null
+++ b/src/ViewModels/ApplyStash.cs
@@ -0,0 +1,48 @@
+using System.Threading.Tasks;
+
+namespace SourceGit.ViewModels
+{
+    public class ApplyStash : Popup
+    {
+        public Models.Stash Stash
+        {
+            get;
+            private set;
+        }
+
+        public bool RestoreIndex
+        {
+            get;
+            set;
+        } = true;
+
+        public bool DropAfterApply
+        {
+            get;
+            set;
+        } = false;
+
+        public ApplyStash(string repo, Models.Stash stash)
+        {
+            _repo = repo;
+            Stash = stash;
+            View = new Views.ApplyStash() { DataContext = this };
+        }
+
+        public override Task<bool> Sure()
+        {
+            ProgressDescription = $"Applying stash: {Stash.Name}";
+
+            return Task.Run(() =>
+            {
+                var succ = new Commands.Stash(_repo).Apply(Stash.Name, RestoreIndex);
+                if (succ && DropAfterApply)
+                    new Commands.Stash(_repo).Drop(Stash.Name);
+
+                return true;
+            });
+        }
+
+        private readonly string _repo;
+    }
+}
diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs
index 3b5608f7..33ebb1f3 100644
--- a/src/ViewModels/StashChanges.cs
+++ b/src/ViewModels/StashChanges.cs
@@ -91,7 +91,7 @@ namespace SourceGit.ViewModels
                 }
 
                 if (AutoRestore && succ)
-                    succ = new Commands.Stash(_repo.FullPath).Apply();
+                    succ = new Commands.Stash(_repo.FullPath).Apply("stash@{0}", true);
 
                 CallUIThread(() =>
                 {
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index e5755a91..4a3bf933 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -141,15 +141,9 @@ namespace SourceGit.ViewModels
             apply.Header = App.Text("StashCM.Apply");
             apply.Click += (_, ev) =>
             {
-                Task.Run(() => new Commands.Stash(_repo.FullPath).Apply(stash.Name));
-                ev.Handled = true;
-            };
+                if (_repo.CanCreatePopup())
+                    _repo.ShowPopup(new ApplyStash(_repo.FullPath, stash));
 
-            var pop = new MenuItem();
-            pop.Header = App.Text("StashCM.Pop");
-            pop.Click += (_, ev) =>
-            {
-                Task.Run(() => new Commands.Stash(_repo.FullPath).Pop(stash.Name));
                 ev.Handled = true;
             };
 
@@ -165,7 +159,6 @@ namespace SourceGit.ViewModels
 
             var menu = new ContextMenu();
             menu.Items.Add(apply);
-            menu.Items.Add(pop);
             menu.Items.Add(drop);
             return menu;
         }
diff --git a/src/Views/ApplyStash.axaml b/src/Views/ApplyStash.axaml
new file mode 100644
index 00000000..44a97f42
--- /dev/null
+++ b/src/Views/ApplyStash.axaml
@@ -0,0 +1,38 @@
+<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:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.ApplyStash"
+             x:DataType="vm:ApplyStash">
+  <StackPanel Orientation="Vertical" Margin="8,0,0,0">
+    <TextBlock FontSize="18"
+               Classes="bold"
+               Text="{DynamicResource Text.ApplyStash}"/>
+    <Grid Margin="0,16,8,0" RowDefinitions="32,32,32" ColumnDefinitions="100,*">
+      <TextBlock Grid.Row="0" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.ApplyStash.Stash}"/>
+      <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
+        <Path Width="12" Height="12" Margin="2,0,8,0"
+              HorizontalAlignment="Left" VerticalAlignment="Center"
+              Data="{StaticResource Icons.Stashes}"/>
+
+        <TextBlock VerticalAlignment="Center" Classes="primary" Text="{Binding Stash.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding Stash.Message}" Margin="8,0,0,0"/>
+      </StackPanel>
+
+      <CheckBox Grid.Row="1" Grid.Column="1"
+                Content="{DynamicResource Text.ApplyStash.RestoreIndex}"
+                IsChecked="{Binding RestoreIndex, Mode=TwoWay}"
+                ToolTip.Tip="--index"/>
+
+      <CheckBox Grid.Row="2" Grid.Column="1"
+                Content="{DynamicResource Text.ApplyStash.DropAfterApply}"
+                IsChecked="{Binding DropAfterApply, Mode=TwoWay}"/>
+    </Grid>
+  </StackPanel>
+</UserControl>
diff --git a/src/Views/ApplyStash.axaml.cs b/src/Views/ApplyStash.axaml.cs
new file mode 100644
index 00000000..07b6cf90
--- /dev/null
+++ b/src/Views/ApplyStash.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public partial class ApplyStash : UserControl
+    {
+        public ApplyStash()
+        {
+            InitializeComponent();
+        }
+    }
+}
+

From d1f3469250c65eb0f9c6a2d37cdeabe0cbf4ec58 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 08:34:27 +0000
Subject: [PATCH 072/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index b1e07a97..e088d538 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en_US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.32%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.32%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.05%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.59%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-93.78%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.32%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.79%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-93.54%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.06%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-93.27%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.79%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 30f1f7f7..c1e57a1a 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,9 +1,13 @@
-### de_DE.axaml: 99.32%
+### de_DE.axaml: 98.79%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.ApplyStash
+- Text.ApplyStash.DropAfterApply
+- Text.ApplyStash.RestoreIndex
+- Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.Stash.AutoRestore
@@ -12,12 +16,16 @@
 
 </details>
 
-### es_ES.axaml: 99.32%
+### es_ES.axaml: 98.79%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.ApplyStash
+- Text.ApplyStash.DropAfterApply
+- Text.ApplyStash.RestoreIndex
+- Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.Stash.AutoRestore
@@ -26,12 +34,16 @@
 
 </details>
 
-### fr_FR.axaml: 94.05%
+### fr_FR.axaml: 93.54%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.ApplyStash
+- Text.ApplyStash.DropAfterApply
+- Text.ApplyStash.RestoreIndex
+- Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.InProgress.CherryPick.Head
@@ -79,24 +91,32 @@
 
 </details>
 
-### it_IT.axaml: 99.59%
+### it_IT.axaml: 99.06%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.ApplyStash
+- Text.ApplyStash.DropAfterApply
+- Text.ApplyStash.RestoreIndex
+- Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 
 </details>
 
-### pt_BR.axaml: 93.78%
+### pt_BR.axaml: 93.27%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.ApplyStash
+- Text.ApplyStash.DropAfterApply
+- Text.ApplyStash.RestoreIndex
+- Text.ApplyStash.Stash
 - Text.BranchCM.MergeMultiBranches
 - Text.Clone.RecurseSubmodules
 - Text.CommitCM.Merge
@@ -146,12 +166,16 @@
 
 </details>
 
-### ru_RU.axaml: 99.32%
+### ru_RU.axaml: 98.79%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.ApplyStash
+- Text.ApplyStash.DropAfterApply
+- Text.ApplyStash.RestoreIndex
+- Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
 - Text.Stash.AutoRestore

From 2105fd450d2f95ddbc39dc8491f1d4719b830d7d Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Fri, 7 Feb 2025 11:30:14 +0800
Subject: [PATCH 073/364] fix: when upstream is null show CommitAndPush and
 stop auto push (#955) (#956)

---
 src/ViewModels/LauncherPage.cs | 6 ++++--
 src/ViewModels/Popup.cs        | 5 +++++
 src/ViewModels/Push.cs         | 5 +++++
 src/ViewModels/Repository.cs   | 3 ---
 src/ViewModels/WorkingCopy.cs  | 7 -------
 src/Views/WorkingCopy.axaml    | 1 -
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index 498c1865..78aa9278 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -59,15 +59,17 @@ namespace SourceGit.ViewModels
         public void StartPopup(Popup popup)
         {
             Popup = popup;
-            ProcessPopup();
+            ProcessPopup(true);
         }
 
-        public async void ProcessPopup()
+        public async void ProcessPopup(bool autoCheck = false)
         {
             if (_popup != null)
             {
                 if (!_popup.Check())
                     return;
+                if (autoCheck && !_popup.AutoCheck())
+                    return;
 
                 _popup.InProgress = true;
                 var task = _popup.Sure();
diff --git a/src/ViewModels/Popup.cs b/src/ViewModels/Popup.cs
index ff74df51..f8991ff4 100644
--- a/src/ViewModels/Popup.cs
+++ b/src/ViewModels/Popup.cs
@@ -37,6 +37,11 @@ namespace SourceGit.ViewModels
             return !HasErrors;
         }
 
+        public virtual bool AutoCheck()
+        {
+            return true;
+        }
+
         public virtual Task<bool> Sure()
         {
             return null;
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index 004ae7b6..5f37bfaf 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -152,6 +152,11 @@ namespace SourceGit.ViewModels
             View = new Views.Push() { DataContext = this };
         }
 
+        public override bool AutoCheck()
+        {
+            return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
+        }
+
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 926fd6b6..c91f5e73 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -937,9 +937,6 @@ namespace SourceGit.ViewModels
                 CurrentBranch = branches.Find(x => x.IsCurrent);
                 LocalBranchTrees = builder.Locals;
                 RemoteBranchTrees = builder.Remotes;
-
-                if (_workingCopy != null)
-                    _workingCopy.CanCommitWithPush = _currentBranch != null && !string.IsNullOrEmpty(_currentBranch.Upstream);
             });
         }
 
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 616f244a..255d6b6b 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -26,12 +26,6 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public bool CanCommitWithPush
-        {
-            get => _canCommitWithPush;
-            set => SetProperty(ref _canCommitWithPush, value);
-        }
-
         public bool HasUnsolvedConflicts
         {
             get => _hasUnsolvedConflicts;
@@ -1625,7 +1619,6 @@ namespace SourceGit.ViewModels
         private bool _isUnstaging = false;
         private bool _isCommitting = false;
         private bool _useAmend = false;
-        private bool _canCommitWithPush = false;
         private List<Models.Change> _cached = [];
         private List<Models.Change> _unstaged = [];
         private List<Models.Change> _staged = [];
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 7f493b6a..e0d0503d 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -375,7 +375,6 @@
           <Button.IsVisible>
             <MultiBinding Converter="{x:Static BoolConverters.And}">
               <Binding Path="UseAmend" Converter="{x:Static BoolConverters.Not}"/>
-              <Binding Path="CanCommitWithPush"/>
               <Binding Path="InProgressContext" Converter="{x:Static ObjectConverters.IsNull}"/>
             </MultiBinding>
           </Button.IsVisible>  

From 8edd95537021efcc0ba417b214fb12bfe7807c73 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Feb 2025 11:36:30 +0800
Subject: [PATCH 074/364] code_review: PR #956

* Just use `Check` instead of a new one `AutoCheck`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/LauncherPage.cs | 6 ++----
 src/ViewModels/Popup.cs        | 7 +------
 src/ViewModels/Push.cs         | 4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index 78aa9278..498c1865 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -59,17 +59,15 @@ namespace SourceGit.ViewModels
         public void StartPopup(Popup popup)
         {
             Popup = popup;
-            ProcessPopup(true);
+            ProcessPopup();
         }
 
-        public async void ProcessPopup(bool autoCheck = false)
+        public async void ProcessPopup()
         {
             if (_popup != null)
             {
                 if (!_popup.Check())
                     return;
-                if (autoCheck && !_popup.AutoCheck())
-                    return;
 
                 _popup.InProgress = true;
                 var task = _popup.Sure();
diff --git a/src/ViewModels/Popup.cs b/src/ViewModels/Popup.cs
index f8991ff4..7475d829 100644
--- a/src/ViewModels/Popup.cs
+++ b/src/ViewModels/Popup.cs
@@ -29,7 +29,7 @@ namespace SourceGit.ViewModels
         }
 
         [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")]
-        public bool Check()
+        public virtual bool Check()
         {
             if (HasErrors)
                 return false;
@@ -37,11 +37,6 @@ namespace SourceGit.ViewModels
             return !HasErrors;
         }
 
-        public virtual bool AutoCheck()
-        {
-            return true;
-        }
-
         public virtual Task<bool> Sure()
         {
             return null;
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index 5f37bfaf..697a56fc 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -152,9 +152,9 @@ namespace SourceGit.ViewModels
             View = new Views.Push() { DataContext = this };
         }
 
-        public override bool AutoCheck()
+        public override bool Check()
         {
-            return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
+            return base.Check() && !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
         }
 
         public override Task<bool> Sure()

From 8ed7a999231bb67c507a43d01b9ffdce9d4d1119 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Feb 2025 11:45:18 +0800
Subject: [PATCH 075/364] fix: `COMMIT & PUSH` should hide when there's no
 remotes available (#956)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs  | 3 +++
 src/ViewModels/WorkingCopy.cs | 7 +++++++
 src/Views/WorkingCopy.axaml   | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index c91f5e73..c7f2e86f 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -937,6 +937,9 @@ namespace SourceGit.ViewModels
                 CurrentBranch = branches.Find(x => x.IsCurrent);
                 LocalBranchTrees = builder.Locals;
                 RemoteBranchTrees = builder.Remotes;
+
+                if (_workingCopy != null)
+                    _workingCopy.HasRemotes = remotes.Count > 0;
             });
         }
 
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 255d6b6b..08f8690a 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -26,6 +26,12 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public bool HasRemotes
+        {
+            get => _hasRemotes;
+            set => SetProperty(ref _hasRemotes, value);
+        }
+
         public bool HasUnsolvedConflicts
         {
             get => _hasUnsolvedConflicts;
@@ -1619,6 +1625,7 @@ namespace SourceGit.ViewModels
         private bool _isUnstaging = false;
         private bool _isCommitting = false;
         private bool _useAmend = false;
+        private bool _hasRemotes = false;
         private List<Models.Change> _cached = [];
         private List<Models.Change> _unstaged = [];
         private List<Models.Change> _staged = [];
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index e0d0503d..c22fb32d 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -374,6 +374,7 @@
                 ToolTip.VerticalOffset="0">
           <Button.IsVisible>
             <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="HasRemotes"/>
               <Binding Path="UseAmend" Converter="{x:Static BoolConverters.Not}"/>
               <Binding Path="InProgressContext" Converter="{x:Static ObjectConverters.IsNull}"/>
             </MultiBinding>

From 9a36e652e685d8025d332702fd72a7b0f51e9d6f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Feb 2025 11:56:30 +0800
Subject: [PATCH 076/364] fix: add a new interface `CanStartDirectly` and move
 this check to `StartPopup` (#956)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/LauncherPage.cs | 4 +++-
 src/ViewModels/Popup.cs        | 7 ++++++-
 src/ViewModels/Push.cs         | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index 498c1865..b8138aca 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -59,7 +59,9 @@ namespace SourceGit.ViewModels
         public void StartPopup(Popup popup)
         {
             Popup = popup;
-            ProcessPopup();
+
+            if (popup.CanStartDirectly())
+                ProcessPopup();
         }
 
         public async void ProcessPopup()
diff --git a/src/ViewModels/Popup.cs b/src/ViewModels/Popup.cs
index 7475d829..98a12ca2 100644
--- a/src/ViewModels/Popup.cs
+++ b/src/ViewModels/Popup.cs
@@ -29,7 +29,7 @@ namespace SourceGit.ViewModels
         }
 
         [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")]
-        public virtual bool Check()
+        public bool Check()
         {
             if (HasErrors)
                 return false;
@@ -37,6 +37,11 @@ namespace SourceGit.ViewModels
             return !HasErrors;
         }
 
+        public virtual bool CanStartDirectly()
+        {
+            return true;
+        }
+
         public virtual Task<bool> Sure()
         {
             return null;
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index 697a56fc..1f18b38e 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -152,9 +152,9 @@ namespace SourceGit.ViewModels
             View = new Views.Push() { DataContext = this };
         }
 
-        public override bool Check()
+        public override bool CanStartDirectly()
         {
-            return base.Check() && !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
+            return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
         }
 
         public override Task<bool> Sure()

From 12597fd3e3f973449c2e75f4ddd287829ae2e606 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Feb 2025 12:06:29 +0800
Subject: [PATCH 077/364] code_style: run `dotnet format`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/OS.cs                 |  9 ++++++---
 src/ViewModels/FileHistories.cs  |  2 +-
 src/ViewModels/Histories.cs      | 12 ++++++------
 src/ViewModels/Repository.cs     | 10 +++++-----
 src/Views/FileHistories.axaml.cs |  3 +--
 src/Views/Launcher.axaml.cs      |  3 ++-
 src/Views/TextDiffView.axaml.cs  |  2 +-
 7 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/Native/OS.cs b/src/Native/OS.cs
index 177bbf9f..3a688654 100644
--- a/src/Native/OS.cs
+++ b/src/Native/OS.cs
@@ -25,7 +25,8 @@ namespace SourceGit.Native
             void OpenWithDefaultEditor(string file);
         }
 
-        public static string DataDir {
+        public static string DataDir
+        {
             get;
             private set;
         } = string.Empty;
@@ -61,12 +62,14 @@ namespace SourceGit.Native
             private set;
         } = new Version(0, 0, 0);
 
-        public static string ShellOrTerminal {
+        public static string ShellOrTerminal
+        {
             get;
             set;
         } = string.Empty;
 
-        public static List<Models.ExternalTool> ExternalTools {
+        public static List<Models.ExternalTool> ExternalTools
+        {
             get;
             set;
         } = [];
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index ab12e596..7e248274 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -295,7 +295,7 @@ namespace SourceGit.ViewModels
         public void NavigateToCommit(Models.Commit commit)
         {
             _repo.NavigateToCommit(commit.SHA);
-        }        
+        }
 
         private readonly Repository _repo = null;
         private readonly string _file = null;
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index b5754d33..03f216de 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -285,7 +285,7 @@ namespace SourceGit.ViewModels
 
                     if (canCherryPick || canMerge)
                         multipleMenu.Items.Add(new MenuItem() { Header = "-" });
-                }                
+                }
 
                 var saveToPatchMultiple = new MenuItem();
                 saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff");
@@ -589,7 +589,7 @@ namespace SourceGit.ViewModels
                     menu.Items.Add(interactiveRebase);
                     menu.Items.Add(new MenuItem() { Header = "-" });
                 }
-            }            
+            }
 
             if (current.Head != commit.SHA)
             {
@@ -937,7 +937,7 @@ namespace SourceGit.ViewModels
                     submenu.Items.Add(finish);
                     submenu.Items.Add(new MenuItem() { Header = "-" });
                 }
-            }            
+            }
 
             var copy = new MenuItem();
             copy.Header = App.Text("BranchCM.CopyName");
@@ -983,7 +983,7 @@ namespace SourceGit.ViewModels
                     e.Handled = true;
                 };
                 submenu.Items.Add(merge);
-            }            
+            }
 
             var rename = new MenuItem();
             rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
@@ -1025,7 +1025,7 @@ namespace SourceGit.ViewModels
                     submenu.Items.Add(finish);
                     submenu.Items.Add(new MenuItem() { Header = "-" });
                 }
-            }            
+            }
 
             var copy = new MenuItem();
             copy.Header = App.Text("BranchCM.CopyName");
@@ -1131,7 +1131,7 @@ namespace SourceGit.ViewModels
                     e.Handled = true;
                 };
                 submenu.Items.Add(merge);
-            }            
+            }
 
             var delete = new MenuItem();
             delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index c7f2e86f..45a05b34 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1500,7 +1500,7 @@ namespace SourceGit.ViewModels
                         menu.Items.Add(fastForward);
                         menu.Items.Add(pull);
                     }
-                }                
+                }
 
                 menu.Items.Add(push);
             }
@@ -1518,7 +1518,7 @@ namespace SourceGit.ViewModels
                     };
                     menu.Items.Add(checkout);
                     menu.Items.Add(new MenuItem() { Header = "-" });
-                }                
+                }
 
                 var worktree = _worktrees.Find(x => x.Branch == branch.FullName);
                 var upstream = _branches.Find(x => x.FullName == branch.Upstream);
@@ -1577,7 +1577,7 @@ namespace SourceGit.ViewModels
 
                     menu.Items.Add(merge);
                     menu.Items.Add(rebase);
-                }                
+                }
 
                 var compareWithHead = new MenuItem();
                 compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
@@ -1629,7 +1629,7 @@ namespace SourceGit.ViewModels
                     menu.Items.Add(new MenuItem() { Header = "-" });
                     menu.Items.Add(finish);
                 }
-            }            
+            }
 
             var rename = new MenuItem();
             rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
@@ -1702,7 +1702,7 @@ namespace SourceGit.ViewModels
                     };
                     menu.Items.Add(tracking);
                 }
-            }            
+            }
 
             var archive = new MenuItem();
             archive.Icon = App.CreateMenuIcon("Icons.Archive");
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index 6f86c70c..be5affc3 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -56,7 +55,7 @@ namespace SourceGit.Views
 
                 NotifyDonePanel.IsVisible = true;
                 e.Handled = true;
-            }            
+            }
         }
     }
 }
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 832cca80..b5f09d79 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -146,7 +146,8 @@ namespace SourceGit.Views
                     return;
                 }
 
-                if (e.Key == Key.Q) {
+                if (e.Key == Key.Q)
+                {
                     App.Quit(0);
                     e.Handled = true;
                     return;
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index bd01a0a4..15a2a212 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1000,7 +1000,7 @@ namespace SourceGit.Views
                     builder.AppendLine(line.Content.Substring(selection.StartPosition.Column - 1));
                     continue;
                 }
-                
+
                 if (i == endIdx && selection.EndPosition.Column < line.Content.Length)
                 {
                     builder.AppendLine(line.Content.Substring(0, selection.EndPosition.Column));

From f8bc0228133ff5268d577e3c86825b0fe916b3d5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Feb 2025 18:08:07 +0800
Subject: [PATCH 078/364] ux: clarify `Delete` operation for tree node in
 welcome page (#957)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml    |  3 +++
 src/Resources/Locales/zh_CN.axaml    |  3 +++
 src/Resources/Locales/zh_TW.axaml    |  3 +++
 src/Views/DeleteRepositoryNode.axaml | 32 ++++++++++++++++++++++++----
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index b2118a3e..d8f80426 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -228,8 +228,11 @@
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">You are trying to delete multiple branches at one time. Be sure to double-check before taking action!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Delete Remote</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remote:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Path:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Target:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">All children will be removed from list.</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Confirm Deleting Group</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">This will only remove it from list, not from disk!</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Confirm Deleting Repository</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Delete Submodule</x:String>
   <x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">Submodule Path:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index e4a38e9c..d3dca525 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -231,8 +231,11 @@
   <x:String x:Key="Text.DeleteMultiBranch.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.TitleForGroup" xml:space="preserve">删除分组确认</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index c2008445..94cc406e 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -231,8 +231,11 @@
   <x:String x:Key="Text.DeleteMultiBranch.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.TitleForGroup" xml:space="preserve">刪除群組確認</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" 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>
diff --git a/src/Views/DeleteRepositoryNode.axaml b/src/Views/DeleteRepositoryNode.axaml
index f4e041e5..30a3728e 100644
--- a/src/Views/DeleteRepositoryNode.axaml
+++ b/src/Views/DeleteRepositoryNode.axaml
@@ -17,12 +17,12 @@
                Text="{DynamicResource Text.DeleteRepositoryNode.TitleForRepository}"
                IsVisible="{Binding Node.IsRepository}"/>
 
-    <Grid Margin="0,16,8,0" Height="28" ColumnDefinitions="120,*">
-      <TextBlock Grid.Column="0"
+    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto,32" ColumnDefinitions="120,*">
+      <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.DeleteRepositoryNode.Target}"/>
-      <StackPanel Grid.Column="1" Orientation="Horizontal">
+      <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
         <Path Width="12" Height="12" Margin="0,0,8,0"
               Fill="{Binding Node.Bookmark, Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
               HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -35,8 +35,32 @@
               IsVisible="{Binding !Node.IsRepository}"/>
 
         <TextBlock VerticalAlignment="Center" Text="{Binding Node.Name}"/>
-        <TextBlock Margin="8,0" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Node.Id}" IsVisible="{Binding Node.IsRepository}"/>
       </StackPanel>
+      
+      <TextBlock Grid.Row="1" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.DeleteRepositoryNode.Path}"
+                 IsVisible="{Binding Node.IsRepository}"/>
+      <StackPanel Grid.Row="1" Grid.Column="1" Height="32" Orientation="Horizontal" IsVisible="{Binding Node.IsRepository}">
+        <Path Width="12" Height="12"
+              Margin="0,0,8,0"
+              Fill="{DynamicResource Brush.FG1}"
+              HorizontalAlignment="Left" VerticalAlignment="Center"
+              Data="{StaticResource Icons.Folder}"/>
+        <TextBlock Text="{Binding Node.Id}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+      </StackPanel>
+
+      <Grid Grid.Row="2" Grid.Column="1">
+        <TextBlock Text="{DynamicResource Text.DeleteRepositoryNode.TipForRepository}"
+                   TextWrapping="Wrap"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   IsVisible="{Binding Node.IsRepository}"/>
+        <TextBlock Text="{DynamicResource Text.DeleteRepositoryNode.TipForGroup}"
+                   TextWrapping="Wrap"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   IsVisible="{Binding !Node.IsRepository}"/>
+      </Grid>
     </Grid>
   </StackPanel>
 </UserControl>

From cf90e51887df02e7fd08455e2a760f7856eed92f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:08:27 +0000
Subject: [PATCH 079/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 30 ++++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e088d538..7e9dd698 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.79%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-93.54%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.06%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-93.27%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.79%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.39%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.39%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-93.16%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.66%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.90%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.39%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index c1e57a1a..4d82da36 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 98.79%
+### de_DE.axaml: 98.39%
 
 
 <details>
@@ -10,13 +10,16 @@
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.DeleteRepositoryNode.Path
+- Text.DeleteRepositoryNode.TipForGroup
+- Text.DeleteRepositoryNode.TipForRepository
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### es_ES.axaml: 98.79%
+### es_ES.axaml: 98.39%
 
 
 <details>
@@ -28,13 +31,16 @@
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.DeleteRepositoryNode.Path
+- Text.DeleteRepositoryNode.TipForGroup
+- Text.DeleteRepositoryNode.TipForRepository
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### fr_FR.axaml: 93.54%
+### fr_FR.axaml: 93.16%
 
 
 <details>
@@ -46,6 +52,9 @@
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.DeleteRepositoryNode.Path
+- Text.DeleteRepositoryNode.TipForGroup
+- Text.DeleteRepositoryNode.TipForRepository
 - Text.InProgress.CherryPick.Head
 - Text.InProgress.Merge.Operating
 - Text.InProgress.Rebase.StoppedAt
@@ -91,7 +100,7 @@
 
 </details>
 
-### it_IT.axaml: 99.06%
+### it_IT.axaml: 98.66%
 
 
 <details>
@@ -102,12 +111,15 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
+- Text.DeleteRepositoryNode.Path
+- Text.DeleteRepositoryNode.TipForGroup
+- Text.DeleteRepositoryNode.TipForRepository
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 
 </details>
 
-### pt_BR.axaml: 93.27%
+### pt_BR.axaml: 92.90%
 
 
 <details>
@@ -126,6 +138,9 @@
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
 - Text.CreateBranch.Name.WarnSpace
+- Text.DeleteRepositoryNode.Path
+- Text.DeleteRepositoryNode.TipForGroup
+- Text.DeleteRepositoryNode.TipForRepository
 - Text.Diff.UseBlockNavigation
 - Text.Fetch.Force
 - Text.FileCM.ResolveUsing
@@ -166,7 +181,7 @@
 
 </details>
 
-### ru_RU.axaml: 98.79%
+### ru_RU.axaml: 98.39%
 
 
 <details>
@@ -178,6 +193,9 @@
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
 - Text.CreateBranch.Name.WarnSpace
+- Text.DeleteRepositoryNode.Path
+- Text.DeleteRepositoryNode.TipForGroup
+- Text.DeleteRepositoryNode.TipForRepository
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff

From a915708db3a8092b9aafb0f34f00706693965d79 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 24 Dec 2024 15:51:27 +0800
Subject: [PATCH 080/364] refactor: rewrite OpenAI integration

- use `OpenAI` and `Azure.AI.OpenAI`
- use `developer` role instead of `system` for OpenAI's `o1` series models
- use streaming response
- re-design `AIAssistant`

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md                             |   4 +-
 src/App.JsonCodeGen.cs                |   2 -
 src/Commands/GenerateCommitMessage.cs |  89 +++++++--------
 src/Models/OpenAI.cs                  | 130 +++++----------------
 src/Resources/Locales/en_US.axaml     |   2 +
 src/Resources/Locales/zh_CN.axaml     |   2 +
 src/Resources/Locales/zh_TW.axaml     |   2 +
 src/SourceGit.csproj                  |   2 +
 src/ViewModels/Repository.cs          |  19 ++++
 src/ViewModels/WorkingCopy.cs         |  31 +----
 src/Views/AIAssistant.axaml           |  41 ++++---
 src/Views/AIAssistant.axaml.cs        | 158 ++++++++++++++++++++++----
 12 files changed, 270 insertions(+), 212 deletions(-)

diff --git a/README.md b/README.md
index 7e9dd698..0589b9dc 100644
--- a/README.md
+++ b/README.md
@@ -136,11 +136,11 @@ This software supports using OpenAI or other AI service that has an OpenAI comap
 
 For `OpenAI`:
 
-* `Server` must be `https://api.openai.com/v1/chat/completions`
+* `Server` must be `https://api.openai.com/v1`
 
 For other AI service:
 
-* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1/chat/completions`. For example, when using `Ollama`, it should be `http://localhost:11434/v1/chat/completions` instead of `http://localhost:11434/api/generate`
+* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1`. For example, when using `Ollama`, it should be `http://localhost:11434/v1` instead of `http://localhost:11434/api/generate`
 * The `API Key` is optional that depends on the service
 
 ## External Tools
diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs
index f37e269c..9cad0792 100644
--- a/src/App.JsonCodeGen.cs
+++ b/src/App.JsonCodeGen.cs
@@ -46,8 +46,6 @@ namespace SourceGit
     [JsonSerializable(typeof(Models.ExternalToolPaths))]
     [JsonSerializable(typeof(Models.InteractiveRebaseJobCollection))]
     [JsonSerializable(typeof(Models.JetBrainsState))]
-    [JsonSerializable(typeof(Models.OpenAIChatRequest))]
-    [JsonSerializable(typeof(Models.OpenAIChatResponse))]
     [JsonSerializable(typeof(Models.ThemeOverrides))]
     [JsonSerializable(typeof(Models.Version))]
     [JsonSerializable(typeof(Models.RepositorySettings))]
diff --git a/src/Commands/GenerateCommitMessage.cs b/src/Commands/GenerateCommitMessage.cs
index e4f25f38..f3596588 100644
--- a/src/Commands/GenerateCommitMessage.cs
+++ b/src/Commands/GenerateCommitMessage.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 
+using Avalonia.Threading;
+
 namespace SourceGit.Commands
 {
     /// <summary>
@@ -20,82 +22,75 @@ namespace SourceGit.Commands
             }
         }
 
-        public GenerateCommitMessage(Models.OpenAIService service, string repo, List<Models.Change> changes, CancellationToken cancelToken, Action<string> onProgress)
+        public GenerateCommitMessage(Models.OpenAIService service, string repo, List<Models.Change> changes, CancellationToken cancelToken, Action<string> onResponse)
         {
             _service = service;
             _repo = repo;
             _changes = changes;
             _cancelToken = cancelToken;
-            _onProgress = onProgress;
+            _onResponse = onResponse;
         }
 
-        public string Result()
+        public void Exec()
         {
             try
             {
-                var summarybuilder = new StringBuilder();
-                var bodyBuilder = new StringBuilder();
+                var responseBuilder = new StringBuilder();
+                var summaryBuilder = new StringBuilder();
                 foreach (var change in _changes)
                 {
                     if (_cancelToken.IsCancellationRequested)
-                        return "";
+                        return;
 
-                    _onProgress?.Invoke($"Analyzing {change.Path}...");
+                    responseBuilder.Append("- ");
+                    summaryBuilder.Append("- ");
 
-                    var summary = GenerateChangeSummary(change);
-                    summarybuilder.Append("- ");
-                    summarybuilder.Append(summary);
-                    summarybuilder.Append("(file: ");
-                    summarybuilder.Append(change.Path);
-                    summarybuilder.Append(")");
-                    summarybuilder.AppendLine();
+                    var rs = new GetDiffContent(_repo, new Models.DiffOption(change, false)).ReadToEnd();
+                    if (rs.IsSuccess)
+                    {
+                        _service.Chat(
+                            _service.AnalyzeDiffPrompt, 
+                            $"Here is the `git diff` output: {rs.StdOut}",
+                            _cancelToken,
+                            update =>
+                            {
+                                responseBuilder.Append(update);
+                                summaryBuilder.Append(update);
+                                _onResponse?.Invoke("Waiting for pre-file analyzing to complated...\n\n" + responseBuilder.ToString());
+                            });
+                    }
 
-                    bodyBuilder.Append("- ");
-                    bodyBuilder.Append(summary);
-                    bodyBuilder.AppendLine();
+                    responseBuilder.Append("\n");
+                    summaryBuilder.Append("(file: ");
+                    summaryBuilder.Append(change.Path);
+                    summaryBuilder.Append(")\n");
                 }
 
                 if (_cancelToken.IsCancellationRequested)
-                    return "";
+                    return;
 
-                _onProgress?.Invoke($"Generating commit message...");
-
-                var body = bodyBuilder.ToString();
-                var subject = GenerateSubject(summarybuilder.ToString());
-                return string.Format("{0}\n\n{1}", subject, body);
+                var responseBody = responseBuilder.ToString();
+                var subjectBuilder = new StringBuilder();
+                _service.Chat(
+                    _service.GenerateSubjectPrompt, 
+                    $"Here are the summaries changes:\n{summaryBuilder}", 
+                    _cancelToken,
+                    update =>
+                    {
+                        subjectBuilder.Append(update);
+                        _onResponse?.Invoke($"{subjectBuilder}\n\n{responseBody}");
+                    });
             }
             catch (Exception e)
             {
-                App.RaiseException(_repo, $"Failed to generate commit message: {e}");
-                return "";
+                Dispatcher.UIThread.Post(() => App.RaiseException(_repo, $"Failed to generate commit message: {e}"));
             }
         }
 
-        private string GenerateChangeSummary(Models.Change change)
-        {
-            var rs = new GetDiffContent(_repo, new Models.DiffOption(change, false)).ReadToEnd();
-            var diff = rs.IsSuccess ? rs.StdOut : "unknown change";
-
-            var rsp = _service.Chat(_service.AnalyzeDiffPrompt, $"Here is the `git diff` output: {diff}", _cancelToken);
-            if (rsp != null && rsp.Choices.Count > 0)
-                return rsp.Choices[0].Message.Content;
-
-            return string.Empty;
-        }
-
-        private string GenerateSubject(string summary)
-        {
-            var rsp = _service.Chat(_service.GenerateSubjectPrompt, $"Here are the summaries changes:\n{summary}", _cancelToken);
-            if (rsp != null && rsp.Choices.Count > 0)
-                return rsp.Choices[0].Message.Content;
-
-            return string.Empty;
-        }
-
         private Models.OpenAIService _service;
         private string _repo;
         private List<Models.Change> _changes;
         private CancellationToken _cancelToken;
-        private Action<string> _onProgress;
+        private Action<string> _onResponse;
     }
 }
diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index df67ff66..51d953dd 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -1,81 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Serialization;
+using System.ClientModel;
 using System.Threading;
-
+using Azure.AI.OpenAI;
 using CommunityToolkit.Mvvm.ComponentModel;
+using OpenAI;
+using OpenAI.Chat;
 
 namespace SourceGit.Models
 {
-    public class OpenAIChatMessage
-    {
-        [JsonPropertyName("role")]
-        public string Role
-        {
-            get;
-            set;
-        }
-
-        [JsonPropertyName("content")]
-        public string Content
-        {
-            get;
-            set;
-        }
-    }
-
-    public class OpenAIChatChoice
-    {
-        [JsonPropertyName("index")]
-        public int Index
-        {
-            get;
-            set;
-        }
-
-        [JsonPropertyName("message")]
-        public OpenAIChatMessage Message
-        {
-            get;
-            set;
-        }
-    }
-
-    public class OpenAIChatResponse
-    {
-        [JsonPropertyName("choices")]
-        public List<OpenAIChatChoice> Choices
-        {
-            get;
-            set;
-        } = [];
-    }
-
-    public class OpenAIChatRequest
-    {
-        [JsonPropertyName("model")]
-        public string Model
-        {
-            get;
-            set;
-        }
-
-        [JsonPropertyName("messages")]
-        public List<OpenAIChatMessage> Messages
-        {
-            get;
-            set;
-        } = [];
-
-        public void AddMessage(string role, string content)
-        {
-            Messages.Add(new OpenAIChatMessage { Role = role, Content = content });
-        }
-    }
-
     public class OpenAIService : ObservableObject
     {
         public string Name
@@ -147,48 +79,48 @@ namespace SourceGit.Models
                 """;
         }
 
-        public OpenAIChatResponse Chat(string prompt, string question, CancellationToken cancellation)
+        public void Chat(string prompt, string question, CancellationToken cancellation, Action<string> onUpdate)
         {
-            var chat = new OpenAIChatRequest() { Model = Model };
-            chat.AddMessage("user", prompt);
-            chat.AddMessage("user", question);
-
-            var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(60) };
-            if (!string.IsNullOrEmpty(ApiKey))
+            Uri server = new(Server);
+            ApiKeyCredential key = new(ApiKey);
+            ChatClient client = null;
+            if (Server.Contains("openai.azure.com/", StringComparison.Ordinal))
             {
-                if (Server.Contains("openai.azure.com/", StringComparison.Ordinal))
-                    client.DefaultRequestHeaders.Add("api-key", ApiKey);
-                else
-                    client.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
+                var azure = new AzureOpenAIClient(server, key);
+                client = azure.GetChatClient(Model);
+            }
+            else
+            {
+                var openai = new OpenAIClient(key, new() { Endpoint = server });
+                client = openai.GetChatClient(Model);
             }
 
-            var req = new StringContent(JsonSerializer.Serialize(chat, JsonCodeGen.Default.OpenAIChatRequest), Encoding.UTF8, "application/json");
             try
             {
-                var task = client.PostAsync(Server, req, cancellation);
-                task.Wait(cancellation);
+                var updates = client.CompleteChatStreaming([
+                    ShouldUseDeveloperPrompt() ? new DeveloperChatMessage(prompt) : new SystemChatMessage(prompt),
+                    new UserChatMessage(question),
+                ], null, cancellation);
 
-                var rsp = task.Result;
-                var reader = rsp.Content.ReadAsStringAsync(cancellation);
-                reader.Wait(cancellation);
-
-                var body = reader.Result;
-                if (!rsp.IsSuccessStatusCode)
+                foreach (var update in updates)
                 {
-                    throw new Exception($"AI service returns error code {rsp.StatusCode}. Body: {body ?? string.Empty}");
+                    if (update.ContentUpdate.Count > 0)
+                        onUpdate.Invoke(update.ContentUpdate[0].Text);
                 }
-
-                return JsonSerializer.Deserialize(reader.Result, JsonCodeGen.Default.OpenAIChatResponse);
             }
             catch
             {
-                if (cancellation.IsCancellationRequested)
-                    return null;
-
-                throw;
+                if (!cancellation.IsCancellationRequested)
+                    throw;
             }
         }
 
+        private bool ShouldUseDeveloperPrompt()
+        {
+            return _model.Equals("o1", StringComparison.Ordinal) ||
+                _model.Equals("o1-mini", StringComparison.Ordinal);
+        }
+
         private string _name;
         private string _server;
         private string _apiKey;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d8f80426..018b54d7 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -19,7 +19,9 @@
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Track Branch:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Tracking remote branch</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">AI Assistant</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GENERATE</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Use AI to generate commit message</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLY AS COMMIT MESSAGE</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Error</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Raise errors and refuses to apply the patch</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index d3dca525..66d1f37e 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -22,7 +22,9 @@
   <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.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.Apply" xml:space="preserve">应用补丁(apply)</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">错误</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">输出错误，并终止应用补丁</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 94cc406e..f8255947 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -22,7 +22,9 @@
   <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.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.Apply" xml:space="preserve">套用修補檔 (apply patch)</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">錯誤</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">輸出錯誤，並中止套用修補檔</x:String>
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index dfd00a98..c3e813b0 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -48,8 +48,10 @@
     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.1" />
+    <PackageReference Include="OpenAI" Version="2.2.0-beta.1" />
     <PackageReference Include="TextMateSharp" Version="1.0.65" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.65" />
   </ItemGroup>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 45a05b34..44de8c35 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1199,6 +1199,25 @@ namespace SourceGit.ViewModels
             App.GetLauncer()?.OpenRepositoryInTab(node, null);
         }
 
+        public AvaloniaList<Models.OpenAIService> GetPreferedOpenAIServices()
+        {
+            var services = Preferences.Instance.OpenAIServices;
+            if (services == null || services.Count == 0)
+                return [];
+
+            if (services.Count == 1)
+                return services;
+
+            var prefered = _settings.PreferedOpenAIService;
+            foreach (var service in services)
+            {
+                if (service.Name.Equals(prefered, StringComparison.Ordinal))
+                    return [service];
+            }
+
+            return services;
+        }
+
         public ContextMenu CreateContextMenuForGitFlow()
         {
             var menu = new ContextMenu();
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 08f8690a..12bf1068 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -1068,7 +1068,7 @@ namespace SourceGit.ViewModels
             var menu = new ContextMenu();
 
             var ai = null as MenuItem;
-            var services = GetPreferedOpenAIServices();
+            var services = _repo.GetPreferedOpenAIServices();
             if (services.Count > 0)
             {
                 ai = new MenuItem();
@@ -1079,7 +1079,7 @@ namespace SourceGit.ViewModels
                 {
                     ai.Click += (_, e) =>
                     {
-                        var dialog = new Views.AIAssistant(services[0], _repo.FullPath, _selectedStaged, generated => CommitMessage = generated);
+                        var dialog = new Views.AIAssistant(services[0], _repo.FullPath, this, _selectedStaged);
                         App.OpenDialog(dialog);
                         e.Handled = true;
                     };
@@ -1094,7 +1094,7 @@ namespace SourceGit.ViewModels
                         item.Header = service.Name;
                         item.Click += (_, e) =>
                         {
-                            var dialog = new Views.AIAssistant(dup, _repo.FullPath, _selectedStaged, generated => CommitMessage = generated);
+                            var dialog = new Views.AIAssistant(dup, _repo.FullPath, this, _selectedStaged);
                             App.OpenDialog(dialog);
                             e.Handled = true;
                         };
@@ -1459,7 +1459,7 @@ namespace SourceGit.ViewModels
                 return null;
             }
 
-            var services = GetPreferedOpenAIServices();
+            var services = _repo.GetPreferedOpenAIServices();
             if (services.Count == 0)
             {
                 App.RaiseException(_repo.FullPath, "Bad configuration for OpenAI");
@@ -1468,7 +1468,7 @@ namespace SourceGit.ViewModels
 
             if (services.Count == 1)
             {
-                var dialog = new Views.AIAssistant(services[0], _repo.FullPath, _staged, generated => CommitMessage = generated);
+                var dialog = new Views.AIAssistant(services[0], _repo.FullPath, this, _staged);
                 App.OpenDialog(dialog);
                 return null;
             }
@@ -1484,7 +1484,7 @@ namespace SourceGit.ViewModels
                     item.Header = service.Name;
                     item.Click += (_, e) =>
                     {
-                        var dialog = new Views.AIAssistant(dup, _repo.FullPath, _staged, generated => CommitMessage = generated);
+                        var dialog = new Views.AIAssistant(dup, _repo.FullPath, this, _staged);
                         App.OpenDialog(dialog);
                         e.Handled = true;
                     };
@@ -1600,25 +1600,6 @@ namespace SourceGit.ViewModels
             return false;
         }
 
-        private IList<Models.OpenAIService> GetPreferedOpenAIServices()
-        {
-            var services = Preferences.Instance.OpenAIServices;
-            if (services == null || services.Count == 0)
-                return [];
-
-            if (services.Count == 1)
-                return services;
-
-            var prefered = _repo.Settings.PreferedOpenAIService;
-            foreach (var service in services)
-            {
-                if (service.Name.Equals(prefered, StringComparison.Ordinal))
-                    return [service];
-            }
-
-            return services;
-        }
-
         private Repository _repo = null;
         private bool _isLoadingData = false;
         private bool _isStaging = false;
diff --git a/src/Views/AIAssistant.axaml b/src/Views/AIAssistant.axaml
index a273b240..e07c3a3e 100644
--- a/src/Views/AIAssistant.axaml
+++ b/src/Views/AIAssistant.axaml
@@ -10,7 +10,7 @@
                     x:Name="ThisControl"
                     Icon="/App.ico"
                     Title="{DynamicResource Text.AIAssistant}"
-                    Width="400" SizeToContent="Height"
+                    Width="520" SizeToContent="Height"
                     CanResize="False"
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,Auto">
@@ -36,18 +36,33 @@
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
 
-    <!-- Animated Icon -->
-    <v:LoadingIcon Grid.Row="1"
-                   Width="24" Height="24"
-                   Margin="0,16,0,0"/>
+    <!-- AI response -->
+    <v:AIResponseView Grid.Row="1"
+                      x:Name="TxtResponse"
+                      Margin="8"
+                      Height="320"
+                      BorderThickness="1"
+                      BorderBrush="{DynamicResource Brush.Border2}"
+                      Background="{DynamicResource Brush.Contents}"/>
 
-    <!-- Message -->
-    <TextBlock Grid.Row="2"
-               x:Name="ProgressMessage"
-               Margin="16"
-               FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-               HorizontalAlignment="Center"
-               Text="Generating commit message... Please wait!"
-               TextTrimming="CharacterEllipsis"/>
+    <!-- Options -->
+    <Border Grid.Row="2" Margin="0,0,0,8">
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+        <v:LoadingIcon x:Name="IconInProgress" Width="14" Height="14" Margin="0,0,8,0"/>
+        <Button Classes="flat"
+                x:Name="BtnGenerateCommitMessage"
+                Height="28"
+                Margin="0,0,8,0"
+                Padding="12,0"
+                Content="{DynamicResource Text.AIAssistant.Use}"
+                Click="OnGenerateCommitMessage"/>
+        <Button Classes="flat"
+                x:Name="BtnRegenerate"
+                Height="28"
+                Padding="12,0"
+                Content="{DynamicResource Text.AIAssistant.Regen}"
+                Click="OnRegen"/>
+      </StackPanel>
+    </Border>
   </Grid>
 </v:ChromelessWindow>
diff --git a/src/Views/AIAssistant.axaml.cs b/src/Views/AIAssistant.axaml.cs
index d81335eb..c86707a0 100644
--- a/src/Views/AIAssistant.axaml.cs
+++ b/src/Views/AIAssistant.axaml.cs
@@ -3,26 +3,112 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.Threading;
 
+using AvaloniaEdit.Document;
+using AvaloniaEdit.Editing;
+using AvaloniaEdit.TextMate;
+using AvaloniaEdit;
+
 namespace SourceGit.Views
 {
+    public class AIResponseView : TextEditor
+    {
+        protected override Type StyleKeyOverride => typeof(TextEditor);
+
+        public AIResponseView() : base(new TextArea(), new TextDocument())
+        {
+            IsReadOnly = true;
+            ShowLineNumbers = false;
+            WordWrap = true;
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
+            VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+
+            TextArea.TextView.Margin = new Thickness(4, 0);
+            TextArea.TextView.Options.EnableHyperlinks = false;
+            TextArea.TextView.Options.EnableEmailHyperlinks = false;
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            TextArea.TextView.ContextRequested += OnTextViewContextRequested;
+
+            if (_textMate == null)
+            {
+                _textMate = Models.TextMateHelper.CreateForEditor(this);
+                Models.TextMateHelper.SetGrammarByFileName(_textMate, "README.md");
+            }
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            base.OnUnloaded(e);
+
+            TextArea.TextView.ContextRequested -= OnTextViewContextRequested;
+
+            if (_textMate != null)
+            {
+                _textMate.Dispose();
+                _textMate = null;
+            }
+
+            GC.Collect();
+        }
+
+        private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
+        {
+            var selected = SelectedText;
+            if (string.IsNullOrEmpty(selected))
+                return;
+
+            var copy = new MenuItem() { Header = App.Text("Copy") };
+            copy.Click += (_, ev) =>
+            {
+                App.CopyText(selected);
+                ev.Handled = true;
+            };
+
+            if (this.FindResource("Icons.Copy") is Geometry geo)
+            {
+                copy.Icon = new Avalonia.Controls.Shapes.Path()
+                {
+                    Width = 10,
+                    Height = 10,
+                    Stretch = Stretch.Uniform,
+                    Data = geo,
+                };
+            }
+
+            var menu = new ContextMenu();
+            menu.Items.Add(copy);
+            menu.Open(TextArea.TextView);
+
+            e.Handled = true;
+        }
+
+        private TextMate.Installation _textMate = null;
+    }
+
     public partial class AIAssistant : ChromelessWindow
     {
         public AIAssistant()
         {
-            _cancel = new CancellationTokenSource();
             InitializeComponent();
         }
 
-        public AIAssistant(Models.OpenAIService service, string repo, List<Models.Change> changes, Action<string> onDone)
+        public AIAssistant(Models.OpenAIService service, string repo, ViewModels.WorkingCopy wc, List<Models.Change> changes)
         {
             _service = service;
             _repo = repo;
+            _wc = wc;
             _changes = changes;
-            _onDone = onDone;
-            _cancel = new CancellationTokenSource();
 
             InitializeComponent();
         }
@@ -30,39 +116,63 @@ namespace SourceGit.Views
         protected override void OnOpened(EventArgs e)
         {
             base.OnOpened(e);
-
-            if (string.IsNullOrEmpty(_repo))
-                return;
-
-            Task.Run(() =>
-            {
-                var message = new Commands.GenerateCommitMessage(_service, _repo, _changes, _cancel.Token, SetDescription).Result();
-                if (_cancel.IsCancellationRequested)
-                    return;
-
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    _onDone?.Invoke(message);
-                    Close();
-                });
-            }, _cancel.Token);
+            Generate();
         }
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
             base.OnClosing(e);
-            _cancel.Cancel();
+            _cancel?.Cancel();
         }
 
-        private void SetDescription(string message)
+        private void OnGenerateCommitMessage(object sender, RoutedEventArgs e)
         {
-            Dispatcher.UIThread.Invoke(() => ProgressMessage.Text = message);
+            if (_wc != null)
+                _wc.CommitMessage = TxtResponse.Text;
+
+            Close();
+        }
+
+        private void OnRegen(object sender, RoutedEventArgs e)
+        {
+            TxtResponse.Text = string.Empty;
+            Generate();
+            e.Handled = true;
+        }
+
+        private void Generate()
+        {
+            if (_repo == null)
+                return;
+
+            IconInProgress.IsVisible = true;
+            BtnGenerateCommitMessage.IsEnabled = false;
+            BtnRegenerate.IsEnabled = false;
+
+            _cancel = new CancellationTokenSource();
+            Task.Run(() =>
+            {
+                new Commands.GenerateCommitMessage(_service, _repo, _changes, _cancel.Token, message =>
+                {
+                    Dispatcher.UIThread.Invoke(() => TxtResponse.Text = message);
+                }).Exec();
+
+                if (!_cancel.IsCancellationRequested)
+                {
+                    Dispatcher.UIThread.Invoke(() =>
+                    {
+                        IconInProgress.IsVisible = false;
+                        BtnGenerateCommitMessage.IsEnabled = true;
+                        BtnRegenerate.IsEnabled = true;
+                    });
+                }
+            }, _cancel.Token);
         }
 
         private Models.OpenAIService _service;
         private string _repo;
+        private ViewModels.WorkingCopy _wc;
         private List<Models.Change> _changes;
-        private Action<string> _onDone;
         private CancellationTokenSource _cancel;
     }
 }

From 6a80e54b473488987910ae001be5da3d5857dc52 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 02:17:16 +0000
Subject: [PATCH 081/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0589b9dc..67ee5258 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.39%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.39%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-93.16%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.66%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.90%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.39%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.13%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.13%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.91%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.40%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.65%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.13%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 4d82da36..9f7a1c80 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,9 +1,11 @@
-### de_DE.axaml: 98.39%
+### de_DE.axaml: 98.13%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.AIAssistant.Regen
+- Text.AIAssistant.Use
 - Text.ApplyStash
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
@@ -19,12 +21,14 @@
 
 </details>
 
-### es_ES.axaml: 98.39%
+### es_ES.axaml: 98.13%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.AIAssistant.Regen
+- Text.AIAssistant.Use
 - Text.ApplyStash
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
@@ -40,12 +44,14 @@
 
 </details>
 
-### fr_FR.axaml: 93.16%
+### fr_FR.axaml: 92.91%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.AIAssistant.Regen
+- Text.AIAssistant.Use
 - Text.ApplyStash
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
@@ -100,12 +106,14 @@
 
 </details>
 
-### it_IT.axaml: 98.66%
+### it_IT.axaml: 98.40%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.AIAssistant.Regen
+- Text.AIAssistant.Use
 - Text.ApplyStash
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
@@ -119,12 +127,14 @@
 
 </details>
 
-### pt_BR.axaml: 92.90%
+### pt_BR.axaml: 92.65%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.AIAssistant.Regen
+- Text.AIAssistant.Use
 - Text.ApplyStash
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
@@ -181,12 +191,14 @@
 
 </details>
 
-### ru_RU.axaml: 98.39%
+### ru_RU.axaml: 98.13%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.AIAssistant.Regen
+- Text.AIAssistant.Use
 - Text.ApplyStash
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex

From 1f0dd1519273e564434458853fa2c4682307d4e4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 8 Feb 2025 11:57:10 +0800
Subject: [PATCH 082/364] fix: only `o1-mini` does not supports `system` prompt

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/OpenAI.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index 51d953dd..e791efcf 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -98,7 +98,7 @@ namespace SourceGit.Models
             try
             {
                 var updates = client.CompleteChatStreaming([
-                    ShouldUseDeveloperPrompt() ? new DeveloperChatMessage(prompt) : new SystemChatMessage(prompt),
+                    _model.Equals("o1-mini", StringComparison.Ordinal) ? new UserChatMessage(prompt) : new SystemChatMessage(prompt),
                     new UserChatMessage(question),
                 ], null, cancellation);
 
@@ -115,12 +115,6 @@ namespace SourceGit.Models
             }
         }
 
-        private bool ShouldUseDeveloperPrompt()
-        {
-            return _model.Equals("o1", StringComparison.Ordinal) ||
-                _model.Equals("o1-mini", StringComparison.Ordinal);
-        }
-
         private string _name;
         private string _server;
         private string _apiKey;

From 2495911bd865db9e9325a3d4442544183482ff68 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 8 Feb 2025 12:08:06 +0800
Subject: [PATCH 083/364] code_style: run `dotnet format`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/GenerateCommitMessage.cs | 6 +++---
 src/Views/AIAssistant.axaml.cs        | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Commands/GenerateCommitMessage.cs b/src/Commands/GenerateCommitMessage.cs
index f3596588..c207786f 100644
--- a/src/Commands/GenerateCommitMessage.cs
+++ b/src/Commands/GenerateCommitMessage.cs
@@ -49,7 +49,7 @@ namespace SourceGit.Commands
                     if (rs.IsSuccess)
                     {
                         _service.Chat(
-                            _service.AnalyzeDiffPrompt, 
+                            _service.AnalyzeDiffPrompt,
                             $"Here is the `git diff` output: {rs.StdOut}",
                             _cancelToken,
                             update =>
@@ -72,8 +72,8 @@ namespace SourceGit.Commands
                 var responseBody = responseBuilder.ToString();
                 var subjectBuilder = new StringBuilder();
                 _service.Chat(
-                    _service.GenerateSubjectPrompt, 
-                    $"Here are the summaries changes:\n{summaryBuilder}", 
+                    _service.GenerateSubjectPrompt,
+                    $"Here are the summaries changes:\n{summaryBuilder}",
                     _cancelToken,
                     update =>
                     {
diff --git a/src/Views/AIAssistant.axaml.cs b/src/Views/AIAssistant.axaml.cs
index c86707a0..73fea708 100644
--- a/src/Views/AIAssistant.axaml.cs
+++ b/src/Views/AIAssistant.axaml.cs
@@ -2,18 +2,16 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Threading;
-
+using AvaloniaEdit;
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Editing;
 using AvaloniaEdit.TextMate;
-using AvaloniaEdit;
 
 namespace SourceGit.Views
 {

From aa0d066944a48cad3b76880ee96e1b3796bbc4ee Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 8 Feb 2025 14:55:55 +0800
Subject: [PATCH 084/364] enhance: move `Create New Page` button out of tab
 list if scroll arrow is visible (#958)

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

diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 5be41a13..c957d134 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -7,7 +7,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.LauncherTabBar"
              x:DataType="vm:Launcher">
-  <Grid ColumnDefinitions="Auto,*,Auto">
+  <Grid ColumnDefinitions="Auto,*,Auto,Auto">
     <RepeatButton x:Name="LeftScrollIndicator" Grid.Column="0" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsLeft">
       <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleLeft}"/>
     </RepeatButton>
@@ -96,7 +96,8 @@
           </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button Classes="icon_button"
+        <Button x:Name="InnerNewTabBtn"
+                Classes="icon_button"
                 Width="16" Height="16"
                 Margin="8,0"
                 Command="{Binding AddNewTab}">
@@ -115,5 +116,21 @@
     <RepeatButton x:Name="RightScrollIndicator" Grid.Column="2" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsRight">
       <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
     </RepeatButton>
+
+    <Button x:Name="OuterNewTabBtn"
+            Grid.Column="3"
+            Classes="icon_button"
+            Width="16" Height="16"
+            Margin="8,0"
+            Command="{Binding AddNewTab}">
+      <ToolTip.Tip>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+          <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
+          <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+T, macOS=⌘+T}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+        </StackPanel>
+      </ToolTip.Tip>
+
+      <Path Width="12" Height="12" Data="{StaticResource Icons.Plus}"/>
+    </Button>
   </Grid>
 </UserControl>
diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index f8c9107c..129ce892 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -43,6 +43,9 @@ namespace SourceGit.Views
                 if (containerEndX < startX || containerEndX > endX)
                     continue;
 
+                if (OuterNewTabBtn.IsVisible && i == count - 1)
+                    break;
+
                 var separatorX = containerEndX - startX + LauncherTabsScroller.Bounds.X;
                 context.DrawLine(separatorPen, new Point(separatorX, separatorY), new Point(separatorX, separatorY + 20));
             }
@@ -88,7 +91,7 @@ namespace SourceGit.Views
                     x = drawRightX - 6;
                 }
 
-                if (drawRightX < LauncherTabsScroller.Bounds.Right)
+                if (drawRightX <= LauncherTabsScroller.Bounds.Right)
                 {
                     ctx.LineTo(new Point(x, y));
                     x = drawRightX;
@@ -146,11 +149,15 @@ namespace SourceGit.Views
                 LeftScrollIndicator.IsEnabled = LauncherTabsScroller.Offset.X > 0;
                 RightScrollIndicator.IsVisible = true;
                 RightScrollIndicator.IsEnabled = LauncherTabsScroller.Offset.X < LauncherTabsScroller.Extent.Width - LauncherTabsScroller.Viewport.Width;
+                InnerNewTabBtn.IsVisible = false;
+                OuterNewTabBtn.IsVisible = true;
             }
             else
             {
                 LeftScrollIndicator.IsVisible = false;
                 RightScrollIndicator.IsVisible = false;
+                InnerNewTabBtn.IsVisible = true;
+                OuterNewTabBtn.IsVisible = false;
             }
 
             InvalidateVisual();

From 35abeae7587a3a5ed6278ef1846e0c1e21fd6627 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 8 Feb 2025 16:20:45 +0800
Subject: [PATCH 085/364] project: upgrade `Azure.AI.OpenAI` to `2.2.0-beta.1`

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

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index c3e813b0..af8fa5b1 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -48,7 +48,7 @@
     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.1" />
     <PackageReference Include="OpenAI" Version="2.2.0-beta.1" />

From 8cc056d2af52cda0c56776955d759d10a5b6ac14 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 8 Feb 2025 17:16:56 +0800
Subject: [PATCH 086/364] enhance: supports searching/filtering unstaged
 changes (#960)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/WorkingCopy.cs | 208 +++++++++++++++++++++-------------
 src/Views/WorkingCopy.axaml   |  38 ++++++-
 2 files changed, 165 insertions(+), 81 deletions(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 12bf1068..ecb3c0d6 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -99,12 +99,34 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public string UnstagedFilter
+        {
+            get => _unstagedFilter;
+            set
+            {
+                if (SetProperty(ref _unstagedFilter, value))
+                {
+                    if (_isLoadingData)
+                        return;
+
+                    VisibleUnstaged = GetVisibleUnstagedChanges();
+                    SelectedUnstaged = [];
+                }
+            }
+        }
+
         public List<Models.Change> Unstaged
         {
             get => _unstaged;
             private set => SetProperty(ref _unstaged, value);
         }
 
+        public List<Models.Change> VisibleUnstaged
+        {
+            get => _visibleUnstaged;
+            private set => SetProperty(ref _visibleUnstaged, value);
+        }
+
         public List<Models.Change> Staged
         {
             get => _staged;
@@ -191,8 +213,9 @@ namespace SourceGit.ViewModels
             _selectedStaged.Clear();
             OnPropertyChanged(nameof(SelectedStaged));
 
+            _visibleUnstaged.Clear();
             _unstaged.Clear();
-            OnPropertyChanged(nameof(Unstaged));
+            OnPropertyChanged(nameof(VisibleUnstaged));
 
             _staged.Clear();
             OnPropertyChanged(nameof(Staged));
@@ -249,7 +272,6 @@ namespace SourceGit.ViewModels
             }
 
             var unstaged = new List<Models.Change>();
-            var selectedUnstaged = new List<Models.Change>();
             var hasConflict = false;
             foreach (var c in changes)
             {
@@ -257,12 +279,19 @@ namespace SourceGit.ViewModels
                 {
                     unstaged.Add(c);
                     hasConflict |= c.IsConflit;
-
-                    if (lastSelectedUnstaged.Contains(c.Path))
-                        selectedUnstaged.Add(c);
                 }
             }
 
+            _unstaged = unstaged;
+
+            var visibleUnstaged = GetVisibleUnstagedChanges();
+            var selectedUnstaged = new List<Models.Change>();
+            foreach (var c in visibleUnstaged)
+            {
+                if (lastSelectedUnstaged.Contains(c.Path))
+                    selectedUnstaged.Add(c);
+            }
+
             var staged = GetStagedChanges();
             var selectedStaged = new List<Models.Change>();
             foreach (var c in staged)
@@ -275,7 +304,7 @@ namespace SourceGit.ViewModels
             {
                 _isLoadingData = true;
                 HasUnsolvedConflicts = hasConflict;
-                Unstaged = unstaged;
+                VisibleUnstaged = visibleUnstaged;
                 Staged = staged;
                 SelectedUnstaged = selectedUnstaged;
                 SelectedStaged = selectedStaged;
@@ -336,46 +365,7 @@ namespace SourceGit.ViewModels
 
         public void StageAll()
         {
-            StageChanges(_unstaged, null);
-        }
-
-        public async void StageChanges(List<Models.Change> changes, Models.Change next)
-        {
-            if (_unstaged.Count == 0 || changes.Count == 0)
-                return;
-
-            // Use `_selectedUnstaged` instead of `SelectedUnstaged` to avoid UI refresh.
-            _selectedUnstaged = next != null ? [next] : [];
-
-            IsStaging = true;
-            _repo.SetWatcherEnabled(false);
-            if (changes.Count == _unstaged.Count)
-            {
-                await Task.Run(() => new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Exec());
-            }
-            else if (Native.OS.GitVersion >= Models.GitVersions.ADD_WITH_PATHSPECFILE)
-            {
-                var paths = new List<string>();
-                foreach (var c in changes)
-                    paths.Add(c.Path);
-
-                var tmpFile = Path.GetTempFileName();
-                File.WriteAllLines(tmpFile, paths);
-                await Task.Run(() => new Commands.Add(_repo.FullPath, tmpFile).Exec());
-                File.Delete(tmpFile);
-            }
-            else
-            {
-                for (int i = 0; i < changes.Count; i += 10)
-                {
-                    var count = Math.Min(10, changes.Count - i);
-                    var step = changes.GetRange(i, count);
-                    await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec());
-                }
-            }
-            _repo.MarkWorkingCopyDirtyManually();
-            _repo.SetWatcherEnabled(true);
-            IsStaging = false;
+            StageChanges(_visibleUnstaged, null);
         }
 
         public void UnstageSelected(Models.Change next)
@@ -388,44 +378,17 @@ namespace SourceGit.ViewModels
             UnstageChanges(_staged, null);
         }
 
-        public async void UnstageChanges(List<Models.Change> changes, Models.Change next)
-        {
-            if (_staged.Count == 0 || changes.Count == 0)
-                return;
-
-            // Use `_selectedStaged` instead of `SelectedStaged` to avoid UI refresh.
-            _selectedStaged = next != null ? [next] : [];
-
-            IsUnstaging = true;
-            _repo.SetWatcherEnabled(false);
-            if (_useAmend)
-            {
-                await Task.Run(() => new Commands.UnstageChangesForAmend(_repo.FullPath, changes).Exec());
-            }
-            else if (changes.Count == _staged.Count)
-            {
-                await Task.Run(() => new Commands.Reset(_repo.FullPath).Exec());
-            }
-            else
-            {
-                for (int i = 0; i < changes.Count; i += 10)
-                {
-                    var count = Math.Min(10, changes.Count - i);
-                    var step = changes.GetRange(i, count);
-                    await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec());
-                }
-            }
-            _repo.MarkWorkingCopyDirtyManually();
-            _repo.SetWatcherEnabled(true);
-            IsUnstaging = false;
-        }
-
         public void Discard(List<Models.Change> changes)
         {
             if (_repo.CanCreatePopup())
                 _repo.ShowPopup(new Discard(_repo, changes));
         }
 
+        public void ClearUnstagedFilter()
+        {
+            UnstagedFilter = string.Empty;
+        }
+
         public async void UseTheirs(List<Models.Change> changes)
         {
             var files = new List<string>();
@@ -1496,6 +1459,22 @@ namespace SourceGit.ViewModels
             }
         }
 
+        private List<Models.Change> GetVisibleUnstagedChanges()
+        {
+            if (string.IsNullOrEmpty(_unstagedFilter))
+                return _unstaged;
+
+            var visible = new List<Models.Change>();
+            
+            foreach (var c in _unstaged)
+            {
+                if (c.Path.Contains(_unstagedFilter, StringComparison.OrdinalIgnoreCase))
+                    visible.Add(c);
+            }
+
+            return visible;
+        }
+
         private List<Models.Change> GetStagedChanges()
         {
             if (_useAmend)
@@ -1511,6 +1490,77 @@ namespace SourceGit.ViewModels
             return rs;
         }
 
+        private async void StageChanges(List<Models.Change> changes, Models.Change next)
+        {
+            if (changes.Count == 0)
+                return;
+
+            // Use `_selectedUnstaged` instead of `SelectedUnstaged` to avoid UI refresh.
+            _selectedUnstaged = next != null ? [next] : [];
+
+            IsStaging = true;
+            _repo.SetWatcherEnabled(false);
+            if (changes.Count == _unstaged.Count)
+            {
+                await Task.Run(() => new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Exec());
+            }
+            else if (Native.OS.GitVersion >= Models.GitVersions.ADD_WITH_PATHSPECFILE)
+            {
+                var paths = new List<string>();
+                foreach (var c in changes)
+                    paths.Add(c.Path);
+
+                var tmpFile = Path.GetTempFileName();
+                File.WriteAllLines(tmpFile, paths);
+                await Task.Run(() => new Commands.Add(_repo.FullPath, tmpFile).Exec());
+                File.Delete(tmpFile);
+            }
+            else
+            {
+                for (int i = 0; i < changes.Count; i += 10)
+                {
+                    var count = Math.Min(10, changes.Count - i);
+                    var step = changes.GetRange(i, count);
+                    await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec());
+                }
+            }
+            _repo.MarkWorkingCopyDirtyManually();
+            _repo.SetWatcherEnabled(true);
+            IsStaging = false;
+        }
+
+        private async void UnstageChanges(List<Models.Change> changes, Models.Change next)
+        {
+            if (changes.Count == 0)
+                return;
+
+            // Use `_selectedStaged` instead of `SelectedStaged` to avoid UI refresh.
+            _selectedStaged = next != null ? [next] : [];
+
+            IsUnstaging = true;
+            _repo.SetWatcherEnabled(false);
+            if (_useAmend)
+            {
+                await Task.Run(() => new Commands.UnstageChangesForAmend(_repo.FullPath, changes).Exec());
+            }
+            else if (changes.Count == _staged.Count)
+            {
+                await Task.Run(() => new Commands.Reset(_repo.FullPath).Exec());
+            }
+            else
+            {
+                for (int i = 0; i < changes.Count; i += 10)
+                {
+                    var count = Math.Min(10, changes.Count - i);
+                    var step = changes.GetRange(i, count);
+                    await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec());
+                }
+            }
+            _repo.MarkWorkingCopyDirtyManually();
+            _repo.SetWatcherEnabled(true);
+            IsUnstaging = false;
+        }
+
         private void SetDetail(Models.Change change, bool isUnstaged)
         {
             if (_isLoadingData)
@@ -1609,11 +1659,13 @@ namespace SourceGit.ViewModels
         private bool _hasRemotes = false;
         private List<Models.Change> _cached = [];
         private List<Models.Change> _unstaged = [];
+        private List<Models.Change> _visibleUnstaged = [];
         private List<Models.Change> _staged = [];
         private List<Models.Change> _selectedUnstaged = [];
         private List<Models.Change> _selectedStaged = [];
         private int _count = 0;
         private object _detailContext = null;
+        private string _unstagedFilter = string.Empty;
         private string _commitMessage = string.Empty;
 
         private bool _hasUnsolvedConflicts = false;
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index c22fb32d..84b60c14 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -25,7 +25,7 @@
       </Grid.RowDefinitions>
       
       <!-- Unstaged -->
-      <Grid Grid.Row="0" RowDefinitions="28,*">
+      <Grid Grid.Row="0" RowDefinitions="28,36,*">
         <!-- Unstaged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
           <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto">
@@ -75,15 +75,47 @@
           </Grid>
         </Border>
 
+        <!-- Unstaged Filter -->
+        <Border Grid.Row="1" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
+          <TextBox Height="24"
+                   Margin="4,0"
+                   BorderThickness="1"
+                   CornerRadius="12"
+                   Text="{Binding UnstagedFilter, Mode=TwoWay}"
+                   BorderBrush="{DynamicResource Brush.Border2}"
+                   VerticalContentAlignment="Center">
+            <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 ClearUnstagedFilter}"
+                      IsVisible="{Binding UnstagedFilter, 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>
+        </Border>
+        
         <!-- Unstaged Changes -->
-        <v:ChangeCollectionView Grid.Row="1"
+        <v:ChangeCollectionView Grid.Row="2"
                                 x:Name="UnstagedChangesView"
                                 Focusable="True"
                                 IsUnstagedChange="True"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode}"
-                                Changes="{Binding Unstaged}"
+                                Changes="{Binding VisibleUnstaged}"
                                 SelectedChanges="{Binding SelectedUnstaged, Mode=TwoWay}"
                                 ContextRequested="OnUnstagedContextRequested"
                                 ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"

From ef2e0a8a562a0e8bafe29728922d06230cbda8fd Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Sat, 8 Feb 2025 17:30:27 +0800
Subject: [PATCH 087/364] fix: Ignore the Chain-of-Thought in AI response
 (#952)

- Improve chat response processing to handle thinking patterns using regular expressions.
- Migrate server value by removing trailing '/chat/completions' path.
---
 src/Commands/GenerateCommitMessage.cs | 78 +++++++++++++++++++++++----
 src/Models/OpenAI.cs                  | 10 +++-
 2 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/src/Commands/GenerateCommitMessage.cs b/src/Commands/GenerateCommitMessage.cs
index c207786f..4b18a561 100644
--- a/src/Commands/GenerateCommitMessage.cs
+++ b/src/Commands/GenerateCommitMessage.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 using Avalonia.Threading;
@@ -48,16 +49,18 @@ namespace SourceGit.Commands
                     var rs = new GetDiffContent(_repo, new Models.DiffOption(change, false)).ReadToEnd();
                     if (rs.IsSuccess)
                     {
+                        var hasFirstValidChar = false;
+                        var thinkingBuffer = new StringBuilder();
                         _service.Chat(
                             _service.AnalyzeDiffPrompt,
                             $"Here is the `git diff` output: {rs.StdOut}",
                             _cancelToken,
                             update =>
-                            {
-                                responseBuilder.Append(update);
-                                summaryBuilder.Append(update);
-                                _onResponse?.Invoke("Waiting for pre-file analyzing to complated...\n\n" + responseBuilder.ToString());
-                            });
+                                ProcessChatResponse(update, ref hasFirstValidChar, thinkingBuffer,
+                                    (responseBuilder, text =>
+                                        _onResponse?.Invoke(
+                                            $"Waiting for pre-file analyzing to completed...\n\n{text}")),
+                                    (summaryBuilder, null)));
                     }
 
                     responseBuilder.Append("\n");
@@ -71,15 +74,15 @@ namespace SourceGit.Commands
 
                 var responseBody = responseBuilder.ToString();
                 var subjectBuilder = new StringBuilder();
+                var hasSubjectFirstValidChar = false;
+                var subjectThinkingBuffer = new StringBuilder();
                 _service.Chat(
                     _service.GenerateSubjectPrompt,
                     $"Here are the summaries changes:\n{summaryBuilder}",
                     _cancelToken,
                     update =>
-                    {
-                        subjectBuilder.Append(update);
-                        _onResponse?.Invoke($"{subjectBuilder}\n\n{responseBody}");
-                    });
+                        ProcessChatResponse(update, ref hasSubjectFirstValidChar, subjectThinkingBuffer,
+                            (subjectBuilder, text => _onResponse?.Invoke($"{text}\n\n{responseBody}"))));
             }
             catch (Exception e)
             {
@@ -87,10 +90,67 @@ namespace SourceGit.Commands
             }
         }
 
+        private void ProcessChatResponse(
+            string update,
+            ref bool hasFirstValidChar,
+            StringBuilder thinkingBuffer,
+            params (StringBuilder builder, Action<string> callback)[] outputs)
+        {
+            if (!hasFirstValidChar)
+            {
+                update = update.TrimStart();
+                if (string.IsNullOrEmpty(update))
+                    return;
+                if (update.StartsWith("<", StringComparison.Ordinal))
+                    thinkingBuffer.Append(update);
+                hasFirstValidChar = true;
+            }
+
+            if (thinkingBuffer.Length > 0)
+                thinkingBuffer.Append(update);
+
+            if (thinkingBuffer.Length > 15)
+            {
+                var match = REG_COT.Match(thinkingBuffer.ToString());
+                if (match.Success)
+                {
+                    update = REG_COT.Replace(thinkingBuffer.ToString(), "").TrimStart();
+                    if (update.Length > 0)
+                    {
+                        foreach (var output in outputs)
+                            output.builder.Append(update);
+                        thinkingBuffer.Clear();
+                    }
+                    return;
+                }
+
+                match = REG_THINK_START.Match(thinkingBuffer.ToString());
+                if (!match.Success)
+                {
+                    foreach (var output in outputs)
+                        output.builder.Append(thinkingBuffer);
+                    thinkingBuffer.Clear();
+                    return;
+                }
+            }
+
+            if (thinkingBuffer.Length == 0)
+            {
+                foreach (var output in outputs)
+                {
+                    output.builder.Append(update);
+                    output.callback?.Invoke(output.builder.ToString());
+                }
+            }
+        }
+
         private Models.OpenAIService _service;
         private string _repo;
         private List<Models.Change> _changes;
         private CancellationToken _cancelToken;
         private Action<string> _onResponse;
+
+        private static readonly Regex REG_COT = new(@"^<(think|thought|thinking|thought_chain)>(.*?)</\1>", RegexOptions.Singleline);
+        private static readonly Regex REG_THINK_START = new(@"^<(think|thought|thinking|thought_chain)>", RegexOptions.Singleline);
     }
 }
diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index e791efcf..a6648c11 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -19,7 +19,15 @@ namespace SourceGit.Models
         public string Server
         {
             get => _server;
-            set => SetProperty(ref _server, value);
+            set
+            {
+                // migrate old server value
+                if (!string.IsNullOrEmpty(value) && value.EndsWith("/chat/completions", StringComparison.Ordinal))
+                {
+                    value = value.Substring(0, value.Length - "/chat/completions".Length);
+                }
+                SetProperty(ref _server, value);
+            }
         }
 
         public string ApiKey

From 3b76a309485e06cf208c10897770689c5c9162d2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Feb 2025 10:05:10 +0800
Subject: [PATCH 088/364] version: Release 2025.04

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

diff --git a/VERSION b/VERSION
index d5cfddc3..4ee298df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.03
\ No newline at end of file
+2025.04
\ No newline at end of file

From bead749c57fc506213e3d4921fe00674f2cc2658 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Mon, 10 Feb 2025 14:05:27 +0800
Subject: [PATCH 089/364] enhance: async refresh operations in Watcher (#961)

---
 src/Models/Watcher.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index 7a6c5163..a5e1c324 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -136,20 +136,20 @@ namespace SourceGit.Models
             if (_updateSubmodules > 0 && now > _updateSubmodules)
             {
                 _updateSubmodules = 0;
-                _repo.RefreshSubmodules();
+                Task.Run(_repo.RefreshSubmodules);
             }
 
             if (_updateStashes > 0 && now > _updateStashes)
             {
                 _updateStashes = 0;
-                _repo.RefreshStashes();
+                Task.Run(_repo.RefreshStashes);
             }
 
             if (_updateTags > 0 && now > _updateTags)
             {
                 _updateTags = 0;
-                _repo.RefreshTags();
-                _repo.RefreshCommits();
+                Task.Run(_repo.RefreshTags);
+                Task.Run(_repo.RefreshCommits);
             }
         }
 

From 59e4f0d38873515939bd8cf7cdaa9e861114bdd5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Feb 2025 14:28:20 +0800
Subject: [PATCH 090/364] refactor: update submodules when branch status
 changed

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Watcher.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index a5e1c324..d0ccdea5 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -114,6 +114,7 @@ namespace SourceGit.Models
             {
                 _updateBranch = 0;
                 _updateWC = 0;
+                _updateSubmodules = 0;
 
                 if (_updateTags > 0)
                 {
@@ -124,6 +125,7 @@ namespace SourceGit.Models
                 Task.Run(_repo.RefreshBranches);
                 Task.Run(_repo.RefreshCommits);
                 Task.Run(_repo.RefreshWorkingCopyChanges);
+                Task.Run(_repo.RefreshSubmodules);
                 Task.Run(_repo.RefreshWorktrees);
             }
 
@@ -178,12 +180,6 @@ namespace SourceGit.Models
                 (name.StartsWith("worktrees/", StringComparison.Ordinal) && name.EndsWith("/HEAD", StringComparison.Ordinal)))
             {
                 _updateBranch = DateTime.Now.AddSeconds(.5).ToFileTime();
-
-                lock (_lockSubmodule)
-                {
-                    if (_submodules.Count > 0)
-                        _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime();
-                }
             }
             else if (name.StartsWith("objects/", StringComparison.Ordinal) || name.Equals("index", StringComparison.Ordinal))
             {

From e757e63bf706268363adf7f6e169962adaa3ad1c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Feb 2025 16:42:42 +0800
Subject: [PATCH 091/364] refactor: launcher tab bar scroller visibility

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/LauncherTabBar.axaml    | 46 ++++++++++++++++---------------
 src/Views/LauncherTabBar.axaml.cs | 29 ++++++++-----------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index c957d134..05e04933 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -6,9 +6,14 @@
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.LauncherTabBar"
-             x:DataType="vm:Launcher">
+             x:DataType="vm:Launcher"
+             x:Name="ThisControl">
   <Grid ColumnDefinitions="Auto,*,Auto,Auto">
-    <RepeatButton x:Name="LeftScrollIndicator" Grid.Column="0" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsLeft">
+    <RepeatButton Grid.Column="0"
+                  Classes="icon_button"
+                  Width="18" Height="30"
+                  Click="ScrollTabsLeft"
+                  IsVisible="{Binding #ThisControl.IsScrollerVisible}">
       <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleLeft}"/>
     </RepeatButton>
 
@@ -96,11 +101,11 @@
           </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button x:Name="InnerNewTabBtn"
-                Classes="icon_button"
+        <Button Classes="icon_button"
                 Width="16" Height="16"
                 Margin="8,0"
-                Command="{Binding AddNewTab}">
+                Command="{Binding AddNewTab}"
+                IsVisible="{Binding !#ThisControl.IsScrollerVisible}">
           <ToolTip.Tip>
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
               <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
@@ -113,24 +118,21 @@
       </StackPanel>
     </ScrollViewer>
 
-    <RepeatButton x:Name="RightScrollIndicator" Grid.Column="2" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsRight">
-      <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
-    </RepeatButton>
+    <StackPanel Grid.Column="2" Orientation="Horizontal" IsVisible="{Binding #ThisControl.IsScrollerVisible}">
+      <RepeatButton Classes="icon_button" Width="18" Height="30" Click="ScrollTabsRight">
+        <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
+      </RepeatButton>
 
-    <Button x:Name="OuterNewTabBtn"
-            Grid.Column="3"
-            Classes="icon_button"
-            Width="16" Height="16"
-            Margin="8,0"
-            Command="{Binding AddNewTab}">
-      <ToolTip.Tip>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-          <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
-          <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+T, macOS=⌘+T}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
-        </StackPanel>
-      </ToolTip.Tip>
+      <Button Classes="icon_button" Width="16" Height="16" Margin="8,0" Command="{Binding AddNewTab}">
+        <ToolTip.Tip>
+          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+            <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
+            <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+T, macOS=⌘+T}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+          </StackPanel>
+        </ToolTip.Tip>
 
-      <Path Width="12" Height="12" Data="{StaticResource Icons.Plus}"/>
-    </Button>
+        <Path Width="12" Height="12" Data="{StaticResource Icons.Plus}"/>
+      </Button>
+    </StackPanel>
   </Grid>
 </UserControl>
diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index 129ce892..c06f1599 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -10,6 +10,15 @@ namespace SourceGit.Views
 {
     public partial class LauncherTabBar : UserControl
     {
+        public static readonly StyledProperty<bool> IsScrollerVisibleProperty =
+            AvaloniaProperty.Register<LauncherTabBar, bool>(nameof(IsScrollerVisible));
+
+        public bool IsScrollerVisible
+        {
+            get => GetValue(IsScrollerVisibleProperty);
+            set => SetValue(IsScrollerVisibleProperty, value);
+        }
+
         public LauncherTabBar()
         {
             InitializeComponent();
@@ -43,7 +52,7 @@ namespace SourceGit.Views
                 if (containerEndX < startX || containerEndX > endX)
                     continue;
 
-                if (OuterNewTabBtn.IsVisible && i == count - 1)
+                if (IsScrollerVisible && i == count - 1)
                     break;
 
                 var separatorX = containerEndX - startX + LauncherTabsScroller.Bounds.X;
@@ -143,23 +152,7 @@ namespace SourceGit.Views
 
         private void OnTabsLayoutUpdated(object _1, EventArgs _2)
         {
-            if (LauncherTabsScroller.Extent.Width > LauncherTabsScroller.Viewport.Width)
-            {
-                LeftScrollIndicator.IsVisible = true;
-                LeftScrollIndicator.IsEnabled = LauncherTabsScroller.Offset.X > 0;
-                RightScrollIndicator.IsVisible = true;
-                RightScrollIndicator.IsEnabled = LauncherTabsScroller.Offset.X < LauncherTabsScroller.Extent.Width - LauncherTabsScroller.Viewport.Width;
-                InnerNewTabBtn.IsVisible = false;
-                OuterNewTabBtn.IsVisible = true;
-            }
-            else
-            {
-                LeftScrollIndicator.IsVisible = false;
-                RightScrollIndicator.IsVisible = false;
-                InnerNewTabBtn.IsVisible = true;
-                OuterNewTabBtn.IsVisible = false;
-            }
-
+            SetCurrentValue(IsScrollerVisibleProperty, LauncherTabsScroller.Extent.Width > LauncherTabsScroller.Viewport.Width);
             InvalidateVisual();
         }
 

From 0c8179b934a7a8f79cc4cba188684e34b82651e7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Feb 2025 20:06:44 +0800
Subject: [PATCH 092/364] enhance: add a opened tabs selector popup (#958)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml               |   1 +
 src/Views/LauncherTabBar.axaml          |  14 ++-
 src/Views/LauncherTabBar.axaml.cs       |   9 ++
 src/Views/LauncherTabsSelector.axaml    | 107 +++++++++++++++++++++
 src/Views/LauncherTabsSelector.axaml.cs | 120 ++++++++++++++++++++++++
 5 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 src/Views/LauncherTabsSelector.axaml
 create mode 100644 src/Views/LauncherTabsSelector.axaml.cs

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index c7e02431..efec7b2b 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -10,6 +10,7 @@
   <StreamGeometry x:Key="Icons.Check">M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Changes">M747 467c29 0 56 4 82 12v-363c0-47-38-84-84-84H125c-47 0-84 38-84 84v707c0 47 38 84 84 84h375a287 287 0 01-43-152c0-160 129-289 289-289zm-531-250h438c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm0 179h263c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm131 247h-131c-19 0-34-15-34-34s15-34 34-34h131c19 0 34 15 34 34s-15 34-34 34zM747 521c-130 0-236 106-236 236S617 992 747 992s236-106 236-236S877 521 747 521zm11 386v-65h-130c-12 0-22-10-22-22s10-22 22-22h260l-130 108zm108-192H606l130-108v65h130c12 0 22 10 22 22s-10 22-22 22z</StreamGeometry>
   <StreamGeometry x:Key="Icons.CherryPick">M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CircleDown">M512 926c-229 0-414-186-414-414S283 98 512 98s414 186 414 414-186 414-414 414zm0-73c189 0 341-153 341-341S701 171 512 171 171 323 171 512s153 341 341 341zm-6-192L284 439l52-52 171 171 171-171L728 439l-222 222z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Clear">M512 57c251 0 455 204 455 455S763 967 512 967 57 763 57 512 261 57 512 57zm181 274c-11-11-29-11-40 0L512 472 371 331c-11-11-29-11-40 0-11 11-11 29 0 40L471 512 331 653c-11 11-11 29 0 40 11 11 29 11 40 0l141-141 141 141c11 11 29 11 40 0 11-11 11-29 0-40L552 512l141-141c11-11 11-29 0-40z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Clean">M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Clone">M1280 704c0 141-115 256-256 256H288C129 960 0 831 0 672c0-126 80-232 192-272A327 327 0 01192 384c0-177 143-320 320-320 119 0 222 64 277 160C820 204 857 192 896 192c106 0 192 86 192 192 0 24-5 48-13 69C1192 477 1280 580 1280 704zm-493-128H656V352c0-18-14-32-32-32h-96c-18 0-32 14-32 32v224h-131c-29 0-43 34-23 55l211 211c12 12 33 12 45 0l211-211c20-20 6-55-23-55z</StreamGeometry>
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 05e04933..9b748e91 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -4,11 +4,12 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:c="using:SourceGit.Converters"
+             xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.LauncherTabBar"
              x:DataType="vm:Launcher"
              x:Name="ThisControl">
-  <Grid ColumnDefinitions="Auto,*,Auto,Auto">
+  <Grid ColumnDefinitions="Auto,*,Auto">
     <RepeatButton Grid.Column="0"
                   Classes="icon_button"
                   Width="18" Height="30"
@@ -123,7 +124,16 @@
         <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
       </RepeatButton>
 
-      <Button Classes="icon_button" Width="16" Height="16" Margin="8,0" Command="{Binding AddNewTab}">
+      <Button x:Name="PageSelector" Classes="icon_button" Width="16" Height="16" Margin="8,0">
+        <Button.Flyout>
+          <Flyout>
+            <v:LauncherTabsSelector Pages="{Binding Pages}" PageSelected="OnGotoSelectedPage"/>
+          </Flyout>
+        </Button.Flyout>
+        <Path Width="14" Height="14" Data="{StaticResource Icons.CircleDown}"/>
+      </Button>
+
+      <Button Classes="icon_button" Width="16" Height="16" Command="{Binding AddNewTab}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
             <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index c06f1599..12bca91f 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -248,6 +248,15 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
+        private void OnGotoSelectedPage(object sender, LauncherTabSelectedEventArgs e)
+        {
+            if (DataContext is ViewModels.Launcher vm)
+                vm.ActivePage = e.Page;
+
+            PageSelector.Flyout?.Hide();
+            e.Handled = true;
+        }
+
         private bool _pressedTab = false;
         private Point _pressedTabPosition = new Point();
         private bool _startDragTab = false;
diff --git a/src/Views/LauncherTabsSelector.axaml b/src/Views/LauncherTabsSelector.axaml
new file mode 100644
index 00000000..109a2ce7
--- /dev/null
+++ b/src/Views/LauncherTabsSelector.axaml
@@ -0,0 +1,107 @@
+<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:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.LauncherTabsSelector"
+             x:Name="ThisControl">
+  <Grid RowDefinitions="28,Auto">
+    <TextBox Grid.Row="0"
+             Height="24"
+             Margin="4,0"
+             BorderThickness="1"
+             CornerRadius="12"
+             Text="{Binding #ThisControl.SearchFilter, Mode=TwoWay}"
+             BorderBrush="{DynamicResource Brush.Border2}"
+             VerticalContentAlignment="Center">
+      <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"
+                Click="OnClearSearchFilter"
+                IsVisible="{Binding #ThisControl.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="1"
+             Width="200"
+             MaxHeight="400"
+             Margin="0,4,0,0"
+             Background="Transparent"
+             SelectionMode="Single"
+             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+             ScrollViewer.VerticalScrollBarVisibility="Auto"
+             ItemsSource="{Binding #ThisControl.VisiblePages}"
+             SelectionChanged="OnPageSelectionChanged">
+      <ListBox.Styles>
+        <Style Selector="ListBoxItem">
+          <Setter Property="Padding" Value="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:LauncherPage">
+          <Grid ColumnDefinitions="Auto,*" VerticalAlignment="Center">
+            <Path Grid.Column="0"
+                  Width="12" Height="12" Margin="12,0"
+                  Fill="{Binding Node.Bookmark, Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
+                  Data="{StaticResource Icons.Bookmark}"
+                  IsVisible="{Binding Node.IsRepository}"
+                  IsHitTestVisible="False"/>
+            <Path Grid.Column="0"
+                  Width="12" Height="12" Margin="12,0"
+                  Fill="{DynamicResource Brush.FG1}"
+                  Data="{StaticResource Icons.Repositories}"
+                  IsVisible="{Binding !Node.IsRepository}"
+                  IsHitTestVisible="False"/>
+            <TextBlock Grid.Column="1"
+                       Classes="primary"
+                       VerticalAlignment="Center"
+                       FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                       Text="{Binding Node.Name}"
+                       IsVisible="{Binding Node.IsRepository}"
+                       IsHitTestVisible="False"/>
+            <TextBlock Grid.Column="1"
+                       Classes="primary"
+                       VerticalAlignment="Center"
+                       FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                       Text="{DynamicResource Text.PageTabBar.Welcome.Title}"
+                       IsVisible="{Binding !Node.IsRepository}"
+                       IsHitTestVisible="False"/>
+          </Grid>
+        </DataTemplate>
+      </ListBox.ItemTemplate>
+    </ListBox>
+  </Grid>
+</UserControl>
diff --git a/src/Views/LauncherTabsSelector.axaml.cs b/src/Views/LauncherTabsSelector.axaml.cs
new file mode 100644
index 00000000..01c5fa0d
--- /dev/null
+++ b/src/Views/LauncherTabsSelector.axaml.cs
@@ -0,0 +1,120 @@
+using System;
+
+using Avalonia;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace SourceGit.Views
+{
+    public class LauncherTabSelectedEventArgs : RoutedEventArgs
+    {
+        public ViewModels.LauncherPage Page { get; }
+
+        public LauncherTabSelectedEventArgs(ViewModels.LauncherPage page)
+        {
+            RoutedEvent = LauncherTabsSelector.PageSelectedEvent;
+            Page = page;
+        }
+    }
+
+    public partial class LauncherTabsSelector : UserControl
+    {
+        public static readonly StyledProperty<AvaloniaList<ViewModels.LauncherPage>> PagesProperty =
+            AvaloniaProperty.Register<LauncherTabsSelector, AvaloniaList<ViewModels.LauncherPage>>(nameof(Pages));
+
+        public AvaloniaList<ViewModels.LauncherPage> Pages
+        {
+            get => GetValue(PagesProperty);
+            set => SetValue(PagesProperty, value);
+        }
+
+        public static readonly StyledProperty<string> SearchFilterProperty =
+            AvaloniaProperty.Register<LauncherTabsSelector, string>(nameof(SearchFilter));
+
+        public string SearchFilter
+        {
+            get => GetValue(SearchFilterProperty);
+            set => SetValue(SearchFilterProperty, value);
+        }
+
+        public static readonly RoutedEvent<LauncherTabSelectedEventArgs> PageSelectedEvent =
+            RoutedEvent.Register<ChangeCollectionView, LauncherTabSelectedEventArgs>(nameof(PageSelected), RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        public event EventHandler<LauncherTabSelectedEventArgs> PageSelected
+        {
+            add { AddHandler(PageSelectedEvent, value); }
+            remove { RemoveHandler(PageSelectedEvent, value); }
+        }
+
+        public AvaloniaList<ViewModels.LauncherPage> VisiblePages
+        {
+            get;
+            private set;
+        }
+
+        public LauncherTabsSelector()
+        {
+            VisiblePages = new AvaloniaList<ViewModels.LauncherPage>();
+            InitializeComponent();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == PagesProperty || change.Property == SearchFilterProperty)
+                UpdateVisiblePages();
+        }
+
+        private void OnClearSearchFilter(object sender, RoutedEventArgs e)
+        {
+            SearchFilter = string.Empty;
+        }
+
+        private void OnPageSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is ListBox { SelectedItem : ViewModels.LauncherPage page })
+            {
+                _isProcessingSelection = true;
+                RaiseEvent(new LauncherTabSelectedEventArgs(page));
+                _isProcessingSelection = false;
+            }
+
+            e.Handled = true;
+        }
+
+        private void UpdateVisiblePages()
+        {
+            if (_isProcessingSelection)
+                return;
+                
+            VisiblePages.Clear();
+
+            if (Pages == null)
+                return;
+
+            var filter = SearchFilter?.Trim() ?? "";
+            if (string.IsNullOrEmpty(filter))
+            {
+                foreach (var p in Pages)
+                    VisiblePages.Add(p);
+
+                return;
+            }
+
+            foreach (var page in Pages)
+            {
+                if (!page.Node.IsRepository)
+                    continue;
+
+                if (page.Node.Name.Contains(filter, StringComparison.OrdinalIgnoreCase) ||
+                    page.Node.Id.Contains(filter, StringComparison.OrdinalIgnoreCase))
+                    VisiblePages.Add(page);
+            }
+        }
+
+        private bool _isProcessingSelection = false;
+    }
+}
+

From aebfffee003413b679ed7523c04c834764fe0a82 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Feb 2025 20:51:36 +0800
Subject: [PATCH 093/364] fix: GUI stops refreshing after manually refresh
 while merge tool is open (#949)

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

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index ecb3c0d6..7ac13dc2 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -431,10 +431,7 @@ namespace SourceGit.ViewModels
         {
             var toolType = Preferences.Instance.ExternalMergeToolType;
             var toolPath = Preferences.Instance.ExternalMergeToolPath;
-
-            _repo.SetWatcherEnabled(false);
             await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
-            _repo.SetWatcherEnabled(true);
         }
 
         public void ContinueMerge()

From 821063e3ec196da97c75951d30c93088c127f91e Mon Sep 17 00:00:00 2001
From: Doodeletion <99095135+Doodeletion@users.noreply.github.com>
Date: Tue, 11 Feb 2025 03:57:20 +0100
Subject: [PATCH 094/364] Swap selection start and end index if selection is
 created from bottom to top (#967)

---
 src/Views/TextDiffView.axaml.cs | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 15a2a212..cc8fcfe5 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -970,8 +970,19 @@ namespace SourceGit.Views
             }
 
             var lines = GetLines();
-            var startIdx = Math.Min(selection.StartPosition.Line - 1, lines.Count - 1);
-            var endIdx = Math.Min(selection.EndPosition.Line - 1, lines.Count - 1);
+
+            var startPosition = selection.StartPosition;
+            var endPosition = selection.EndPosition;
+            
+            if (startPosition.Line  > endPosition.Line 
+                || startPosition.Line == endPosition.Line && startPosition.Column > endPosition.Column)
+            {
+                // swap start and end
+                (startPosition, endPosition) = (endPosition, startPosition);
+            }
+            
+            var startIdx = Math.Min(startPosition.Line - 1, lines.Count - 1);
+            var endIdx = Math.Min(endPosition.Line - 1, lines.Count - 1);
 
             if (startIdx == endIdx)
             {
@@ -995,15 +1006,15 @@ namespace SourceGit.Views
                     line.Type == Models.TextDiffLineType.None)
                     continue;
 
-                if (i == startIdx && selection.StartPosition.Column > 1)
+                if (i == startIdx && startPosition.Column > 1)
                 {
-                    builder.AppendLine(line.Content.Substring(selection.StartPosition.Column - 1));
+                    builder.AppendLine(line.Content.Substring(startPosition.Column - 1));
                     continue;
                 }
 
-                if (i == endIdx && selection.EndPosition.Column < line.Content.Length)
+                if (i == endIdx && endPosition.Column < line.Content.Length)
                 {
-                    builder.AppendLine(line.Content.Substring(0, selection.EndPosition.Column));
+                    builder.AppendLine(line.Content.Substring(0, endPosition.Column));
                     continue;
                 }
 

From 10fba08e430f6f67d6c1bca7abbf9338a546b9a4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 11:07:33 +0800
Subject: [PATCH 095/364] code_review: PR #949

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

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index cc8fcfe5..28fe81a8 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -973,13 +973,9 @@ namespace SourceGit.Views
 
             var startPosition = selection.StartPosition;
             var endPosition = selection.EndPosition;
-            
-            if (startPosition.Line  > endPosition.Line 
-                || startPosition.Line == endPosition.Line && startPosition.Column > endPosition.Column)
-            {
-                // swap start and end
+
+            if (startPosition.Location > endPosition.Location)
                 (startPosition, endPosition) = (endPosition, startPosition);
-            }
             
             var startIdx = Math.Min(startPosition.Line - 1, lines.Count - 1);
             var endIdx = Math.Min(endPosition.Line - 1, lines.Count - 1);

From af20ab2448a2b46dfd687c0ff95a12716d2f9543 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 14:34:14 +0800
Subject: [PATCH 096/364] feature: add `Wait for action done` option to control
 whether or not to wait for the custom action execution to complete (#951)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/ExecuteCustomAction.cs   | 32 ++++++++++++++++++++++++++-
 src/Models/CustomAction.cs            |  7 ++++++
 src/Resources/Locales/en_US.axaml     |  1 +
 src/Resources/Locales/zh_CN.axaml     |  1 +
 src/Resources/Locales/zh_TW.axaml     |  1 +
 src/ViewModels/ExecuteCustomAction.cs |  6 ++++-
 src/Views/RepositoryConfigure.axaml   |  4 +++-
 7 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs
index a10f5387..3a77ec01 100644
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@@ -8,7 +8,37 @@ namespace SourceGit.Commands
 {
     public static class ExecuteCustomAction
     {
-        public static void Run(string repo, string file, string args, Action<string> outputHandler)
+        public static void Run(string repo, string file, string args)
+        {
+            var start = new ProcessStartInfo();
+            start.FileName = file;
+            start.Arguments = args;
+            start.UseShellExecute = false;
+            start.CreateNoWindow = true;
+            start.WorkingDirectory = repo;
+
+            // Force using en_US.UTF-8 locale to avoid GCM crash
+            if (OperatingSystem.IsLinux())
+                start.Environment.Add("LANG", "en_US.UTF-8");
+
+            // Fix macOS `PATH` env
+            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
+                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
+
+            try
+            {
+                Process.Start(start);
+            }
+            catch (Exception e)
+            {
+                Dispatcher.UIThread.Invoke(() =>
+                {
+                    App.RaiseException(repo, e.Message);
+                });
+            }
+        }
+
+        public static void RunAndWait(string repo, string file, string args, Action<string> outputHandler)
         {
             var start = new ProcessStartInfo();
             start.FileName = file;
diff --git a/src/Models/CustomAction.cs b/src/Models/CustomAction.cs
index 8452a42d..bd56d6ae 100644
--- a/src/Models/CustomAction.cs
+++ b/src/Models/CustomAction.cs
@@ -34,9 +34,16 @@ namespace SourceGit.Models
             set => SetProperty(ref _arguments, value);
         }
 
+        public bool WaitForExit
+        {
+            get => _waitForExit;
+            set => SetProperty(ref _waitForExit, value);
+        }
+
         private string _name = string.Empty;
         private CustomActionScope _scope = CustomActionScope.Repository;
         private string _executable = string.Empty;
         private string _arguments = string.Empty;
+        private bool _waitForExit = true;
     }
 }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 018b54d7..40f95793 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -158,6 +158,7 @@
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Scope:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repository</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Wait for action done</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Email Address</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Email address</x:String>
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 66d1f37e..ef31972a 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -161,6 +161,7 @@
   <x:String x:Key="Text.Configure.CustomAction.Scope" 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.Repository" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index f8255947..506a618f 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -161,6 +161,7 @@
   <x:String x:Key="Text.Configure.CustomAction.Scope" 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.Repository" 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>
diff --git a/src/ViewModels/ExecuteCustomAction.cs b/src/ViewModels/ExecuteCustomAction.cs
index 920b9f43..848faaaf 100644
--- a/src/ViewModels/ExecuteCustomAction.cs
+++ b/src/ViewModels/ExecuteCustomAction.cs
@@ -28,7 +28,11 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                Commands.ExecuteCustomAction.Run(_repo.FullPath, CustomAction.Executable, _args, SetProgressDescription);
+                if (CustomAction.WaitForExit)
+                    Commands.ExecuteCustomAction.RunAndWait(_repo.FullPath, CustomAction.Executable, _args, SetProgressDescription);
+                else
+                    Commands.ExecuteCustomAction.Run(_repo.FullPath, CustomAction.Executable, _args);
+
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return true;
             });
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 5e9374f9..d9383743 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -341,7 +341,7 @@
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.CustomAction}"/>
         </TabItem.Header>
 
-        <Grid ColumnDefinitions="200,*" Height="250" Margin="0,8,0,16">
+        <Grid ColumnDefinitions="200,*" Height="300" Margin="0,8,0,16">
           <Border Grid.Column="0"
                   BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                   Background="{DynamicResource Brush.Contents}">
@@ -439,6 +439,8 @@
                   <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Arguments}"/>
                   <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Arguments, Mode=TwoWay}"/>
                   <TextBlock Margin="0,2,0,0" TextWrapping="Wrap" Text="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}" Foreground="{DynamicResource Brush.FG2}"/>
+
+                  <CheckBox Margin="0,8,0,0" Content="{DynamicResource Text.Configure.CustomAction.WaitForExit}" IsChecked="{Binding WaitForExit, Mode=TwoWay}"/>
                 </StackPanel>
               </DataTemplate>
             </ContentControl.DataTemplates>

From 37fed935894a08b073a0c02aeebe9c9083077ecd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 06:34:33 +0000
Subject: [PATCH 097/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 67ee5258..50f92a53 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.13%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.13%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.91%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.40%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.65%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.13%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.00%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.00%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.79%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.26%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.52%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.00%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 9f7a1c80..f67ceacc 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 98.13%
+### de_DE.axaml: 98.00%
 
 
 <details>
@@ -11,6 +11,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.WaitForExit
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
@@ -21,7 +22,7 @@
 
 </details>
 
-### es_ES.axaml: 98.13%
+### es_ES.axaml: 98.00%
 
 
 <details>
@@ -34,6 +35,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.WaitForExit
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
@@ -44,7 +46,7 @@
 
 </details>
 
-### fr_FR.axaml: 92.91%
+### fr_FR.axaml: 92.79%
 
 
 <details>
@@ -57,6 +59,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.WaitForExit
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
@@ -106,7 +109,7 @@
 
 </details>
 
-### it_IT.axaml: 98.40%
+### it_IT.axaml: 98.26%
 
 
 <details>
@@ -119,6 +122,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.WaitForExit
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
@@ -127,7 +131,7 @@
 
 </details>
 
-### pt_BR.axaml: 92.65%
+### pt_BR.axaml: 92.52%
 
 
 <details>
@@ -145,6 +149,7 @@
 - Text.CommitCM.MergeMultiple
 - Text.CommitDetail.Files.Search
 - Text.CommitDetail.Info.Children
+- Text.Configure.CustomAction.WaitForExit
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
 - Text.CreateBranch.Name.WarnSpace
@@ -191,7 +196,7 @@
 
 </details>
 
-### ru_RU.axaml: 98.13%
+### ru_RU.axaml: 98.00%
 
 
 <details>
@@ -204,6 +209,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.WaitForExit
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup

From 06df27780f46ad62b14a0305635546c1b6870528 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 14:36:46 +0800
Subject: [PATCH 098/364] localization: update
 `Text.Configure.CustomAction.WaitForExit` for en_US

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

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 40f95793..9aeaae50 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -158,7 +158,7 @@
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Scope:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repository</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Wait for action done</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Wait for action exit</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Email Address</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Email address</x:String>
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>

From 37e592638823681af941e99ccdb64a43cbdda7f4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 14:41:56 +0800
Subject: [PATCH 099/364] code_style: keep translation ordered

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml | 2 +-
 src/Resources/Locales/en_US.axaml | 2 +-
 src/Resources/Locales/es_ES.axaml | 2 +-
 src/Resources/Locales/fr_FR.axaml | 2 +-
 src/Resources/Locales/it_IT.axaml | 2 +-
 src/Resources/Locales/pt_BR.axaml | 2 +-
 src/Resources/Locales/ru_RU.axaml | 2 +-
 src/Resources/Locales/zh_CN.axaml | 2 +-
 src/Resources/Locales/zh_TW.axaml | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index fe961d14..e4cefbd4 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -565,6 +565,7 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Aufheben</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Im Graph ausblenden</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Im Graph filtern</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Aktiviere '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertikal</x:String>
@@ -573,7 +574,6 @@
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologie</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Aktiviere '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Erstelle Branch</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Nur aktuellen Branch im Graphen hervorheben</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Öffne in {0}</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 9aeaae50..83a9650f 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -574,6 +574,7 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Unset</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Hide in commit graph</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filter in commit graph</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Enable '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
@@ -582,7 +583,6 @@
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologically</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOCAL BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navigate to HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Enable '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Create Branch</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Only highlight current branch in graph</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Open in {0}</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 3e926c63..a0f35814 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -566,6 +566,7 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Desestablecer</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Ocultar en el Gráfico de Commits</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filtrar en el Gráfico de Commits</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Habilitar Opción '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">DISPOSICIÓN</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
@@ -574,7 +575,6 @@
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topológicamente</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">RAMAS LOCALES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navegar a HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Habilitar Opción '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Crear Rama</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Resaltar solo la rama actual en el gráfico</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Abrir en {0}</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index da20a5ee..b269424a 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -548,9 +548,9 @@
   <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Activer l'option '--reflog'</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Ouvrir dans l'explorateur de fichiers</x:String>
   <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Rechercher Branches/Tags/Submodules</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Activer l'option '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCHES LOCALES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Naviguer vers le HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Activer l'option '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Créer une branche</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Mettre la branche courante en surbrillance dans le graph</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Ouvrir dans {0}</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 95f7bd1d..1d0d353e 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -568,6 +568,7 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Non impostato</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Nascondi nel grafico dei commit</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filtra nel grafico dei commit</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Abilita opzione '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Orizzontale</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Verticale</x:String>
@@ -576,7 +577,6 @@
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologicamente</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCH LOCALI</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Vai a HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Abilita opzione '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Crea Branch</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Evidenzia nel grafico solo il branch corrente</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Apri in {0}</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index dee8565b..a318cfa8 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -566,11 +566,11 @@
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Desfazer</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Esconder no gráfico de commit</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Incluir no gráfico de commit</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Habilitar opção '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Data do Commit</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologicamente</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCHES LOCAIS</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navegar para HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Habilitar opção '--first-parent'</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Criar Branch</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Abrir em {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Abrir em Ferramentas Externas</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 27a2d360..e9f03d5a 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -567,6 +567,7 @@
   <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.FilterCommits.Prefix" xml:space="preserve">ОТФИЛЬТРОВАНО:</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Включить опцию --first-parent</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>
@@ -575,7 +576,6 @@
   <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.NavigateToCurrentHead" xml:space="preserve">Навигация по ГОЛОВЕ (HEAD)</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Включить опцию --first-parent</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Создать ветку</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Выделять только текущую ветку на графике</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Открыть в {0}</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index ef31972a..c3932321 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -578,6 +578,7 @@
   <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.FirstParentFilterToggle" xml:space="preserve">启用 --first-parent 过滤选项</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>
@@ -586,7 +587,6 @@
   <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.NavigateToCurrentHead" xml:space="preserve">定位HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">启用 --first-parent 过滤选项</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">新建分支</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">提交路线图中仅高亮显示当前分支</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">在 {0} 中打开</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 506a618f..3e7382b8 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -577,6 +577,7 @@
   <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.FirstParentFilterToggle" xml:space="preserve">啟用 [--first-parent] 選項</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>
@@ -585,7 +586,6 @@
   <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.NavigateToCurrentHead" xml:space="preserve">回到 HEAD</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">啟用 [--first-parent] 選項</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">新增分支</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">提交圖表中僅高亮顯示目前分支</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">在 {0} 中開啟</x:String>

From 011a415949ebe23ef224878a0dd213b7be40b8e8 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 15:15:27 +0800
Subject: [PATCH 100/364] enhance: add a button to clear all notifications
 (#950)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml         |  1 +
 src/Resources/Locales/en_US.axaml |  1 +
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/Resources/Locales/zh_TW.axaml |  1 +
 src/ViewModels/LauncherPage.cs    |  5 +++++
 src/Views/LauncherPage.axaml      | 20 ++++++++++++++++++--
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index efec7b2b..8e865660 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -12,6 +12,7 @@
   <StreamGeometry x:Key="Icons.CherryPick">M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z</StreamGeometry>
   <StreamGeometry x:Key="Icons.CircleDown">M512 926c-229 0-414-186-414-414S283 98 512 98s414 186 414 414-186 414-414 414zm0-73c189 0 341-153 341-341S701 171 512 171 171 323 171 512s153 341 341 341zm-6-192L284 439l52-52 171 171 171-171L728 439l-222 222z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Clear">M512 57c251 0 455 204 455 455S763 967 512 967 57 763 57 512 261 57 512 57zm181 274c-11-11-29-11-40 0L512 472 371 331c-11-11-29-11-40 0-11 11-11 29 0 40L471 512 331 653c-11 11-11 29 0 40 11 11 29 11 40 0l141-141 141 141c11 11 29 11 40 0 11-11 11-29 0-40L552 512l141-141c11-11 11-29 0-40z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClearNotifications">M591 907A85 85 0 01427 875h114a299 299 0 0050 32zM725 405c130 0 235 105 235 235s-105 235-235 235-235-105-235-235 105-235 235-235zM512 64a43 43 0 0143 43v24c126 17 229 107 264 225A298 298 0 00725 341l-4 0A235 235 0 00512 213l-5 0c-125 4-224 104-228 229l-0 6v167a211 211 0 01-26 101l-4 7-14 23h211a298 298 0 0050 85l-276-0a77 77 0 01-66-39c-13-22-14-50-2-73l2-4 22-36c10-17 16-37 17-57l0-7v-167C193 287 313 153 469 131V107a43 43 0 0139-43zm345 505L654 771a149 149 0 00202-202zM725 491a149 149 0 00-131 220l202-202A149 149 0 00725 491z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Clean">M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Clone">M1280 704c0 141-115 256-256 256H288C129 960 0 831 0 672c0-126 80-232 192-272A327 327 0 01192 384c0-177 143-320 320-320 119 0 222 64 277 160C820 204 857 192 896 192c106 0 192 86 192 192 0 24-5 48-13 69C1192 477 1280 580 1280 704zm-493-128H656V352c0-18-14-32-32-32h-96c-18 0-32 14-32 32v224h-131c-29 0-43 34-23 55l211 211c12 12 33 12 45 0l211-211c20-20 6-55-23-55z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Code">M853 102H171C133 102 102 133 102 171v683C102 891 133 922 171 922h683C891 922 922 891 922 853V171C922 133 891 102 853 102zM390 600l-48 48L205 512l137-137 48 48L301 512l88 88zM465 819l-66-18L559 205l66 18L465 819zm218-171L634 600 723 512l-88-88 48-48L819 512 683 649z</StreamGeometry>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 83a9650f..70da2973 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -584,6 +584,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOCAL BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navigate to HEAD</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Create Branch</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">CLEAR NOTIFICATIONS</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Only highlight current branch in graph</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Open in {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Open in External Tools</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c3932321..005ef3a2 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -588,6 +588,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" 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.OnlyHighlightCurrentBranchInHistories" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 3e7382b8..fe0e4bac 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -587,6 +587,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" 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.OnlyHighlightCurrentBranchInHistories" 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>
diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index b8138aca..63cb52af 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -45,6 +45,11 @@ namespace SourceGit.ViewModels
             _data = repo;
         }
 
+        public void ClearNotifications()
+        {
+            Notifications.Clear();
+        }
+
         public void CopyPath()
         {
             if (_node.IsRepository)
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
index ee4c77eb..81f504c1 100644
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@@ -53,7 +53,7 @@
               PointerPressed="OnMaskClicked"
               IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}"/>
 
-      <Grid RowDefinitions="Auto,*" Width="512" HorizontalAlignment="Center">
+      <Grid RowDefinitions="Auto,Auto,*" Width="512" HorizontalAlignment="Center">
         <!-- Popup -->
         <Border Grid.Row="0"
                 Margin="6,0"
@@ -104,8 +104,24 @@
           </ContentControl>
         </Border>
 
+        <!-- Notifications Clear Button -->
+        <Button Grid.Row="1"
+                Classes="flat primary"
+                Margin="0,8,0,0"
+                Padding="16,0"
+                Height="24"
+                CornerRadius="12"
+                HorizontalAlignment="Center"
+                Command="{Binding ClearNotifications}"
+                IsVisible="{Binding Notifications.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+            <Path Width="14" Height="14" Data="{StaticResource Icons.ClearNotifications}" Fill="White"/>
+            <TextBlock Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Notifications.Clear}" Foreground="White"/>
+          </StackPanel>
+        </Button>
+
         <!-- Notifications -->
-        <ScrollViewer Grid.Row="1" Margin="0,6,0,0" VerticalAlignment="Top" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+        <ScrollViewer Grid.Row="2" VerticalAlignment="Top" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
           <ItemsControl ItemsSource="{Binding Notifications}">
             <ItemsControl.ItemTemplate>
               <DataTemplate DataType="m:Notification">

From 1bfe1a275511a23f9a665da414ac892df66097e7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 07:15:47 +0000
Subject: [PATCH 101/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 50f92a53..623347bf 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.00%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.00%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.79%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.26%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.52%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.00%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.87%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.67%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.13%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.40%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-97.87%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index f67ceacc..d1e474d2 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 98.00%
+### de_DE.axaml: 97.87%
 
 
 <details>
@@ -16,13 +16,14 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### es_ES.axaml: 98.00%
+### es_ES.axaml: 97.87%
 
 
 <details>
@@ -40,13 +41,14 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### fr_FR.axaml: 92.79%
+### fr_FR.axaml: 92.67%
 
 
 <details>
@@ -90,6 +92,7 @@
 - Text.Repository.HistoriesOrder
 - Text.Repository.HistoriesOrder.ByDate
 - Text.Repository.HistoriesOrder.Topo
+- Text.Repository.Notifications.Clear
 - Text.Repository.Skip
 - Text.Repository.Tags.OrderByCreatorDate
 - Text.Repository.Tags.OrderByNameAsc
@@ -109,7 +112,7 @@
 
 </details>
 
-### it_IT.axaml: 98.26%
+### it_IT.axaml: 98.13%
 
 
 <details>
@@ -126,12 +129,13 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 
 </details>
 
-### pt_BR.axaml: 92.52%
+### pt_BR.axaml: 92.40%
 
 
 <details>
@@ -177,6 +181,7 @@
 - Text.Repository.HistoriesLayout.Horizontal
 - Text.Repository.HistoriesLayout.Vertical
 - Text.Repository.HistoriesOrder
+- Text.Repository.Notifications.Clear
 - Text.Repository.OnlyHighlightCurrentBranchInHistories
 - Text.Repository.Skip
 - Text.Repository.Tags.OrderByCreatorDate
@@ -196,7 +201,7 @@
 
 </details>
 
-### ru_RU.axaml: 98.00%
+### ru_RU.axaml: 97.87%
 
 
 <details>
@@ -214,6 +219,7 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.WorkingCopy.SignOff

From e9d16a5102351c107ca5cfc43785afc5663d9ef6 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 16:58:10 +0800
Subject: [PATCH 102/364] project: upgrade `TextMateSharp` to `1.0.66` (#969)

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

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index af8fa5b1..624804f1 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -52,8 +52,8 @@
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.1" />
     <PackageReference Include="OpenAI" Version="2.2.0-beta.1" />
-    <PackageReference Include="TextMateSharp" Version="1.0.65" />
-    <PackageReference Include="TextMateSharp.Grammars" Version="1.0.65" />
+    <PackageReference Include="TextMateSharp" Version="1.0.66" />
+    <PackageReference Include="TextMateSharp.Grammars" Version="1.0.66" />
   </ItemGroup>
 
   <ItemGroup>

From 21cfd17cdb8c6467ff8704d67a820ec17f29dbcd Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Feb 2025 18:57:54 +0800
Subject: [PATCH 103/364] fix: do NOT quit when try to input `@` via `Alt Gr+Q`
 with German ISO keyboard layout (#970)

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

diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index b5f09d79..e3140191 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -120,6 +120,13 @@ namespace SourceGit.Views
                 return;
             }
 
+            // Ctrl+Q quits the application (macOS use hotkeys in system menu bar)
+            if (!OperatingSystem.IsMacOS() && e.KeyModifiers == KeyModifiers.Control && e.Key == Key.Q)
+            {
+                App.Quit(0);
+                return;
+            }
+
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
             {
                 if (e.Key == Key.W)
@@ -146,13 +153,6 @@ namespace SourceGit.Views
                     return;
                 }
 
-                if (e.Key == Key.Q)
-                {
-                    App.Quit(0);
-                    e.Handled = true;
-                    return;
-                }
-
                 if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
                     (!OperatingSystem.IsMacOS() && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
                 {

From eea55ec56fffc10032829662c43f36f5a14cd549 Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Wed, 12 Feb 2025 05:51:06 +0300
Subject: [PATCH 104/364] localization: update russian localization (#971)

---
 src/Resources/Locales/ru_RU.axaml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index e9f03d5a..a1c40764 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -22,7 +22,9 @@
   <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.AIAssistant" xml:space="preserve">OpenAI Ассистент</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">ПЕРЕСОЗДАТЬ</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Использовать OpenAI для создания сообщения о ревизии</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">ПРИМЕНИТЬ КАК СООБЩЕНИЕ РЕВИЗИИ</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Исправить </x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Ошибка</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Выдает ошибки и отказывается применять исправление</x:String>
@@ -37,6 +39,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Предупреждать</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" 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>
@@ -100,6 +106,7 @@
   <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">Инициализировать и обновить подмодуль</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Адрес репозитория:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">ЗАКРЫТЬ</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Редактор</x:String>
@@ -131,7 +138,7 @@
   <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">АВТОР</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Changed" 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.Committer" xml:space="preserve">РЕВИЗОР(ИСПОЛНИТЕЛЬ)</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Найти все ветки с этой ревизией</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">ВЕТКИ С ЭТОЙ РЕВИЗИЕЙ</x:String>
   <x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Отображаются только первые 100 изменений. Смотрите все изменения на вкладке ИЗМЕНЕНИЯ.</x:String>
@@ -154,15 +161,16 @@
   <x:String x:Key="Text.Configure.CustomAction.Scope" 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.Repository" 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">Автоматическое скачивание изменений</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.DefaultRemote" xml:space="preserve">Внешний репозиторий по умолчанию</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ОТСЛЕЖИВАНИЕ ПРОБЛЕМ</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</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Добавить пример правила для тем в Gitea</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Добавить пример правила запроса скачивания из Gitea</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Добавить пример правила для Git</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Добавить пример правила Jira</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Добавить пример правила выдачи GitLab</x:String>
@@ -203,6 +211,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Отложить и применить повторно</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.Name.WarnSpace" xml:space="preserve">Пробелы будут заменены на тире.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" 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>
@@ -226,8 +235,11 @@
   <x:String x:Key="Text.DeleteMultiBranch.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">Path:</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.TitleForGroup" xml:space="preserve">Подтвердите удаление группы</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" 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>
@@ -577,6 +589,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" 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.OnlyHighlightCurrentBranchInHistories" 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>
@@ -585,7 +598,7 @@
   <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.ByCommitter" xml:space="preserve">Ревизор</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" 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.BySHA" xml:space="preserve">SHA</x:String>
@@ -645,6 +658,8 @@
   <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Подготовленные так и неподготовленные изменения выбранных файлов будут сохранены!!!</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.AutoRestore" xml:space="preserve">Автоматически восстанавливать после откладывания</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Ваши рабочие файлы остаются неизменными, но отложенные сохранятся.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Включить неотслеживаемые файлы</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Хранить отложенные файлы</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Сообщение:</x:String>
@@ -660,7 +675,7 @@
   <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.CommitAmount" xml:space="preserve">РЕВИЗИИ</x:String>
-  <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">ИСПОЛНИТЕЛИ</x:String>
+  <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">РЕВИЗИИ: </x:String>
@@ -722,6 +737,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.SignOff" xml:space="preserve">Завершение работы</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>

From 19e72f86505233a694d0041c5dbf06170a256681 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 02:51:20 +0000
Subject: [PATCH 105/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 623347bf..eadd0cfd 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.87%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.67%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.13%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.40%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-97.87%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.87%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.67%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.13%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.40%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index d1e474d2..86da7846 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -201,28 +201,13 @@
 
 </details>
 
-### ru_RU.axaml: 97.87%
+### ru_RU.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.AIAssistant.Regen
-- Text.AIAssistant.Use
-- Text.ApplyStash
-- Text.ApplyStash.DropAfterApply
-- Text.ApplyStash.RestoreIndex
-- Text.ApplyStash.Stash
-- Text.Clone.RecurseSubmodules
-- Text.Configure.CustomAction.WaitForExit
-- Text.CreateBranch.Name.WarnSpace
-- Text.DeleteRepositoryNode.Path
-- Text.DeleteRepositoryNode.TipForGroup
-- Text.DeleteRepositoryNode.TipForRepository
-- Text.Repository.Notifications.Clear
-- Text.Stash.AutoRestore
-- Text.Stash.AutoRestore.Tip
-- Text.WorkingCopy.SignOff
+
 
 </details>
 

From 9757678dcf18de806828d23dbd1631b97602cce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christopher=20G=C3=B6ttfert?=
 <45085620+ChrisGoettfert@users.noreply.github.com>
Date: Wed, 12 Feb 2025 03:59:00 +0100
Subject: [PATCH 106/364] localization: added missing german translations
 (#973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Christopher Göttfert <Christopher.Goettfert@.uni-wuerzburg.de>
---
 src/Resources/Locales/de_DE.axaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index e4cefbd4..995c113b 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -22,7 +22,9 @@
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Branch verfolgen:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Remote-Branch verfolgen</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">OpenAI Assistent</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">Neu generieren</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Verwende OpenAI, um Commit-Nachrichten zu generieren</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">Als Commit-Nachricht verwenden</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Fehler</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Fehler werfen und anwenden des Patches verweigern</x:String>
@@ -37,6 +39,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Warnen</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Gibt eine Warnung für ein paar solcher Fehler aus, aber wendet es an</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Leerzeichen:</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Stash anwenden</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Nach dem Anwenden löschen</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Änderungen des Index wiederherstellen</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Archivieren...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Speichere Archiv in:</x:String>
   <x:String x:Key="Text.Archive.File.Placeholder" xml:space="preserve">Wähle Archivpfad aus</x:String>
@@ -100,6 +106,7 @@
   <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">Lokaler Name:</x:String>
   <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">Repository-Name. Optional.</x:String>
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Übergeordneter Ordner:</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Submodule initialisieren und aktualisieren</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Repository URL:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">SCHLIESSEN</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
@@ -202,6 +209,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Neuer Branch-Name:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Branch-Namen eingeben.</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Leerzeichen werden durch Bindestriche ersetzt.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Lokalen Branch erstellen</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">Tag erstellen...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">Neuer Tag auf:</x:String>
@@ -225,8 +233,11 @@
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Du versuchst mehrere Branches auf einmal zu löschen. Kontrolliere noch einmal vor dem Fortfahren!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Remote löschen</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remote:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Pfad:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Ziel:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Bestätige löschen von Gruppe</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Alle Nachfolger werden aus der Liste entfernt.</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">Dadurch wird es nur aus der Liste entfernt, nicht von der Festplatte!</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Bestätige löschen von Repository</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Lösche Submodul</x:String>
   <x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">Submodul Pfad:</x:String>
@@ -574,6 +585,7 @@
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologie</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Aktiviere '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Erstelle Branch</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Nur aktuellen Branch im Graphen hervorheben</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Öffne in {0}</x:String>
@@ -641,6 +653,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Pfad zum privaten SSH Schlüssel</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Automatisch wiederherstellen nach dem Stashen</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Die Arbeitsdateien bleiben unverändert, aber ein Stash wird gespeichert.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Inklusive nicht-verfolgter Dateien</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Behalte gestagte Dateien</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Name:</x:String>
@@ -720,6 +734,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">NICHT-VERFOLGTE DATEIEN INKLUDIEREN</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">KEINE BISHERIGEN COMMIT-NACHRICHTEN</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">KEINE COMMIT TEMPLATES</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">GESTAGED</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGEN</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">ALLES UNSTAGEN</x:String>

From 21e4dcffd0e301e84045c17af1aa97490fbe0bb8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 02:59:19 +0000
Subject: [PATCH 107/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index eadd0cfd..f188bf25 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-97.87%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.67%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.13%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.40%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.73%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.67%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.13%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.40%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 86da7846..71ef0acf 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,25 +1,11 @@
-### de_DE.axaml: 97.87%
+### de_DE.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.AIAssistant.Regen
-- Text.AIAssistant.Use
-- Text.ApplyStash
-- Text.ApplyStash.DropAfterApply
-- Text.ApplyStash.RestoreIndex
-- Text.ApplyStash.Stash
-- Text.Clone.RecurseSubmodules
 - Text.Configure.CustomAction.WaitForExit
-- Text.CreateBranch.Name.WarnSpace
-- Text.DeleteRepositoryNode.Path
-- Text.DeleteRepositoryNode.TipForGroup
-- Text.DeleteRepositoryNode.TipForRepository
 - Text.Repository.Notifications.Clear
-- Text.Stash.AutoRestore
-- Text.Stash.AutoRestore.Tip
-- Text.WorkingCopy.SignOff
 
 </details>
 

From 3302bdeb2607149c0ceaa3cadb0901516bea7617 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Feb 2025 21:25:57 +0800
Subject: [PATCH 108/364] localization: remove duplicated keys in de_DE

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 995c113b..b6458822 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -585,7 +585,6 @@
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologie</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Aktiviere '--first-parent' Option</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Erstelle Branch</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Nur aktuellen Branch im Graphen hervorheben</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Öffne in {0}</x:String>

From c6aedf1193114b8fa94823aecf6c28235817ea16 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Feb 2025 21:29:17 +0800
Subject: [PATCH 109/364] ux: right margin of main tab bar on macOS

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

diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index bfabf6e5..db5aeecb 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -86,10 +86,10 @@
       </Button>
 
       <!-- Pages Tabs-->
-      <v:LauncherTabBar Grid.Column="2" Height="30" VerticalAlignment="Bottom"/>
+      <v:LauncherTabBar Grid.Column="2" Height="30" Margin="0,0,16,0" VerticalAlignment="Bottom"/>
 
       <!-- Caption Buttons (Windows/Linux)-->
-      <Border Grid.Column="3" Margin="32,0,0,0" IsVisible="{Binding #ThisControl.IsRightCaptionButtonsVisible}">
+      <Border Grid.Column="3" Margin="16,0,0,0" IsVisible="{Binding #ThisControl.IsRightCaptionButtonsVisible}">
         <v:CaptionButtons Height="30" VerticalAlignment="Top"/>
       </Border>
     </Grid>

From 588879eb7f8689506179e02fea6402d6b5a8ed3b Mon Sep 17 00:00:00 2001
From: "Dmitrij D. Czarkoff" <czarkoff@gmail.com>
Date: Thu, 13 Feb 2025 02:41:08 +0000
Subject: [PATCH 110/364] feat: change worktree presentation (#978)

Present the worktree name first, then relative path to the main repo.

This is more aligned with Git's own UI,  and works better with UI size constrains.
---
 src/Commands/Worktree.cs       | 2 ++
 src/Models/Worktree.cs         | 9 +++++----
 src/Views/RemoveWorktree.axaml | 4 ++--
 src/Views/Repository.axaml     | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Commands/Worktree.cs b/src/Commands/Worktree.cs
index 27c0e28e..b73b8573 100644
--- a/src/Commands/Worktree.cs
+++ b/src/Commands/Worktree.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 namespace SourceGit.Commands
 {
@@ -26,6 +27,7 @@ namespace SourceGit.Commands
                     if (line.StartsWith("worktree ", StringComparison.Ordinal))
                     {
                         last = new Models.Worktree() { FullPath = line.Substring(9).Trim() };
+                        last.RelativePath = Path.GetRelativePath(WorkingDirectory, last.FullPath);
                         worktrees.Add(last);
                     }
                     else if (line.StartsWith("bare", StringComparison.Ordinal))
diff --git a/src/Models/Worktree.cs b/src/Models/Worktree.cs
index f9ba14e4..bc40e320 100644
--- a/src/Models/Worktree.cs
+++ b/src/Models/Worktree.cs
@@ -6,6 +6,7 @@ namespace SourceGit.Models
     {
         public string Branch { get; set; } = string.Empty;
         public string FullPath { get; set; } = string.Empty;
+        public string RelativePath { get; set; } = string.Empty;
         public string Head { get; set; } = string.Empty;
         public bool IsBare { get; set; } = false;
         public bool IsDetached { get; set; } = false;
@@ -21,15 +22,15 @@ namespace SourceGit.Models
             get
             {
                 if (IsDetached)
-                    return $"(deteched HEAD at {Head.Substring(10)})";
+                    return $"deteched HEAD at {Head.Substring(10)}";
 
                 if (Branch.StartsWith("refs/heads/", System.StringComparison.Ordinal))
-                    return $"({Branch.Substring(11)})";
+                    return Branch.Substring(11);
 
                 if (Branch.StartsWith("refs/remotes/", System.StringComparison.Ordinal))
-                    return $"({Branch.Substring(13)})";
+                    return Branch.Substring(13);
 
-                return $"({Branch})";
+                return Branch;
             }
         }
 
diff --git a/src/Views/RemoveWorktree.axaml b/src/Views/RemoveWorktree.axaml
index 6d7ea914..364881d2 100644
--- a/src/Views/RemoveWorktree.axaml
+++ b/src/Views/RemoveWorktree.axaml
@@ -18,8 +18,8 @@
       <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">
-          <Run Text="{Binding Target.FullPath}"/>
-          <Run Text="{Binding Target.Name}" Foreground="{DynamicResource Brush.FG2}"/>
+          <Run Text="{Binding Target.Name}"/>
+          (<Run Text="{Binding Target.RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>)
         </TextBlock>
       </Grid>
 
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 74f628c6..4180a054 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -372,8 +372,8 @@
                 <Grid ColumnDefinitions="Auto,*,22">
                   <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" TextTrimming="CharacterEllipsis">
-                    <Run Text="{Binding FullPath}"/>
-                    <Run Text="{Binding Name}" Foreground="{DynamicResource Brush.FG2}"/>
+                    <Run Text="{Binding Name}"/>
+                    (<Run Text="{Binding RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>)
                   </TextBlock>
                   <Path Grid.Column="2" Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Lock}" Fill="{DynamicResource Brush.FG2}" IsVisible="{Binding IsLocked}"/>
                 </Grid>

From 9b07034846ea097f2628930ea43ce818ca0a35a1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Feb 2025 10:46:28 +0800
Subject: [PATCH 111/364] code_review: PR #978

* Remove unnecessary parentheses since the name of relative path uses secondary foreground color already

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

diff --git a/src/Views/RemoveWorktree.axaml b/src/Views/RemoveWorktree.axaml
index 364881d2..736e6e40 100644
--- a/src/Views/RemoveWorktree.axaml
+++ b/src/Views/RemoveWorktree.axaml
@@ -19,7 +19,7 @@
         <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">
           <Run Text="{Binding Target.Name}"/>
-          (<Run Text="{Binding Target.RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>)
+          <Run Text="{Binding Target.RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>
         </TextBlock>
       </Grid>
 
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 4180a054..4d6bc64a 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -373,7 +373,7 @@
                   <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" TextTrimming="CharacterEllipsis">
                     <Run Text="{Binding Name}"/>
-                    (<Run Text="{Binding RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>)
+                    <Run Text="{Binding RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>
                   </TextBlock>
                   <Path Grid.Column="2" Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Lock}" Fill="{DynamicResource Brush.FG2}" IsVisible="{Binding IsLocked}"/>
                 </Grid>

From 9104060d79b0c4e5f316550cab8eca267e9e15ba Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 14 Feb 2025 10:43:08 +0800
Subject: [PATCH 112/364] feature: support add custom actions for selected
 branch (#980)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/CustomAction.cs            |  1 +
 src/Resources/Locales/en_US.axaml     |  4 ++-
 src/Resources/Locales/zh_CN.axaml     |  4 ++-
 src/Resources/Locales/zh_TW.axaml     |  4 ++-
 src/ViewModels/ExecuteCustomAction.cs | 19 ++++++++++--
 src/ViewModels/Repository.cs          | 42 ++++++++++++++++++++++++++-
 src/Views/RepositoryConfigure.axaml   | 21 ++++----------
 7 files changed, 73 insertions(+), 22 deletions(-)

diff --git a/src/Models/CustomAction.cs b/src/Models/CustomAction.cs
index bd56d6ae..a614961a 100644
--- a/src/Models/CustomAction.cs
+++ b/src/Models/CustomAction.cs
@@ -6,6 +6,7 @@ namespace SourceGit.Models
     {
         Repository,
         Commit,
+        Branch,
     }
 
     public class CustomAction : ObservableObject
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 70da2973..f8a06f08 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -56,6 +56,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Compare with HEAD</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.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>
   <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Discard all changes</x:String>
@@ -152,10 +153,11 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Template Content:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Repository's path; ${SHA} - Selected commit's SHA</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Repository's path; ${BRANCH} - Selected branch; ${SHA} - Selected commit's SHA</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">Executable File:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Name" xml:space="preserve">Name:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Scope:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Branch</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repository</x:String>
   <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Wait for action exit</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 005ef3a2..4db909c9 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -59,6 +59,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</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.DiscardAll" xml:space="preserve">放弃所有更改</x:String>
@@ -155,10 +156,11 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" 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}代替仓库路径，${SHA}代替提交哈希</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">请使用${REPO}代替仓库路径，${BRANCH}代替选中的分支，${SHA}代替提交哈希</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Executable" 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.Repository" xml:space="preserve">仓库</x:String>
   <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">等待操作执行完成</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index fe0e4bac..167565cf 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -59,6 +59,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</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.DiscardAll" xml:space="preserve">捨棄所有變更</x:String>
@@ -155,10 +156,11 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" 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} 表示存放庫路徑、${SHA} 表示所選的提交編號</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">使用 ${REPO} 表示存放庫路徑、${BRANCH} 表示所選的分支、${SHA} 表示所選的提交編號</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Executable" 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.Repository" xml:space="preserve">存放庫</x:String>
   <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">等待自訂操作退出</x:String>
diff --git a/src/ViewModels/ExecuteCustomAction.cs b/src/ViewModels/ExecuteCustomAction.cs
index 848faaaf..8e34379f 100644
--- a/src/ViewModels/ExecuteCustomAction.cs
+++ b/src/ViewModels/ExecuteCustomAction.cs
@@ -10,13 +10,26 @@ namespace SourceGit.ViewModels
             private set;
         }
 
-        public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Commit commit)
+        public ExecuteCustomAction(Repository repo, Models.CustomAction action)
         {
             _repo = repo;
             _args = action.Arguments.Replace("${REPO}", _repo.FullPath);
-            if (commit != null)
-                _args = _args.Replace("${SHA}", commit.SHA);
+            CustomAction = action;
+            View = new Views.ExecuteCustomAction() { DataContext = this };
+        }
 
+        public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Branch branch)
+        {
+            _repo = repo;
+            _args = action.Arguments.Replace("${REPO}", _repo.FullPath).Replace("${BRANCH}", branch.FriendlyName);
+            CustomAction = action;
+            View = new Views.ExecuteCustomAction() { DataContext = this };
+        }
+
+        public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Commit commit)
+        {
+            _repo = repo;
+            _args = action.Arguments.Replace("${REPO}", _repo.FullPath).Replace("${SHA}", commit.SHA);
             CustomAction = action;
             View = new Views.ExecuteCustomAction() { DataContext = this };
         }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 44de8c35..6b96255f 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1439,7 +1439,7 @@ namespace SourceGit.ViewModels
                     item.Click += (_, e) =>
                     {
                         if (CanCreatePopup())
-                            ShowAndStartPopup(new ExecuteCustomAction(this, dup, null));
+                            ShowAndStartPopup(new ExecuteCustomAction(this, dup));
 
                         e.Handled = true;
                     };
@@ -1698,6 +1698,7 @@ namespace SourceGit.ViewModels
             menu.Items.Add(createBranch);
             menu.Items.Add(createTag);
             menu.Items.Add(new MenuItem() { Header = "-" });
+            TryToAddCustomActionsToBranchContextMenu(menu, branch);
 
             if (!IsBare)
             {
@@ -1968,7 +1969,9 @@ namespace SourceGit.ViewModels
             menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(archive);
             menu.Items.Add(new MenuItem() { Header = "-" });
+            TryToAddCustomActionsToBranchContextMenu(menu, branch);
             menu.Items.Add(copy);
+
             return menu;
         }
 
@@ -2319,6 +2322,43 @@ namespace SourceGit.ViewModels
             return null;
         }
 
+        private void TryToAddCustomActionsToBranchContextMenu(ContextMenu menu, Models.Branch branch)
+        {
+            var actions = new List<Models.CustomAction>();
+            foreach (var action in Settings.CustomActions)
+            {
+                if (action.Scope == Models.CustomActionScope.Branch)
+                    actions.Add(action);
+            }
+
+            if (actions.Count == 0)
+                return;
+
+            var custom = new MenuItem();
+            custom.Header = App.Text("BranchCM.CustomAction");
+            custom.Icon = App.CreateMenuIcon("Icons.Action");
+
+            foreach (var action in actions)
+            {
+                var dup = action;
+                var item = new MenuItem();
+                item.Icon = App.CreateMenuIcon("Icons.Action");
+                item.Header = dup.Name;
+                item.Click += (_, e) =>
+                {
+                    if (CanCreatePopup())
+                        ShowAndStartPopup(new ExecuteCustomAction(this, dup, branch));
+
+                    e.Handled = true;
+                };
+
+                custom.Items.Add(item);
+            }
+
+            menu.Items.Add(custom);
+            menu.Items.Add(new MenuItem() { Header = "-" });
+        }
+
         private void UpdateCurrentRevisionFilesForSearchSuggestion()
         {
             _revisionFiles.Clear();
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index d9383743..6b7cdc12 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -5,7 +5,6 @@
                     xmlns:m="using:SourceGit.Models"
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
-                    xmlns:ac="using:Avalonia.Controls.Converters"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                     x:Class="SourceGit.Views.RepositoryConfigure"
                     x:DataType="vm:RepositoryConfigure"
@@ -412,20 +411,12 @@
                   <TextBlock Text="{DynamicResource Text.Configure.CustomAction.Name}"/>
                   <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Name, Mode=TwoWay}"/>
 
-                  <StackPanel Orientation="Horizontal" Margin="0,12,0,0">
-                    <StackPanel.Resources>
-                      <ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
-                    </StackPanel.Resources>
-                    
-                    <TextBlock Text="{DynamicResource Text.Configure.CustomAction.Scope}"/>
-                    <RadioButton Content="{DynamicResource Text.Configure.CustomAction.Scope.Repository}"
-                                 GroupName="CustomActionScope"
-                                 Margin="8,0"
-                                 IsChecked="{Binding Scope, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:CustomActionScope.Repository}}"/>
-                    <RadioButton Content="{DynamicResource Text.Configure.CustomAction.Scope.Commit}"
-                                 GroupName="CustomActionScope"
-                                 IsChecked="{Binding Scope, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:CustomActionScope.Commit}}"/>
-                  </StackPanel>
+                  <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Scope}"/>
+                  <ComboBox Margin="0,4,0,0" Height="28" HorizontalAlignment="Stretch" SelectedIndex="{Binding Scope, Mode=TwoWay}">
+                    <ComboBoxItem Content="{DynamicResource Text.Configure.CustomAction.Scope.Repository}"/>
+                    <ComboBoxItem Content="{DynamicResource Text.Configure.CustomAction.Scope.Commit}"/>
+                    <ComboBoxItem Content="{DynamicResource Text.Configure.CustomAction.Scope.Branch}"/>
+                  </ComboBox>
 
                   <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Executable}"/>
                   <TextBox Margin="0,4,0,0" Height="28" CornerRadius="3" Text="{Binding Executable, Mode=TwoWay}">

From e39351b4a77e3f179340c4a1b61ed04087a9c3fc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2025 02:43:26 +0000
Subject: [PATCH 113/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index f188bf25..3829cf54 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.73%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.67%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-98.13%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.40%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.47%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.61%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.42%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.15%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 71ef0acf..84411404 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,15 +1,17 @@
-### de_DE.axaml: 99.73%
+### de_DE.axaml: 99.47%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.BranchCM.CustomAction
+- Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.Repository.Notifications.Clear
 
 </details>
 
-### es_ES.axaml: 97.87%
+### es_ES.axaml: 97.61%
 
 
 <details>
@@ -21,7 +23,9 @@
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
+- Text.BranchCM.CustomAction
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
@@ -34,7 +38,7 @@
 
 </details>
 
-### fr_FR.axaml: 92.67%
+### fr_FR.axaml: 92.42%
 
 
 <details>
@@ -46,7 +50,9 @@
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
+- Text.BranchCM.CustomAction
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
@@ -98,7 +104,7 @@
 
 </details>
 
-### it_IT.axaml: 98.13%
+### it_IT.axaml: 97.87%
 
 
 <details>
@@ -110,7 +116,9 @@
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
+- Text.BranchCM.CustomAction
 - Text.Clone.RecurseSubmodules
+- Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
@@ -121,7 +129,7 @@
 
 </details>
 
-### pt_BR.axaml: 92.40%
+### pt_BR.axaml: 92.15%
 
 
 <details>
@@ -133,12 +141,14 @@
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
+- Text.BranchCM.CustomAction
 - Text.BranchCM.MergeMultiBranches
 - Text.Clone.RecurseSubmodules
 - Text.CommitCM.Merge
 - Text.CommitCM.MergeMultiple
 - Text.CommitDetail.Files.Search
 - Text.CommitDetail.Info.Children
+- Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
@@ -187,13 +197,14 @@
 
 </details>
 
-### ru_RU.axaml: 100.00%
+### ru_RU.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.BranchCM.CustomAction
+- Text.Configure.CustomAction.Scope.Branch
 
 </details>
 

From bc66e24407629efc0f9791fe14f3f05d9f1484e3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 15 Feb 2025 17:43:32 +0800
Subject: [PATCH 114/364] project: upgrade `AvaloniaUI` to `11.2.4`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/SourceGit.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 624804f1..7cceee7e 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -41,11 +41,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia" Version="11.2.4" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.4" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.4" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.4" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" />

From 36178d5ecf00e650a59058d538d9ae2764f9b2d7 Mon Sep 17 00:00:00 2001
From: Chiahong <36815907+ChiahongHong@users.noreply.github.com>
Date: Tue, 18 Feb 2025 09:26:44 +0800
Subject: [PATCH 115/364] localization: update zh_TW.axaml (#989)

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

diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 167565cf..a3fe5c19 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -39,10 +39,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">警告</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" 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.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">還原索引中已暫存的變更 (--index)</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">已選擇擱置變更:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">封存 (archive)...</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>
@@ -107,7 +107,7 @@
   <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">初始化並複製子模組</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">初始化並更新子模組</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">遠端存放庫:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">關閉</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">提交訊息編輯器</x:String>
@@ -163,7 +163,7 @@
   <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.Repository" xml:space="preserve">存放庫</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" 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>
@@ -240,7 +240,7 @@
   <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.TitleForGroup" xml:space="preserve">刪除群組確認</x:String>
-  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">只會從清單中移除，而不會刪除磁碟中的檔案！</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" 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>
@@ -265,7 +265,7 @@
   <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.UseBlockNavigation" xml:space="preserve">啟用基於變更區塊的導航</x:String>
+  <x:String x:Key="Text.Diff.UseBlockNavigation" 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>
@@ -412,7 +412,7 @@
   <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">重定基底 (rebase) 操作進行中。</x:String>
-  <x:String x:Key="Text.InProgress.Rebase.StoppedAt" 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>
@@ -425,8 +425,8 @@
   <x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>
-  <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.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>
@@ -580,17 +580,17 @@
   <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.FirstParentFilterToggle" xml:space="preserve">啟用 [--first-parent] 選項</x:String>
-  <x:String x:Key="Text.Repository.HistoriesLayout" 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.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.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.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">提交圖表中僅高亮顯示目前分支</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">清除所有通知</x:String>
+  <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" 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.Refresh" xml:space="preserve">重新載入</x:String>
@@ -616,7 +616,7 @@
   <x:String x:Key="Text.Repository.Tags.OrderByNameDes" 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.UseRelativeTimeInHistories" xml:space="preserve">在提交清單中使用相對時間</x:String>
+  <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">在提交列表中使用相對時間</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>
@@ -656,8 +656,8 @@
   <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">擱置變更 (stash)</x:String>
-  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">暫存後自動復原工作區</x:String>
-  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">工作區檔案保持未修改，但暫存內容已儲存。</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">擱置變更後自動復原工作區</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">工作區檔案保持未修改，但擱置內容已儲存。</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">包含未追蹤的檔案</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">保留已暫存的變更</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">擱置變更訊息:</x:String>
@@ -729,7 +729,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</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.CommitToEdit" xml:space="preserve">提交 (修改原始提交)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自動暫存全部變更並提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>

From 7ae5100fcf210649e6a9f19189e88615dea1a4b7 Mon Sep 17 00:00:00 2001
From: Arun <visionofarun@gmail.com>
Date: Mon, 17 Feb 2025 17:25:51 -0800
Subject: [PATCH 116/364] chore: Convey the usage of monospace font only in
 text editor (#990)

Signed-off-by: Arun <visionofarun@gmail.com>
(cherry picked from commit 7ec7de7b4a933a599cfffc79382a6edd13582c85)
---
 src/Resources/Locales/en_US.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index f8a06f08..cd266666 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -465,7 +465,7 @@
   <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">Only use monospace font in text editor</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.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>

From 14f47a9007beab39a02fc10c08eb0736e4bdc116 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Feb 2025 09:50:01 +0800
Subject: [PATCH 117/364] =?UTF-8?q?ux:=20style=20for=20current=20branch=20?=
 =?UTF-8?q?in=20branch=20tree=20(#991=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
index 698dc7ad..5c42f729 100644
--- a/src/ViewModels/BranchTreeNode.cs
+++ b/src/ViewModels/BranchTreeNode.cs
@@ -40,9 +40,9 @@ namespace SourceGit.ViewModels
             get => Backend is Models.Branch;
         }
 
-        public FontWeight NameFontWeight
+        public bool IsCurrent
         {
-            get => Backend is Models.Branch { IsCurrent: true } ? FontWeight.Bold : FontWeight.Regular;
+            get => Backend is Models.Branch { IsCurrent: true };
         }
 
         public string Tooltip
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index 0ebcdf20..b7ac725b 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -57,11 +57,17 @@
                                   IsExpanded="{Binding IsExpanded}"/>
 
             <!-- Name -->
-            <TextBlock Grid.Column="1"
-                       Text="{Binding Name}"
-                       Classes="primary"
-                       FontWeight="{Binding NameFontWeight}"
-                       TextTrimming="CharacterEllipsis"/>
+            <Grid Grid.Column="1" ColumnDefinitions="Auto,*">
+              <Border Grid.Column="0" Margin="0,0,4,0" Background="Green" Height="16" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsCurrent}">
+                <TextBlock Text="HEAD" Classes="primary" Margin="8,0" Foreground="#FFDDDDDD" FontSize="10" VerticalAlignment="Center"/>
+              </Border>              
+              
+              <TextBlock Grid.Column="1"
+                         Classes="primary"
+                         Text="{Binding Name}"
+                         TextTrimming="CharacterEllipsis"/>
+            </Grid>
+            
 
             <!-- Tracking status -->
             <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"

From e28abf81198c44a26df33eb34db995e33967bf8e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Feb 2025 10:04:56 +0800
Subject: [PATCH 118/364] enhance: supports remove single histories filter
 (#987)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs  | 9 +++++++++
 src/Views/Repository.axaml    | 6 +++++-
 src/Views/Repository.axaml.cs | 8 ++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 6b96255f..19e48b13 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -826,6 +826,15 @@ namespace SourceGit.ViewModels
             Task.Run(RefreshCommits);
         }
 
+        public void RemoveHistoriesFilter(Models.Filter filter)
+        {
+            if (_settings.HistoriesFilters.Remove(filter))
+            {
+                HistoriesFilterMode = _settings.HistoriesFilters.Count > 0 ? _settings.HistoriesFilters[0].Mode : Models.FilterMode.None;
+                RefreshHistoriesFilters(true);
+            }
+        }
+
         public void UpdateBranchNodeIsExpanded(BranchTreeNode node)
         {
             if (_settings == null || !string.IsNullOrWhiteSpace(_filter))
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 4d6bc64a..30180f7d 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -685,7 +685,11 @@
                   <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,0,0"/>
+                    <TextBlock Classes="primary" 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.Window.Close}"/>
+                    </Button>
                   </StackPanel>
                 </Border>
               </DataTemplate>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index bb359040..53bb2d53 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -519,5 +519,13 @@ namespace SourceGit.Views
 
             e.Handled = true;
         }
+
+        private void OnRemoveSelectedHistoriesFilter(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Repository repo && sender is Button { DataContext: Models.Filter filter})
+                repo.RemoveHistoriesFilter(filter);
+
+            e.Handled = true;
+        }
     }
 }

From d401e898a287b26cac19ca907bdc8be4dcfbf250 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Feb 2025 10:58:30 +0800
Subject: [PATCH 119/364] version: Release 2025.05

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

diff --git a/VERSION b/VERSION
index 4ee298df..15689348 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.04
\ No newline at end of file
+2025.05
\ No newline at end of file

From af4645a4ade086672c43a99f23aa2f2e93223d41 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Feb 2025 16:27:19 +0800
Subject: [PATCH 120/364] project: upgrade
 `LiveChartsCore.SkiaSharpView.Avalonia` to `2.0.0-rc5.4`

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

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 7cceee7e..12e914f9 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -50,7 +50,7 @@
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.1" />
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.4" />
     <PackageReference Include="OpenAI" Version="2.2.0-beta.1" />
     <PackageReference Include="TextMateSharp" Version="1.0.66" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.66" />

From 3d4a9b86b46f4ee09a1335532483d958edc5f0db Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Feb 2025 16:54:00 +0800
Subject: [PATCH 121/364] ux: use bold font weight for current branch name
 (#997)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Converters/BoolConverters.cs | 4 ++++
 src/Views/BranchTree.axaml       | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index 2d738700..3563fb37 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -1,4 +1,5 @@
 using Avalonia.Data.Converters;
+using Avalonia.Media;
 
 namespace SourceGit.Converters
 {
@@ -6,5 +7,8 @@ namespace SourceGit.Converters
     {
         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.Normal);
     }
 }
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index b7ac725b..a01f3502 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -65,6 +65,7 @@
               <TextBlock Grid.Column="1"
                          Classes="primary"
                          Text="{Binding Name}"
+                         FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
                          TextTrimming="CharacterEllipsis"/>
             </Grid>
             

From 5d2cd8b2fa6cf94b972865bd73dae7c2c1eef278 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Feb 2025 18:19:19 +0800
Subject: [PATCH 122/364] ux: new style for current branch (#998)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml     |  1 +
 src/Views/BranchTree.axaml    | 17 +++++------------
 src/Views/BranchTree.axaml.cs | 19 ++++++++++++-------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index 8e865660..b7d9c22e 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -8,6 +8,7 @@
   <StreamGeometry x:Key="Icons.Branch">M757 226a143 143 0 00-55 276 96 96 0 01-88 59h-191a187 187 0 00-96 27V312a143 143 0 10-96 0v399a143 143 0 10103 2 96 96 0 0188-59h191a191 191 0 00187-151 143 143 0 00-43-279zM280 130a48 48 0 110 96 48 48 0 010-96zm0 764a48 48 0 110-96 48 48 0 010 96zM757 417a48 48 0 110-96 48 48 0 010 96z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Branch.Add">M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Check">M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckCircled">M512 32C246 32 32 250 32 512s218 480 480 480 480-218 480-480S774 32 512 32zm269 381L496 698c-26 26-61 26-83 0L243 528c-26-26-26-61 0-83s61-26 83 0l128 128 240-240c26-26 61-26 83 0 26 19 26 54 3 80z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Changes">M747 467c29 0 56 4 82 12v-363c0-47-38-84-84-84H125c-47 0-84 38-84 84v707c0 47 38 84 84 84h375a287 287 0 01-43-152c0-160 129-289 289-289zm-531-250h438c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm0 179h263c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm131 247h-131c-19 0-34-15-34-34s15-34 34-34h131c19 0 34 15 34 34s-15 34-34 34zM747 521c-130 0-236 106-236 236S617 992 747 992s236-106 236-236S877 521 747 521zm11 386v-65h-130c-12 0-22-10-22-22s10-22 22-22h260l-130 108zm108-192H606l130-108v65h130c12 0 22 10 22 22s-10 22-22 22z</StreamGeometry>
   <StreamGeometry x:Key="Icons.CherryPick">M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z</StreamGeometry>
   <StreamGeometry x:Key="Icons.CircleDown">M512 926c-229 0-414-186-414-414S283 98 512 98s414 186 414 414-186 414-414 414zm0-73c189 0 341-153 341-341S701 171 512 171 171 323 171 512s153 341 341 341zm-6-192L284 439l52-52 171 171 171-171L728 439l-222 222z</StreamGeometry>
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index a01f3502..6bff4d39 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -57,18 +57,11 @@
                                   IsExpanded="{Binding IsExpanded}"/>
 
             <!-- Name -->
-            <Grid Grid.Column="1" ColumnDefinitions="Auto,*">
-              <Border Grid.Column="0" Margin="0,0,4,0" Background="Green" Height="16" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsCurrent}">
-                <TextBlock Text="HEAD" Classes="primary" Margin="8,0" Foreground="#FFDDDDDD" FontSize="10" VerticalAlignment="Center"/>
-              </Border>              
-              
-              <TextBlock Grid.Column="1"
-                         Classes="primary"
-                         Text="{Binding Name}"
-                         FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
-                         TextTrimming="CharacterEllipsis"/>
-            </Grid>
-            
+            <TextBlock Grid.Column="1"
+                       Classes="primary"
+                       Text="{Binding Name}"
+                       FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
+                       TextTrimming="CharacterEllipsis"/>            
 
             <!-- Tracking status -->
             <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
index e5460866..51bb01e0 100644
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@@ -52,31 +52,31 @@ namespace SourceGit.Views
 
             if (node.Backend is Models.Remote)
             {
-                CreateContent(new Thickness(0, 0, 0, 0), "Icons.Remote");
+                CreateContent(new Thickness(0, 0, 0, 0), "Icons.Remote", false);
             }
             else if (node.Backend is Models.Branch branch)
             {
                 if (branch.IsCurrent)
-                    CreateContent(new Thickness(0, 2, 0, 0), "Icons.Check");
+                    CreateContent(new Thickness(0, 0, 0, 0), "Icons.CheckCircled", true);
                 else
-                    CreateContent(new Thickness(2, 0, 0, 0), "Icons.Branch");
+                    CreateContent(new Thickness(2, 0, 0, 0), "Icons.Branch", false);
             }
             else
             {
                 if (node.IsExpanded)
-                    CreateContent(new Thickness(0, 2, 0, 0), "Icons.Folder.Open");
+                    CreateContent(new Thickness(0, 2, 0, 0), "Icons.Folder.Open", false);
                 else
-                    CreateContent(new Thickness(0, 2, 0, 0), "Icons.Folder");
+                    CreateContent(new Thickness(0, 2, 0, 0), "Icons.Folder", false);
             }
         }
 
-        private void CreateContent(Thickness margin, string iconKey)
+        private void CreateContent(Thickness margin, string iconKey, bool highlight)
         {
             var geo = this.FindResource(iconKey) as StreamGeometry;
             if (geo == null)
                 return;
 
-            Content = new Path()
+            var path = new Path()
             {
                 Width = 12,
                 Height = 12,
@@ -85,6 +85,11 @@ namespace SourceGit.Views
                 Margin = margin,
                 Data = geo,
             };
+
+            if (highlight)
+                path.Fill = Brushes.Green;
+
+            Content = path;
         }
     }
 

From 59638eb73159d60cb103a7bb58a5cee4511e95db Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 19 Feb 2025 10:35:34 +0800
Subject: [PATCH 123/364] enhance: tag push behavior while creating and
 deleting (#999)

- Remember the state of `Push to all remotes after created` checkbox while creating tag
- Remember the state of `Delete from remote repositories` checkbox while deleting tag
- Change default state of `Delete from remote repositories` to `false`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/RepositorySettings.cs | 12 ++++++++++++
 src/ViewModels/CreateTag.cs      | 13 +++++++------
 src/ViewModels/DeleteTag.cs      |  9 ++++-----
 src/Views/CreateTag.axaml        |  2 +-
 src/Views/DeleteTag.axaml        |  2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 556c99ea..44742fb8 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -104,6 +104,18 @@ namespace SourceGit.Models
             set;
         } = false;
 
+        public bool PushToRemoteWhenCreateTag
+        {
+            get;
+            set;
+        } = true;
+
+        public bool PushToRemoteWhenDeleteTag
+        {
+            get;
+            set;
+        } = false;
+
         public DealWithLocalChanges DealWithLocalChangesOnCreateBranch
         {
             get;
diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs
index af9dcf99..a6d7255b 100644
--- a/src/ViewModels/CreateTag.cs
+++ b/src/ViewModels/CreateTag.cs
@@ -39,11 +39,11 @@ namespace SourceGit.ViewModels
             set;
         } = false;
 
-        public bool PushToAllRemotes
+        public bool PushToRemotes
         {
-            get;
-            set;
-        } = true;
+            get => _repo.Settings.PushToRemoteWhenCreateTag;
+            set => _repo.Settings.PushToRemoteWhenCreateTag = value;
+        }
 
         public CreateTag(Repository repo, Models.Branch branch)
         {
@@ -82,6 +82,7 @@ namespace SourceGit.ViewModels
             _repo.SetWatcherEnabled(false);
             ProgressDescription = "Create tag...";
 
+            var remotes = PushToRemotes ? _repo.Remotes : null;
             return Task.Run(() =>
             {
                 bool succ;
@@ -90,9 +91,9 @@ namespace SourceGit.ViewModels
                 else
                     succ = Commands.Tag.Add(_repo.FullPath, _tagName, _basedOn);
 
-                if (succ && PushToAllRemotes)
+                if (succ && remotes != null)
                 {
-                    foreach (var remote in _repo.Remotes)
+                    foreach (var remote in remotes)
                     {
                         SetProgressDescription($"Pushing tag to remote {remote.Name} ...");
                         new Commands.Push(_repo.FullPath, remote.Name, _tagName, false).Exec();
diff --git a/src/ViewModels/DeleteTag.cs b/src/ViewModels/DeleteTag.cs
index 7b53e798..341eb4a2 100644
--- a/src/ViewModels/DeleteTag.cs
+++ b/src/ViewModels/DeleteTag.cs
@@ -10,17 +10,16 @@ namespace SourceGit.ViewModels
             private set;
         }
 
-        public bool ShouldPushToRemote
+        public bool PushToRemotes
         {
-            get;
-            set;
+            get => _repo.Settings.PushToRemoteWhenDeleteTag;
+            set => _repo.Settings.PushToRemoteWhenDeleteTag = value;
         }
 
         public DeleteTag(Repository repo, Models.Tag tag)
         {
             _repo = repo;
             Target = tag;
-            ShouldPushToRemote = true;
             View = new Views.DeleteTag() { DataContext = this };
         }
 
@@ -29,9 +28,9 @@ namespace SourceGit.ViewModels
             _repo.SetWatcherEnabled(false);
             ProgressDescription = $"Deleting tag '{Target.Name}' ...";
 
+            var remotes = PushToRemotes ? _repo.Remotes : null;
             return Task.Run(() =>
             {
-                var remotes = ShouldPushToRemote ? _repo.Remotes : null;
                 var succ = Commands.Tag.Delete(_repo.FullPath, Target.Name, remotes);
                 CallUIThread(() =>
                 {
diff --git a/src/Views/CreateTag.axaml b/src/Views/CreateTag.axaml
index 20b6798a..55b6052f 100644
--- a/src/Views/CreateTag.axaml
+++ b/src/Views/CreateTag.axaml
@@ -84,7 +84,7 @@
 
       <CheckBox Grid.Row="5" Grid.Column="1"
                 Content="{DynamicResource Text.CreateTag.PushToAllRemotes}"
-                IsChecked="{Binding PushToAllRemotes, Mode=TwoWay}"/>
+                IsChecked="{Binding PushToRemotes, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/DeleteTag.axaml b/src/Views/DeleteTag.axaml
index 702a7f2a..23c19d35 100644
--- a/src/Views/DeleteTag.axaml
+++ b/src/Views/DeleteTag.axaml
@@ -23,7 +23,7 @@
 
       <CheckBox Grid.Row="1" Grid.Column="1"
                 Content="{DynamicResource Text.DeleteTag.WithRemote}"
-                IsChecked="{Binding ShouldPushToRemote, Mode=TwoWay}"/>
+                IsChecked="{Binding PushToRemotes, Mode=TwoWay}"/>
     </Grid>    
   </StackPanel>
 </UserControl>

From 69d107430a2473de5a2f4fb92b2c106929882f8f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 19 Feb 2025 10:44:51 +0800
Subject: [PATCH 124/364] project: upgrade `OpenAI` and `Azure.AI.OpenAI` to
 `2.2.0-beta.2`

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

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 12e914f9..4183511e 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -48,10 +48,10 @@
     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.4" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.2" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.4" />
-    <PackageReference Include="OpenAI" Version="2.2.0-beta.1" />
+    <PackageReference Include="OpenAI" Version="2.2.0-beta.2" />
     <PackageReference Include="TextMateSharp" Version="1.0.66" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.66" />
   </ItemGroup>

From c3eca0d7fdea2c28084db3732875becac6874c28 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 19 Feb 2025 18:01:16 +0800
Subject: [PATCH 125/364] refactor: OpenAI integration (#996)

- Add `OpenAIResponse` to trim the `<think>...</think>` block
- Add an `Enable Streaming` option to fix the issue that some services do not support streaming output

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/GenerateCommitMessage.cs |  81 +++------------
 src/Models/OpenAI.cs                  | 136 +++++++++++++++++++++++---
 src/Resources/Locales/en_US.axaml     |   1 +
 src/Resources/Locales/zh_CN.axaml     |   1 +
 src/Resources/Locales/zh_TW.axaml     |   7 +-
 src/Views/Preferences.axaml           |   4 +
 6 files changed, 145 insertions(+), 85 deletions(-)

diff --git a/src/Commands/GenerateCommitMessage.cs b/src/Commands/GenerateCommitMessage.cs
index 4b18a561..df61fdd2 100644
--- a/src/Commands/GenerateCommitMessage.cs
+++ b/src/Commands/GenerateCommitMessage.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 
 using Avalonia.Threading;
@@ -36,6 +35,8 @@ namespace SourceGit.Commands
         {
             try
             {
+                _onResponse?.Invoke("Waiting for pre-file analyzing to completed...\n\n");
+
                 var responseBuilder = new StringBuilder();
                 var summaryBuilder = new StringBuilder();
                 foreach (var change in _changes)
@@ -49,18 +50,17 @@ namespace SourceGit.Commands
                     var rs = new GetDiffContent(_repo, new Models.DiffOption(change, false)).ReadToEnd();
                     if (rs.IsSuccess)
                     {
-                        var hasFirstValidChar = false;
-                        var thinkingBuffer = new StringBuilder();
                         _service.Chat(
                             _service.AnalyzeDiffPrompt,
                             $"Here is the `git diff` output: {rs.StdOut}",
                             _cancelToken,
                             update =>
-                                ProcessChatResponse(update, ref hasFirstValidChar, thinkingBuffer,
-                                    (responseBuilder, text =>
-                                        _onResponse?.Invoke(
-                                            $"Waiting for pre-file analyzing to completed...\n\n{text}")),
-                                    (summaryBuilder, null)));
+                            {
+                                responseBuilder.Append(update);
+                                summaryBuilder.Append(update);
+
+                                _onResponse?.Invoke($"Waiting for pre-file analyzing to completed...\n\n{responseBuilder}");
+                            });
                     }
 
                     responseBuilder.Append("\n");
@@ -74,15 +74,15 @@ namespace SourceGit.Commands
 
                 var responseBody = responseBuilder.ToString();
                 var subjectBuilder = new StringBuilder();
-                var hasSubjectFirstValidChar = false;
-                var subjectThinkingBuffer = new StringBuilder();
                 _service.Chat(
                     _service.GenerateSubjectPrompt,
                     $"Here are the summaries changes:\n{summaryBuilder}",
                     _cancelToken,
                     update =>
-                        ProcessChatResponse(update, ref hasSubjectFirstValidChar, subjectThinkingBuffer,
-                            (subjectBuilder, text => _onResponse?.Invoke($"{text}\n\n{responseBody}"))));
+                    {
+                        subjectBuilder.Append(update);
+                        _onResponse?.Invoke($"{subjectBuilder}\n\n{responseBody}");
+                    });
             }
             catch (Exception e)
             {
@@ -90,67 +90,10 @@ namespace SourceGit.Commands
             }
         }
 
-        private void ProcessChatResponse(
-            string update,
-            ref bool hasFirstValidChar,
-            StringBuilder thinkingBuffer,
-            params (StringBuilder builder, Action<string> callback)[] outputs)
-        {
-            if (!hasFirstValidChar)
-            {
-                update = update.TrimStart();
-                if (string.IsNullOrEmpty(update))
-                    return;
-                if (update.StartsWith("<", StringComparison.Ordinal))
-                    thinkingBuffer.Append(update);
-                hasFirstValidChar = true;
-            }
-
-            if (thinkingBuffer.Length > 0)
-                thinkingBuffer.Append(update);
-
-            if (thinkingBuffer.Length > 15)
-            {
-                var match = REG_COT.Match(thinkingBuffer.ToString());
-                if (match.Success)
-                {
-                    update = REG_COT.Replace(thinkingBuffer.ToString(), "").TrimStart();
-                    if (update.Length > 0)
-                    {
-                        foreach (var output in outputs)
-                            output.builder.Append(update);
-                        thinkingBuffer.Clear();
-                    }
-                    return;
-                }
-
-                match = REG_THINK_START.Match(thinkingBuffer.ToString());
-                if (!match.Success)
-                {
-                    foreach (var output in outputs)
-                        output.builder.Append(thinkingBuffer);
-                    thinkingBuffer.Clear();
-                    return;
-                }
-            }
-
-            if (thinkingBuffer.Length == 0)
-            {
-                foreach (var output in outputs)
-                {
-                    output.builder.Append(update);
-                    output.callback?.Invoke(output.builder.ToString());
-                }
-            }
-        }
-
         private Models.OpenAIService _service;
         private string _repo;
         private List<Models.Change> _changes;
         private CancellationToken _cancelToken;
         private Action<string> _onResponse;
-
-        private static readonly Regex REG_COT = new(@"^<(think|thought|thinking|thought_chain)>(.*?)</\1>", RegexOptions.Singleline);
-        private static readonly Regex REG_THINK_START = new(@"^<(think|thought|thinking|thought_chain)>", RegexOptions.Singleline);
     }
 }
diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index a6648c11..264230c6 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -1,5 +1,8 @@
 using System;
 using System.ClientModel;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using Azure.AI.OpenAI;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -8,6 +11,91 @@ using OpenAI.Chat;
 
 namespace SourceGit.Models
 {
+    public partial class OpenAIResponse
+    {
+        public OpenAIResponse(Action<string> onUpdate)
+        {
+            _onUpdate = onUpdate;
+        }
+
+        public void Append(string text)
+        {
+            var buffer = text;
+
+            if (_thinkTail.Length > 0)
+            {
+                _thinkTail.Append(buffer);
+                buffer = _thinkTail.ToString();
+                _thinkTail.Clear();
+            }
+
+            buffer = REG_COT().Replace(buffer, "");
+
+            var startIdx = buffer.IndexOf('<', StringComparison.Ordinal);
+            if (startIdx >= 0)
+            {
+                if (startIdx > 0)
+                    OnReceive(buffer.Substring(0, startIdx));
+                   
+                var endIdx = buffer.IndexOf(">", startIdx + 1, StringComparison.Ordinal);
+                if (endIdx <= startIdx)
+                {
+                    if (buffer.Length - startIdx <= 15)
+                        _thinkTail.Append(buffer.Substring(startIdx));
+                    else
+                        OnReceive(buffer.Substring(startIdx));
+                }
+                else if (endIdx < startIdx + 15)
+                {
+                    var tag = buffer.Substring(startIdx + 1, endIdx - startIdx - 1);
+                    if (_thinkTags.Contains(tag))
+                        _thinkTail.Append(buffer.Substring(startIdx));
+                    else
+                        OnReceive(buffer.Substring(startIdx));
+                }
+                else
+                {
+                    OnReceive(buffer.Substring(startIdx));
+                }
+            }
+            else
+            {
+                OnReceive(buffer);
+            }
+        }
+
+        public void End()
+        {
+            if (_thinkTail.Length > 0)
+            {
+                OnReceive(_thinkTail.ToString());
+                _thinkTail.Clear();
+            }
+        }
+
+        private void OnReceive(string text)
+        {
+            if (!_hasTrimmedStart)
+            {
+                text = text.TrimStart();
+                if (string.IsNullOrEmpty(text))
+                    return;
+
+                _hasTrimmedStart = true;
+            }
+
+            _onUpdate.Invoke(text);
+        }
+
+        [GeneratedRegex(@"<(think|thought|thinking|thought_chain)>.*?</\1>", RegexOptions.Singleline)]
+        private static partial Regex REG_COT();
+
+        private Action<string> _onUpdate = null;
+        private StringBuilder _thinkTail = new StringBuilder();
+        private HashSet<string> _thinkTags = ["think", "thought", "thinking", "thought_chain"];
+        private bool _hasTrimmedStart = false;
+    }
+
     public class OpenAIService : ObservableObject
     {
         public string Name
@@ -42,6 +130,12 @@ namespace SourceGit.Models
             set => SetProperty(ref _model, value);
         }
 
+        public bool Streaming
+        {
+            get => _streaming;
+            set => SetProperty(ref _streaming, value);
+        }
+
         public string AnalyzeDiffPrompt
         {
             get => _analyzeDiffPrompt;
@@ -89,32 +183,47 @@ namespace SourceGit.Models
 
         public void Chat(string prompt, string question, CancellationToken cancellation, Action<string> onUpdate)
         {
-            Uri server = new(Server);
-            ApiKeyCredential key = new(ApiKey);
-            ChatClient client = null;
-            if (Server.Contains("openai.azure.com/", StringComparison.Ordinal))
+            var server = new Uri(_server);
+            var key = new ApiKeyCredential(_apiKey);
+            var client = null as ChatClient;
+            if (_server.Contains("openai.azure.com/", StringComparison.Ordinal))
             {
                 var azure = new AzureOpenAIClient(server, key);
-                client = azure.GetChatClient(Model);
+                client = azure.GetChatClient(_model);
             }
             else
             {
                 var openai = new OpenAIClient(key, new() { Endpoint = server });
-                client = openai.GetChatClient(Model);
+                client = openai.GetChatClient(_model);
             }
 
+            var messages = new List<ChatMessage>();
+            messages.Add(_model.Equals("o1-mini", StringComparison.Ordinal) ? new UserChatMessage(prompt) : new SystemChatMessage(prompt));
+            messages.Add(new UserChatMessage(question));
+
             try
             {
-                var updates = client.CompleteChatStreaming([
-                    _model.Equals("o1-mini", StringComparison.Ordinal) ? new UserChatMessage(prompt) : new SystemChatMessage(prompt),
-                    new UserChatMessage(question),
-                ], null, cancellation);
+                var rsp = new OpenAIResponse(onUpdate);
 
-                foreach (var update in updates)
+                if (_streaming)
                 {
-                    if (update.ContentUpdate.Count > 0)
-                        onUpdate.Invoke(update.ContentUpdate[0].Text);
+                    var updates = client.CompleteChatStreaming(messages, null, cancellation);
+
+                    foreach (var update in updates)
+                    {
+                        if (update.ContentUpdate.Count > 0)
+                            rsp.Append(update.ContentUpdate[0].Text);
+                    }
                 }
+                else
+                {
+                    var completion = client.CompleteChat(messages, null, cancellation);
+
+                    if (completion.Value.Content.Count > 0)
+                        rsp.Append(completion.Value.Content[0].Text);
+                }
+
+                rsp.End();
             }
             catch
             {
@@ -127,6 +236,7 @@ namespace SourceGit.Models
         private string _server;
         private string _apiKey;
         private string _model;
+        private bool _streaming = true;
         private string _analyzeDiffPrompt;
         private string _generateSubjectPrompt;
     }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index cd266666..0da8b5ed 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -459,6 +459,7 @@
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Model</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Name</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
+  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Enable Streaming</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPEARANCE</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 4db909c9..983775e7 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -462,6 +462,7 @@
   <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.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.FontSize" xml:space="preserve">字体大小</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index a3fe5c19..2a5ced45 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -456,12 +456,13 @@
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} 年前</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.Server" xml:space="preserve">伺服器</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">分析變更差異提示詞</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.AnalyzeDiffPrompt" xml:space="preserve">分析變更差異提示詞</x:String>
-  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">產生提交訊息提示詞</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.FontSize" xml:space="preserve">字型大小</x:String>
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 1d282ad9..3bdd150a 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -616,6 +616,10 @@
                              Text="{Binding GenerateSubjectPrompt, Mode=TwoWay}"
                              AcceptsReturn="true"
                              TextWrapping="Wrap"/>
+
+                    <CheckBox Margin="0,12,0,0"
+                              Content="{DynamicResource Text.Preferences.AI.Streaming}"
+                              IsChecked="{Binding Streaming, Mode=TwoWay}"/>
                   </StackPanel>
                 </DataTemplate>
               </ContentControl.DataTemplates>

From 68946d21400575332c784d8820ae247063865b1b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 10:01:37 +0000
Subject: [PATCH 126/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3829cf54..aca5a594 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.47%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.61%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.42%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.15%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.48%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.74%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.03%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.60%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 84411404..08b7c462 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.47%
+### de_DE.axaml: 99.34%
 
 
 <details>
@@ -7,11 +7,12 @@
 - Text.BranchCM.CustomAction
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
+- Text.Preferences.AI.Streaming
 - Text.Repository.Notifications.Clear
 
 </details>
 
-### es_ES.axaml: 97.61%
+### es_ES.axaml: 97.48%
 
 
 <details>
@@ -31,6 +32,7 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Preferences.AI.Streaming
 - Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
@@ -38,7 +40,7 @@
 
 </details>
 
-### fr_FR.axaml: 92.42%
+### fr_FR.axaml: 92.30%
 
 
 <details>
@@ -67,6 +69,7 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
+- Text.Preferences.AI.Streaming
 - Text.Preferences.Appearance.FontSize
 - Text.Preferences.Appearance.FontSize.Default
 - Text.Preferences.Appearance.FontSize.Editor
@@ -104,7 +107,7 @@
 
 </details>
 
-### it_IT.axaml: 97.87%
+### it_IT.axaml: 97.74%
 
 
 <details>
@@ -123,13 +126,14 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Preferences.AI.Streaming
 - Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 
 </details>
 
-### pt_BR.axaml: 92.15%
+### pt_BR.axaml: 92.03%
 
 
 <details>
@@ -169,6 +173,7 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
+- Text.Preferences.AI.Streaming
 - Text.Preferences.General.DateFormat
 - Text.Preferences.General.ShowChildren
 - Text.Preferences.Git.SSLVerify
@@ -197,7 +202,7 @@
 
 </details>
 
-### ru_RU.axaml: 99.73%
+### ru_RU.axaml: 99.60%
 
 
 <details>
@@ -205,6 +210,7 @@
 
 - Text.BranchCM.CustomAction
 - Text.Configure.CustomAction.Scope.Branch
+- Text.Preferences.AI.Streaming
 
 </details>
 

From ce16ac63eb9ef3308209f42ee94ee974a2b42957 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 19 Feb 2025 19:22:21 +0800
Subject: [PATCH 127/364] enhance: submodule bookmark inherts from parent repo
 (#1001)

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

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 19e48b13..6e8a5290 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1161,6 +1161,10 @@ namespace SourceGit.ViewModels
 
         public void OpenSubmodule(string submodule)
         {
+            var selfPage = GetOwnerPage();
+            if (selfPage == null)
+                return;
+
             var root = Path.GetFullPath(Path.Combine(_fullpath, submodule));
             var normalizedPath = root.Replace("\\", "/");
 
@@ -1171,12 +1175,12 @@ namespace SourceGit.ViewModels
                 {
                     Id = normalizedPath,
                     Name = Path.GetFileName(normalizedPath),
-                    Bookmark = 0,
+                    Bookmark = selfPage.Node.Bookmark,
                     IsRepository = true,
                 };
             }
 
-            App.GetLauncer()?.OpenRepositoryInTab(node, null);
+            App.GetLauncer().OpenRepositoryInTab(node, null);
         }
 
         public void AddWorktree()

From cbc2e46beb75edf05fb05935d87d8dfce36a539d Mon Sep 17 00:00:00 2001
From: Oleg Kosmakov <1533952+kosmakoff@users.noreply.github.com>
Date: Thu, 20 Feb 2025 02:31:07 +0100
Subject: [PATCH 128/364] fix: Update unstaged filed counter when unstaged
 files change (#1007)

* Add missing OnPropertyChanged in Cleanup

* Force unstaged count to refresh
---
 src/ViewModels/WorkingCopy.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 7ac13dc2..60fa93c3 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -214,9 +214,11 @@ namespace SourceGit.ViewModels
             OnPropertyChanged(nameof(SelectedStaged));
 
             _visibleUnstaged.Clear();
-            _unstaged.Clear();
             OnPropertyChanged(nameof(VisibleUnstaged));
 
+            _unstaged.Clear();
+            OnPropertyChanged(nameof(Unstaged));
+
             _staged.Clear();
             OnPropertyChanged(nameof(Staged));
 
@@ -305,6 +307,7 @@ namespace SourceGit.ViewModels
                 _isLoadingData = true;
                 HasUnsolvedConflicts = hasConflict;
                 VisibleUnstaged = visibleUnstaged;
+                OnPropertyChanged(nameof(Unstaged));
                 Staged = staged;
                 SelectedUnstaged = selectedUnstaged;
                 SelectedStaged = selectedStaged;

From 0e1dfba7ef9c94e43f0cf9a9dc8bfad33d3f8df7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Feb 2025 09:34:03 +0800
Subject: [PATCH 129/364] code_review: PR #1007

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

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 60fa93c3..d87c54ec 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -109,7 +109,7 @@ namespace SourceGit.ViewModels
                     if (_isLoadingData)
                         return;
 
-                    VisibleUnstaged = GetVisibleUnstagedChanges();
+                    VisibleUnstaged = GetVisibleUnstagedChanges(_unstaged);
                     SelectedUnstaged = [];
                 }
             }
@@ -284,9 +284,7 @@ namespace SourceGit.ViewModels
                 }
             }
 
-            _unstaged = unstaged;
-
-            var visibleUnstaged = GetVisibleUnstagedChanges();
+            var visibleUnstaged = GetVisibleUnstagedChanges(unstaged);
             var selectedUnstaged = new List<Models.Change>();
             foreach (var c in visibleUnstaged)
             {
@@ -307,7 +305,7 @@ namespace SourceGit.ViewModels
                 _isLoadingData = true;
                 HasUnsolvedConflicts = hasConflict;
                 VisibleUnstaged = visibleUnstaged;
-                OnPropertyChanged(nameof(Unstaged));
+                Unstaged = unstaged;
                 Staged = staged;
                 SelectedUnstaged = selectedUnstaged;
                 SelectedStaged = selectedStaged;
@@ -1459,14 +1457,14 @@ namespace SourceGit.ViewModels
             }
         }
 
-        private List<Models.Change> GetVisibleUnstagedChanges()
+        private List<Models.Change> GetVisibleUnstagedChanges(List<Models.Change> unstaged)
         {
             if (string.IsNullOrEmpty(_unstagedFilter))
-                return _unstaged;
+                return unstaged;
 
             var visible = new List<Models.Change>();
             
-            foreach (var c in _unstaged)
+            foreach (var c in unstaged)
             {
                 if (c.Path.Contains(_unstagedFilter, StringComparison.OrdinalIgnoreCase))
                     visible.Add(c);

From 53f591bdad68afeb49a4c6d0b0ea8fc42b7a7323 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Feb 2025 10:12:12 +0800
Subject: [PATCH 130/364] ux: add a warning icon when the tracking upstream of
 a local branch is gone (#1006)

Co-authored-by: Davide Tentori <dtentori@softeam.it>
---
 src/Commands/QueryBranches.cs     | 12 ++++++++++++
 src/Models/Branch.cs              |  1 +
 src/Resources/Locales/en_US.axaml |  1 +
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/Resources/Locales/zh_TW.axaml |  1 +
 src/ViewModels/BranchTreeNode.cs  |  8 +++++---
 src/Views/BranchTree.axaml        | 12 +++++++++++-
 7 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
index 95f97214..44438cef 100644
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@@ -25,11 +25,22 @@ namespace SourceGit.Commands
                 return branches;
 
             var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            var remoteBranches = new HashSet<string>();
             foreach (var line in lines)
             {
                 var b = ParseLine(line);
                 if (b != null)
+                {
                     branches.Add(b);
+                    if (!b.IsLocal)
+                        remoteBranches.Add(b.FullName);
+                }
+            }
+
+            foreach (var b in branches)
+            {
+                if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))
+                    b.IsUpsteamGone = !remoteBranches.Contains(b.Upstream);
             }
 
             return branches;
@@ -75,6 +86,7 @@ namespace SourceGit.Commands
             branch.Head = parts[1];
             branch.IsCurrent = parts[2] == "*";
             branch.Upstream = parts[3];
+            branch.IsUpsteamGone = false;
 
             if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
                 branch.TrackStatus = new QueryTrackStatus(WorkingDirectory, branch.Name, branch.Upstream).Result();
diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs
index 0ba320c1..2d0ae5b2 100644
--- a/src/Models/Branch.cs
+++ b/src/Models/Branch.cs
@@ -34,6 +34,7 @@ namespace SourceGit.Models
         public string Upstream { get; set; }
         public BranchTrackStatus TrackStatus { get; set; }
         public string Remote { get; set; }
+        public bool IsUpsteamGone { get; set; }
 
         public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 0da8b5ed..dfc17dee 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -72,6 +72,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Rename ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Set Tracking Branch...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Branch Compare</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Invalid upstream!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">CANCEL</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Reset to This Revision</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 983775e7..115f917e 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -75,6 +75,7 @@
   <x:String x:Key="Text.BranchCM.Rename" 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.BranchUpstreamInvalid" xml:space="preserve">跟踪的上游分支不存在或已删除！</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">字节</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取    消</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">重置文件到该版本</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 2a5ced45..00933783 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -75,6 +75,7 @@
   <x:String x:Key="Text.BranchCM.Rename" 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.BranchUpstreamInvalid" xml:space="preserve">追蹤上游分支不存在或已刪除！</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">位元組</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取  消</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">重設檔案為此版本</x:String>
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
index 5c42f729..6c1d2e04 100644
--- a/src/ViewModels/BranchTreeNode.cs
+++ b/src/ViewModels/BranchTreeNode.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-
 using Avalonia;
-using Avalonia.Media;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -45,6 +42,11 @@ namespace SourceGit.ViewModels
             get => Backend is Models.Branch { IsCurrent: true };
         }
 
+        public bool ShowUpstreamGoneTip
+        {
+            get => Backend is Models.Branch { IsUpsteamGone: true };
+        }
+
         public string Tooltip
         {
             get => Backend is Models.Branch b ? b.FriendlyName : null;
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index 6bff4d39..0ac09e6c 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -61,7 +61,17 @@
                        Classes="primary"
                        Text="{Binding Name}"
                        FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
-                       TextTrimming="CharacterEllipsis"/>            
+                       TextTrimming="CharacterEllipsis"/>
+
+            <!-- Upstream invalid tip -->
+            <Border Grid.Column="2"
+                    Width="12" Height="12"
+                    Margin="8,0"
+                    Background="Transparent"
+                    ToolTip.Tip="{DynamicResource Text.BranchUpstreamInvalid}"
+                    IsVisible="{Binding ShowUpstreamGoneTip}">
+              <Path Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
+            </Border>
 
             <!-- Tracking status -->
             <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"

From b57c0158c17f4c1d8f0c250859a71281e1d00229 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Feb 2025 02:14:51 +0000
Subject: [PATCH 131/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index aca5a594..784d0672 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.48%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.74%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-92.03%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.60%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.20%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.35%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.18%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.61%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.91%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.47%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 08b7c462..53631bc1 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,10 +1,11 @@
-### de_DE.axaml: 99.34%
+### de_DE.axaml: 99.20%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.BranchCM.CustomAction
+- Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.Preferences.AI.Streaming
@@ -12,7 +13,7 @@
 
 </details>
 
-### es_ES.axaml: 97.48%
+### es_ES.axaml: 97.35%
 
 
 <details>
@@ -25,6 +26,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.BranchCM.CustomAction
+- Text.BranchUpstreamInvalid
 - Text.Clone.RecurseSubmodules
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
@@ -40,7 +42,7 @@
 
 </details>
 
-### fr_FR.axaml: 92.30%
+### fr_FR.axaml: 92.18%
 
 
 <details>
@@ -53,6 +55,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.BranchCM.CustomAction
+- Text.BranchUpstreamInvalid
 - Text.Clone.RecurseSubmodules
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
@@ -107,7 +110,7 @@
 
 </details>
 
-### it_IT.axaml: 97.74%
+### it_IT.axaml: 97.61%
 
 
 <details>
@@ -120,6 +123,7 @@
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
 - Text.BranchCM.CustomAction
+- Text.BranchUpstreamInvalid
 - Text.Clone.RecurseSubmodules
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
@@ -133,7 +137,7 @@
 
 </details>
 
-### pt_BR.axaml: 92.03%
+### pt_BR.axaml: 91.91%
 
 
 <details>
@@ -147,6 +151,7 @@
 - Text.ApplyStash.Stash
 - Text.BranchCM.CustomAction
 - Text.BranchCM.MergeMultiBranches
+- Text.BranchUpstreamInvalid
 - Text.Clone.RecurseSubmodules
 - Text.CommitCM.Merge
 - Text.CommitCM.MergeMultiple
@@ -202,13 +207,14 @@
 
 </details>
 
-### ru_RU.axaml: 99.60%
+### ru_RU.axaml: 99.47%
 
 
 <details>
 <summary>Missing Keys</summary>
 
 - Text.BranchCM.CustomAction
+- Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Preferences.AI.Streaming
 

From 507e502874a6dc6e3d4aa090519fc8a48e6c3e83 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Feb 2025 10:18:46 +0800
Subject: [PATCH 132/364] fix: `Custom Action` height is not large enough to
 display all contents (#1004)

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

diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 6b7cdc12..61bc14e0 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -340,7 +340,7 @@
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.CustomAction}"/>
         </TabItem.Header>
 
-        <Grid ColumnDefinitions="200,*" Height="300" Margin="0,8,0,16">
+        <Grid ColumnDefinitions="200,*" Height="340" Margin="0,8,0,16">
           <Border Grid.Column="0"
                   BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                   Background="{DynamicResource Brush.Contents}">

From 731f1055bcdc10da906eccd4345a43ba595896a3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Feb 2025 11:04:57 +0800
Subject: [PATCH 133/364] feat!: add `ptyxis` support (#1005)

BREAKING CHANGE: Index of `Custom` shell/terminal

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/ShellOrTerminal.cs              |   1 +
 src/Resources/Images/ShellIcons/ptyxis.png | Bin 0 -> 6930 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 src/Resources/Images/ShellIcons/ptyxis.png

diff --git a/src/Models/ShellOrTerminal.cs b/src/Models/ShellOrTerminal.cs
index 4f0222e8..3ada2cf9 100644
--- a/src/Models/ShellOrTerminal.cs
+++ b/src/Models/ShellOrTerminal.cs
@@ -57,6 +57,7 @@ namespace SourceGit.Models
                     new ShellOrTerminal("mate-terminal", "MATE Terminal", "mate-terminal"),
                     new ShellOrTerminal("foot", "Foot", "foot"),
                     new ShellOrTerminal("wezterm", "WezTerm", "wezterm"),
+                    new ShellOrTerminal("ptyxis", "Ptyxis", "ptyxis"),
                     new ShellOrTerminal("custom", "Custom", ""),
                 };
             }
diff --git a/src/Resources/Images/ShellIcons/ptyxis.png b/src/Resources/Images/ShellIcons/ptyxis.png
new file mode 100644
index 0000000000000000000000000000000000000000..9202f6e115724d234fd1bf015abd705a475405a0
GIT binary patch
literal 6930
zcmV+t8|~zYP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D8mCD_K~#8N?VEeB
zWmjG2Kfkrsex28S-+rV!>7>&H0)zxm0-_0^j0ouHj9Q2yGm4B;fDTilC>YccsbWyE
z#2OU~kP&Opp^8F59>q%_1c8u*q?0sB`jPIwkG}Vw*WPEp)>`w&KHceb-`h^61gRRn
zw^r?Q);@dh_51F%zU#Mszjfg|_zoTue(=L@k1nkHwuMJ7thx~D!ir1brcd2sHm<Bb
z|K0b#^~wv+eY@f5ciwW<)Box9zjI;zg?LN^6bE~O6P|`sw>{(Ve}CGA=l`|v{;$73
zJpcQ3AN{ZGYIFSes$ag~{QB+im<Zru5L;1J)lxahKl)v_z4>t${^Ua3;%`wm-1aL^
zzu_yt@yZ*&{KmID{|mRwpFMZ=hhH7t_~qaD_3!(~*Z;tyuX=1ay;y(pk2e4Md(VFN
z!|Ye=R{8j9GoO3(FE7R=$H?3J?>^{V^p?Pz=Q~ty7+F4e?_nmDLy2ZN4EUh~*I-;T
z*t~#M4&@ZC_S|*sA?_KRW@13cAxk>s*^hfXvo>H@RDArQuQPHb-+RR&u5K^kr3Uff
z1z!mdoIb_+IHfXR;*eGpan1Z9kumsb8$}6&e27;<hY)QN-uLlOGDs`BQLy!r7v22y
z*UtX?2QM(~94;c@ZTGzE#(25))(UrOLh-!AYpV<QA3aHKJr03R8<gOkK~Y0CLYxD@
z173lupzIg;z#uJ+4h<#_nQRV8Vhv7FW+f78B+xil5$FIX9)(9$Lb^7>$00%6pxO~p
zJ0=|rklGUj=3IM~S6q8wAHBIQ;w<+ZInMEWPNUGwE<`;4=BKY|CGT3)t*7d-`|7K%
z{Fz@n&s_BRUjRP#jt{Or>*v1zrDdXDII7E*iUZ<ai*Z>|mY&L5v@+PNz#~}a@B&T*
zr#yH?c4mUjEQm)$A)+YyBZ5u>0!3bt_j7Oxo7b3jj8lRWL3zdGOh%bIL>Ul8pbTk$
zgmO(!a3c6=vEo5#bQChI3w)p%Z1pjr=HL^rM8&49ML#<defbwYa_ejF`Oue7pKtF)
z1OTr6gk87yu2}xXp(_|wB_*D))gmh=6vGrP8Y&BAjW~;_rY|W#c|)<DqP*a6IOV9b
z2~oR+7(t=1nWf4qY+ewy19TGLq<Nc&A|GZ*VZnP)jyz3?S}`UL@fY-2g(pih!fwK-
zDyYO$iLi8NFJWv@UT6gY>9LJ>z4J$Y@6V?l^&GY%fcrmu`)cc^gKtW9&5&8kuqa7w
z30iQIihO;5t7~jlAmY)XKG!hqgnTf@RTb7+ysv4^bs^D+ct9bdu|+{NlhEBe4`{q?
znkJ%%IuVYVS{y1dBy(L<sLuZ2QEl}i2(YoXg^nW9NsciJ6&eC9#3rCv%lN=s{`3Xu
zy<6i)UA&zJoW(Q$_BB2=75lE<OD-^~Ew--6*G6ayRbF9>ilo!RYmZeBBq6S_kk?eB
z90Y<+j2OX*o9de&-hj2JL}OYp`N|NRRiHq3Lc(4|m_&>>MhLnQMjT!|;vYS6IdKRI
zDn~vTfim<iTOjVmw8Mz}%z*si0bl-^Kik&Uou@$sR%!0P<3Ub7a0(S9sIX1g?cxH1
zP7Kj(4B9sh)Sj>tp%a4(72#YPGZ$k6k5Zm%_UvZ&+!BJJN(;(CNj-98D+6q9DF+2^
zBKXo_Gs~F=R!~+z+_cxqMaDA~LGd6)(VCy3J=-DQ9I|%LQI37}J~lVU=uYdx%g*8A
zJ5Et61zLz_dWZ_hH^#Wqp-o8GX(K@hUU1TQoJNO~S%t41;uTID;8^Uox%s*$^W6sz
zVbcudJ;j*}m)4Y{3AU*4IO@8<l{v*QCEpy<?sXBhWAnB}BgP&bhqUHqY0uB0!|<YE
zb3V3x!uNgYjW4L@LUb!aLNHp$H@A@5Q)DG&QQ<}7ly2UQ7sxGkRKmpKUGvtK7Uy{U
zl~<ybBdu~aCS#m;2##u!;fkDirbRfL(B3_RbPds5hh%PMIxAe*vVR`JIah*OP4&({
zO7|XxZ3#H>g|D5A<A7*3q_xy0TJ8|d#|&0i(4w%D3YX?kIm8K+j(S|;#uZgs;wnq0
z+hJ~QmPt7wuRX_C)^SSVm8Z3*OXsp#+I!~#j~9#X1;q0$R21M8IBCjbh2ybZw=Dq=
z{ql$IEKdz^2o?biK`*Aa)Mb2T9Vu&UR#J^8=pew>mU>)LXEpVxMpYF-+c2t2vbrL5
zHAh#@OeI$!(n!bPl$$nIH4~aNW8Py?I24V8^;jSmD7#mezQ?u%08n}A&G93RunwIl
zddpqPY>f9MaVH??2I!WdOml2nQlu$fX(|P2HKC+t^~@G$h6CJrkK4IZervHK0Y)3L
ztue(QM|qD@g13SW4Xv3L@k|>RD(bo<Orl2gT#Ygw6&uq27;0ht;SEkcZ~`62c=>iQ
z`w{F&07{6G7TNlU!O;z>eo4KV(Lb?*_X1wwYezLKuz5*)zKiM@y8C7kEmRvBD|a7d
zUKw6|^Rv*tzQn`+^{```WU8ET(xyGzqZnsQh8c0vIyWrpeu*E|l!F457}`r+u03#o
zmI;WGn5R7T2^@OdLDF=Lb#^*qOczbl&v=D6^~mvCj7vPRkrD@FqcKUhLm0)>nZu?Y
zabSlv<;YTwN|Xbw;qqO}T)lTUGxHq?6lp!-fm5q^3C=k(=L?k=hgS}(n&Y<`I}%_O
z2!d*yJSH1`+@ylclAal3i<;Wj)J091mk=r9cFa~aChA6%;z)~vjd8}&wRN1PS^5fS
z8t=`EphJyGLZT$xxiQ~FZ2QccZ~e_*DrXHO8XF1{7_g3foMMXtv7Wl9X)h!wU(s6X
zfCjH&Z8Bo)O49zA_0yZ&bH@?rv`7}aDAjnjWnN&58kC>{jqXNNlS#9(ys$CfWNb^o
z=J6FBcN4<77VYH@$x@GKp-0qBaN_W$rfm#2ANnqy`?MSBwpxHNOmnuz6V}#;RHKq?
zSP;z35G{1TC~R7jpPEo_)%X%9T;oJ-W|WhPS}DA5^x$8#Tmst@eg*L}{_M4rdRH5~
zqw!A!n-!E>1(DU<a^uUmdDjyW6n}T}R^I-l|IJXBxUvT42wDkFJSJ(}TbtGlzp+l$
zF9}*95^I8XfDR4Wcud@B<8(9R{-x0_h1-7Y54W{-dwPzMmuDtOZc*Z~-coCa>V&9B
z(<b1iUDweipoQi~E_)Wg_RN<uXJd5GLdWf?hCn%(ke%u?JhqNjO?1Z<CDb)_mNVY!
z6LwlS0dXGhzd2<mY)=4Sf`Gx%ReWAzm^$ZHp(8_9l{~n40*^-l5sDY=zJWJB`{m5n
zK{LJ8jpL+LK$X=*?KX&~s0zxuBFj>oSUSr+OsoiE4c_9M!#aoa4(lDxdA##D=W+g#
z;?LIm=C|k9ZC7@}js%E<D2&;<f0gmcE$EjND}B<3w<xf@>QCRqk&RR5y!8;xbC;gP
z@7(ksS*{{<ZNW9uWnc^*hv~$04$Lus?H=}i*Hz3tX*bcH4z0xwg2h%AaSHJsuN+Y)
zL^+GHwh>5c5$nM@d|Kkuf+!N=Rsgm}SxaCY+B(EKl=Ud<FS$C}kpO(-14QjEZfqGG
zTW7K|APOQJaLSGN**|(c_pTqu<M2R$@T|o{{PuHR!7k|{ws|uS57yztlkA@%*ww*>
zf)|DNf-NlL)e#yH*Tlw>ZW|?ncQl@-lO|m5Jvc?WHK86?6q`Awuw1o&4^KLDIoBV$
zf*TGVV7}MGHy7hC;a==WfcI{?u7@Cw2~CVIgz@?a=W5yqmsvF_Kl}DKaM$SvanrtF
z&^%+|D&G8@|HK~E!`Mg0V3<UxK=8h97DHZ;QrNtIl_-j*YhZ^GHC<X)4M9qwIxWJb
zd6Ip*Xz$y@+~s@m5$rv*m%WGfvarx$X}-t7-Md+c+ib3^H$BBSWhY#M01rw?7Q5)!
zV2nl^gDY!XQDe2IeP|b}NzTjv_!hqM@DXftB^t#Iv-|n|=e>&kW)@|AL#9%IphTfX
zsI#2a!zYO180Q7=1Xp?NsG=U0l!F5A1rbf{z`7=AszvB;t}%abnL>N=y26S_iE!f7
z8lU+5SCAmWA~-j-We4m?fLM<&DzddrieW}I$*Cq2Orp_&!Fiz;=v}o$zg6<{fBZ&1
z_t0H9nkcP7ac%E1-u45p;i_;6ReSRFA^m$-86Vl?%$+CMy!$lmsMUy+1uWRCrXH5K
zQHjeYxT1oxCQusVg?wd;(_cGGD+;j|0#Sro;|k9mUpvC*zH}Ev0kvxc)j6myLBNjc
z@YMJGqA!eKUD=3}2!SyurKs_ECDS#%Bd9gm@hy@;&D(zd*Ld!s8wjS{dOQzg8~p0W
z-ocUVG&SI?MQIHp_~~8FhPUfciOVgnEHQHlL;>D9ln8m65=0?UD+VAPjR=%SX@kvb
zq9g`mAP`g>Vv?YVJnMkOsIMj!fA!I4|IY89XXeFuftx;ci&_5FXU+{aMz0eTUV$<O
z(F#P)ss7oey?Bokh`I@RRq~O4{4`hYyMn8i_94^1*`UQUue_c+Pu$DKG><2~>3-q_
z2~-nh?nSh^ZHmbRVnck{Je~c!>0P!=y4fe0pQW`tOSsS@T%M(K*)s9m3?___+Eb<l
zxF&XiQi$?+?NOmZvSNJrJ)d}Udi$xh^X<KefCC3m`QFRE*xEC@9L&Z@Z15iH(t;B#
z9=u0fqwdN#>syB->?Rc6@v+Z;mi<e+dEA}@jj{th6LaHLPvNeU_p_D`a0)0b)><Sm
zs90g50C7S#N=cR$kSIhc&FIt`+Ia}fRA;~&kjM}y!{8gIv7-`K)lHU4HxX@7LZCF#
zuQ~eO&pc=CFTe8j3(UQkfMcII=Hh2uaip_*_GLB@bQ}_OBf@S(krqhRBsdU3d{dNf
z-ZVhaj;Qc_{MOH~I5W$&`>sYcsS7$f=9ved%H69+Ss83H8Rlp)hz6w;KCc*_+#n1i
ztnwIRD7MBFXND-zC}Rkc5HmGAUmtPiuA@XoW2+ib3XuS(J)*!UO|><lTp4ogtsni*
z7uw2BBKXiN-}lMt$OeG}yu&Gvv^BjeX3mAR&UsiDxSS48veYJ7>T&y#!!(QP1{#>t
z5!cM^$LAGVz?BwqPrf!{baIm*Nl;;cRF=usfGSHdu_5bkQEc`p*ZZW$R$2e*y<`ub
zq}@sYsIvl}*SOrG3J>Fo@yQL!G$(02_QZ%QHVU#+eL^qzsY|MYkT_1JuBmH^eRL6P
z2`l*V8=udA`{`dIID1DAIga1`z@PJ1pZz<0XmG|utjQ)B-b2`K<CVg6TEx2-=p5L~
z+_hIRckPwT9o&!hLcN*d(u%m#qP^TD-qohNcaCIf1_F<1J5(D~ThU&cA&A2NH&-~&
zn$htsh7WEK*P74?l%BFEnmK*D1&8+prROKFeJ;Ox(@RNc5+@$W#PY`X{R#i`3m>62
z5Oxwemo1R&n`7bH%SrYvQi;boOI4QCWkp@rSX(2JA)4zVkwJ$6Sn#6pS}>tzw6;Yt
znh<x|g!3(0yJncZd>2KY<6WayJ7GrxocBZ~V%7)Dtmp8JGpyWtAN9CItVdY~&LOVx
zx5X)vT=Vkle~4fDo*yUi>fFsozT{W_@~yo8_J1JWGlOXb6j_Ed3XH)8hH!C~nf<%T
zhZF2zf+{^Kuc=P;S^eT+R=#)-KC7{{h05V34w=B#ku}P#9EDI@M_qZULB-1L4?yYh
zUK&?=2kdy}N$>bMp9hYXcwY2_-%Cc#+92i5yY8bH7U#HYB*Bx^npZya$9VZu{|zw;
znZ^@`Hs`hPej6XZ?~BAsJydA00?r7Xy^H8h2(dv028jadwGrcQoWy1om9s=qfJ&k!
z4_Q0JmgISfLgSqy?!-t9c{V|Zs_BU$v^s69c)SR$N^!@l-np%<kE*=M-(u>2vOipn
z%9l?D>5Gd&PCc$zUTAaZ8INZppD-FtICaNSj18up8{%5=%QycdKk?+7Nzh2+)X}dp
zUi}xp%jX`vi+JxGVgv#~j0P{H<CM<6CEB|d&`AhkfYF-Gdmf@%9paruw+%W7s73|e
zLDV*wUP3;|pmZQ$3yXL#p+<#<+BtB|;PV2lN^|F{|6*GL9yJXfSbAbBCwq+!;vcOl
zXUHwSaE!+pYpd%J1&sS+iv9!#&E^NIc-{BEjGuVo&BRm3#{p-GF|Yj7Tlm6>yJ=s!
zM6Es6*CaDBCJqoSP+Ri#5#y6*NY4x?Hbzt%L#Qo2&#|s1nvY3l+vMp4sT{f!qB;Sy
zyXUY~K`|}}lxZ@_kw&!wf=)zL7x>zO15*oY|M0cnI^Wi_xR{lziFRFo?Nd58UVmFH
zo-)k|dI4c4W;{&MPLo72BG7i4H@xr_yy&WD5Kg<j2To-Je&K)oCU>koz|0f&(z<E^
z6=((zuOS5_i(RTw!FY9qvJk`u6$MNt8LAX;9xaNpEKspw_VNXSAmsF&4<br1?F1ca
zaE>yqFrqQBfp&n74Z3XzO+f$j2BeO5rMdIJy!&EXw<TbTYyRM6-YtZ5_stQ^L?9k-
z75VCj>{y?fD&n{Q?a%YPD{de};ivQciO~kHc*k#X@8CFQSC^SXi};Q~83F4_Pxk39
z&ru9B21hpugBa5Z2znu2dD2sTbluDz7==j;<IO%&ds;~wCz`r0F=2pL9w{wln$udC
zMcM|P1gMrlw+vb-HV&`QPT}jXeb2VGZaWKn_Z_$FOP;dK?30!;voW>yRN|;iO>41-
zww^cq@Xzu6SKL74_0)9FgPSY7{EuGGeS_nK3tgP@l#>dng<?3Nm{cU44jcDBj2o61
z3*|T?GzP+EFHm=>31ryHV&V|fjaa;LFQye!*A8bbCJ0c0A!;Y+c7zH8#%r78>jOx0
zv=fX836qHV{foFuOoJD(^1@HQ;n1+<K3f^J+X+}X>&rQmhwSJU`e@GQfBDa8dqA2*
z+2QpQyz)=p#ED`Zvou54i7AQ#tre|(bJ)7V+h$vx3`-_kBZ4r(*Ot7Ppdw8)*Cy%4
zWT!?{<C0(|p?AeRQ8!}v@CK8W6fJ_ZLsSx=<A5LvNmmDuS*)$7$`V^O@kFgW7{hGP
z=J4y@dy%bND1rb-KKI#l{J_SiJkcxatUyW!mBsdR2KTR#9pA!u&2z4K8Vl_iYCQLx
zeu!Uq$8Yj*wMDqlCfYlX>L!GNCg1F1^O8tnY+2z;kJKJlTX2@36VYCp!+Ws93F&5v
zrinRJS;1(fPnl+fI>6?RDzAuoF*?x@8l+{2dkK?`5kliA#S0y}OEVB^1Vv<p^-tXS
ze<^}fJmJkR^{JHD%Hyapu|b;<BN}ZL^Qq>iZhA3gRq)<Ve2@*56U`)4#xZ~WAqrdL
z2PxT!HEdB6C?THdQaQm}htErFS<>3oC0gj>74#oiLpy0=fl8sH0ErbSOPLkO#NlgC
zT@`fqFA*(vAW;Ny%;3m6<(Ui}D#C??Xt_l+lQ2BCiG66meXslLZEd}%2b{&Oo3DG5
zGX{wby~P>AaGJaGf-PzW>5$JJ{tCApxr;pXL~|X`8YiCap}i<2WGh>kP_cB)9wy_Q
z@#zs-1nt4s4y_I2%@Ni)dV3bh`zczVT|j%3(MS-W;(%zrMYPz#d2ppCTOX018K9gc
zYK64g3B%I^bf<-C8+6YgZ9_EICh(fmfAghnd%(6L2;i)v#*ysmLdW0}jf4SSgu1TL
z-3Z-_P%|;67dPij6T4F)XzQ4)Y!O5em9z9NTOjJj6vHv;U<d*d8j@}YmsTAA$HTZm
zNtG6$q=^I>)nts7G$mH_9=E{E)k_4OkWd1$lM_yU`azE0dIVckDB}q`F%pMVWku~A
z`rs_jy6rc9@j@H96ai(Hk<7P==2{RbRIE`ENL}NmQC$@pv@!U=V0xNpCO~U&YbmS$
zbUz`Qbag~EtSHkG(VC>yA_zmuNzsJ50)q-dW|rp&XJTw+q3}pmBfbfA3TGEvV3jAj
zyvy<p`>?T~lp#u5L_wQKhor~W$yfSBJ|H#`ktnnSwEx3r-S+F(Uufr!Lm+v|Wp7%%
z@c;xKJ>8^O^)u4d5n&WJ!A~#EE-@Ufy&ZzYP_C!+kFOF~h4O-}9o1lr@y+hCCI%>I
ztsu~dR!AU7s4z*0NetP_CQ%rpLX9?p2@E<?m{23y5NHFX#pjN4T%K#Q_YkOnaw}*3
zo)Zj@Zje2+N&l-yiN^lT=1k^JeCYPO&$n}1VE{PvTR%G3^@8hqRaG!KIbe9-8g6Wf
z;wCX7s!3#e@2RC`?uLCRqgnmZaYAYK4y)-}*wz)+I)eC-e>V~jJ~F6IfW#UJ6)G}>
zp(bA$F*>$|7>|h~OrSwEQ>ZO!ihP1X69f@~IlFbf39yRSIH{YcP^hRj#$@-d4ErDa
z%FMZkpNAa@c=8|o%qO$9evXPliql)9-&iAkXbs~95ka(I1yCL*o?TD5g0S7?#Fy?P
z@XeMt?Lo9ZH`1&$UH+_R5zTd3xb6V1r64j$q*0;5SmD@5Zbw)0$R<bC#Q3x{u>esG
zxuU0=HKl2n)eyH6g2fId2^l@OM*85H5A^@`)_?bC3mfb>1gibrFDDC&FX`-EO5CKT
zTp3btW@z6eHpB~NntL~1F<Bdto!TUH3gy8}<AB;Lln7{rl4e+FnmA&WmsGB%w`&$c
zkT8Tu5hezTisH-|LC{J~<BD?bAHkZMX>?hdbIqSc#irTi8U$2Z>DFXeyrjJQ_{Ie$
z!lguT>z$v!+s(9Y46OP<RLU^25IRrbJfZW1))QDyV1>X5VI_oxG~drF;n`!|9F0>L
zCj?FrJB>ZoXXUf^WBQg*8+4$ti7@xX{glRGrq_n&9i!=e&wh@k=b~DOYDH9Q;z|z#
zr#|2kb>rxNeeV7X?K_JdhrqWO!Zizfp7<Z0_tVMacmGtlt9PA^MC_z~@|VBo_bv)$
z|4U-WA@D87#$>eqiMzjW>hEv+8|Ukf#&I;(=<L+{zW6BB{{IP@eKaxe@8CQ54!&9V
YKP$wmyhUBAH2?qr07*qoM6N<$g6988N&o-=

literal 0
HcmV?d00001


From 08da3ac5d873f2af5ccb16b691b86b26ec89c0b1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Feb 2025 11:12:29 +0800
Subject: [PATCH 134/364] enhance: prefer to use `Default Remote` in repository
 settings while fetching remote changes (#1008)

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

diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs
index d816d0b8..1094012e 100644
--- a/src/ViewModels/Fetch.cs
+++ b/src/ViewModels/Fetch.cs
@@ -38,7 +38,24 @@ namespace SourceGit.ViewModels
         {
             _repo = repo;
             _fetchAllRemotes = preferedRemote == null;
-            SelectedRemote = preferedRemote != null ? preferedRemote : _repo.Remotes[0];
+
+            if (preferedRemote != null)
+            {
+                SelectedRemote = preferedRemote;
+            }
+            else if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
+            {
+                var def = _repo.Remotes.Find(r => r.Name == _repo.Settings.DefaultRemote);
+                if (def != null)
+                    SelectedRemote = def;
+                else
+                    SelectedRemote = _repo.Remotes[0];
+            }
+            else
+            {
+                SelectedRemote = _repo.Remotes[0];
+            }
+
             View = new Views.Fetch() { DataContext = this };
         }
 

From b5feabfd37816ced5ecfa6eacb6fd820833e1651 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Feb 2025 15:42:11 +0800
Subject: [PATCH 135/364] enhance: auto-set commit message while rebasing is
 inprogress (#1003)

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

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index d87c54ec..f1db3f3d 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -233,25 +233,10 @@ namespace SourceGit.ViewModels
                 // Just force refresh selected changes.
                 Dispatcher.UIThread.Invoke(() =>
                 {
-                    if (_selectedUnstaged.Count == 1)
-                        SetDetail(_selectedUnstaged[0], true);
-                    else if (_selectedStaged.Count == 1)
-                        SetDetail(_selectedStaged[0], false);
-                    else
-                        SetDetail(null, false);
-
-                    var inProgress = null as InProgressContext;
-                    if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD")))
-                        inProgress = new CherryPickInProgress(_repo);
-                    else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply")))
-                        inProgress = new RebaseInProgress(_repo);
-                    else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
-                        inProgress = new RevertInProgress(_repo);
-                    else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD")))
-                        inProgress = new MergeInProgress(_repo);
-
                     HasUnsolvedConflicts = _cached.Find(x => x.IsConflit) != null;
-                    InProgressContext = inProgress;
+
+                    UpdateDetail();
+                    UpdateInProgressState();
                 });
 
                 return;
@@ -311,32 +296,8 @@ namespace SourceGit.ViewModels
                 SelectedStaged = selectedStaged;
                 _isLoadingData = false;
 
-                if (selectedUnstaged.Count == 1)
-                    SetDetail(selectedUnstaged[0], true);
-                else if (selectedStaged.Count == 1)
-                    SetDetail(selectedStaged[0], false);
-                else
-                    SetDetail(null, false);
-
-                var inProgress = null as InProgressContext;
-                if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD")))
-                    inProgress = new CherryPickInProgress(_repo);
-                else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply")))
-                    inProgress = new RebaseInProgress(_repo);
-                else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
-                    inProgress = new RevertInProgress(_repo);
-                else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD")))
-                    inProgress = new MergeInProgress(_repo);
-
-                InProgressContext = inProgress;
-
-                // Try to load merge message from MERGE_MSG
-                if (string.IsNullOrEmpty(_commitMessage))
-                {
-                    var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
-                    if (File.Exists(mergeMsgFile))
-                        CommitMessage = File.ReadAllText(mergeMsgFile);
-                }
+                UpdateDetail();
+                UpdateInProgressState();
             });
         }
 
@@ -1488,6 +1449,57 @@ namespace SourceGit.ViewModels
             return rs;
         }
 
+        private void UpdateDetail()
+        {
+            if (_selectedUnstaged.Count == 1)
+                SetDetail(_selectedUnstaged[0], true);
+            else if (_selectedStaged.Count == 1)
+                SetDetail(_selectedStaged[0], false);
+            else
+                SetDetail(null, false);
+        }
+
+        private void UpdateInProgressState()
+        {
+            if (string.IsNullOrEmpty(_commitMessage))
+            {
+                var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
+                if (File.Exists(mergeMsgFile))
+                    CommitMessage = File.ReadAllText(mergeMsgFile);
+            }
+
+            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).Result();
+                }
+            }
+            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;
+            }
+        }
+
         private async void StageChanges(List<Models.Change> changes, Models.Change next)
         {
             if (changes.Count == 0)

From 9da2c787dbf0dbac7cc26ce777672857d40e6066 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Feb 2025 09:44:51 +0800
Subject: [PATCH 136/364] enhance: supports to configure `fetch.prune` for
 selected repository (#995)

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

diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index a7c04937..cf23b6d8 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -60,6 +60,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _httpProxy, value);
         }
 
+        public bool EnablePruneOnFetch
+        {
+            get;
+            set;
+        }
+
         public bool EnableAutoFetch
         {
             get => _repo.Settings.EnableAutoFetch;
@@ -153,6 +159,8 @@ namespace SourceGit.ViewModels
                 GPGUserSigningKey = signingKey;
             if (_cached.TryGetValue("http.proxy", out var proxy))
                 HttpProxy = proxy;
+            if (_cached.TryGetValue("fetch.prune", out var prune))
+                EnablePruneOnFetch = (prune == "true");
         }
 
         public void ClearHttpProxy()
@@ -286,6 +294,7 @@ namespace SourceGit.ViewModels
             SetIfChanged("tag.gpgsign", GPGTagSigningEnabled ? "true" : "false", "false");
             SetIfChanged("user.signingkey", GPGUserSigningKey, "");
             SetIfChanged("http.proxy", HttpProxy, "");
+            SetIfChanged("fetch.prune", EnablePruneOnFetch ? "true" : "false", "false");
         }
 
         private void SetIfChanged(string key, string value, string defValue)
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 61bc14e0..f6a02c49 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" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="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"
@@ -119,7 +119,11 @@
                     Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal">
+          <CheckBox Grid.Row="7" Grid.Column="1"
+                    Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
+                    IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"/>
+
+          <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal">
             <CheckBox x:Name="AutoFetchCheckBox"
                       Content="{DynamicResource Text.Configure.Git.AutoFetch}"
                       IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>

From 2b4fc64c73b126fd0d94b5562be53e25dcf7b24d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Feb 2025 10:26:14 +0800
Subject: [PATCH 137/364] fix: resolve conflict with deleted files does not
 work (#1009)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Add.cs             |  4 +-
 src/ViewModels/WorkingCopy.cs   | 76 ++++++++++++++++++++++++++-------
 src/Views/TextDiffView.axaml.cs |  2 +-
 3 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/Commands/Add.cs b/src/Commands/Add.cs
index e1b55b68..b2aa803d 100644
--- a/src/Commands/Add.cs
+++ b/src/Commands/Add.cs
@@ -12,7 +12,7 @@ namespace SourceGit.Commands
             Args = includeUntracked ? "add ." : "add -u .";
         }
 
-        public Add(string repo, List<Models.Change> changes)
+        public Add(string repo, List<string> changes)
         {
             WorkingDirectory = repo;
             Context = repo;
@@ -22,7 +22,7 @@ namespace SourceGit.Commands
             foreach (var c in changes)
             {
                 builder.Append(" \"");
-                builder.Append(c.Path);
+                builder.Append(c);
                 builder.Append("\"");
             }
             Args = builder.ToString();
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index f1db3f3d..ce2a2ac1 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -353,38 +353,80 @@ namespace SourceGit.ViewModels
 
         public async void UseTheirs(List<Models.Change> changes)
         {
+            _repo.SetWatcherEnabled(false);
+
             var files = new List<string>();
+            var needStage = new List<string>();
+
             foreach (var change in changes)
             {
-                if (change.IsConflit)
+                if (!change.IsConflit)
+                    continue;
+
+                if (change.WorkTree == Models.ChangeState.Deleted)
+                {
+                    var fullpath = Path.Combine(_repo.FullPath, change.Path);
+                    if (File.Exists(fullpath))
+                        File.Delete(fullpath);
+
+                    needStage.Add(change.Path);
+                }
+                else
+                {
                     files.Add(change.Path);
+                }
             }
 
-            _repo.SetWatcherEnabled(false);
-            var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).UseTheirs(files));
-            if (succ)
+            if (files.Count > 0)
             {
-                await Task.Run(() => new Commands.Add(_repo.FullPath, changes).Exec());
+                var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).UseTheirs(files));
+                if (succ)
+                    needStage.AddRange(files);
             }
+
+            if (needStage.Count > 0)
+                await Task.Run(() => new Commands.Add(_repo.FullPath, needStage).Exec());
+
             _repo.MarkWorkingCopyDirtyManually();
             _repo.SetWatcherEnabled(true);
         }
 
         public async void UseMine(List<Models.Change> changes)
         {
+            _repo.SetWatcherEnabled(false);
+
             var files = new List<string>();
+            var needStage = new List<string>();
+
             foreach (var change in changes)
             {
-                if (change.IsConflit)
+                if (!change.IsConflit)
+                    continue;
+
+                if (change.Index == Models.ChangeState.Deleted)
+                {
+                    var fullpath = Path.Combine(_repo.FullPath, change.Path);
+                    if (File.Exists(fullpath))
+                        File.Delete(fullpath);
+
+                    needStage.Add(change.Path);
+                }
+                else
+                {
                     files.Add(change.Path);
+                }
             }
 
-            _repo.SetWatcherEnabled(false);
-            var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).UseMine(files));
-            if (succ)
+            if (files.Count > 0)
             {
-                await Task.Run(() => new Commands.Add(_repo.FullPath, changes).Exec());
+                var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).UseMine(files));
+                if (succ)
+                    needStage.AddRange(files);
             }
+
+            if (needStage.Count > 0)
+                await Task.Run(() => new Commands.Add(_repo.FullPath, needStage).Exec());
+
             _repo.MarkWorkingCopyDirtyManually();
             _repo.SetWatcherEnabled(true);
         }
@@ -1502,7 +1544,8 @@ namespace SourceGit.ViewModels
 
         private async void StageChanges(List<Models.Change> changes, Models.Change next)
         {
-            if (changes.Count == 0)
+            var count = changes.Count;
+            if (count == 0)
                 return;
 
             // Use `_selectedUnstaged` instead of `SelectedUnstaged` to avoid UI refresh.
@@ -1510,7 +1553,7 @@ namespace SourceGit.ViewModels
 
             IsStaging = true;
             _repo.SetWatcherEnabled(false);
-            if (changes.Count == _unstaged.Count)
+            if (count == _unstaged.Count)
             {
                 await Task.Run(() => new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Exec());
             }
@@ -1527,10 +1570,13 @@ namespace SourceGit.ViewModels
             }
             else
             {
-                for (int i = 0; i < changes.Count; i += 10)
+                var paths = new List<string>();
+                foreach (var c in changes)
+                    paths.Add(c.Path);
+
+                for (int i = 0; i < count; i += 10)
                 {
-                    var count = Math.Min(10, changes.Count - i);
-                    var step = changes.GetRange(i, count);
+                    var step = paths.GetRange(i, Math.Min(10, count - i));
                     await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec());
                 }
             }
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 28fe81a8..83bc47e3 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1796,7 +1796,7 @@ namespace SourceGit.Views
 
             if (!selection.HasLeftChanges)
             {
-                new Commands.Add(repo.FullPath, [change]).Exec();
+                new Commands.Add(repo.FullPath, [change.Path]).Exec();
             }
             else
             {

From 841276852a29c12f9da642e8d3c5f96b6cb7fce1 Mon Sep 17 00:00:00 2001
From: saxc <saxc@users.noreply.github.com>
Date: Fri, 21 Feb 2025 03:34:38 +0100
Subject: [PATCH 138/364] localization: add german translations (#1011)

(cherry picked from commit fcc720480c85fe01120e555c22b6aec286ee717b)
---
 src/Resources/Locales/de_DE.axaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index b6458822..c16c90b5 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -59,6 +59,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Mit HEAD 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.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>
   <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Alle Änderungen verwerfen</x:String>
@@ -159,6 +160,7 @@
   <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">Ausführbare Datei:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Name" xml:space="preserve">Name:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Geltungsbereich:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Branch</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repository</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Email Adresse</x:String>
@@ -586,6 +588,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Erstelle Branch</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">BENACHRICHTIGUNGEN LÖSCHEN</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Nur aktuellen Branch im Graphen hervorheben</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Öffne in {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Öffne in externen Tools</x:String>
@@ -710,7 +713,7 @@
   <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">Öffne alle Repositories</x:String>
   <x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">Öffne Repository</x:String>
   <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">Öffne Terminal</x:String>
-  <x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">Klon Standardordner erneut nach Repositories durchsuchen</x:String>  
+  <x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">Klon Standardordner erneut nach Repositories durchsuchen</x:String>
   <x:String x:Key="Text.Welcome.Search" xml:space="preserve">Suche Repositories...</x:String>
   <x:String x:Key="Text.Welcome.Sort" xml:space="preserve">Sortieren</x:String>
   <x:String x:Key="Text.WorkingCopy" xml:space="preserve">Änderungen</x:String>

From b2ab62825ece1bb0111782f094266d1445c3a110 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 02:48:21 +0000
Subject: [PATCH 139/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 784d0672..60c8543e 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.20%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.35%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.18%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.61%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.91%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.47%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.60%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.35%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.18%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.61%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.91%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.47%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 53631bc1..c235ea6a 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,15 +1,12 @@
-### de_DE.axaml: 99.20%
+### de_DE.axaml: 99.60%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.BranchCM.CustomAction
 - Text.BranchUpstreamInvalid
-- Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.Preferences.AI.Streaming
-- Text.Repository.Notifications.Clear
 
 </details>
 

From 9ab602788a7bfeaf05e382d876a145547cc3e73c Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Mon, 24 Feb 2025 10:28:00 +0900
Subject: [PATCH 140/364] docs: update README.md (#1014)

comaptible -> compatible
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 60c8543e..256070e2 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ For **Linux** users:
 
 ## OpenAI
 
-This software supports using OpenAI or other AI service that has an OpenAI comaptible HTTP API to generate commit message. You need configurate the service in `Preference` window.
+This software supports using OpenAI or other AI service that has an OpenAI compatible HTTP API to generate commit message. You need configurate the service in `Preference` window.
 
 For `OpenAI`:
 

From fa4caa218628169d5f34076732ffa9b35ed040fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20W?= <44604769+goran-w@users.noreply.github.com>
Date: Mon, 24 Feb 2025 02:32:19 +0100
Subject: [PATCH 141/364] enhance: add first/last buttons for block-nav, no
 wrapping (#1015) (#1016)

Added 2 new buttons (only visible in block-nav mode), with new icons and new (en_US) strings (First/Last Difference).
Implemented these new buttons, and disabled the automatic wrap-around for the prev/next buttons in block-nav mode.
---
 src/Resources/Icons.axaml         |  2 ++
 src/Resources/Locales/en_US.axaml |  2 ++
 src/ViewModels/BlockNavigation.cs | 28 ++++++++++++++--
 src/Views/DiffView.axaml          | 28 ++++++++++++++++
 src/Views/DiffView.axaml.cs       | 14 ++++++++
 src/Views/TextDiffView.axaml.cs   | 56 +++++++++++++++++++++++++++++++
 6 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index b7d9c22e..9426d20a 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -5,6 +5,7 @@
   <StreamGeometry x:Key="Icons.Binary">M71 1024V0h661L953 219V1024H71zm808-731-220-219H145V951h735V293zM439 512h-220V219h220V512zm-74-219H292v146h74v-146zm0 512h74v73h-220v-73H292v-146H218V585h147v219zm294-366h74V512H512v-73h74v-146H512V219h147v219zm74 439H512V585h220v293zm-74-219h-74v146h74v-146z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Blame">M128 256h192a64 64 0 110 128H128a64 64 0 110-128zm576 192h192a64 64 0 010 128h-192a64 64 0 010-128zm-576 192h192a64 64 0 010 128H128a64 64 0 010-128zm576 0h192a64 64 0 010 128h-192a64 64 0 010-128zm0-384h192a64 64 0 010 128h-192a64 64 0 010-128zM128 448h192a64 64 0 110 128H128a64 64 0 110-128zm384-320a64 64 0 0164 64v640a64 64 0 01-128 0V192a64 64 0 0164-64z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Bookmark">M832 64H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V96c0-18-14-32-32-32zM736 596 624 502 506 596V131h230v318z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Bottom">M509 546 780 275 871 366 509 728 147 366 238 275zM509 728h-362v128h724v-128z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Branch">M757 226a143 143 0 00-55 276 96 96 0 01-88 59h-191a187 187 0 00-96 27V312a143 143 0 10-96 0v399a143 143 0 10103 2 96 96 0 0188-59h191a191 191 0 00187-151 143 143 0 00-43-279zM280 130a48 48 0 110 96 48 48 0 010-96zm0 764a48 48 0 110-96 48 48 0 010 96zM757 417a48 48 0 110-96 48 48 0 010 96z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Branch.Add">M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Check">M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z</StreamGeometry>
@@ -119,6 +120,7 @@
   <StreamGeometry x:Key="Icons.Tags">M996 452 572 28A96 96 0 00504 0H96C43 0 0 43 0 96v408a96 96 0 0028 68l424 424c37 37 98 37 136 0l408-408c37-37 37-98 0-136zM224 320c-53 0-96-43-96-96s43-96 96-96 96 43 96 96-43 96-96 96zm1028 268L844 996c-37 37-98 37-136 0l-1-1L1055 647c34-34 53-79 53-127s-19-93-53-127L663 0h97a96 96 0 0168 28l424 424c37 37 37 98 0 136z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Target">M765 118 629 239l-16 137-186 160 54 59 183-168 144 4 136-129 47-43-175-12L827 67zM489 404c-66 0-124 55-124 125s54 121 124 121c66 0 120-55 120-121H489l23-121c-8-4-16-4-23-4zM695 525c0 114-93 207-206 207s-206-94-206-207 93-207 206-207c16 0 27 0 43 4l43-207c-27-4-54-8-85-8-229 0-416 188-416 419s187 419 416 419c225 0 408-180 416-403v-12l-210-4z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Terminal">M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Top">M170 831 513 489 855 831 960 726 512 278 64 726 170 831zM512 278h448v-128h-896v128h448z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Track">M897 673v13c0 51-42 93-93 93h-10c-1 0-2 0-2 0H220c-23 0-42 19-42 42v13c0 23 19 42 42 42h552c14 0 26 12 26 26 0 14-12 26-26 26H220c-51 0-93-42-93-93v-13c0-51 42-93 93-93h20c1-0 2-0 2-0h562c23 0 42-19 42-42v-13c0-11-5-22-13-29-8-7-17-11-28-10H660c-14 0-26-12-26-26 0-14 12-26 26-26h144c24-1 47 7 65 24 18 17 29 42 29 67zM479 98c-112 0-203 91-203 203 0 44 14 85 38 118l132 208c15 24 50 24 66 0l133-209c23-33 37-73 37-117 0-112-91-203-203-203zm0 327c-68 0-122-55-122-122s55-122 122-122 122 55 122 122-55 122-122 122z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Tree">M912 800a48 48 0 1 1 0 96h-416a48 48 0 1 1 0-96h416z m-704-704A112 112 0 0 1 256 309.184V480h80a48 48 0 0 1 0 96H256v224h81.664a48 48 0 1 1 0 96H256a96 96 0 0 1-96-96V309.248A112 112 0 0 1 208 96z m704 384a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z m0-320a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z</StreamGeometry>
   <StreamGeometry x:Key="Icons.TriangleLeft">M30 0 30 30 0 15z</StreamGeometry>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index dfc17dee..d2d64d5c 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -252,9 +252,11 @@
   <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Change</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
+  <x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">NO CHANGES OR ONLY EOL CHANGES</x:String>
   <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Previous Difference</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
   <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Save as Patch</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Show hidden symbols</x:String>
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Side-By-Side Diff</x:String>
diff --git a/src/ViewModels/BlockNavigation.cs b/src/ViewModels/BlockNavigation.cs
index 709338f8..9a5a926c 100644
--- a/src/ViewModels/BlockNavigation.cs
+++ b/src/ViewModels/BlockNavigation.cs
@@ -101,12 +101,12 @@ namespace SourceGit.ViewModels
             return (_current >= 0 && _current < Blocks.Count) ? Blocks[_current] : null;
         }
 
-        public Block GotoNext()
+        public Block GotoFirst()
         {
             if (Blocks.Count == 0)
                 return null;
 
-            Current = (_current + 1) % Blocks.Count;
+            Current = 0;
             return Blocks[_current];
         }
 
@@ -115,7 +115,29 @@ namespace SourceGit.ViewModels
             if (Blocks.Count == 0)
                 return null;
 
-            Current = _current == -1 ? Blocks.Count - 1 : (_current - 1 + Blocks.Count) % Blocks.Count;
+            if (_current == -1)
+                Current = 0;
+            else if (_current > 0)
+                Current = _current - 1;
+            return Blocks[_current];
+        }
+
+        public Block GotoNext()
+        {
+            if (Blocks.Count == 0)
+                return null;
+
+            if (_current < Blocks.Count - 1)
+                Current = _current + 1;
+            return Blocks[_current];
+        }
+
+        public Block GotoLast()
+        {
+            if (Blocks.Count == 0)
+                return null;
+
+            Current = Blocks.Count - 1;
             return Blocks[_current];
         }
 
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index aa75c2a0..fccb949d 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -34,6 +34,20 @@
 
           <!-- Toolbar Buttons -->
           <StackPanel Grid.Column="3" Margin="8,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
+            <Button Classes="icon_button"
+                    Width="28"
+                    Click="OnGotoFirstChange"
+                    IsVisible="{Binding IsTextDiff}"
+                    ToolTip.Tip="{DynamicResource Text.Diff.First}">
+              <Button.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                  <Binding Path="IsTextDiff"/>
+                  <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/>
+                </MultiBinding>
+              </Button.IsVisible>
+              <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Top}"/>
+            </Button>
+            
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoPrevChange"
@@ -61,6 +75,20 @@
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
             </Button>
             
+            <Button Classes="icon_button"
+                    Width="28"
+                    Click="OnGotoLastChange"
+                    IsVisible="{Binding IsTextDiff}"
+                    ToolTip.Tip="{DynamicResource Text.Diff.Last}">
+              <Button.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                  <Binding Path="IsTextDiff"/>
+                  <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/>
+                </MultiBinding>
+              </Button.IsVisible>
+              <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Bottom}"/>
+            </Button>
+
             <ToggleButton Classes="line_path"
                           Width="28"
                           IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseBlockNavigationInDiffView, Mode=TwoWay}"
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index d9157a03..889f0df7 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -11,6 +11,13 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
+        private void OnGotoFirstChange(object _, RoutedEventArgs e)
+        {
+            var textDiff = this.FindDescendantOfType<TextDiffView>();
+            textDiff?.GotoFirstChange();
+            e.Handled = true;
+        }
+
         private void OnGotoPrevChange(object _, RoutedEventArgs e)
         {
             var textDiff = this.FindDescendantOfType<TextDiffView>();
@@ -24,5 +31,12 @@ namespace SourceGit.Views
             textDiff?.GotoNextChange();
             e.Handled = true;
         }
+
+        private void OnGotoLastChange(object _, RoutedEventArgs e)
+        {
+            var textDiff = this.FindDescendantOfType<TextDiffView>();
+            textDiff?.GotoLastChange();
+            e.Handled = true;
+        }
     }
 }
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 83bc47e3..323fde03 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -543,6 +543,21 @@ namespace SourceGit.Views
         {
         }
 
+        public void GotoFirstChange()
+        {
+            var blockNavigation = BlockNavigation;
+            if (blockNavigation != null)
+            {
+                var prev = blockNavigation.GotoFirst();
+                if (prev != null)
+                {
+                    TextArea.Caret.Line = prev.Start;
+                    ScrollToLine(prev.Start);
+                }
+            }
+            // NOTE: Not implemented (button hidden) for non-block navigation.
+        }
+
         public void GotoPrevChange()
         {
             var blockNavigation = BlockNavigation;
@@ -641,6 +656,21 @@ namespace SourceGit.Views
             }
         }
 
+        public void GotoLastChange()
+        {
+            var blockNavigation = BlockNavigation;
+            if (blockNavigation != null)
+            {
+                var next = blockNavigation.GotoLast();
+                if (next != null)
+                {
+                    TextArea.Caret.Line = next.Start;
+                    ScrollToLine(next.Start);
+                }
+            }
+            // NOTE: Not implemented (button hidden) for non-block navigation.
+        }
+
         public override void Render(DrawingContext context)
         {
             base.Render(context);
@@ -1682,6 +1712,19 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
+        public void GotoFirstChange()
+        {
+            var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
+            if (presenter == null)
+                return;
+
+            presenter.GotoFirstChange();
+            if (presenter is SingleSideTextDiffPresenter singleSide)
+                singleSide.ForceSyncScrollOffset();
+
+            BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
+        }
+
         public void GotoPrevChange()
         {
             var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
@@ -1708,6 +1751,19 @@ namespace SourceGit.Views
             BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
         }
 
+        public void GotoLastChange()
+        {
+            var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
+            if (presenter == null)
+                return;
+
+            presenter.GotoLastChange();
+            if (presenter is SingleSideTextDiffPresenter singleSide)
+                singleSide.ForceSyncScrollOffset();
+
+            BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
+        }
+
         protected override void OnDataContextChanged(EventArgs e)
         {
             base.OnDataContextChanged(e);

From 52a53cc6976df7ff153209ace0e78bb353e50d94 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 01:32:32 +0000
Subject: [PATCH 142/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 34 ++++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 256070e2..a48af9bd 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.60%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.35%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-92.18%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.61%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.91%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.47%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.09%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.93%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.35%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.21%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-99.74%25-yellow)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-99.74%25-yellow)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index c235ea6a..4e96f0ac 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.60%
+### de_DE.axaml: 99.34%
 
 
 <details>
@@ -6,11 +6,13 @@
 
 - Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.WaitForExit
+- Text.Diff.First
+- Text.Diff.Last
 - Text.Preferences.AI.Streaming
 
 </details>
 
-### es_ES.axaml: 97.35%
+### es_ES.axaml: 97.09%
 
 
 <details>
@@ -31,6 +33,8 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Diff.First
+- Text.Diff.Last
 - Text.Preferences.AI.Streaming
 - Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
@@ -39,7 +43,7 @@
 
 </details>
 
-### fr_FR.axaml: 92.18%
+### fr_FR.axaml: 91.93%
 
 
 <details>
@@ -60,6 +64,8 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Diff.First
+- Text.Diff.Last
 - Text.InProgress.CherryPick.Head
 - Text.InProgress.Merge.Operating
 - Text.InProgress.Rebase.StoppedAt
@@ -107,7 +113,7 @@
 
 </details>
 
-### it_IT.axaml: 97.61%
+### it_IT.axaml: 97.35%
 
 
 <details>
@@ -127,6 +133,8 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Diff.First
+- Text.Diff.Last
 - Text.Preferences.AI.Streaming
 - Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
@@ -134,7 +142,7 @@
 
 </details>
 
-### pt_BR.axaml: 91.91%
+### pt_BR.axaml: 91.67%
 
 
 <details>
@@ -162,6 +170,8 @@
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Diff.First
+- Text.Diff.Last
 - Text.Diff.UseBlockNavigation
 - Text.Fetch.Force
 - Text.FileCM.ResolveUsing
@@ -204,7 +214,7 @@
 
 </details>
 
-### ru_RU.axaml: 99.47%
+### ru_RU.axaml: 99.21%
 
 
 <details>
@@ -213,26 +223,30 @@
 - Text.BranchCM.CustomAction
 - Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.Scope.Branch
+- Text.Diff.First
+- Text.Diff.Last
 - Text.Preferences.AI.Streaming
 
 </details>
 
-### zh_CN.axaml: 100.00%
+### zh_CN.axaml: 99.74%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Diff.First
+- Text.Diff.Last
 
 </details>
 
-### zh_TW.axaml: 100.00%
+### zh_TW.axaml: 99.74%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Diff.First
+- Text.Diff.Last
 
 </details>

From 124bdc97f96a30ebcd0572671aed5db26bc6ee81 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Feb 2025 09:37:34 +0800
Subject: [PATCH 143/364] localization: add missing keys for zh_CN and zh_TW

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml | 6 +++---
 src/Resources/Locales/zh_CN.axaml | 2 ++
 src/Resources/Locales/zh_TW.axaml | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d2d64d5c..1a83a4da 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -250,13 +250,13 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">OLD</x:String>
   <x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copy</x:String>
   <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
-  <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Change</x:String>
-  <x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
+  <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Change</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
+  <x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">NO CHANGES OR ONLY EOL CHANGES</x:String>
   <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Previous Difference</x:String>
-  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
   <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Save as Patch</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Show hidden symbols</x:String>
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Side-By-Side Diff</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 115f917e..acfdefd2 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -253,7 +253,9 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">原始大小</x:String>
   <x:String x:Key="Text.Diff.Copy" 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.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.Next" xml:space="preserve">下一个差异</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">没有变更或仅有换行符差异</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 00933783..dd9092a4 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -253,7 +253,9 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">原始大小</x:String>
   <x:String x:Key="Text.Diff.Copy" 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.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.Next" xml:space="preserve">下一個差異</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">沒有變更或僅有換行字元差異</x:String>

From 74e5bcb7047d95e38ca116a1fe0ef2ef9c84242e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 01:37:52 +0000
Subject: [PATCH 144/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a48af9bd..a82a43b1 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.09%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.93%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.35%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.21%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-99.74%25-yellow)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-99.74%25-yellow)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.09%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.93%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.35%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.21%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 4e96f0ac..acecf990 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -229,24 +229,22 @@
 
 </details>
 
-### zh_CN.axaml: 99.74%
+### zh_CN.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Diff.First
-- Text.Diff.Last
+
 
 </details>
 
-### zh_TW.axaml: 99.74%
+### zh_TW.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Diff.First
-- Text.Diff.Last
+
 
 </details>

From d4341c119554835d4885dd54ba15bd7fe153cf78 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: Sun, 23 Feb 2025 19:45:39 -0600
Subject: [PATCH 145/364] localization: add missing spanish translations
 (#1017)

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

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index a0f35814..24170683 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -22,7 +22,9 @@
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Rama de Seguimiento:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Seguimiento de rama remota</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Asistente OpenAI</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GENERAR</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usar OpenAI para generar mensaje de commit</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APLICAR CÓMO MENSAJE DE COMMIT</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Aplicar Patch</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Error</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Genera errores y se niega a aplicar el patch</x:String>
@@ -37,6 +39,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Advertencia</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Genera advertencias para algunos de estos errores, pero aplica</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Espacios en Blanco:</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Aplicar Stash</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Borrar después de aplicar</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Restaurar los cambios del índice</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Archivar...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Guardar Archivo en:</x:String>
   <x:String x:Key="Text.Archive.File.Placeholder" xml:space="preserve">Seleccionar ruta del archivo</x:String>
@@ -53,6 +59,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar con HEAD</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 Rama</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>
   <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Descartar todos los cambios</x:String>
@@ -68,6 +75,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Renombrar ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Establecer Rama de Seguimiento...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Comparar Ramas</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">¡Upstream inválido!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">CANCELAR</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Resetear a Esta Revisión</x:String>
@@ -100,6 +108,7 @@
   <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">Nombre Local:</x:String>
   <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">Nombre del repositorio. Opcional.</x:String>
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Carpeta Padre:</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Inicializar y actualizar submodulos</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL del Repositorio:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">CERRAR</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
@@ -152,8 +161,10 @@
   <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">Archivo Ejecutable:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Name" xml:space="preserve">Nombre:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Alcance:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Rama</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repositorio</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Esperar la acción de salida</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Dirección de Email</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Dirección de email</x:String>
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
@@ -202,6 +213,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nombre de la Nueva Rama:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Introduzca el nombre de la rama.</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Los espacios serán reemplazados con guiones.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Crear Rama Local</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">Crear Etiqueta...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">Nueva Etiqueta En:</x:String>
@@ -225,8 +237,11 @@
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Estás intentando eliminar múltiples ramas a la vez. ¡Asegúrate de revisar antes de tomar acción!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Eliminar Remoto</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remoto:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Ruta:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Destino:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Todos los hijos serán removidos de la lista.</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Confirmar Eliminación de Grupo</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">¡Esto solo lo removera de la lista, no del disco!</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Confirmar Eliminación de Repositorio</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Eliminar Submódulo</x:String>
   <x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">Ruta del Submódulo:</x:String>
@@ -449,6 +464,7 @@
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modelo</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nombre</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Servidor</x:String>
+  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Activar Transmisión</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APARIENCIA</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Fuente por defecto</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Tamaño de fuente</x:String>
@@ -576,6 +592,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">RAMAS LOCALES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navegar a HEAD</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Crear Rama</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">LIMPIAR NOTIFICACIONES</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Resaltar solo la rama actual en el gráfico</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Abrir en {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Abrir en Herramientas Externas</x:String>
@@ -642,6 +659,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Ruta de almacenamiento de la clave privada SSH</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">INICIAR</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Restaurar automáticamente después del stashing</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Tus archivos de trabajo permanecen sin cambios, pero se guarda un stash.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Incluir archivos no rastreados</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Mantener archivos staged</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Mensaje:</x:String>
@@ -721,6 +740,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARCHIVOS NO RASTREADOS</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO HAY MENSAJES DE ENTRADA RECIENTES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO HAY PLANTILLAS DE COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">Firmar</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGE</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">UNSTAGE TODO</x:String>

From 89e09d842d6f632e4c2cda52a6715983b44a2c28 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 01:45:49 +0000
Subject: [PATCH 146/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 22 +---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index a82a43b1..0990a39d 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.09%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.93%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.35%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.21%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.74%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.93%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.35%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.21%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index acecf990..04e121fc 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -12,34 +12,14 @@
 
 </details>
 
-### es_ES.axaml: 97.09%
+### es_ES.axaml: 99.74%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.AIAssistant.Regen
-- Text.AIAssistant.Use
-- Text.ApplyStash
-- Text.ApplyStash.DropAfterApply
-- Text.ApplyStash.RestoreIndex
-- Text.ApplyStash.Stash
-- Text.BranchCM.CustomAction
-- Text.BranchUpstreamInvalid
-- Text.Clone.RecurseSubmodules
-- Text.Configure.CustomAction.Scope.Branch
-- Text.Configure.CustomAction.WaitForExit
-- Text.CreateBranch.Name.WarnSpace
-- Text.DeleteRepositoryNode.Path
-- Text.DeleteRepositoryNode.TipForGroup
-- Text.DeleteRepositoryNode.TipForRepository
 - Text.Diff.First
 - Text.Diff.Last
-- Text.Preferences.AI.Streaming
-- Text.Repository.Notifications.Clear
-- Text.Stash.AutoRestore
-- Text.Stash.AutoRestore.Tip
-- Text.WorkingCopy.SignOff
 
 </details>
 

From 0b7805b2ee3489de0e4b6a3b62782301fa25012b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Feb 2025 09:49:30 +0800
Subject: [PATCH 147/364] version: Release 2025.06

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

diff --git a/VERSION b/VERSION
index 15689348..bb11b3b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.05
\ No newline at end of file
+2025.06
\ No newline at end of file

From 1d037c7c572389bd91d50a22a1105b89bf4fd5c6 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Feb 2025 21:24:53 +0800
Subject: [PATCH 148/364] feature: add context menu `Save As Patch...` for
 selected stash (#1018)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/SaveChangesAsPatch.cs | 13 +++++++++++
 src/Resources/Locales/en_US.axaml  |  1 +
 src/Resources/Locales/zh_CN.axaml  |  1 +
 src/Resources/Locales/zh_TW.axaml  |  1 +
 src/ViewModels/StashesPage.cs      | 37 ++++++++++++++++++++++++++++++
 5 files changed, 53 insertions(+)

diff --git a/src/Commands/SaveChangesAsPatch.cs b/src/Commands/SaveChangesAsPatch.cs
index 461bbfb5..b10037a1 100644
--- a/src/Commands/SaveChangesAsPatch.cs
+++ b/src/Commands/SaveChangesAsPatch.cs
@@ -37,6 +37,19 @@ namespace SourceGit.Commands
             return true;
         }
 
+        public static bool ProcessStashChanges(string repo, List<Models.DiffOption> opts, string saveTo)
+        {
+            using (var sw = File.Create(saveTo))
+            {
+                foreach (var opt in opts)
+                {
+                    if (!ProcessSingleChange(repo, opt, sw))
+                        return false;
+                }
+            }
+            return true;
+        }
+
         private static bool ProcessSingleChange(string repo, Models.DiffOption opt, FileStream writer)
         {
             var starter = new ProcessStartInfo();
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 1a83a4da..6c397ea0 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -669,6 +669,7 @@
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Apply</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Drop</x:String>
   <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Save as Patch...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Drop Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Drop:</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">STASHES</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index acfdefd2..09c46e95 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -673,6 +673,7 @@
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">应用(apply)</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">删除(drop)</x:String>
   <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">应用并删除(pop)</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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index dd9092a4..0eb54676 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -672,6 +672,7 @@
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">套用 (apply)</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">刪除 (drop)</x:String>
   <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">套用並刪除 (pop)</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">另存為修補檔 (patch)...</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>
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 4a3bf933..57b30fd3 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Threading.Tasks;
 
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -157,9 +158,45 @@ namespace SourceGit.ViewModels
                 ev.Handled = true;
             };
 
+            var patch = new MenuItem();
+            patch.Header = App.Text("StashCM.SaveAsPatch");
+            patch.Icon = App.CreateMenuIcon("Icons.Diff");
+            patch.Click += async (_, e) =>
+            {
+                var storageProvider = App.GetStorageProvider();
+                if (storageProvider == null)
+                    return;
+
+                var options = new FilePickerSaveOptions();
+                options.Title = App.Text("StashCM.SaveAsPatch");
+                options.DefaultExtension = ".patch";
+                options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
+
+                var storageFile = await storageProvider.SaveFilePickerAsync(options);
+                if (storageFile != null)
+                {
+                    var opts = new List<Models.DiffOption>();
+                    foreach (var c in _changes)
+                    {
+                        if (_untrackedChanges.Contains(c.Path))
+                            opts.Add(new Models.DiffOption("4b825dc642cb6eb9a060e54bf8d69288fbee4904", _selectedStash.Parents[2], c));
+                        else
+                            opts.Add(new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, c));
+                    }
+
+                    var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessStashChanges(_repo.FullPath, opts, storageFile.Path.LocalPath));
+                    if (succ)
+                        App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
+                }
+
+                e.Handled = true;
+            };
+
             var menu = new ContextMenu();
             menu.Items.Add(apply);
             menu.Items.Add(drop);
+            menu.Items.Add(new MenuItem { Header = "-" });
+            menu.Items.Add(patch);
             return menu;
         }
 

From 1f35e837997148049b2365484b9bbea16ef5bd56 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:25:13 +0000
Subject: [PATCH 149/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0990a39d..e89b071c 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.34%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.74%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.93%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.35%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.21%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.60%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.81%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.23%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.55%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.08%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 04e121fc..024cd035 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.34%
+### de_DE.axaml: 99.21%
 
 
 <details>
@@ -9,10 +9,11 @@
 - Text.Diff.First
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
+- Text.StashCM.SaveAsPatch
 
 </details>
 
-### es_ES.axaml: 99.74%
+### es_ES.axaml: 99.60%
 
 
 <details>
@@ -20,10 +21,11 @@
 
 - Text.Diff.First
 - Text.Diff.Last
+- Text.StashCM.SaveAsPatch
 
 </details>
 
-### fr_FR.axaml: 91.93%
+### fr_FR.axaml: 91.81%
 
 
 <details>
@@ -88,12 +90,13 @@
 - Text.SHALinkCM.NavigateTo
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
+- Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### it_IT.axaml: 97.35%
+### it_IT.axaml: 97.23%
 
 
 <details>
@@ -119,10 +122,11 @@
 - Text.Repository.Notifications.Clear
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
+- Text.StashCM.SaveAsPatch
 
 </details>
 
-### pt_BR.axaml: 91.67%
+### pt_BR.axaml: 91.55%
 
 
 <details>
@@ -189,12 +193,13 @@
 - Text.SHALinkCM.NavigateTo
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
+- Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### ru_RU.axaml: 99.21%
+### ru_RU.axaml: 99.08%
 
 
 <details>
@@ -206,6 +211,7 @@
 - Text.Diff.First
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
+- Text.StashCM.SaveAsPatch
 
 </details>
 

From c6747f72f9fc712229b87783bc8d8a735f119647 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 25 Feb 2025 10:53:42 +0800
Subject: [PATCH 150/364] feature: auto-select first change in commit details
 panel and revision/branch compare panel (#1019)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/OpenAI.cs                    |  2 +-
 src/ViewModels/CommitDetail.cs          | 16 ++++----
 src/ViewModels/Repository.cs            |  6 +++
 src/ViewModels/WorkingCopy.cs           |  2 +-
 src/Views/BranchCompare.axaml           |  1 +
 src/Views/ChangeCollectionView.axaml.cs | 53 +++++++++++++++++++++----
 src/Views/CommitChanges.axaml           |  1 +
 src/Views/LauncherTabsSelector.axaml.cs |  6 +--
 src/Views/Repository.axaml.cs           |  2 +-
 src/Views/RevisionCompare.axaml         |  1 +
 src/Views/TextDiffView.axaml.cs         |  2 +-
 11 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index 264230c6..76daacd0 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -36,7 +36,7 @@ namespace SourceGit.Models
             {
                 if (startIdx > 0)
                     OnReceive(buffer.Substring(0, startIdx));
-                   
+
                 var endIdx = buffer.IndexOf(">", startIdx + 1, StringComparison.Ordinal);
                 if (endIdx <= startIdx)
                 {
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index d90e97d6..702a757c 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -25,8 +25,15 @@ namespace SourceGit.ViewModels
 
         public int ActivePageIndex
         {
-            get => _activePageIndex;
-            set => SetProperty(ref _activePageIndex, value);
+            get => _repo.CommitDetailActivePageIndex;
+            set
+            {
+                if (_repo.CommitDetailActivePageIndex != value)
+                {
+                    _repo.CommitDetailActivePageIndex = value;
+                    OnPropertyChanged();
+                }
+            }
         }
 
         public Models.Commit Commit
@@ -617,11 +624,7 @@ namespace SourceGit.ViewModels
             _changes = null;
             _revisionFiles.Clear();
 
-            FullMessage = string.Empty;
             SignInfo = null;
-            Changes = [];
-            VisibleChanges = null;
-            SelectedChanges = null;
             ViewRevisionFileContent = null;
             Children.Clear();
             RevisionFileSearchFilter = string.Empty;
@@ -821,7 +824,6 @@ namespace SourceGit.ViewModels
         };
 
         private Repository _repo = null;
-        private int _activePageIndex = 0;
         private Models.Commit _commit = null;
         private string _fullMessage = string.Empty;
         private Models.CommitSignInfo _signInfo = null;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 6e8a5290..104ff60b 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -453,6 +453,12 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _isAutoFetching, value);
         }
 
+        public int CommitDetailActivePageIndex
+        {
+            get;
+            set;
+        } = 0;
+
         public Repository(bool isBare, string path, string gitDir)
         {
             IsBare = isBare;
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index ce2a2ac1..afaf5868 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -1466,7 +1466,7 @@ namespace SourceGit.ViewModels
                 return unstaged;
 
             var visible = new List<Models.Change>();
-            
+
             foreach (var c in unstaged)
             {
                 if (c.Path.Contains(_unstagedFilter, StringComparison.OrdinalIgnoreCase))
diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml
index 04b77306..f73860c5 100644
--- a/src/Views/BranchCompare.axaml
+++ b/src/Views/BranchCompare.axaml
@@ -134,6 +134,7 @@
             <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                     Changes="{Binding VisibleChanges}"
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
+                                    AutoSelectFirstChange="True"
                                     ContextRequested="OnChangeContextRequested"/>
           </Border>
         </Grid>
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index d6982dda..6ef79861 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -85,6 +85,15 @@ namespace SourceGit.Views
             set => SetValue(ChangesProperty, value);
         }
 
+        public static readonly StyledProperty<bool> AutoSelectFirstChangeProperty =
+            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(AutoSelectFirstChange), false);
+
+        public bool AutoSelectFirstChange
+        {
+            get => GetValue(AutoSelectFirstChangeProperty);
+            set => SetValue(AutoSelectFirstChangeProperty, value);
+        }
+
         public static readonly StyledProperty<List<Models.Change>> SelectedChangesProperty =
             AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(SelectedChanges));
 
@@ -205,9 +214,9 @@ namespace SourceGit.Views
             base.OnPropertyChanged(change);
 
             if (change.Property == ViewModeProperty)
-                UpdateDataSource(false);
-            else if (change.Property == ChangesProperty)
                 UpdateDataSource(true);
+            else if (change.Property == ChangesProperty)
+                UpdateDataSource(false);
             else if (change.Property == SelectedChangesProperty)
                 UpdateSelection();
         }
@@ -292,9 +301,9 @@ namespace SourceGit.Views
             }
         }
 
-        private void UpdateDataSource(bool disableEvents)
+        private void UpdateDataSource(bool onlyViewModeChange)
         {
-            _disableSelectionChangingEvent = disableEvents;
+            _disableSelectionChangingEvent = !onlyViewModeChange;
 
             var changes = Changes;
             if (changes == null || changes.Count == 0)
@@ -324,7 +333,19 @@ namespace SourceGit.Views
                 MakeTreeRows(rows, tree.Tree);
                 tree.Rows.AddRange(rows);
 
-                if (selected.Count > 0)
+                if (!onlyViewModeChange && AutoSelectFirstChange)
+                {
+                    foreach (var row in tree.Rows)
+                    {
+                        if (row.Change != null)
+                        {
+                            tree.SelectedRows.Add(row);
+                            SetCurrentValue(SelectedChangesProperty, [row.Change]);
+                            break;
+                        }
+                    }
+                }
+                else if (selected.Count > 0)
                 {
                     var sets = new HashSet<Models.Change>();
                     foreach (var c in selected)
@@ -346,16 +367,34 @@ namespace SourceGit.Views
             {
                 var grid = new ViewModels.ChangeCollectionAsGrid();
                 grid.Changes.AddRange(changes);
-                if (selected.Count > 0)
+
+                if (!onlyViewModeChange && AutoSelectFirstChange)
+                {
+                    grid.SelectedChanges.Add(changes[0]);
+                    SetCurrentValue(SelectedChangesProperty, [changes[0]]);
+                }
+                else if (selected.Count > 0)
+                {
                     grid.SelectedChanges.AddRange(selected);
+                }
+
                 Content = grid;
             }
             else
             {
                 var list = new ViewModels.ChangeCollectionAsList();
                 list.Changes.AddRange(changes);
-                if (selected.Count > 0)
+
+                if (!onlyViewModeChange && AutoSelectFirstChange)
+                {
+                    list.SelectedChanges.Add(changes[0]);
+                    SetCurrentValue(SelectedChangesProperty, [changes[0]]);
+                }
+                else if (selected.Count > 0)
+                {
                     list.SelectedChanges.AddRange(selected);
+                }
+
                 Content = list;
             }
 
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 377be944..2fac9365 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -49,6 +49,7 @@
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                 Changes="{Binding VisibleChanges}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
+                                AutoSelectFirstChange="True"
                                 ContextRequested="OnChangeContextRequested"/>
       </Border>
     </Grid>
diff --git a/src/Views/LauncherTabsSelector.axaml.cs b/src/Views/LauncherTabsSelector.axaml.cs
index 01c5fa0d..61d7a966 100644
--- a/src/Views/LauncherTabsSelector.axaml.cs
+++ b/src/Views/LauncherTabsSelector.axaml.cs
@@ -39,7 +39,7 @@ namespace SourceGit.Views
         }
 
         public static readonly RoutedEvent<LauncherTabSelectedEventArgs> PageSelectedEvent =
-            RoutedEvent.Register<ChangeCollectionView, LauncherTabSelectedEventArgs>(nameof(PageSelected), RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+            RoutedEvent.Register<LauncherTabsSelector, LauncherTabSelectedEventArgs>(nameof(PageSelected), RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
 
         public event EventHandler<LauncherTabSelectedEventArgs> PageSelected
         {
@@ -74,7 +74,7 @@ namespace SourceGit.Views
 
         private void OnPageSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (sender is ListBox { SelectedItem : ViewModels.LauncherPage page })
+            if (sender is ListBox { SelectedItem: ViewModels.LauncherPage page })
             {
                 _isProcessingSelection = true;
                 RaiseEvent(new LauncherTabSelectedEventArgs(page));
@@ -88,7 +88,7 @@ namespace SourceGit.Views
         {
             if (_isProcessingSelection)
                 return;
-                
+
             VisiblePages.Clear();
 
             if (Pages == null)
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 53bb2d53..2b3b7c30 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -522,7 +522,7 @@ namespace SourceGit.Views
 
         private void OnRemoveSelectedHistoriesFilter(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.Repository repo && sender is Button { DataContext: Models.Filter filter})
+            if (DataContext is ViewModels.Repository repo && sender is Button { DataContext: Models.Filter filter })
                 repo.RemoveHistoriesFilter(filter);
 
             e.Handled = true;
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 46b667ac..73703ff1 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -99,6 +99,7 @@
           <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                   Changes="{Binding VisibleChanges}"
                                   SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
+                                  AutoSelectFirstChange="True"
                                   ContextRequested="OnChangeContextRequested"/>
         </Border>
       </Grid>
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 323fde03..dccbb9b2 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1006,7 +1006,7 @@ namespace SourceGit.Views
 
             if (startPosition.Location > endPosition.Location)
                 (startPosition, endPosition) = (endPosition, startPosition);
-            
+
             var startIdx = Math.Min(startPosition.Line - 1, lines.Count - 1);
             var endIdx = Math.Min(endPosition.Line - 1, lines.Count - 1);
 

From 4d740f4731432e637ca1bb5f195ce9b307b4e805 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 25 Feb 2025 11:09:12 +0800
Subject: [PATCH 151/364] feature: auto-select the first change when selected
 stash changed (#1019)

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

diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 57b30fd3..9e220234 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -89,7 +89,7 @@ namespace SourceGit.ViewModels
             private set
             {
                 if (SetProperty(ref _changes, value))
-                    SelectedChange = null;
+                    SelectedChange = value is { Count: >0 } ? value[0] : null;
             }
         }
 

From a0786bf9cc12f6e1b29078eed8357879e023098d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 25 Feb 2025 14:37:03 +0800
Subject: [PATCH 152/364] fix: pulling with empty repository (no local branch)
 crashes this app (#1020)

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

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 104ff60b..85b819c4 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -663,6 +663,12 @@ namespace SourceGit.ViewModels
                 return;
             }
 
+            if (_currentBranch == null)
+            {
+                App.RaiseException(_fullpath, "Can NOT found current branch!!!");
+                return;
+            }
+
             var pull = new Pull(this, null);
             if (autoStart && pull.SelectedBranch != null)
                 ShowAndStartPopup(pull);

From 79306ad73bbd2b6f0872cbb32d348a0b105b50e4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 25 Feb 2025 19:50:09 +0800
Subject: [PATCH 153/364] fix: `ptyxis` does not start with given working
 directory (#1005)

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

diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index a24f1b65..fec110b2 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -65,13 +65,16 @@ namespace SourceGit.Native
         {
             var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
             var cwd = string.IsNullOrEmpty(workdir) ? home : workdir;
+            var terminal = OS.ShellOrTerminal;
 
             var startInfo = new ProcessStartInfo();
             startInfo.WorkingDirectory = cwd;
-            startInfo.FileName = OS.ShellOrTerminal;
+            startInfo.FileName = terminal;
 
-            if (OS.ShellOrTerminal.EndsWith("wezterm", StringComparison.OrdinalIgnoreCase))
+            if (terminal.EndsWith("wezterm", StringComparison.OrdinalIgnoreCase))
                 startInfo.Arguments = $"start --cwd \"{cwd}\"";
+            else if (terminal.EndsWith("ptyxis", StringComparison.OrdinalIgnoreCase))
+                startInfo.Arguments = $"--working-directory=\"{cwd}\"";
 
             try
             {

From a7e254cac658ec288de30b490a1eaabbc4a3aa83 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 26 Feb 2025 09:50:54 +0800
Subject: [PATCH 154/364] fix: multiple bindings for `IsVisible` property of
 Button

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

diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index fccb949d..3644f8fc 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -37,7 +37,6 @@
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoFirstChange"
-                    IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.First}">
               <Button.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
@@ -78,7 +77,6 @@
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoLastChange"
-                    IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.Last}">
               <Button.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">

From 8f7db4e8747982991fc7f7d0e737abc98e1847a1 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: Wed, 26 Feb 2025 01:44:51 -0600
Subject: [PATCH 155/364] localization: add missing spanish translations
 (#1024)

* localization: add missing spanish translations

* localization: add missing spanish translations
---
 src/Resources/Locales/es_ES.axaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 24170683..ef98a1a2 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -253,7 +253,9 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">ANTIGUO</x:String>
   <x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copiar</x:String>
   <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Modo de Archivo Cambiado</x:String>
+  <x:String x:Key="Text.Diff.First" xml:space="preserve">Primera Diferencia</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorar Cambio de Espacios en Blanco</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Última Diferencia</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">CAMBIO DE OBJETO LFS</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Siguiente Diferencia</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">SIN CAMBIOS O SOLO CAMBIOS DE EOL</x:String>

From c849c13fcbca8c537d2deb7c756d87b05a43208b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2025 07:45:04 +0000
Subject: [PATCH 156/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e89b071c..bca0a57d 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.60%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.81%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.23%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.55%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.08%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.81%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.23%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.55%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.08%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 024cd035..20aad3ff 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -13,14 +13,12 @@
 
 </details>
 
-### es_ES.axaml: 99.60%
+### es_ES.axaml: 99.87%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Diff.First
-- Text.Diff.Last
 - Text.StashCM.SaveAsPatch
 
 </details>

From 7bfb95f7ce226d49d09d3a4d57add781b16fe830 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 26 Feb 2025 16:07:04 +0800
Subject: [PATCH 157/364] fix: `ptyxis` does not start with given working
 directory (#1005)

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

diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index fec110b2..bfb98500 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -74,7 +74,7 @@ namespace SourceGit.Native
             if (terminal.EndsWith("wezterm", StringComparison.OrdinalIgnoreCase))
                 startInfo.Arguments = $"start --cwd \"{cwd}\"";
             else if (terminal.EndsWith("ptyxis", StringComparison.OrdinalIgnoreCase))
-                startInfo.Arguments = $"--working-directory=\"{cwd}\"";
+                startInfo.Arguments = $"--new-window --working-directory=\"{cwd}\"";
 
             try
             {

From bdf439a74206cc6c42dd21a309e21862f913950b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 26 Feb 2025 16:33:11 +0800
Subject: [PATCH 158/364] enhance: do not show error message if it is empty

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/ExecuteCustomAction.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs
index 3a77ec01..7775da34 100644
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@@ -31,10 +31,7 @@ namespace SourceGit.Commands
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(repo, e.Message);
-                });
+                Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, e.Message));
             }
         }
 
@@ -87,19 +84,14 @@ namespace SourceGit.Commands
                 var exitCode = proc.ExitCode;
                 if (exitCode != 0)
                 {
-                    var errMsg = builder.ToString();
-                    Dispatcher.UIThread.Invoke(() =>
-                    {
-                        App.RaiseException(repo, errMsg);
-                    });
+                    var errMsg = builder.ToString().Trim();
+                    if (!string.IsNullOrEmpty(errMsg))
+                        Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, errMsg));
                 }
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(repo, e.Message);
-                });
+                Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, e.Message));
             }
 
             proc.Close();

From 61d7f36be4f403abf07d0391047e487398576964 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 27 Feb 2025 10:59:00 +0800
Subject: [PATCH 159/364] enhance: reset diff view context for empty commit

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

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 702a757c..7c5aa28f 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -686,6 +686,9 @@ namespace SourceGit.ViewModels
                     {
                         Changes = changes;
                         VisibleChanges = visible;
+
+                        if (visible.Count == 0)
+                            SelectedChanges = null;
                     });
                 }
             });

From fc3043b93c05b7907a199550c1ad93d7c157dba7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 27 Feb 2025 21:10:41 +0800
Subject: [PATCH 160/364] fix: double-clicking button trigger binded command
 twice (#1032)

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

diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 84b60c14..ebf26a96 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -352,8 +352,13 @@
                      Margin="8,0,0,0"
                      Padding="8,0"
                      Command="{Binding ContinueMerge}"
-                     IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
-                     IsEnabled="{Binding !HasUnsolvedConflicts}">
+                     IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
+          <SplitButton.IsEnabled>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="IsCommitting" Converter="{x:Static BoolConverters.Not}"/>
+              <Binding Path="HasUnsolvedConflicts" Converter="{x:Static BoolConverters.Not}"/>
+            </MultiBinding>
+          </SplitButton.IsEnabled>
           <SplitButton.Flyout>
             <MenuFlyout>
               <MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}" Command="{Binding Commit}"/>
@@ -370,6 +375,7 @@
                 Command="{Binding Commit}"
                 HotKey="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"
                 IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNull}}"
+                IsEnabled="{Binding !IsCommitting}"
                 ToolTip.Placement="Top"
                 ToolTip.VerticalOffset="0">
           <ToolTip.Tip>
@@ -401,6 +407,7 @@
                 Padding="8,0"
                 Command="{Binding CommitWithPush}"
                 HotKey="Alt+Enter"
+                IsEnabled="{Binding !IsCommitting}"
                 ToolTip.Tip="{OnPlatform Alt+Enter, macOS=⌥+Enter}"
                 ToolTip.Placement="Top"
                 ToolTip.VerticalOffset="0">

From 337ee1a55d3c00027953c8c69daa68c68df71c02 Mon Sep 17 00:00:00 2001
From: Leonardo <leonardo.cossutta@gmail.com>
Date: Thu, 27 Feb 2025 14:12:14 +0100
Subject: [PATCH 161/364] localization: update italian translation (#1029)

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

diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 1d0d353e..d7d01f1d 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -22,7 +22,9 @@
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Traccia Branch:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Traccia branch remoto</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assistente AI</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RIGENERA</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usa AI per generare il messaggio di commit</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLICA COME MESSAGGIO DI COMMIT</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Applica</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Errore</x:String>
   <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Genera errori e si rifiuta di applicare la patch</x:String>
@@ -37,6 +39,10 @@
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Avviso</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Mostra avvisi per alcuni errori, ma applica comunque</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Spazi:</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Applica lo stash</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Rimuovi dopo aver applicato</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Ripristina le modifiche all'indice</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Archivia...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Salva Archivio In:</x:String>
   <x:String x:Key="Text.Archive.File.Placeholder" xml:space="preserve">Seleziona il percorso del file archivio</x:String>
@@ -53,6 +59,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Confronta con HEAD</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Confronta con Worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copia Nome Branch</x:String>
+  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Azione personalizzata</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Elimina ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Elimina i {0} branch selezionati</x:String>
   <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Scarta tutte le modifiche</x:String>
@@ -68,6 +75,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Rinomina ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Imposta Branch di Tracciamento...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Confronto Branch</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Upstream non valido</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Byte</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ANNULLA</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Ripristina Questa Revisione</x:String>
@@ -100,6 +108,7 @@
   <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">Nome Locale:</x:String>
   <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">Nome del repository. Facoltativo.</x:String>
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Cartella Principale:</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Inizializza e aggiorna i sottomoduli</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL del Repository:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">CHIUDI</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
@@ -152,8 +161,10 @@
   <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">File Eseguibile:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Name" xml:space="preserve">Nome:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Ambito:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Branch</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repository</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Attendi la fine dell'azione</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Indirizzo Email</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Indirizzo email</x:String>
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
@@ -226,7 +237,10 @@
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Stai per eliminare più branch contemporaneamente. Controlla attentamente prima di procedere!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Elimina Remoto</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remoto:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Percorso:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Destinazione:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Tutti i figli verranno rimossi dalla lista.</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">Lo rimuoverà solamente dalla lista, non dal disco!</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Conferma Eliminazione Gruppo</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Conferma Eliminazione Repository</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Elimina Sottomodulo</x:String>
@@ -239,7 +253,9 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">VECCHIO</x:String>
   <x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copia</x:String>
   <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Modalità File Modificata</x:String>
+  <x:String x:Key="Text.Diff.First" xml:space="preserve">Prima differenza</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignora Modifiche agli Spazi</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Ultima differenza</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">MODIFICA OGGETTO LFS</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Differenza Successiva</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">NESSUNA MODIFICA O SOLO CAMBIAMENTI DI FINE LINEA</x:String>
@@ -450,6 +466,7 @@
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modello</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nome</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
+  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Abilita streaming</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">ASPETTO</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Font Predefinito</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
@@ -578,6 +595,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCH LOCALI</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Vai a HEAD</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Crea Branch</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">CANCELLA LE NOTIFICHE</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Evidenzia nel grafico solo il branch corrente</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Apri in {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Apri in Strumenti Esterni</x:String>
@@ -644,6 +662,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Percorso per la chiave SSH privata</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">AVVIA</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stasha</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Auto-ripristino dopo lo stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">I tuoi file di lavoro rimangono inalterati, ma viene salvato uno stash.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Includi file non tracciati</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Mantieni file in stage</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Messaggio:</x:String>
@@ -654,6 +674,7 @@
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Applica</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Elimina</x:String>
   <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Estrai</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Salva come Patch...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Elimina Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Elimina:</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">STASH</x:String>

From caca1dcaaf68fc8be4c6e2a99bcd9190e702b0e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:12:27 +0000
Subject: [PATCH 162/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 24 ++----------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index bca0a57d..14d24a54 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.81%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.23%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.55%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.08%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.81%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.55%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.08%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 20aad3ff..516db432 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -94,33 +94,13 @@
 
 </details>
 
-### it_IT.axaml: 97.23%
+### it_IT.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.AIAssistant.Regen
-- Text.AIAssistant.Use
-- Text.ApplyStash
-- Text.ApplyStash.DropAfterApply
-- Text.ApplyStash.RestoreIndex
-- Text.ApplyStash.Stash
-- Text.BranchCM.CustomAction
-- Text.BranchUpstreamInvalid
-- Text.Clone.RecurseSubmodules
-- Text.Configure.CustomAction.Scope.Branch
-- Text.Configure.CustomAction.WaitForExit
-- Text.DeleteRepositoryNode.Path
-- Text.DeleteRepositoryNode.TipForGroup
-- Text.DeleteRepositoryNode.TipForRepository
-- Text.Diff.First
-- Text.Diff.Last
-- Text.Preferences.AI.Streaming
-- Text.Repository.Notifications.Clear
-- Text.Stash.AutoRestore
-- Text.Stash.AutoRestore.Tip
-- Text.StashCM.SaveAsPatch
+
 
 </details>
 

From 57cb9d0909548e350669ee875541455668f09d80 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 27 Feb 2025 21:14:24 +0800
Subject: [PATCH 163/364] fix: Dynamic load copyright (#1030)

---
 LICENSE                           |  4 ++--
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/en_US.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/fr_FR.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/pt_BR.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 src/SourceGit.csproj              |  2 +-
 src/Views/About.axaml             |  2 +-
 src/Views/About.axaml.cs          | 10 ++++++++++
 13 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/LICENSE b/LICENSE
index dceab2d8..442ce085 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 sourcegit
+Copyright (c) 2025 sourcegit
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index c16c90b5..1d0ca895 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Über SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Erstellt mit </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• Grafik gerendert durch </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• Texteditor von </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Monospace-Schriftarten von </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Quelltext findest du auf </x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 6c397ea0..5208a269 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -3,7 +3,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">About SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Build with </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• Chart is rendered by </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• TextEditor from </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Monospace fonts come from </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Source code can be found at </x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index ef98a1a2..bf635321 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Acerca de SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Construido con </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• El gráfico es renderizado por </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• Editor de texto de </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Las fuentes monoespaciadas provienen de </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• El código fuente se puede encontrar en </x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index b269424a..59fe00a8 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">À propos de SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Compilé avec </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• Le graphique est rendu par </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• TextEditor de </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Les polices Monospace proviennent de </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Le code source est disponible sur </x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index d7d01f1d..6e99decf 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Informazioni su SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Creato con </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• Il grafico è reso da </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• Editor di testo da </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• I font monospaziati provengono da </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Il codice sorgente è disponibile su </x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index a318cfa8..78445bfb 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -31,7 +31,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Sobre o SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Construído com </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• Gráfico desenhado por </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• Editor de Texto de </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Fontes monoespaçadas de </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Código-fonte pode ser encontrado em </x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index a1c40764..4468650b 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">О SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Сборка с </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• Диаграмма отображается с помощью</x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• Текстовый редактор от </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Моноширинные шрифты взяты из </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Исходный код можно найти по адресу </x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 09c46e95..0e8b9f7d 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">关于本软件</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• 项目依赖于 </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• 图表绘制组件来自 </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• 文本编辑器使用 </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• 等宽字体来自于 </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• 项目源代码地址 </x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 0eb54676..f4cfad08 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -6,7 +6,6 @@
   <x:String x:Key="Text.About.Menu" xml:space="preserve">關於 SourceGit</x:String>
   <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• 專案依賴於 </x:String>
   <x:String x:Key="Text.About.Chart" xml:space="preserve">• 圖表繪製元件來自 </x:String>
-  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
   <x:String x:Key="Text.About.Editor" xml:space="preserve">• 文字編輯器使用 </x:String>
   <x:String x:Key="Text.About.Fonts" xml:space="preserve">• 等寬字型來自於 </x:String>
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• 專案原始碼網址 </x:String>
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 4183511e..c001fca0 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -13,7 +13,7 @@
     <Product>SourceGit</Product>
     <Description>OpenSource GIT client</Description>
     <Company>sourcegit-scm</Company>
-    <Copyright>Copyright © 2024 sourcegit-scm.</Copyright>
+    <Copyright>Copyright © $([System.DateTime]::Now.Year) sourcegit-scm.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/sourcegit-scm/sourcegit.git</PackageProjectUrl>
     <RepositoryUrl>https://github.com/sourcegit-scm/sourcegit.git</RepositoryUrl>
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index d781ee9e..6e45ab70 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -52,7 +52,7 @@
 
         <TextBlock Margin="2,0,0,0" Text="{DynamicResource Text.About.SubTitle}" FontSize="16"/>
 
-        <TextBlock Margin="2,8,0,0" Text="{DynamicResource Text.About.Copyright}" Foreground="{DynamicResource Brush.FG2}"/>
+        <TextBlock Margin="2,8,0,0" Text="{Binding Copyright}" Foreground="{DynamicResource Brush.FG2}"/>
 
         <StackPanel Orientation="Vertical" Margin="0,24,0,0">
           <StackPanel Orientation="Horizontal" Height="18">
diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs
index b02cd13f..bbfd659c 100644
--- a/src/Views/About.axaml.cs
+++ b/src/Views/About.axaml.cs
@@ -11,11 +11,21 @@ namespace SourceGit.Views
             private set;
         }
 
+        public string Copyright
+        {
+            get;
+            private set;
+        }
+
         public About()
         {
             var ver = Assembly.GetExecutingAssembly().GetName().Version;
             if (ver != null)
                 Version = $"{ver.Major}.{ver.Minor}";
+            var attributes = Assembly.GetExecutingAssembly()
+                .GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+            if (attributes.Length > 0)
+                Copyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
 
             DataContext = this;
             InitializeComponent();

From 109eee5668a3eba8597906e5fd40cba6dbad2eb4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:14:38 +0000
Subject: [PATCH 164/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 14d24a54..c5b16f59 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.81%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.55%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.08%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.80%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.53%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.07%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 516db432..716ddd3a 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -23,7 +23,7 @@
 
 </details>
 
-### fr_FR.axaml: 91.81%
+### fr_FR.axaml: 91.80%
 
 
 <details>
@@ -104,7 +104,7 @@
 
 </details>
 
-### pt_BR.axaml: 91.55%
+### pt_BR.axaml: 91.53%
 
 
 <details>
@@ -177,7 +177,7 @@
 
 </details>
 
-### ru_RU.axaml: 99.08%
+### ru_RU.axaml: 99.07%
 
 
 <details>

From f930967698a6c982e4a2ae889dea6b7918f98819 Mon Sep 17 00:00:00 2001
From: Andre Greeff <little.grief@gmail.com>
Date: Fri, 28 Feb 2025 11:05:49 +0200
Subject: [PATCH 165/364] feat: remove `IsMerged` check from "Interactive
 Rebase" context menu conditional (#1033)

---
 src/ViewModels/Histories.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 03f216de..9463c2d3 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -566,7 +566,7 @@ namespace SourceGit.ViewModels
 
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
-                if (commit.IsMerged && current.Head != commit.SHA)
+                if (current.Head != commit.SHA)
                 {
                     var interactiveRebase = new MenuItem();
                     interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name);

From 3e70ff94b0c572ecb00f58bd4f2fce2a960bb111 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Feb 2025 17:03:51 +0800
Subject: [PATCH 166/364] fix: should not use `...` to get revision range for
 rebasing (#1033)

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

diff --git a/README.md b/README.md
index c5b16f59..dae76783 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
   * Clone/Fetch/Pull/Push...
   * Merge/Rebase/Reset/Revert/Amend/Cherry-pick...
   * Amend/Reword
-  * Interactive rebase (Basic)
+  * Interactive rebase
   * Branches
   * Remotes
   * Tags
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
index 355671c7..9f28fbc7 100644
--- a/src/ViewModels/InteractiveRebase.cs
+++ b/src/ViewModels/InteractiveRebase.cs
@@ -118,7 +118,7 @@ namespace SourceGit.ViewModels
 
             Task.Run(() =>
             {
-                var commits = new Commands.QueryCommitsWithFullMessage(repoPath, $"{on.SHA}...HEAD").Result();
+                var commits = new Commands.QueryCommitsWithFullMessage(repoPath, $"{on.SHA}..HEAD").Result();
                 var list = new List<InteractiveRebaseItem>();
 
                 foreach (var c in commits)

From 639bff9ad8271eac4105f6082c146c73ae7fda34 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Feb 2025 17:27:17 +0800
Subject: [PATCH 167/364] code_style: run `dotnet format`

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

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 9463c2d3..48ce114d 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -561,13 +561,7 @@ namespace SourceGit.ViewModels
                             _repo.ShowPopup(new CheckoutCommit(_repo, commit));
                         e.Handled = true;
                     };
-                    menu.Items.Add(checkoutCommit);
-                }
 
-                menu.Items.Add(new MenuItem() { Header = "-" });
-
-                if (current.Head != commit.SHA)
-                {
                     var interactiveRebase = new MenuItem();
                     interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name);
                     interactiveRebase.Icon = App.CreateMenuIcon("Icons.InteractiveRebase");
@@ -586,9 +580,13 @@ namespace SourceGit.ViewModels
 
                         e.Handled = true;
                     };
-                    menu.Items.Add(interactiveRebase);
+
+                    menu.Items.Add(checkoutCommit);
                     menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(interactiveRebase);
                 }
+
+                menu.Items.Add(new MenuItem() { Header = "-" });
             }
 
             if (current.Head != commit.SHA)
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 9e220234..ec7cc84a 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -89,7 +89,7 @@ namespace SourceGit.ViewModels
             private set
             {
                 if (SetProperty(ref _changes, value))
-                    SelectedChange = value is { Count: >0 } ? value[0] : null;
+                    SelectedChange = value is { Count: > 0 } ? value[0] : null;
             }
         }
 

From 9cf1cba9b7160ae9a594147a94256581aada8a60 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Feb 2025 19:08:27 +0800
Subject: [PATCH 168/364] feature: apply commit message while continue
 merge/revert (#1027)

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

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index afaf5868..3033da07 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -445,6 +445,10 @@ namespace SourceGit.ViewModels
                 _repo.SetWatcherEnabled(false);
                 Task.Run(() =>
                 {
+                    var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
+                    if (File.Exists(mergeMsgFile))
+                        File.WriteAllText(mergeMsgFile, _commitMessage);
+
                     var succ = _inProgressContext.Continue();
                     Dispatcher.UIThread.Invoke(() =>
                     {

From 88c7d5bbc9e0d5b4687aa32d31aec795ef3998cb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Feb 2025 19:15:02 +0800
Subject: [PATCH 169/364] fix: app crashes when `Return` key is pressed while
 current action is already running (#1035)

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

diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index 63cb52af..288770bc 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -71,7 +71,7 @@ namespace SourceGit.ViewModels
 
         public async void ProcessPopup()
         {
-            if (_popup != null)
+            if (_popup is { InProgress: false })
             {
                 if (!_popup.Check())
                     return;

From c90b7afac10a5beaa35eaee637ae317c84cd4b0a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Feb 2025 19:18:10 +0800
Subject: [PATCH 170/364] feature: makes the base on branch name selectable
 (#1036)

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

diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index dff42516..ec56ff20 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -32,7 +32,7 @@
           <DataTemplate DataType="m:Branch">
             <StackPanel Orientation="Horizontal">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
+              <SelectableTextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
             </StackPanel>
           </DataTemplate>
 

From 5199fb2b74e90936d062253cc6737f249c9a3932 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Feb 2025 22:14:21 +0800
Subject: [PATCH 171/364] enhance: do NOT remember the last selected handling
 method of uncommitted local changes (#977)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/RepositorySettings.cs | 18 ------------------
 src/ViewModels/Checkout.cs       |  6 +++---
 src/ViewModels/CreateBranch.cs   |  6 +++---
 src/ViewModels/Pull.cs           |  6 +++---
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 44742fb8..08bf48ca 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -50,12 +50,6 @@ namespace SourceGit.Models
             set;
         } = true;
 
-        public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
-        {
-            get;
-            set;
-        } = DealWithLocalChanges.DoNothing;
-
         public bool EnableForceOnFetch
         {
             get;
@@ -68,12 +62,6 @@ namespace SourceGit.Models
             set;
         } = false;
 
-        public DealWithLocalChanges DealWithLocalChangesOnPull
-        {
-            get;
-            set;
-        } = DealWithLocalChanges.DoNothing;
-
         public bool PreferRebaseInsteadOfMerge
         {
             get;
@@ -116,12 +104,6 @@ namespace SourceGit.Models
             set;
         } = false;
 
-        public DealWithLocalChanges DealWithLocalChangesOnCreateBranch
-        {
-            get;
-            set;
-        } = DealWithLocalChanges.DoNothing;
-
         public bool CheckoutBranchOnCreateBranch
         {
             get;
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index fd84682a..9376741d 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -11,9 +11,9 @@ namespace SourceGit.ViewModels
 
         public Models.DealWithLocalChanges PreAction
         {
-            get => _repo.Settings.DealWithLocalChangesOnCheckoutBranch;
-            set => _repo.Settings.DealWithLocalChangesOnCheckoutBranch = value;
-        }
+            get;
+            set;
+        } = Models.DealWithLocalChanges.DoNothing;
 
         public Checkout(Repository repo, string branch)
         {
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index a9698a07..01bff031 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -21,9 +21,9 @@ namespace SourceGit.ViewModels
 
         public Models.DealWithLocalChanges PreAction
         {
-            get => _repo.Settings.DealWithLocalChangesOnCreateBranch;
-            set => _repo.Settings.DealWithLocalChangesOnCreateBranch = value;
-        }
+            get;
+            set;
+        } = Models.DealWithLocalChanges.DoNothing;
 
         public bool CheckoutAfterCreated
         {
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index 52f98d87..755b58f4 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -40,9 +40,9 @@ namespace SourceGit.ViewModels
 
         public Models.DealWithLocalChanges PreAction
         {
-            get => _repo.Settings.DealWithLocalChangesOnPull;
-            set => _repo.Settings.DealWithLocalChangesOnPull = value;
-        }
+            get;
+            set;
+        } = Models.DealWithLocalChanges.DoNothing;
 
         public bool UseRebase
         {

From 8dd0274bdd7fe18727328ea320443a5a9f9fb1c3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 1 Mar 2025 09:21:52 +0800
Subject: [PATCH 172/364] enhance: only write MERGE_MSG when commit message is
 not null

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

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 3033da07..97684093 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -446,7 +446,7 @@ namespace SourceGit.ViewModels
                 Task.Run(() =>
                 {
                     var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
-                    if (File.Exists(mergeMsgFile))
+                    if (File.Exists(mergeMsgFile) && !string.IsNullOrWhiteSpace(_commitMessage))
                         File.WriteAllText(mergeMsgFile, _commitMessage);
 
                     var succ = _inProgressContext.Continue();
@@ -729,8 +729,8 @@ namespace SourceGit.ViewModels
                         byParentFolder.IsVisible = !isRooted;
                         byParentFolder.Click += (_, e) =>
                         {
-                            var path = Path.GetDirectoryName(change.Path).Replace("\\", "/");
-                            Commands.GitIgnore.Add(_repo.FullPath, path + "/");
+                            var dir = Path.GetDirectoryName(change.Path).Replace("\\", "/");
+                            Commands.GitIgnore.Add(_repo.FullPath, dir + "/");
                             e.Handled = true;
                         };
                         addToIgnore.Items.Add(byParentFolder);
@@ -751,8 +751,8 @@ namespace SourceGit.ViewModels
                             byExtensionInSameFolder.IsVisible = !isRooted;
                             byExtensionInSameFolder.Click += (_, e) =>
                             {
-                                var path = Path.GetDirectoryName(change.Path).Replace("\\", "/");
-                                Commands.GitIgnore.Add(_repo.FullPath, path + "/*" + extension);
+                                var dir = Path.GetDirectoryName(change.Path).Replace("\\", "/");
+                                Commands.GitIgnore.Add(_repo.FullPath, dir + "/*" + extension);
                                 e.Handled = true;
                             };
                             addToIgnore.Items.Add(byExtensionInSameFolder);

From 8423f53ace95016556c2c44ce4a17a6da77505f8 Mon Sep 17 00:00:00 2001
From: heartacker <1876302+heartacker@users.noreply.github.com>
Date: Sat, 1 Mar 2025 19:20:37 +0800
Subject: [PATCH 173/364] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7Avalonia?=
 =?UTF-8?q?=E5=92=8CCommunityToolkit.Mvvm=E5=8C=85=20(#1038)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Upgrade Avalonia packages to version 11.2.5 and CommunityToolkit.Mvvm to version 8.4.0.
---
 src/SourceGit.csproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index c001fca0..34e4eab2 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -41,15 +41,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.4" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.4" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.4" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.4" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia" Version="11.2.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.5" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.5" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.2" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.4" />
     <PackageReference Include="OpenAI" Version="2.2.0-beta.2" />
     <PackageReference Include="TextMateSharp" Version="1.0.66" />

From 25fa223c6b74d89c8f6b933724a7f0fddb16e859 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 2 Mar 2025 10:39:04 +0800
Subject: [PATCH 174/364] enhance: better regex for remote URL (#1039)

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

diff --git a/src/Models/Remote.cs b/src/Models/Remote.cs
index dbe8cfa7..ec9b8f20 100644
--- a/src/Models/Remote.cs
+++ b/src/Models/Remote.cs
@@ -8,9 +8,9 @@ namespace SourceGit.Models
     {
         [GeneratedRegex(@"^https?://([-a-zA-Z0-9:%._\+~#=]+@)?[-a-zA-Z0-9:%._\+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6})?(:[0-9]{1,5})?\b(/[-a-zA-Z0-9()@:%_\+.~#?&=]+)+(\.git)?$")]
         private static partial Regex REG_HTTPS();
-        [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
+        [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:([a-zA-z0-9~%][\w\-\./~%]*)?[a-zA-Z0-9](\.git)?$")]
         private static partial Regex REG_SSH1();
-        [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
+        [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/([a-zA-z0-9~%][\w\-\./~%]*)?[a-zA-Z0-9](\.git)?$")]
         private static partial Regex REG_SSH2();
 
         [GeneratedRegex(@"^git@([\w\.\-]+):([\w\-/~%]+/[\w\-\.%]+)\.git$")]

From 8c48b9623e89801b70a113b3914cf14cb915f961 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Mar 2025 09:26:49 +0800
Subject: [PATCH 175/364] version: Release 2025.07

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

diff --git a/VERSION b/VERSION
index bb11b3b9..a241ab9b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.06
\ No newline at end of file
+2025.07
\ No newline at end of file

From 7f8372f6b57a15eda2e7ac1f8925e080891ff632 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Mon, 3 Mar 2025 10:38:58 +0800
Subject: [PATCH 176/364] enhance: Handle file mode changes for new/deleted
 file (#1040)

---
 src/Commands/Diff.cs     | 12 ++++++++++++
 src/Models/DiffResult.cs | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
index da971e58..8ae6350f 100644
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@@ -68,6 +68,18 @@ namespace SourceGit.Commands
                 return;
             }
 
+            if (line.StartsWith("deleted file mode ", StringComparison.Ordinal))
+            {
+                _result.OldMode = line.Substring(18);
+                return;
+            }
+
+            if (line.StartsWith("new file mode ", StringComparison.Ordinal))
+            {
+                _result.NewMode = line.Substring(14);
+                return;
+            }
+
             if (_result.IsBinary)
                 return;
 
diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs
index e0ae82e0..88992e10 100644
--- a/src/Models/DiffResult.cs
+++ b/src/Models/DiffResult.cs
@@ -681,6 +681,18 @@ namespace SourceGit.Models
         public TextDiff TextDiff { get; set; } = null;
         public LFSDiff LFSDiff { get; set; } = null;
 
-        public string FileModeChange => string.IsNullOrEmpty(OldMode) ? string.Empty : $"{OldMode} → {NewMode}";
+        public string FileModeChange
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(OldMode) && string.IsNullOrEmpty(NewMode))
+                    return string.Empty;
+
+                var oldDisplay = string.IsNullOrEmpty(OldMode) ? "0" : OldMode;
+                var newDisplay = string.IsNullOrEmpty(NewMode) ? "0" : NewMode;
+
+                return $"{oldDisplay} → {newDisplay}";
+            }
+        }
     }
 }

From 9dffd55c2b720bb1ee71a0bd9bfddfb20f1fbd7c Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Mon, 3 Mar 2025 10:39:57 +0800
Subject: [PATCH 177/364] build: Add pre-install and pre-removal scripts for
 DEBIAN package (#1041)

kill sourcegit before install
---
 SourceGit.sln                      |  2 ++
 build/resources/deb/DEBIAN/preinst | 32 ++++++++++++++++++++++++++
 build/resources/deb/DEBIAN/prerm   | 36 ++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100755 build/resources/deb/DEBIAN/preinst
 create mode 100755 build/resources/deb/DEBIAN/prerm

diff --git a/SourceGit.sln b/SourceGit.sln
index cf761abd..624322f8 100644
--- a/SourceGit.sln
+++ b/SourceGit.sln
@@ -60,6 +60,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DEBIAN", "DEBIAN", "{F101849D-BDB7-40D4-A516-751150C3CCFC}"
 	ProjectSection(SolutionItems) = preProject
 		build\resources\deb\DEBIAN\control = build\resources\deb\DEBIAN\control
+		build\resources\deb\DEBIAN\preinst = build\resources\deb\DEBIAN\preinst
+		build\resources\deb\DEBIAN\prerm = build\resources\deb\DEBIAN\prerm
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpm", "rpm", "{9BA0B044-0CC9-46F8-B551-204F149BF45D}"
diff --git a/build/resources/deb/DEBIAN/preinst b/build/resources/deb/DEBIAN/preinst
new file mode 100755
index 00000000..edcf9088
--- /dev/null
+++ b/build/resources/deb/DEBIAN/preinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/
+
+case "$1" in
+    install|upgrade)
+        # Check if SourceGit is running and stop it
+        if pidof -q sourcegit || pgrep -f sourcegit > /dev/null; then
+            echo "SourceGit is running, stopping it..."
+            killall sourcegit 2>/dev/null || pkill -f sourcegit 2>/dev/null || true
+            # Wait for SourceGit to exit
+            sleep 1
+        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
diff --git a/build/resources/deb/DEBIAN/prerm b/build/resources/deb/DEBIAN/prerm
new file mode 100755
index 00000000..8ecd4b8d
--- /dev/null
+++ b/build/resources/deb/DEBIAN/prerm
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        # Check if SourceGit is running and stop it
+        if pidof -q sourcegit || pgrep -f sourcegit > /dev/null; then
+            echo "SourceGit is running, stopping it before removal..."
+            killall sourcegit 2>/dev/null || pkill -f sourcegit 2>/dev/null || true
+            # Wait for SourceGit to exit
+            sleep 1
+        fi
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0

From 72c7f24e2f31e20f4150e805934b503a8493ea66 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Mon, 3 Mar 2025 14:17:03 +0800
Subject: [PATCH 178/364] fix: set FileModeChange after RefreshAll (#1043)

---
 src/ViewModels/DiffContext.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 05bedca4..8a5c3e80 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -116,7 +116,10 @@ namespace SourceGit.ViewModels
                 var latest = new Commands.Diff(_repo, _option, numLines, _ignoreWhitespace).Result();
                 var info = new Info(_option, numLines, _ignoreWhitespace, latest);
                 if (_info != null && info.IsSame(_info))
+                {
+                    FileModeChange = latest.FileModeChange;
                     return;
+                }
 
                 _info = info;
 

From 598bba521028f6e2562500e41ee8f850ea76e0e3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Mar 2025 14:25:49 +0800
Subject: [PATCH 179/364] code_review: PR #1043

`FileModeChange` should not be changed out of UIThread

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

diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 8a5c3e80..b10f4b62 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -60,6 +60,7 @@ namespace SourceGit.ViewModels
             {
                 _isTextDiff = previous._isTextDiff;
                 _content = previous._content;
+                _fileModeChange = previous._fileModeChange;
                 _unifiedLines = previous._unifiedLines;
                 _ignoreWhitespace = previous._ignoreWhitespace;
                 _info = previous._info;
@@ -116,10 +117,7 @@ namespace SourceGit.ViewModels
                 var latest = new Commands.Diff(_repo, _option, numLines, _ignoreWhitespace).Result();
                 var info = new Info(_option, numLines, _ignoreWhitespace, latest);
                 if (_info != null && info.IsSame(_info))
-                {
-                    FileModeChange = latest.FileModeChange;
                     return;
-                }
 
                 _info = info;
 

From 35ee4a47db9b2124699fbcfac9148c68bd238a23 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Mar 2025 15:39:59 +0800
Subject: [PATCH 180/364] fix: the last selected line is missing while trying
 to copy multiple lines in text diff view (#1044)

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

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index dccbb9b2..958e803e 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1007,8 +1007,8 @@ namespace SourceGit.Views
             if (startPosition.Location > endPosition.Location)
                 (startPosition, endPosition) = (endPosition, startPosition);
 
-            var startIdx = Math.Min(startPosition.Line - 1, lines.Count - 1);
-            var endIdx = Math.Min(endPosition.Line - 1, lines.Count - 1);
+            var startIdx = startPosition.Line - 1;
+            var endIdx = endPosition.Line - 1;
 
             if (startIdx == endIdx)
             {
@@ -1025,7 +1025,7 @@ namespace SourceGit.Views
             }
 
             var builder = new StringBuilder();
-            for (var i = startIdx; i <= endIdx; i++)
+            for (var i = startIdx; i <= endIdx && i <= lines.Count - 1; i++)
             {
                 var line = lines[i];
                 if (line.Type == Models.TextDiffLineType.Indicator ||
@@ -1040,7 +1040,7 @@ namespace SourceGit.Views
 
                 if (i == endIdx && endPosition.Column < line.Content.Length)
                 {
-                    builder.AppendLine(line.Content.Substring(0, endPosition.Column));
+                    builder.AppendLine(line.Content.Substring(0, endPosition.Column - 1));
                     continue;
                 }
 

From d4bcc60113f11dfa7768bb2b24d6ae265a87177f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 09:29:07 +0800
Subject: [PATCH 181/364] enhance: disable `CONTINUE` button while it is
 running (#1046)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/WorkingCopy.cs | 12 ++++++++++++
 src/Views/WorkingCopy.axaml   |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 97684093..35db11b9 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -440,6 +440,8 @@ namespace SourceGit.ViewModels
 
         public void ContinueMerge()
         {
+            IsCommitting = true;
+
             if (_inProgressContext != null)
             {
                 _repo.SetWatcherEnabled(false);
@@ -456,17 +458,21 @@ namespace SourceGit.ViewModels
                             CommitMessage = string.Empty;
 
                         _repo.SetWatcherEnabled(true);
+                        IsCommitting = false;
                     });
                 });
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
+                IsCommitting = false;
             }
         }
 
         public void SkipMerge()
         {
+            IsCommitting = true;
+
             if (_inProgressContext != null)
             {
                 _repo.SetWatcherEnabled(false);
@@ -479,17 +485,21 @@ namespace SourceGit.ViewModels
                             CommitMessage = string.Empty;
 
                         _repo.SetWatcherEnabled(true);
+                        IsCommitting = false;
                     });
                 });
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
+                IsCommitting = false;
             }
         }
 
         public void AbortMerge()
         {
+            IsCommitting = true;
+
             if (_inProgressContext != null)
             {
                 _repo.SetWatcherEnabled(false);
@@ -502,12 +512,14 @@ namespace SourceGit.ViewModels
                             CommitMessage = string.Empty;
 
                         _repo.SetWatcherEnabled(true);
+                        IsCommitting = false;
                     });
                 });
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
+                IsCommitting = false;
             }
         }
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index ebf26a96..0120eda5 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -397,7 +397,8 @@
                 Width="0" Height="0"
                 Background="Transparent"
                 Command="{Binding CommitWithAutoStage}"
-                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"/>
+                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"
+                IsEnabled="{Binding !IsCommitting}"/>
 
         <Button Grid.Column="8"
                 Classes="flat"

From 5301a368e057f2a037f2a4d9353e4af239f3912f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 09:46:02 +0800
Subject: [PATCH 182/364] ux: re-design the layout for `Interactive Rebase`
 window that tries to fix issue #1037

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/InteractiveRebase.axaml | 63 ++++++++++++++-----------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 0a5a01ea..f031479b 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -77,7 +77,7 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid ColumnDefinitions="16,110,*,Auto" Margin="8,0" ClipToBounds="True">
+              <Grid ColumnDefinitions="16,110,*,32,108,96,Auto,32,32" Margin="8,0" ClipToBounds="True">
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"
@@ -188,44 +188,39 @@
                   <TextBlock Grid.Column="1" Classes="primary" Margin="0,0,4,0" Text="{Binding Subject}"/>
                 </Grid>
 
-                <Grid Grid.Column="3" ColumnDefinitions="32,108,96,Auto,32,32" IsHitTestVisible="False" ClipToBounds="True">
-                  <!-- Author Avatar -->
-                  <v:Avatar Grid.Column="0"
-                            Width="16" Height="16"
-                            Margin="8,0,0,0"
-                            VerticalAlignment="Center"
-                            User="{Binding Commit.Author}"/>
+                <!-- Author Avatar -->
+                <v:Avatar Grid.Column="3"
+                          Width="16" Height="16"
+                          Margin="8,0,0,0"
+                          VerticalAlignment="Center"
+                          User="{Binding Commit.Author}"/>
 
-                  <!-- Author Name -->
-                  <TextBlock Grid.Column="1"
-                             Classes="primary"
-                             MaxWidth="90"
-                             Margin="6,0,12,0"
-                             Text="{Binding Commit.Author.Name}"
-                             HorizontalAlignment="Left"/>
+                <!-- Author Name -->
+                <Border Grid.Column="4" ClipToBounds="True">
+                  <TextBlock Classes="primary" Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
+                </Border>
 
-                  <!-- Commit SHA -->
-                  <Border Grid.Column="2" ClipToBounds="True">
-                    <TextBlock Classes="primary"
-                               Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                               HorizontalAlignment="Center"/>
-                  </Border>
+                <!-- Commit SHA -->
+                <Border Grid.Column="5" ClipToBounds="True">
+                  <TextBlock Classes="primary"
+                             Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                             HorizontalAlignment="Center"/>
+                </Border>
 
-                  <!-- Commit Time -->
-                  <Border Grid.Column="3" ClipToBounds="True">
-                    <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
-                  </Border>
+                <!-- Commit Time -->
+                <Border Grid.Column="6">
+                  <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
+                </Border>                
 
-                  <!-- MoveUp Button -->
-                  <Button Grid.Column="4" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
-                    <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
-                  </Button>
+                <!-- MoveUp Button -->
+                <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
+                  <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
+                </Button>
 
-                  <!-- MoveDown Button -->
-                  <Button Grid.Column="5" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
-                    <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
-                  </Button>
-                </Grid>
+                <!-- MoveDown Button -->
+                <Button Grid.Column="8" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
+                  <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
+                </Button>
               </Grid>
             </DataTemplate>
           </ListBox.ItemTemplate>

From b75676a7f8e350e27c9faf34b85e61e20707a589 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 16:04:19 +0800
Subject: [PATCH 183/364] refactor: commit message

- move issue tracker and commit hash links parsing to view models
- parsing links async
- make sure matched hash is a valid commit oid
- disable `CHILDREN` row in submodule info panel

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/IsCommitSHA.cs                   |  17 +++
 ...cs => QueryCommitsForInteractiveRebase.cs} |  16 +-
 src/Models/Commit.cs                          |   6 +-
 src/Models/InteractiveRebase.cs               |   6 +
 src/Models/RevisionFile.cs                    |   2 +-
 src/ViewModels/CommitDetail.cs                | 142 +++++++++++-------
 src/ViewModels/DiffContext.cs                 |   8 +-
 src/ViewModels/FileHistories.cs               |  12 +-
 src/ViewModels/InteractiveRebase.cs           |   2 +-
 src/Views/CommitBaseInfo.axaml                |  11 +-
 src/Views/CommitBaseInfo.axaml.cs             |  33 ++--
 src/Views/CommitDetail.axaml                  |   5 +-
 src/Views/CommitMessagePresenter.cs           |  98 +++---------
 src/Views/DiffView.axaml                      |   4 +-
 src/Views/RevisionFileContentViewer.axaml     |   2 +-
 src/Views/RevisionFiles.axaml                 |   2 +-
 src/Views/RevisionFiles.axaml.cs              |  11 +-
 17 files changed, 191 insertions(+), 186 deletions(-)
 create mode 100644 src/Commands/IsCommitSHA.cs
 rename src/Commands/{QueryCommitsWithFullMessage.cs => QueryCommitsForInteractiveRebase.cs} (86%)

diff --git a/src/Commands/IsCommitSHA.cs b/src/Commands/IsCommitSHA.cs
new file mode 100644
index 00000000..1b0c50e3
--- /dev/null
+++ b/src/Commands/IsCommitSHA.cs
@@ -0,0 +1,17 @@
+namespace SourceGit.Commands
+{
+    public class IsCommitSHA : Command
+    {
+        public IsCommitSHA(string repo, string hash)
+        {
+            WorkingDirectory = repo;
+            Args = $"cat-file -t {hash}";
+        }
+
+        public bool Result()
+        {
+            var rs = ReadToEnd();
+            return rs.IsSuccess && rs.StdOut.Trim().Equals("commit");
+        }
+    }
+}
diff --git a/src/Commands/QueryCommitsWithFullMessage.cs b/src/Commands/QueryCommitsForInteractiveRebase.cs
similarity index 86%
rename from src/Commands/QueryCommitsWithFullMessage.cs
rename to src/Commands/QueryCommitsForInteractiveRebase.cs
index c15cdbe1..232d86e5 100644
--- a/src/Commands/QueryCommitsWithFullMessage.cs
+++ b/src/Commands/QueryCommitsForInteractiveRebase.cs
@@ -3,18 +3,18 @@ using System.Collections.Generic;
 
 namespace SourceGit.Commands
 {
-    public class QueryCommitsWithFullMessage : Command
+    public class QueryCommitsForInteractiveRebase : Command
     {
-        public QueryCommitsWithFullMessage(string repo, string args)
+        public QueryCommitsForInteractiveRebase(string repo, string on)
         {
             _boundary = $"----- BOUNDARY OF COMMIT {Guid.NewGuid()} -----";
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --date-order --no-show-signature --decorate=full --pretty=format:\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {args}";
+            Args = $"log --date-order --no-show-signature --decorate=full --pretty=format:\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";
         }
 
-        public List<Models.CommitWithMessage> Result()
+        public List<Models.InteractiveCommit> Result()
         {
             var rs = ReadToEnd();
             if (!rs.IsSuccess)
@@ -29,7 +29,7 @@ namespace SourceGit.Commands
                 switch (nextPartIdx)
                 {
                     case 0:
-                        _current = new Models.CommitWithMessage();
+                        _current = new Models.InteractiveCommit();
                         _current.Commit.SHA = line;
                         _commits.Add(_current);
                         break;
@@ -52,7 +52,7 @@ namespace SourceGit.Commands
                         _current.Commit.CommitterTime = ulong.Parse(line);
                         break;
                     default:
-                        var boundary = rs.StdOut.IndexOf(_boundary, end + 1);
+                        var boundary = rs.StdOut.IndexOf(_boundary, end + 1, StringComparison.Ordinal);
                         if (boundary > end)
                         {
                             _current.Message = rs.StdOut.Substring(start, boundary - start - 1);
@@ -88,8 +88,8 @@ namespace SourceGit.Commands
             _current.Commit.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
         }
 
-        private List<Models.CommitWithMessage> _commits = new List<Models.CommitWithMessage>();
-        private Models.CommitWithMessage _current = null;
+        private List<Models.InteractiveCommit> _commits = [];
+        private Models.InteractiveCommit _current = null;
         private string _boundary = "";
     }
 }
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index f015130a..5c48b0c0 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -112,9 +112,9 @@ namespace SourceGit.Models
         }
     }
 
-    public class CommitWithMessage
+    public class CommitFullMessage
     {
-        public Commit Commit { get; set; } = new Commit();
-        public string Message { get; set; } = "";
+        public string Message { get; set; } = string.Empty;
+        public List<Hyperlink> Links { get; set; } = [];
     }
 }
diff --git a/src/Models/InteractiveRebase.cs b/src/Models/InteractiveRebase.cs
index 0980587a..691aadeb 100644
--- a/src/Models/InteractiveRebase.cs
+++ b/src/Models/InteractiveRebase.cs
@@ -12,6 +12,12 @@ namespace SourceGit.Models
         Drop,
     }
 
+    public class InteractiveCommit
+    {
+        public Commit Commit { get; set; } = new Commit();
+        public string Message { get; set; } = string.Empty;
+    }
+
     public class InteractiveRebaseJob
     {
         public string SHA { get; set; } = string.Empty;
diff --git a/src/Models/RevisionFile.cs b/src/Models/RevisionFile.cs
index f1f5265f..8cc1be2a 100644
--- a/src/Models/RevisionFile.cs
+++ b/src/Models/RevisionFile.cs
@@ -29,6 +29,6 @@ namespace SourceGit.Models
     public class RevisionSubmodule
     {
         public Commit Commit { get; set; } = null;
-        public string FullMessage { get; set; } = string.Empty;
+        public CommitFullMessage FullMessage { get; set; } = null;
     }
 }
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 7c5aa28f..26fa37c1 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
@@ -46,7 +45,7 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public string FullMessage
+        public Models.CommitFullMessage FullMessage
         {
             get => _fullMessage;
             private set => SetProperty(ref _fullMessage, value);
@@ -85,11 +84,11 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public AvaloniaList<string> Children
+        public List<string> Children
         {
-            get;
-            private set;
-        } = [];
+            get => _children;
+            private set => SetProperty(ref _children, value);
+        }
 
         public string SearchChangeFilter
         {
@@ -109,17 +108,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _viewRevisionFileContent, value);
         }
 
-        public AvaloniaList<Models.CommitLink> WebLinks
+        public List<Models.CommitLink> WebLinks
         {
             get;
             private set;
         } = [];
 
-        public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
-        {
-            get => _repo.Settings?.IssueTrackerRules;
-        }
-
         public string RevisionFileSearchFilter
         {
             get => _revisionFileSearchFilter;
@@ -127,25 +121,23 @@ namespace SourceGit.ViewModels
             {
                 if (SetProperty(ref _revisionFileSearchFilter, value))
                 {
-                    RevisionFileSearchSuggestion.Clear();
-
                     if (!string.IsNullOrEmpty(value))
                     {
-                        if (_revisionFiles.Count == 0)
+                        if (_revisionFiles == null)
                         {
                             var sha = Commit.SHA;
 
                             Task.Run(() =>
                             {
                                 var files = new Commands.QueryRevisionFileNames(_repo.FullPath, sha).Result();
+                                var filesList = new List<string>();
+                                filesList.AddRange(files);
 
                                 Dispatcher.UIThread.Invoke(() =>
                                 {
                                     if (sha == Commit.SHA)
                                     {
-                                        _revisionFiles.Clear();
-                                        _revisionFiles.AddRange(files);
-
+                                        _revisionFiles = filesList;
                                         if (!string.IsNullOrEmpty(_revisionFileSearchFilter))
                                             UpdateRevisionFileSearchSuggestion();
                                     }
@@ -159,23 +151,17 @@ namespace SourceGit.ViewModels
                     }
                     else
                     {
-                        IsRevisionFileSearchSuggestionOpen = false;
+                        RevisionFileSearchSuggestion = null;
                         GC.Collect();
                     }
                 }
             }
         }
 
-        public AvaloniaList<string> RevisionFileSearchSuggestion
+        public List<string> RevisionFileSearchSuggestion
         {
-            get;
-            private set;
-        } = [];
-
-        public bool IsRevisionFileSearchSuggestionOpen
-        {
-            get => _isRevisionFileSearchSuggestionOpen;
-            set => SetProperty(ref _isRevisionFileSearchSuggestionOpen, value);
+            get => _revisionFileSearchSuggestion;
+            private set => SetProperty(ref _revisionFileSearchSuggestion, value);
         }
 
         public CommitDetail(Repository repo)
@@ -212,23 +198,17 @@ namespace SourceGit.ViewModels
         {
             _repo = null;
             _commit = null;
-
-            if (_changes != null)
-                _changes.Clear();
-            if (_visibleChanges != null)
-                _visibleChanges.Clear();
-            if (_selectedChanges != null)
-                _selectedChanges.Clear();
-
+            _changes = null;
+            _visibleChanges = null;
+            _selectedChanges = null;
             _signInfo = null;
             _searchChangeFilter = null;
             _diffContext = null;
             _viewRevisionFileContent = null;
             _cancelToken = null;
-
             WebLinks.Clear();
-            _revisionFiles.Clear();
-            RevisionFileSearchSuggestion.Clear();
+            _revisionFiles = null;
+            _revisionFileSearchSuggestion = null;
         }
 
         public void NavigateTo(string commitSHA)
@@ -251,6 +231,11 @@ namespace SourceGit.ViewModels
             RevisionFileSearchFilter = string.Empty;
         }
 
+        public void CancelRevisionFileSuggestions()
+        {
+            RevisionFileSearchSuggestion = null;
+        }
+
         public Models.Commit GetParent(string sha)
         {
             return new Commands.QuerySingleCommit(_repo.FullPath, sha).Result();
@@ -322,7 +307,12 @@ namespace SourceGit.ViewModels
                         if (commit != null)
                         {
                             var body = new Commands.QueryCommitFullMessage(submoduleRoot, file.SHA).Result();
-                            var submodule = new Models.RevisionSubmodule() { Commit = commit, FullMessage = body };
+                            var submodule = new Models.RevisionSubmodule()
+                            {
+                                Commit = commit,
+                                FullMessage = new Models.CommitFullMessage { Message = body }
+                            };
+
                             Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = submodule);
                         }
                         else
@@ -332,7 +322,7 @@ namespace SourceGit.ViewModels
                                 ViewRevisionFileContent = new Models.RevisionSubmodule()
                                 {
                                     Commit = new Models.Commit() { SHA = file.SHA },
-                                    FullMessage = string.Empty,
+                                    FullMessage = null,
                                 };
                             });
                         }
@@ -622,23 +612,22 @@ namespace SourceGit.ViewModels
         private void Refresh()
         {
             _changes = null;
-            _revisionFiles.Clear();
+            _revisionFiles = null;
 
             SignInfo = null;
             ViewRevisionFileContent = null;
-            Children.Clear();
+            Children = null;
             RevisionFileSearchFilter = string.Empty;
-            IsRevisionFileSearchSuggestionOpen = false;
-
-            GC.Collect();
+            RevisionFileSearchSuggestion = null;
 
             if (_commit == null)
                 return;
 
             Task.Run(() =>
             {
-                var fullMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, _commit.SHA).Result();
-                Dispatcher.UIThread.Invoke(() => FullMessage = fullMessage);
+                var message = new Commands.QueryCommitFullMessage(_repo.FullPath, _commit.SHA).Result();
+                var links = ParseLinksInMessage(message);
+                Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Links = links });
             });
 
             Task.Run(() =>
@@ -694,6 +683,49 @@ namespace SourceGit.ViewModels
             });
         }
 
+        private List<Models.Hyperlink> ParseLinksInMessage(string message)
+        {
+            var links = new List<Models.Hyperlink>();
+            if (_repo.Settings.IssueTrackerRules is { Count: > 0 } rules)
+            {
+                foreach (var rule in rules)
+                    rule.Matches(links, message);
+            }
+
+            var shas = REG_SHA_FORMAT().Matches(message);
+            for (int i = 0; i < shas.Count; i++)
+            {
+                var sha = shas[i];
+                if (!sha.Success)
+                    continue;
+
+                var hash = sha.Groups[1].Value;
+                var test = new Commands.IsCommitSHA(_repo.FullPath, hash).Result();
+                if (!test)
+                    continue;
+
+                var start = sha.Index;
+                var len = sha.Length;
+                var intersect = false;
+                foreach (var link in links)
+                {
+                    if (link.Intersect(start, len))
+                    {
+                        intersect = true;
+                        break;
+                    }
+                }
+
+                if (!intersect)
+                    links.Add(new Models.Hyperlink(start, len, hash, true));
+            }
+
+            if (links.Count > 0)
+                links.Sort((l, r) => l.Start - r.Start);
+
+            return links;
+        }
+
         private void RefreshVisibleChanges()
         {
             if (_changes == null)
@@ -813,11 +845,12 @@ namespace SourceGit.ViewModels
                     break;
             }
 
-            RevisionFileSearchSuggestion.Clear();
-            RevisionFileSearchSuggestion.AddRange(suggestion);
-            IsRevisionFileSearchSuggestionOpen = suggestion.Count > 0;
+            RevisionFileSearchSuggestion = suggestion;
         }
 
+        [GeneratedRegex(@"\b([0-9a-fA-F]{6,40})\b")]
+        private static partial Regex REG_SHA_FORMAT();
+
         [GeneratedRegex(@"^version https://git-lfs.github.com/spec/v\d+\r?\noid sha256:([0-9a-f]+)\r?\nsize (\d+)[\r\n]*$")]
         private static partial Regex REG_LFS_FORMAT();
 
@@ -828,8 +861,9 @@ namespace SourceGit.ViewModels
 
         private Repository _repo = null;
         private Models.Commit _commit = null;
-        private string _fullMessage = string.Empty;
+        private Models.CommitFullMessage _fullMessage = null;
         private Models.CommitSignInfo _signInfo = null;
+        private List<string> _children = null;
         private List<Models.Change> _changes = null;
         private List<Models.Change> _visibleChanges = null;
         private List<Models.Change> _selectedChanges = null;
@@ -837,8 +871,8 @@ namespace SourceGit.ViewModels
         private DiffContext _diffContext = null;
         private object _viewRevisionFileContent = null;
         private Commands.Command.CancelToken _cancelToken = null;
-        private List<string> _revisionFiles = [];
+        private List<string> _revisionFiles = null;
         private string _revisionFileSearchFilter = string.Empty;
-        private bool _isRevisionFileSearchSuggestionOpen = false;
+        private List<string> _revisionFileSearchSuggestion = null;
     }
 }
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index b10f4b62..6dd836bf 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -235,13 +235,17 @@ namespace SourceGit.ViewModels
             if (commit != null)
             {
                 var body = new Commands.QueryCommitFullMessage(repo, sha).Result();
-                return new Models.RevisionSubmodule() { Commit = commit, FullMessage = body };
+                return new Models.RevisionSubmodule()
+                {
+                    Commit = commit,
+                    FullMessage = new Models.CommitFullMessage { Message = body }
+                };
             }
 
             return new Models.RevisionSubmodule()
             {
                 Commit = new Models.Commit() { SHA = sha },
-                FullMessage = string.Empty,
+                FullMessage = null,
             };
         }
 
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 7e248274..417b816d 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -123,12 +123,20 @@ namespace SourceGit.ViewModels
                         if (commit != null)
                         {
                             var message = new Commands.QueryCommitFullMessage(submoduleRoot, obj.SHA).Result();
-                            var module = new Models.RevisionSubmodule() { Commit = commit, FullMessage = message };
+                            var module = new Models.RevisionSubmodule()
+                            {
+                                Commit = commit,
+                                FullMessage = new Models.CommitFullMessage { Message = message }
+                            };
                             Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, module));
                         }
                         else
                         {
-                            var module = new Models.RevisionSubmodule() { Commit = new Models.Commit() { SHA = obj.SHA }, FullMessage = "" };
+                            var module = new Models.RevisionSubmodule()
+                            {
+                                Commit = new Models.Commit() { SHA = obj.SHA },
+                                FullMessage = null
+                            };
                             Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, module));
                         }
                     });
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
index 9f28fbc7..2fd2d67c 100644
--- a/src/ViewModels/InteractiveRebase.cs
+++ b/src/ViewModels/InteractiveRebase.cs
@@ -118,7 +118,7 @@ namespace SourceGit.ViewModels
 
             Task.Run(() =>
             {
-                var commits = new Commands.QueryCommitsWithFullMessage(repoPath, $"{on.SHA}..HEAD").Result();
+                var commits = new Commands.QueryCommitsForInteractiveRebase(repoPath, on.SHA).Result();
                 var list = new List<InteractiveRebaseItem>();
 
                 foreach (var c in commits)
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index c92a3612..4ff8f20f 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -95,8 +95,8 @@
           </StackPanel>
 
           <!-- PARENTS -->
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Parents}" IsVisible="{Binding Parents.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
-          <ItemsControl Grid.Row="1" Grid.Column="1" Height="24" Margin="12,0,0,0" ItemsSource="{Binding Parents}" IsVisible="{Binding Parents.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Parents}" IsVisible="{Binding Parents, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"/>
+          <ItemsControl Grid.Row="1" Grid.Column="1" Height="24" Margin="12,0,0,0" ItemsSource="{Binding Parents}" IsVisible="{Binding Parents, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center"/>
@@ -133,8 +133,8 @@
           </ItemsControl>
 
           <!-- CHILDREN -->
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Children}" IsVisible="{Binding #ThisControl.Children.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
-          <ItemsControl Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" ItemsSource="{Binding #ThisControl.Children}" IsVisible="{Binding #ThisControl.Children.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Children}" IsVisible="{Binding #ThisControl.Children, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"/>
+          <ItemsControl Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" ItemsSource="{Binding #ThisControl.Children}" IsVisible="{Binding #ThisControl.Children, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
                 <WrapPanel Orientation="Horizontal" VerticalAlignment="Center" ItemHeight="24"/>
@@ -187,8 +187,7 @@
           <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1" 
                                     Margin="12,4,8,0" 
                                     Classes="primary" 
-                                    Message="{Binding #ThisControl.Message}"
-                                    IssueTrackerRules="{Binding #ThisControl.IssueTrackerRules}"
+                                    FullMessage="{Binding #ThisControl.FullMessage}"
                                     HorizontalAlignment="Stretch"
                                     TextWrapping="Wrap">            
             <v:CommitMessagePresenter.DataTemplates>
diff --git a/src/Views/CommitBaseInfo.axaml.cs b/src/Views/CommitBaseInfo.axaml.cs
index ce1a7cfd..8767db9f 100644
--- a/src/Views/CommitBaseInfo.axaml.cs
+++ b/src/Views/CommitBaseInfo.axaml.cs
@@ -1,7 +1,7 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -11,13 +11,13 @@ namespace SourceGit.Views
 {
     public partial class CommitBaseInfo : UserControl
     {
-        public static readonly StyledProperty<string> MessageProperty =
-            AvaloniaProperty.Register<CommitBaseInfo, string>(nameof(Message), string.Empty);
+        public static readonly StyledProperty<Models.CommitFullMessage> FullMessageProperty =
+            AvaloniaProperty.Register<CommitBaseInfo, Models.CommitFullMessage>(nameof(FullMessage));
 
-        public string Message
+        public Models.CommitFullMessage FullMessage
         {
-            get => GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
+            get => GetValue(FullMessageProperty);
+            set => SetValue(FullMessageProperty, value);
         }
 
         public static readonly StyledProperty<Models.CommitSignInfo> SignInfoProperty =
@@ -38,28 +38,19 @@ namespace SourceGit.Views
             set => SetValue(SupportsContainsInProperty, value);
         }
 
-        public static readonly StyledProperty<AvaloniaList<Models.CommitLink>> WebLinksProperty =
-            AvaloniaProperty.Register<CommitBaseInfo, AvaloniaList<Models.CommitLink>>(nameof(WebLinks));
+        public static readonly StyledProperty<List<Models.CommitLink>> WebLinksProperty =
+            AvaloniaProperty.Register<CommitBaseInfo, List<Models.CommitLink>>(nameof(WebLinks));
 
-        public AvaloniaList<Models.CommitLink> WebLinks
+        public List<Models.CommitLink> WebLinks
         {
             get => GetValue(WebLinksProperty);
             set => SetValue(WebLinksProperty, value);
         }
 
-        public static readonly StyledProperty<AvaloniaList<Models.IssueTrackerRule>> IssueTrackerRulesProperty =
-            AvaloniaProperty.Register<CommitBaseInfo, AvaloniaList<Models.IssueTrackerRule>>(nameof(IssueTrackerRules));
+        public static readonly StyledProperty<List<string>> ChildrenProperty =
+            AvaloniaProperty.Register<CommitBaseInfo, List<string>>(nameof(Children));
 
-        public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
-        {
-            get => GetValue(IssueTrackerRulesProperty);
-            set => SetValue(IssueTrackerRulesProperty, value);
-        }
-
-        public static readonly StyledProperty<AvaloniaList<string>> ChildrenProperty =
-            AvaloniaProperty.Register<CommitBaseInfo, AvaloniaList<string>>(nameof(Children));
-
-        public AvaloniaList<string> Children
+        public List<string> Children
         {
             get => GetValue(ChildrenProperty);
             set => SetValue(ChildrenProperty, value);
diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml
index d0d52473..28b21eb7 100644
--- a/src/Views/CommitDetail.axaml
+++ b/src/Views/CommitDetail.axaml
@@ -20,12 +20,11 @@
         <StackPanel Orientation="Vertical">
           <!-- Base Information -->
           <v:CommitBaseInfo Content="{Binding Commit}" 
-                            Message="{Binding FullMessage}"
+                            FullMessage="{Binding FullMessage}"
                             SignInfo="{Binding SignInfo}"
                             SupportsContainsIn="True"
                             WebLinks="{Binding WebLinks}"
-                            Children="{Binding Children}"
-                            IssueTrackerRules="{Binding IssueTrackerRules}"/>
+                            Children="{Binding Children}"/>
 
           <!-- Line -->
           <Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}"/>
diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
index dc8a3bb7..002beda1 100644
--- a/src/Views/CommitMessagePresenter.cs
+++ b/src/Views/CommitMessagePresenter.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Documents;
 using Avalonia.Input;
@@ -13,27 +11,15 @@ using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
-    public partial class CommitMessagePresenter : SelectableTextBlock
+    public class CommitMessagePresenter : SelectableTextBlock
     {
-        [GeneratedRegex(@"\b([0-9a-fA-F]{6,40})\b")]
-        private static partial Regex REG_SHA_FORMAT();
+        public static readonly StyledProperty<Models.CommitFullMessage> FullMessageProperty =
+            AvaloniaProperty.Register<CommitMessagePresenter, Models.CommitFullMessage>(nameof(FullMessage));
 
-        public static readonly StyledProperty<string> MessageProperty =
-            AvaloniaProperty.Register<CommitMessagePresenter, string>(nameof(Message));
-
-        public string Message
+        public Models.CommitFullMessage FullMessage
         {
-            get => GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public static readonly StyledProperty<AvaloniaList<Models.IssueTrackerRule>> IssueTrackerRulesProperty =
-            AvaloniaProperty.Register<CommitMessagePresenter, AvaloniaList<Models.IssueTrackerRule>>(nameof(IssueTrackerRules));
-
-        public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
-        {
-            get => GetValue(IssueTrackerRulesProperty);
-            set => SetValue(IssueTrackerRulesProperty, value);
+            get => GetValue(FullMessageProperty);
+            set => SetValue(FullMessageProperty, value);
         }
 
         protected override Type StyleKeyOverride => typeof(SelectableTextBlock);
@@ -42,69 +28,36 @@ namespace SourceGit.Views
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == MessageProperty || change.Property == IssueTrackerRulesProperty)
+            if (change.Property == FullMessageProperty)
             {
                 Inlines!.Clear();
                 _inlineCommits.Clear();
-                _matches = null;
                 _lastHover = null;
                 ClearHoveredIssueLink();
 
-                var message = Message;
+                var message = FullMessage?.Message;
                 if (string.IsNullOrEmpty(message))
                     return;
 
-                var matches = new List<Models.Hyperlink>();
-                if (IssueTrackerRules is { Count: > 0 } rules)
-                {
-                    foreach (var rule in rules)
-                        rule.Matches(matches, message);
-                }
-
-                var shas = REG_SHA_FORMAT().Matches(message);
-                for (int i = 0; i < shas.Count; i++)
-                {
-                    var sha = shas[i];
-                    if (!sha.Success)
-                        continue;
-
-                    var start = sha.Index;
-                    var len = sha.Length;
-                    var intersect = false;
-                    foreach (var match in matches)
-                    {
-                        if (match.Intersect(start, len))
-                        {
-                            intersect = true;
-                            break;
-                        }
-                    }
-
-                    if (!intersect)
-                        matches.Add(new Models.Hyperlink(start, len, sha.Groups[1].Value, true));
-                }
-
-                if (matches.Count == 0)
+                var links = FullMessage?.Links;
+                if (links == null || links.Count == 0)
                 {
                     Inlines.Add(new Run(message));
                     return;
                 }
 
-                matches.Sort((l, r) => l.Start - r.Start);
-                _matches = matches;
-
                 var inlines = new List<Inline>();
                 var pos = 0;
-                foreach (var match in matches)
+                foreach (var link in links)
                 {
-                    if (match.Start > pos)
-                        inlines.Add(new Run(message.Substring(pos, match.Start - pos)));
+                    if (link.Start > pos)
+                        inlines.Add(new Run(message.Substring(pos, link.Start - pos)));
 
-                    var link = new Run(message.Substring(match.Start, match.Length));
-                    link.Classes.Add(match.IsCommitSHA ? "commit_link" : "issue_link");
-                    inlines.Add(link);
+                    var run = new Run(message.Substring(link.Start, link.Length));
+                    run.Classes.Add(link.IsCommitSHA ? "commit_link" : "issue_link");
+                    inlines.Add(run);
 
-                    pos = match.Start + match.Length;
+                    pos = link.Start + link.Length;
                 }
 
                 if (pos < message.Length)
@@ -134,7 +87,7 @@ namespace SourceGit.Views
                         scrollViewer.LineDown();
                 }
             }
-            else if (_matches != null)
+            else if (FullMessage is { Links: { Count: > 0 } links })
             {
                 var point = e.GetPosition(this) - new Point(Padding.Left, Padding.Top);
                 var x = Math.Min(Math.Max(point.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0));
@@ -142,25 +95,25 @@ namespace SourceGit.Views
                 point = new Point(x, y);
 
                 var pos = TextLayout.HitTestPoint(point).TextPosition;
-                foreach (var match in _matches)
+                foreach (var link in links)
                 {
-                    if (!match.Intersect(pos, 1))
+                    if (!link.Intersect(pos, 1))
                         continue;
 
-                    if (match == _lastHover)
+                    if (link == _lastHover)
                         return;
 
                     SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
 
-                    _lastHover = match;
-                    if (!match.IsCommitSHA)
+                    _lastHover = link;
+                    if (!link.IsCommitSHA)
                     {
-                        ToolTip.SetTip(this, match.Link);
+                        ToolTip.SetTip(this, link.Link);
                         ToolTip.SetIsOpen(this, true);
                     }
                     else
                     {
-                        ProcessHoverCommitLink(match);
+                        ProcessHoverCommitLink(link);
                     }
 
                     return;
@@ -361,7 +314,6 @@ namespace SourceGit.Views
             }
         }
 
-        private List<Models.Hyperlink> _matches = null;
         private Models.Hyperlink _lastHover = null;
         private Dictionary<string, Models.Commit> _inlineCommits = new();
     }
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 3644f8fc..2842715c 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -257,7 +257,7 @@
                       <ContentControl.DataTemplates>
                         <DataTemplate DataType="m:RevisionSubmodule">
                           <Border Margin="0,0,0,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Background="{DynamicResource Brush.Window}">
-                            <v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding Commit}" Message="{Binding FullMessage}"/>
+                            <v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
                           </Border>
                         </DataTemplate>
                       </ContentControl.DataTemplates>
@@ -271,7 +271,7 @@
                   <Path Width="16" Height="16" Data="{StaticResource Icons.DoubleDown}" HorizontalAlignment="Center" IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}"/>
 
                   <Border Margin="0,8,0,0" BorderThickness="1" BorderBrush="Green" Background="{DynamicResource Brush.Window}">
-                    <v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding New.Commit}" Message="{Binding New.FullMessage}"/>
+                    <v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding New.Commit}" FullMessage="{Binding New.FullMessage}"/>
                   </Border>
                 </StackPanel>
               </ScrollViewer>
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index de8b3b75..f7599ba0 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -63,7 +63,7 @@
       <Grid RowDefinitions="Auto,*" Margin="8,0">
         <TextBlock Grid.Row="0" Margin="0,8,0,0" Text="{DynamicResource Text.CommitDetail.Files.Submodule}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
         <ScrollViewer Grid.Row="1" Margin="0,16,0,0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-          <v:CommitBaseInfo Content="{Binding Commit}" Message="{Binding FullMessage}"/>
+          <v:CommitBaseInfo Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
         </ScrollViewer>
       </Grid>
     </DataTemplate>
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 3d5cff38..6847b14b 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -44,7 +44,7 @@
         <Popup PlacementTarget="{Binding #TxtSearchRevisionFiles}"
                Placement="BottomEdgeAlignedLeft"
                HorizontalOffset="-8" VerticalAlignment="-8"
-               IsOpen="{Binding IsRevisionFileSearchSuggestionOpen}">
+               IsOpen="{Binding RevisionFileSearchSuggestion, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}">
           <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
             <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
               <ListBox x:Name="SearchSuggestionBox"
diff --git a/src/Views/RevisionFiles.axaml.cs b/src/Views/RevisionFiles.axaml.cs
index 12dfe23a..3208fbb8 100644
--- a/src/Views/RevisionFiles.axaml.cs
+++ b/src/Views/RevisionFiles.axaml.cs
@@ -23,7 +23,7 @@ namespace SourceGit.Views
             }
             else if (e.Key == Key.Down || e.Key == Key.Up)
             {
-                if (vm.IsRevisionFileSearchSuggestionOpen)
+                if (vm.RevisionFileSearchSuggestion.Count > 0)
                 {
                     SearchSuggestionBox.Focus(NavigationMethod.Tab);
                     SearchSuggestionBox.SelectedIndex = 0;
@@ -33,12 +33,7 @@ namespace SourceGit.Views
             }
             else if (e.Key == Key.Escape)
             {
-                if (vm.IsRevisionFileSearchSuggestionOpen)
-                {
-                    vm.RevisionFileSearchSuggestion.Clear();
-                    vm.IsRevisionFileSearchSuggestionOpen = false;
-                }
-
+                vm.CancelRevisionFileSuggestions();
                 e.Handled = true;
             }
         }
@@ -57,7 +52,7 @@ namespace SourceGit.Views
 
             if (e.Key == Key.Escape)
             {
-                vm.RevisionFileSearchSuggestion.Clear();
+                vm.CancelRevisionFileSuggestions();
                 e.Handled = true;
             }
             else if (e.Key == Key.Enter && SearchSuggestionBox.SelectedItem is string content)

From 96538b9a6246ceebbb259cbdfd7abc3dc8239132 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 16:26:14 +0800
Subject: [PATCH 184/364] fix: there's an extra line-ending while copy multiple
 lines from text diff view (#1049)

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

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 958e803e..30034bc6 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1032,18 +1032,32 @@ namespace SourceGit.Views
                     line.Type == Models.TextDiffLineType.None)
                     continue;
 
+                // The first selected line (partial selection)
                 if (i == startIdx && startPosition.Column > 1)
                 {
                     builder.AppendLine(line.Content.Substring(startPosition.Column - 1));
                     continue;
                 }
 
-                if (i == endIdx && endPosition.Column < line.Content.Length)
+                // The selection range is larger than original source.
+                if (i == lines.Count - 1 && i < endIdx)
                 {
-                    builder.AppendLine(line.Content.Substring(0, endPosition.Column - 1));
-                    continue;
+                    builder.Append(line.Content);
+                    break;
                 }
 
+                // For the last line (selection range is within original source)
+                if (i == endIdx)
+                {
+                    if (endPosition.Column < line.Content.Length)
+                        builder.Append(line.Content.Substring(0, endPosition.Column - 1));
+                    else
+                        builder.Append(line.Content);
+
+                    break;
+                }
+
+                // Other lines.
                 builder.AppendLine(line.Content);
             }
 

From 25e6e261a626898942eeb981f75981caab307ff0 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Tue, 4 Mar 2025 16:33:43 +0800
Subject: [PATCH 185/364] refactor: Improve key modifier checks and AltGr
 detection (#1051)

---
 src/Views/Launcher.axaml.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index e3140191..b8c09b35 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -112,8 +112,19 @@ namespace SourceGit.Views
             // We should clear all unhandled key modifiers.
             _unhandledModifiers = KeyModifiers.None;
 
+            // Check for AltGr (which is detected as Ctrl+Alt)
+            bool isAltGr = e.KeyModifiers.HasFlag(KeyModifiers.Control) &&
+                           e.KeyModifiers.HasFlag(KeyModifiers.Alt);
+
+            // Skip hotkey processing if AltGr is pressed
+            if (isAltGr)
+            {
+                base.OnKeyDown(e);
+                return;
+            }
+
             // Ctrl+Shift+P opens preference dialog (macOS use hotkeys in system menu bar)
-            if (!OperatingSystem.IsMacOS() && e.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift) && e.Key == Key.P)
+            if (!OperatingSystem.IsMacOS() && e is { KeyModifiers: (KeyModifiers.Control | KeyModifiers.Shift), Key: Key.P })
             {
                 App.OpenDialog(new Preferences());
                 e.Handled = true;
@@ -243,13 +254,13 @@ namespace SourceGit.Views
             {
                 _unhandledModifiers = e.KeyModifiers;
 
-                if (!_unhandledModifiers.HasFlag(KeyModifiers.Alt) && (e.Key == Key.LeftAlt || e.Key == Key.RightAlt))
+                if (!_unhandledModifiers.HasFlag(KeyModifiers.Alt) && e.Key is Key.LeftAlt or Key.RightAlt)
                     _unhandledModifiers |= KeyModifiers.Alt;
 
-                if (!_unhandledModifiers.HasFlag(KeyModifiers.Control) && (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl))
+                if (!_unhandledModifiers.HasFlag(KeyModifiers.Control) && e.Key is Key.LeftCtrl or Key.RightCtrl)
                     _unhandledModifiers |= KeyModifiers.Control;
 
-                if (!_unhandledModifiers.HasFlag(KeyModifiers.Shift) && (e.Key == Key.LeftShift || e.Key == Key.RightShift))
+                if (!_unhandledModifiers.HasFlag(KeyModifiers.Shift) && e.Key is Key.LeftShift or Key.RightShift)
                     _unhandledModifiers |= KeyModifiers.Shift;
             }
         }

From 68e96f428e650cf29bde1b27276cf63456fd5530 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Tue, 4 Mar 2025 16:34:51 +0800
Subject: [PATCH 186/364] fix: validate result not update #1052 (#1053)

---
 src/ViewModels/Pull.cs | 2 +-
 src/ViewModels/Push.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index 755b58f4..ff557792 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -35,7 +35,7 @@ namespace SourceGit.ViewModels
         public Models.Branch SelectedBranch
         {
             get => _selectedBranch;
-            set => SetProperty(ref _selectedBranch, value);
+            set => SetProperty(ref _selectedBranch, value, true);
         }
 
         public Models.DealWithLocalChanges PreAction
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index 1f18b38e..fb06c76e 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -18,7 +18,7 @@ namespace SourceGit.ViewModels
             get => _selectedLocalBranch;
             set
             {
-                if (SetProperty(ref _selectedLocalBranch, value))
+                if (SetProperty(ref _selectedLocalBranch, value, true))
                     AutoSelectBranchByRemote();
             }
         }
@@ -39,7 +39,7 @@ namespace SourceGit.ViewModels
             get => _selectedRemote;
             set
             {
-                if (SetProperty(ref _selectedRemote, value))
+                if (SetProperty(ref _selectedRemote, value, true))
                     AutoSelectBranchByRemote();
             }
         }
@@ -56,7 +56,7 @@ namespace SourceGit.ViewModels
             get => _selectedRemoteBranch;
             set
             {
-                if (SetProperty(ref _selectedRemoteBranch, value))
+                if (SetProperty(ref _selectedRemoteBranch, value, true))
                     IsSetTrackOptionVisible = value != null && _selectedLocalBranch.Upstream != value.FullName;
             }
         }

From 11af5d9b29ba0f994892e336f13e119fa9c9730b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 16:42:32 +0800
Subject: [PATCH 187/364] code_style: use  `?:` operator instead of `if ...
 else` statement

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

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 30034bc6..93d31668 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1049,11 +1049,7 @@ namespace SourceGit.Views
                 // For the last line (selection range is within original source)
                 if (i == endIdx)
                 {
-                    if (endPosition.Column < line.Content.Length)
-                        builder.Append(line.Content.Substring(0, endPosition.Column - 1));
-                    else
-                        builder.Append(line.Content);
-
+                    builder.Append(endPosition.Column - 1 < line.Content.Length ? line.Content.Substring(0, endPosition.Column - 1) : line.Content);
                     break;
                 }
 

From 2137ad9ec97c2c8aacb78773af2999a5d7f9d57b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 17:26:27 +0800
Subject: [PATCH 188/364] enhance: allow to configure editor tab width in
 preferences window (#1048)

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/Preferences.cs                |  7 ++++
 src/Views/Blame.axaml                        |  1 +
 src/Views/Blame.axaml.cs                     | 19 +++++++++--
 src/Views/Preferences.axaml                  | 35 ++++++++++++++------
 src/Views/RevisionFileContentViewer.axaml    |  1 +
 src/Views/RevisionFileContentViewer.axaml.cs | 26 +++++++++++++--
 src/Views/TextDiffView.axaml                 |  3 ++
 src/Views/TextDiffView.axaml.cs              | 22 +++++++++---
 11 files changed, 98 insertions(+), 19 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5208a269..5df3ca71 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -464,6 +464,7 @@
   <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Enable Streaming</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPEARANCE</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Editor Tab Width</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
   <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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 0e8b9f7d..72b434f9 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -467,6 +467,7 @@
   <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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index f4cfad08..bc9991f6 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -467,6 +467,7 @@
   <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>
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 5cd7c8a4..016fd4c4 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -111,6 +111,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _editorFontSize, value);
         }
 
+        public int EditorTabWidth
+        {
+            get => _editorTabWidth;
+            set => SetProperty(ref _editorTabWidth, value);
+        }
+
         public LayoutInfo Layout
         {
             get => _layout;
@@ -649,6 +655,7 @@ namespace SourceGit.ViewModels
         private bool _useSystemWindowFrame = false;
         private double _defaultFontSize = 13;
         private double _editorFontSize = 13;
+        private int _editorTabWidth = 4;
         private LayoutInfo _layout = new LayoutInfo();
 
         private int _maxHistoryCommits = 20000;
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index 1ddb18fb..b700b580 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -58,6 +58,7 @@
                          Foreground="{DynamicResource Brush.FG1}"
                          FontFamily="{DynamicResource Fonts.Monospace}"
                          FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                         TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
                          BlameData="{Binding Data}"/>
       
       <!-- Not supported mask (for binary files) -->
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
index 1784efc1..7e273998 100644
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@@ -260,6 +260,15 @@ namespace SourceGit.Views
             set => SetValue(BlameDataProperty, value);
         }
 
+        public static readonly StyledProperty<int> TabWidthProperty =
+            AvaloniaProperty.Register<BlameTextEditor, int>(nameof(TabWidth), 4);
+
+        public int TabWidth
+        {
+            get => GetValue(TabWidthProperty);
+            set => SetValue(TabWidthProperty, value);
+        }
+
         protected override Type StyleKeyOverride => typeof(TextEditor);
 
         public BlameTextEditor() : base(new TextArea(), new TextDocument())
@@ -268,6 +277,10 @@ namespace SourceGit.Views
             ShowLineNumbers = false;
             WordWrap = false;
 
+            Options.IndentationSize = TabWidth;
+            Options.EnableHyperlinks = false;
+            Options.EnableEmailHyperlinks = false;
+
             _textMate = Models.TextMateHelper.CreateForEditor(this);
 
             TextArea.LeftMargins.Add(new LineNumberMargin() { Margin = new Thickness(8, 0) });
@@ -280,8 +293,6 @@ namespace SourceGit.Views
             TextArea.TextView.ContextRequested += OnTextViewContextRequested;
             TextArea.TextView.VisualLinesChanged += OnTextViewVisualLinesChanged;
             TextArea.TextView.Margin = new Thickness(4, 0);
-            TextArea.TextView.Options.EnableHyperlinks = false;
-            TextArea.TextView.Options.EnableEmailHyperlinks = false;
         }
 
         public override void Render(DrawingContext context)
@@ -350,6 +361,10 @@ namespace SourceGit.Views
                     Text = string.Empty;
                 }
             }
+            else if (change.Property == TabWidthProperty)
+            {
+                Options.IndentationSize = TabWidth;
+            }
             else if (change.Property.Name == "ActualThemeVariant" && change.NewValue != null)
             {
                 Models.TextMateHelper.SetThemeByApp(_textMate);
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 3bdd150a..12679e50 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -148,7 +148,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,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"
@@ -190,12 +190,12 @@
                        Margin="0,0,16,0"/>
             <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,8,*">
               <NumericUpDown Grid.Column="0"
-                           Minimum="10" Maximum="18" Increment="0.5"
-                           Height="28"
-                           Padding="4"
-                           BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
-                           CornerRadius="3"
-                           Value="{Binding DefaultFontSize, Mode=TwoWay}">
+                             Minimum="10" Maximum="18" Increment="0.5"
+                             Height="28"
+                             Padding="4"
+                             BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                             CornerRadius="3"
+                             Value="{Binding DefaultFontSize, Mode=TwoWay}">
                 <NumericUpDown.InnerLeftContent>
                   <Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource Brush.Border1}">
                     <TextBlock Margin="4,0" Text="{DynamicResource Text.Preferences.Appearance.FontSize.Default}"/>
@@ -218,10 +218,23 @@
             </Grid>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
+                       Text="{DynamicResource Text.Preferences.Appearance.EditorTabWidth}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <Grid Grid.Row="4" Grid.Column="1">
+              <NumericUpDown Minimum="1" Maximum="16" Increment="1"
+                             Height="28"
+                             Padding="4"
+                             BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                             CornerRadius="3"
+                             Value="{Binding EditorTabWidth, Mode=TwoWay}"/>
+            </Grid>
+
+            <TextBlock Grid.Row="5" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.ThemeOverrides}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <TextBox Grid.Row="4" Grid.Column="1"
+            <TextBox Grid.Row="5" Grid.Column="1"
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding ThemeOverrides, Mode=TwoWay}">
@@ -232,16 +245,16 @@
               </TextBox.InnerRightContent>
             </TextBox>
 
-            <CheckBox Grid.Row="5" Grid.Column="1"
+            <CheckBox Grid.Row="6" Grid.Column="1"
                       Content="{DynamicResource Text.Preferences.Appearance.OnlyUseMonoFontInEditor}"
                       IsChecked="{Binding OnlyUseMonoFontInEditor, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="6" Grid.Column="1"
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseFixedTabWidth}"
                       IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="7" Grid.Column="1"
+            <CheckBox Grid.Row="8" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
                       IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSystemWindowFrame, Mode=OneTime}"
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index f7599ba0..a3a168cf 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -22,6 +22,7 @@
     <DataTemplate DataType="m:RevisionTextFile">
       <v:RevisionTextFileView FontFamily="{DynamicResource Fonts.Monospace}"
                               FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                              TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
                               Background="{DynamicResource Brush.Contents}"/>
     </DataTemplate>
 
diff --git a/src/Views/RevisionFileContentViewer.axaml.cs b/src/Views/RevisionFileContentViewer.axaml.cs
index c74f2db2..16f4fc83 100644
--- a/src/Views/RevisionFileContentViewer.axaml.cs
+++ b/src/Views/RevisionFileContentViewer.axaml.cs
@@ -15,6 +15,15 @@ namespace SourceGit.Views
 {
     public class RevisionTextFileView : TextEditor
     {
+        public static readonly StyledProperty<int> TabWidthProperty =
+            AvaloniaProperty.Register<RevisionTextFileView, int>(nameof(TabWidth), 4);
+
+        public int TabWidth
+        {
+            get => GetValue(TabWidthProperty);
+            set => SetValue(TabWidthProperty, value);
+        }
+
         protected override Type StyleKeyOverride => typeof(TextEditor);
 
         public RevisionTextFileView() : base(new TextArea(), new TextDocument())
@@ -22,13 +31,16 @@ namespace SourceGit.Views
             IsReadOnly = true;
             ShowLineNumbers = true;
             WordWrap = false;
+
+            Options.IndentationSize = TabWidth;
+            Options.EnableHyperlinks = false;
+            Options.EnableEmailHyperlinks = false;
+
             HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
             VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
 
             TextArea.LeftMargins[0].Margin = new Thickness(8, 0);
             TextArea.TextView.Margin = new Thickness(4, 0);
-            TextArea.TextView.Options.EnableHyperlinks = false;
-            TextArea.TextView.Options.EnableEmailHyperlinks = false;
         }
 
         protected override void OnLoaded(RoutedEventArgs e)
@@ -69,6 +81,16 @@ namespace SourceGit.Views
             }
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == TabWidthProperty)
+            {
+                Options.IndentationSize = TabWidth;
+            }
+        }
+
         private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
         {
             var selected = SelectedText;
diff --git a/src/Views/TextDiffView.axaml b/src/Views/TextDiffView.axaml
index 3ea7af14..7ea6b44b 100644
--- a/src/Views/TextDiffView.axaml
+++ b/src/Views/TextDiffView.axaml
@@ -27,6 +27,7 @@
                                          IndicatorForeground="{DynamicResource Brush.FG2}"
                                          FontFamily="{DynamicResource Fonts.Monospace}"
                                          FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                                         TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
                                          UseSyntaxHighlighting="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting}"
                                          WordWrap="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableDiffViewWordWrap}"
                                          ShowHiddenSymbols="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView}"
@@ -59,6 +60,7 @@
                                            IndicatorForeground="{DynamicResource Brush.FG2}"
                                            FontFamily="{DynamicResource Fonts.Monospace}"
                                            FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                                           TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
                                            UseSyntaxHighlighting="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting}"
                                            WordWrap="False"
                                            ShowHiddenSymbols="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView}"
@@ -81,6 +83,7 @@
                                            IndicatorForeground="{DynamicResource Brush.FG2}"
                                            FontFamily="{DynamicResource Fonts.Monospace}"
                                            FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
+                                           TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
                                            UseSyntaxHighlighting="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSyntaxHighlighting}"
                                            WordWrap="False"
                                            ShowHiddenSymbols="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowHiddenSymbolsInDiffView}"
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 93d31668..630be1b2 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -475,6 +475,15 @@ namespace SourceGit.Views
             set => SetValue(ShowHiddenSymbolsProperty, value);
         }
 
+        public static readonly StyledProperty<int> TabWidthProperty =
+            AvaloniaProperty.Register<ThemedTextDiffPresenter, int>(nameof(TabWidth), 4);
+
+        public int TabWidth
+        {
+            get => GetValue(TabWidthProperty);
+            set => SetValue(TabWidthProperty, value);
+        }
+
         public static readonly StyledProperty<bool> EnableChunkSelectionProperty =
             AvaloniaProperty.Register<ThemedTextDiffPresenter, bool>(nameof(EnableChunkSelection));
 
@@ -519,12 +528,13 @@ namespace SourceGit.Views
             ShowLineNumbers = false;
             BorderThickness = new Thickness(0);
 
+            Options.IndentationSize = TabWidth;
+            Options.EnableHyperlinks = false;
+            Options.EnableEmailHyperlinks = false;
+
             _lineStyleTransformer = new LineStyleTransformer(this);
 
             TextArea.TextView.Margin = new Thickness(2, 0);
-            TextArea.TextView.Options.EnableHyperlinks = false;
-            TextArea.TextView.Options.EnableEmailHyperlinks = false;
-
             TextArea.TextView.BackgroundRenderers.Add(new LineBackgroundRenderer(this));
             TextArea.TextView.LineTransformers.Add(_lineStyleTransformer);
         }
@@ -734,10 +744,14 @@ namespace SourceGit.Views
             }
             else if (change.Property == ShowHiddenSymbolsProperty)
             {
-                var val = change.NewValue is true;
+                var val = ShowHiddenSymbols;
                 Options.ShowTabs = val;
                 Options.ShowSpaces = val;
             }
+            else if (change.Property == TabWidthProperty)
+            {
+                Options.IndentationSize = TabWidth;
+            }
             else if (change.Property == FileNameProperty)
             {
                 Models.TextMateHelper.SetGrammarByFileName(_textMate, FileName);

From 5af856b9da238d552e8be47fbc002af7efae0742 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 09:26:48 +0000
Subject: [PATCH 189/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index dae76783..849407b3 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.21%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.80%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.53%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.07%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.08%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.74%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.68%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.94%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 716ddd3a..8a7bd378 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.21%
+### de_DE.axaml: 99.08%
 
 
 <details>
@@ -9,21 +9,23 @@
 - Text.Diff.First
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
+- Text.Preferences.Appearance.EditorTabWidth
 - Text.StashCM.SaveAsPatch
 
 </details>
 
-### es_ES.axaml: 99.87%
+### es_ES.axaml: 99.74%
 
 
 <details>
 <summary>Missing Keys</summary>
 
+- Text.Preferences.Appearance.EditorTabWidth
 - Text.StashCM.SaveAsPatch
 
 </details>
 
-### fr_FR.axaml: 91.80%
+### fr_FR.axaml: 91.68%
 
 
 <details>
@@ -56,6 +58,7 @@
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
 - Text.Preferences.AI.Streaming
+- Text.Preferences.Appearance.EditorTabWidth
 - Text.Preferences.Appearance.FontSize
 - Text.Preferences.Appearance.FontSize.Default
 - Text.Preferences.Appearance.FontSize.Editor
@@ -94,17 +97,17 @@
 
 </details>
 
-### it_IT.axaml: 100.00%
+### it_IT.axaml: 99.87%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Preferences.Appearance.EditorTabWidth
 
 </details>
 
-### pt_BR.axaml: 91.53%
+### pt_BR.axaml: 91.41%
 
 
 <details>
@@ -148,6 +151,7 @@
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
 - Text.Preferences.AI.Streaming
+- Text.Preferences.Appearance.EditorTabWidth
 - Text.Preferences.General.DateFormat
 - Text.Preferences.General.ShowChildren
 - Text.Preferences.Git.SSLVerify
@@ -177,7 +181,7 @@
 
 </details>
 
-### ru_RU.axaml: 99.07%
+### ru_RU.axaml: 98.94%
 
 
 <details>
@@ -189,6 +193,7 @@
 - Text.Diff.First
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
+- Text.Preferences.Appearance.EditorTabWidth
 - Text.StashCM.SaveAsPatch
 
 </details>

From e28f8611ef74bf259096b322d6c91531bc4ceeac Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 17:39:07 +0800
Subject: [PATCH 190/364] ux: re-design the layout for `Interactive Rebase`
 window that tries to fix issue #1037

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

diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index f031479b..a4c4dc8e 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -65,6 +65,7 @@
               <Setter Property="Margin" Value="0"/>
               <Setter Property="Padding" Value="0"/>
               <Setter Property="Height" Value="28"/>
+              <Setter Property="HorizontalAlignment" Value="Stretch"/>
               <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
             </Style>
           </ListBox.Styles>
@@ -77,7 +78,7 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid ColumnDefinitions="16,110,*,32,108,96,Auto,32,32" Margin="8,0" ClipToBounds="True">
+              <Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,Auto,32,32" ClipToBounds="True">
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"

From e884f27f67fb79a421421941ce3228882c8b315f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 18:02:29 +0800
Subject: [PATCH 191/364] code_style: re-order `CommitDetail` properties

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/CommitDetail.cs | 105 +++++++++++++++++----------------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 26fa37c1..21931181 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -16,12 +16,6 @@ namespace SourceGit.ViewModels
 {
     public partial class CommitDetail : ObservableObject
     {
-        public DiffContext DiffContext
-        {
-            get => _diffContext;
-            private set => SetProperty(ref _diffContext, value);
-        }
-
         public int ActivePageIndex
         {
             get => _repo.CommitDetailActivePageIndex;
@@ -57,6 +51,18 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _signInfo, value);
         }
 
+        public List<Models.CommitLink> WebLinks
+        {
+            get;
+            private set;
+        } = [];
+
+        public List<string> Children
+        {
+            get => _children;
+            private set => SetProperty(ref _children, value);
+        }
+
         public List<Models.Change> Changes
         {
             get => _changes;
@@ -84,10 +90,10 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public List<string> Children
+        public DiffContext DiffContext
         {
-            get => _children;
-            private set => SetProperty(ref _children, value);
+            get => _diffContext;
+            private set => SetProperty(ref _diffContext, value);
         }
 
         public string SearchChangeFilter
@@ -108,53 +114,13 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _viewRevisionFileContent, value);
         }
 
-        public List<Models.CommitLink> WebLinks
-        {
-            get;
-            private set;
-        } = [];
-
         public string RevisionFileSearchFilter
         {
             get => _revisionFileSearchFilter;
             set
             {
                 if (SetProperty(ref _revisionFileSearchFilter, value))
-                {
-                    if (!string.IsNullOrEmpty(value))
-                    {
-                        if (_revisionFiles == null)
-                        {
-                            var sha = Commit.SHA;
-
-                            Task.Run(() =>
-                            {
-                                var files = new Commands.QueryRevisionFileNames(_repo.FullPath, sha).Result();
-                                var filesList = new List<string>();
-                                filesList.AddRange(files);
-
-                                Dispatcher.UIThread.Invoke(() =>
-                                {
-                                    if (sha == Commit.SHA)
-                                    {
-                                        _revisionFiles = filesList;
-                                        if (!string.IsNullOrEmpty(_revisionFileSearchFilter))
-                                            UpdateRevisionFileSearchSuggestion();
-                                    }
-                                });
-                            });
-                        }
-                        else
-                        {
-                            UpdateRevisionFileSearchSuggestion();
-                        }
-                    }
-                    else
-                    {
-                        RevisionFileSearchSuggestion = null;
-                        GC.Collect();
-                    }
-                }
+                    RefreshRevisionSearchSuggestion();
             }
         }
 
@@ -832,7 +798,44 @@ namespace SourceGit.ViewModels
             menu.Items.Add(new MenuItem() { Header = "-" });
         }
 
-        private void UpdateRevisionFileSearchSuggestion()
+        private void RefreshRevisionSearchSuggestion()
+        {
+            if (!string.IsNullOrEmpty(_revisionFileSearchFilter))
+            {
+                if (_revisionFiles == null)
+                {
+                    var sha = Commit.SHA;
+
+                    Task.Run(() =>
+                    {
+                        var files = new Commands.QueryRevisionFileNames(_repo.FullPath, sha).Result();
+                        var filesList = new List<string>();
+                        filesList.AddRange(files);
+
+                        Dispatcher.UIThread.Invoke(() =>
+                        {
+                            if (sha == Commit.SHA)
+                            {
+                                _revisionFiles = filesList;
+                                if (!string.IsNullOrEmpty(_revisionFileSearchFilter))
+                                    CalcRevisionFileSearchSuggestion();
+                            }
+                        });
+                    });
+                }
+                else
+                {
+                    CalcRevisionFileSearchSuggestion();
+                }
+            }
+            else
+            {
+                RevisionFileSearchSuggestion = null;
+                GC.Collect();
+            }
+        }
+
+        private void CalcRevisionFileSearchSuggestion()
         {
             var suggestion = new List<string>();
             foreach (var file in _revisionFiles)

From 792e61b24f8ed6b18dc6d77d7125312baca99a77 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Mar 2025 18:23:13 +0800
Subject: [PATCH 192/364] ux: re-design the layout for `Interactive Rebase`
 window that tries to fix issue #1037

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/InteractiveRebase.axaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index a4c4dc8e..b4499ddc 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -60,7 +60,7 @@
                                     SelectedItem="{Binding SelectedItem, Mode=OneWayToSource}"
                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                     ScrollViewer.VerticalScrollBarVisibility="Auto">
-          <ListBox.Styles>
+          <v:InteractiveRebaseListBox.Styles>
             <Style Selector="ListBoxItem">
               <Setter Property="Margin" Value="0"/>
               <Setter Property="Padding" Value="0"/>
@@ -68,17 +68,17 @@
               <Setter Property="HorizontalAlignment" Value="Stretch"/>
               <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
             </Style>
-          </ListBox.Styles>
+          </v:InteractiveRebaseListBox.Styles>
 
-          <ListBox.ItemsPanel>
+          <v:InteractiveRebaseListBox.ItemsPanel>
             <ItemsPanelTemplate>
               <VirtualizingStackPanel Orientation="Vertical"/>
             </ItemsPanelTemplate>
-          </ListBox.ItemsPanel>
+          </v:InteractiveRebaseListBox.ItemsPanel>
 
-          <ListBox.ItemTemplate>
+          <v:InteractiveRebaseListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,Auto,32,32" ClipToBounds="True">
+              <Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,170,32,32" ClipToBounds="True">                
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"
@@ -210,8 +210,8 @@
 
                 <!-- Commit Time -->
                 <Border Grid.Column="6">
-                  <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
-                </Border>                
+                  <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" HorizontalAlignment="Center"/>
+                </Border>
 
                 <!-- MoveUp Button -->
                 <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
@@ -224,7 +224,7 @@
                 </Button>
               </Grid>
             </DataTemplate>
-          </ListBox.ItemTemplate>
+          </v:InteractiveRebaseListBox.ItemTemplate>
         </v:InteractiveRebaseListBox>
 
         <v:LoadingIcon Grid.Row="0" Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>

From 71d0b69eee5d48f0118d0c8bd8029a7bf73497bc Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Tue, 4 Mar 2025 19:51:36 +0800
Subject: [PATCH 193/364] fix: prevent kill apt process by accident (#1054)

---
 build/resources/deb/DEBIAN/preinst | 8 ++++----
 build/resources/deb/DEBIAN/prerm   | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build/resources/deb/DEBIAN/preinst b/build/resources/deb/DEBIAN/preinst
index edcf9088..a93f8090 100755
--- a/build/resources/deb/DEBIAN/preinst
+++ b/build/resources/deb/DEBIAN/preinst
@@ -12,10 +12,10 @@ set -e
 case "$1" in
     install|upgrade)
         # Check if SourceGit is running and stop it
-        if pidof -q sourcegit || pgrep -f sourcegit > /dev/null; then
-            echo "SourceGit is running, stopping it..."
-            killall sourcegit 2>/dev/null || pkill -f sourcegit 2>/dev/null || true
-            # Wait for SourceGit to exit
+        if pgrep -f '/opt/sourcegit/sourcegit' > /dev/null; then
+            echo "Stopping running SourceGit instance..."
+            pkill -f '/opt/sourcegit/sourcegit' || true
+            # Give the process a moment to terminate
             sleep 1
         fi
     ;;
diff --git a/build/resources/deb/DEBIAN/prerm b/build/resources/deb/DEBIAN/prerm
index 8ecd4b8d..c2c9e4f0 100755
--- a/build/resources/deb/DEBIAN/prerm
+++ b/build/resources/deb/DEBIAN/prerm
@@ -15,11 +15,10 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-        # Check if SourceGit is running and stop it
-        if pidof -q sourcegit || pgrep -f sourcegit > /dev/null; then
-            echo "SourceGit is running, stopping it before removal..."
-            killall sourcegit 2>/dev/null || pkill -f sourcegit 2>/dev/null || true
-            # Wait for SourceGit to exit
+        if pgrep -f '/opt/sourcegit/sourcegit' > /dev/null; then
+            echo "Stopping running SourceGit instance..."
+            pkill -f '/opt/sourcegit/sourcegit' || true
+            # Give the process a moment to terminate
             sleep 1
         fi
     ;;

From 5e898a809e0b8171a4349371690f5ce491a486ba Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 5 Mar 2025 09:30:38 +0800
Subject: [PATCH 194/364] enhance: check commit hash after intersect testing

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

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 21931181..32827db3 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -665,11 +665,6 @@ namespace SourceGit.ViewModels
                 if (!sha.Success)
                     continue;
 
-                var hash = sha.Groups[1].Value;
-                var test = new Commands.IsCommitSHA(_repo.FullPath, hash).Result();
-                if (!test)
-                    continue;
-
                 var start = sha.Index;
                 var len = sha.Length;
                 var intersect = false;
@@ -682,7 +677,12 @@ namespace SourceGit.ViewModels
                     }
                 }
 
-                if (!intersect)
+                if (intersect)
+                    continue;
+
+                var hash = sha.Groups[1].Value;
+                var isCommitSHA = new Commands.IsCommitSHA(_repo.FullPath, hash).Result();
+                if (isCommitSHA)
                     links.Add(new Models.Hyperlink(start, len, hash, true));
             }
 

From 269903503fe77029ec8db1e16121a3b6e830027d Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Wed, 5 Mar 2025 09:36:32 +0800
Subject: [PATCH 195/364] feat: Add commit Tooltip in Blame (#1055)

Fixes #993
---
 src/ViewModels/Blame.cs         |  5 ++++
 src/Views/Blame.axaml           | 19 ++++++++++++--
 src/Views/Blame.axaml.cs        | 45 ++++++++++++++++++++++++++-------
 src/Views/TextDiffView.axaml.cs |  8 +++---
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/src/ViewModels/Blame.cs b/src/ViewModels/Blame.cs
index 253626bc..7ee39550 100644
--- a/src/ViewModels/Blame.cs
+++ b/src/ViewModels/Blame.cs
@@ -57,6 +57,11 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public Models.Commit GetCommitInfo(string commitSHA)
+        {
+            return new Commands.QuerySingleCommit(_repo, commitSHA).Result();
+        }
+
         private readonly string _repo;
         private Models.BlameData _data = null;
     }
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index b700b580..4d050bb5 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -2,6 +2,7 @@
                     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:m="using:SourceGit.Models"
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -59,8 +60,22 @@
                          FontFamily="{DynamicResource Fonts.Monospace}"
                          FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
                          TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
-                         BlameData="{Binding Data}"/>
-      
+                         BlameData="{Binding Data}">
+        <v:BlameTextEditor.DataTemplates>
+          <DataTemplate DataType="m:Commit">
+            <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"/>
+              </Grid>
+
+              <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+            </StackPanel>
+          </DataTemplate>
+        </v:BlameTextEditor.DataTemplates>
+      </v:BlameTextEditor>
+
       <!-- Not supported mask (for binary files) -->
       <StackPanel Orientation="Vertical"
                   HorizontalAlignment="Center" VerticalAlignment="Center"
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
index 7e273998..37146f72 100644
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
-
+using Avalonia.Threading;
 using AvaloniaEdit;
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Editing;
@@ -162,7 +162,8 @@ namespace SourceGit.Views
                             break;
 
                         var info = _editor.BlameData.LineInfos[lineNumber - 1];
-                        var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop) - view.VerticalOffset;
+                        var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop)
+                                - view.VerticalOffset;
                         var shaLink = new FormattedText(
                             info.CommitSHA,
                             CultureInfo.CurrentCulture,
@@ -175,12 +176,38 @@ namespace SourceGit.Views
                         if (rect.Contains(pos))
                         {
                             Cursor = Cursor.Parse("Hand");
+
+                            // check if the tooltip is already set
+                            var tooltip = ToolTip.GetTip(this);
+                            if (tooltip is Models.Commit existedCommit && existedCommit.SHA == info.CommitSHA)
+                                return;
+
+                            if (DataContext is ViewModels.Blame blame)
+                            {
+                                Task.Run(() =>
+                                {
+                                    var commit = blame.GetCommitInfo(info.CommitSHA);
+                                    if (commit == null)
+                                        return;
+
+                                    Dispatcher.UIThread.Invoke(() =>
+                                    {
+                                        if (IsEffectivelyVisible && IsPointerOver)
+                                        {
+                                            ToolTip.SetTip(this, commit);
+                                            ToolTip.SetIsOpen(this, true);
+                                        }
+                                    });
+                                });
+                            }
+
                             return;
                         }
                     }
-                }
 
-                Cursor = Cursor.Default;
+                    Cursor = Cursor.Default;
+                    ToolTip.SetIsOpen(this, false);
+                }
             }
 
             protected override void OnPointerPressed(PointerPressedEventArgs e)
@@ -230,9 +257,9 @@ namespace SourceGit.Views
             private readonly BlameTextEditor _editor = null;
         }
 
-        public class VerticalSeperatorMargin : AbstractMargin
+        public class VerticalSeparatorMargin : AbstractMargin
         {
-            public VerticalSeperatorMargin(BlameTextEditor editor)
+            public VerticalSeparatorMargin(BlameTextEditor editor)
             {
                 _editor = editor;
             }
@@ -284,9 +311,9 @@ namespace SourceGit.Views
             _textMate = Models.TextMateHelper.CreateForEditor(this);
 
             TextArea.LeftMargins.Add(new LineNumberMargin() { Margin = new Thickness(8, 0) });
-            TextArea.LeftMargins.Add(new VerticalSeperatorMargin(this));
+            TextArea.LeftMargins.Add(new VerticalSeparatorMargin(this));
             TextArea.LeftMargins.Add(new CommitInfoMargin(this) { Margin = new Thickness(8, 0) });
-            TextArea.LeftMargins.Add(new VerticalSeperatorMargin(this));
+            TextArea.LeftMargins.Add(new VerticalSeparatorMargin(this));
             TextArea.Caret.PositionChanged += OnTextAreaCaretPositionChanged;
             TextArea.LayoutUpdated += OnTextAreaLayoutUpdated;
             TextArea.PointerWheelChanged += OnTextAreaPointerWheelChanged;
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 630be1b2..925c7622 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -60,7 +60,7 @@ namespace SourceGit.Views
 
     public class ThemedTextDiffPresenter : TextEditor
     {
-        public class VerticalSeperatorMargin : AbstractMargin
+        public class VerticalSeparatorMargin : AbstractMargin
         {
             public override void Render(DrawingContext context)
             {
@@ -1085,9 +1085,9 @@ namespace SourceGit.Views
         public CombinedTextDiffPresenter() : base(new TextArea(), new TextDocument())
         {
             TextArea.LeftMargins.Add(new LineNumberMargin(false, true));
-            TextArea.LeftMargins.Add(new VerticalSeperatorMargin());
+            TextArea.LeftMargins.Add(new VerticalSeparatorMargin());
             TextArea.LeftMargins.Add(new LineNumberMargin(false, false));
-            TextArea.LeftMargins.Add(new VerticalSeperatorMargin());
+            TextArea.LeftMargins.Add(new VerticalSeparatorMargin());
             TextArea.LeftMargins.Add(new LineModifyTypeMargin());
         }
 
@@ -1286,7 +1286,7 @@ namespace SourceGit.Views
         public SingleSideTextDiffPresenter() : base(new TextArea(), new TextDocument())
         {
             TextArea.LeftMargins.Add(new LineNumberMargin(true, false));
-            TextArea.LeftMargins.Add(new VerticalSeperatorMargin());
+            TextArea.LeftMargins.Add(new VerticalSeparatorMargin());
             TextArea.LeftMargins.Add(new LineModifyTypeMargin());
         }
 

From fb8d4a2542063a76cff6d41b8fc2ad02de3afa0c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 5 Mar 2025 09:54:23 +0800
Subject: [PATCH 196/364] code_review: PR #1055

- since the author and time are already shown in the blame view, use the full message as tooltip is better.
- cache the commit message in `ViewModels.Blame` since the `Tooltip` of control may change.
- querying commit message synchronously (it's very fast) to avoid similar issues in commit details panel.

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Blame.cs  | 13 ++++++++++---
 src/Views/Blame.axaml    | 17 +----------------
 src/Views/Blame.axaml.cs | 30 ++++++------------------------
 3 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/src/ViewModels/Blame.cs b/src/ViewModels/Blame.cs
index 7ee39550..7cfa8eac 100644
--- a/src/ViewModels/Blame.cs
+++ b/src/ViewModels/Blame.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 using Avalonia.Threading;
 
@@ -57,12 +58,18 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public Models.Commit GetCommitInfo(string commitSHA)
+        public string GetCommitMessage(string sha)
         {
-            return new Commands.QuerySingleCommit(_repo, commitSHA).Result();
+            if (_commitMessages.TryGetValue(sha, out var msg))
+                return msg;
+
+            msg = new Commands.QueryCommitFullMessage(_repo, sha).Result();
+            _commitMessages[sha] = msg;
+            return msg;
         }
 
         private readonly string _repo;
         private Models.BlameData _data = null;
+        private Dictionary<string, string> _commitMessages = new Dictionary<string, string>();
     }
 }
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index 4d050bb5..d5c3fd22 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -2,7 +2,6 @@
                     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:m="using:SourceGit.Models"
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -60,21 +59,7 @@
                          FontFamily="{DynamicResource Fonts.Monospace}"
                          FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize}"
                          TabWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorTabWidth}"
-                         BlameData="{Binding Data}">
-        <v:BlameTextEditor.DataTemplates>
-          <DataTemplate DataType="m:Commit">
-            <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"/>
-              </Grid>
-
-              <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-            </StackPanel>
-          </DataTemplate>
-        </v:BlameTextEditor.DataTemplates>
-      </v:BlameTextEditor>
+                         BlameData="{Binding Data}"/>
 
       <!-- Not supported mask (for binary files) -->
       <StackPanel Orientation="Vertical"
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
index 37146f72..ce28046d 100644
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Threading.Tasks;
+
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
-using Avalonia.Threading;
+
 using AvaloniaEdit;
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Editing;
@@ -162,8 +162,7 @@ namespace SourceGit.Views
                             break;
 
                         var info = _editor.BlameData.LineInfos[lineNumber - 1];
-                        var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop)
-                                - view.VerticalOffset;
+                        var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop) - view.VerticalOffset;
                         var shaLink = new FormattedText(
                             info.CommitSHA,
                             CultureInfo.CurrentCulture,
@@ -177,28 +176,11 @@ namespace SourceGit.Views
                         {
                             Cursor = Cursor.Parse("Hand");
 
-                            // check if the tooltip is already set
-                            var tooltip = ToolTip.GetTip(this);
-                            if (tooltip is Models.Commit existedCommit && existedCommit.SHA == info.CommitSHA)
-                                return;
-
                             if (DataContext is ViewModels.Blame blame)
                             {
-                                Task.Run(() =>
-                                {
-                                    var commit = blame.GetCommitInfo(info.CommitSHA);
-                                    if (commit == null)
-                                        return;
-
-                                    Dispatcher.UIThread.Invoke(() =>
-                                    {
-                                        if (IsEffectivelyVisible && IsPointerOver)
-                                        {
-                                            ToolTip.SetTip(this, commit);
-                                            ToolTip.SetIsOpen(this, true);
-                                        }
-                                    });
-                                });
+                                var msg = blame.GetCommitMessage(info.CommitSHA);
+                                ToolTip.SetTip(this, msg);
+                                ToolTip.SetIsOpen(this, true);
                             }
 
                             return;

From 991ebe40824f9d42b4fabff69c2a30b1e00e98e9 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Wed, 5 Mar 2025 09:55:55 +0800
Subject: [PATCH 197/364] ci: set ubuntu:20.04 (#1056)

---
 .github/workflows/build.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4117364..bcb32580 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,14 +19,25 @@ jobs:
             os: macos-latest
             runtime: osx-arm64
           - name : Linux
-            os: ubuntu-20.04
+            os: ubuntu-latest
             runtime: linux-x64
+            container: ubuntu:20.04
           - name : Linux (arm64)
-            os: ubuntu-20.04
+            os: ubuntu-latest
             runtime: linux-arm64
+            container: ubuntu:20.04
     name: Build ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container || '' }}
     steps:
+      - name: Install common CLI tools
+        if: ${{ startsWith(matrix.runtime, 'linux-') }}
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
+          apt-get update
+          apt-get install -y sudo
+          sudo apt-get install -y curl wget git unzip zip libicu66 tzdata clang
       - name: Checkout sources
         uses: actions/checkout@v4
       - name: Setup .NET
@@ -47,7 +58,7 @@ jobs:
         if: ${{ matrix.runtime == 'linux-arm64' }}
         run: |
           sudo apt-get update
-          sudo apt-get install clang llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
+          sudo apt-get install -y llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
       - name: Build
         run: dotnet build -c Release
       - name: Publish

From 81bbe11345522e6ace161747e294c77c3a6f1a81 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 5 Mar 2025 17:06:45 +0800
Subject: [PATCH 198/364] code_style: rename some variables in
 `ParseLinksInMessage`

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

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 32827db3..a4f3f595 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -658,15 +658,15 @@ namespace SourceGit.ViewModels
                     rule.Matches(links, message);
             }
 
-            var shas = REG_SHA_FORMAT().Matches(message);
-            for (int i = 0; i < shas.Count; i++)
+            var matches = REG_SHA_FORMAT().Matches(message);
+            for (int i = 0; i < matches.Count; i++)
             {
-                var sha = shas[i];
-                if (!sha.Success)
+                var match = matches[i];
+                if (!match.Success)
                     continue;
 
-                var start = sha.Index;
-                var len = sha.Length;
+                var start = match.Index;
+                var len = match.Length;
                 var intersect = false;
                 foreach (var link in links)
                 {
@@ -680,10 +680,10 @@ namespace SourceGit.ViewModels
                 if (intersect)
                     continue;
 
-                var hash = sha.Groups[1].Value;
-                var isCommitSHA = new Commands.IsCommitSHA(_repo.FullPath, hash).Result();
+                var sha = match.Groups[1].Value;
+                var isCommitSHA = new Commands.IsCommitSHA(_repo.FullPath, sha).Result();
                 if (isCommitSHA)
-                    links.Add(new Models.Hyperlink(start, len, hash, true));
+                    links.Add(new Models.Hyperlink(start, len, sha, true));
             }
 
             if (links.Count > 0)

From 78c0d8d3344c3315a5a8b022fb893124c703d71a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Mar 2025 10:37:50 +0800
Subject: [PATCH 199/364] fix: both `--tags` and `--no-tags` are used in `git
 pull` command

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

diff --git a/src/Commands/Pull.cs b/src/Commands/Pull.cs
index a4efa4b6..35a6289a 100644
--- a/src/Commands/Pull.cs
+++ b/src/Commands/Pull.cs
@@ -11,10 +11,11 @@ namespace SourceGit.Commands
             Context = repo;
             TraitErrorAsOutput = true;
             SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
-            Args = "pull --verbose --progress --tags ";
+            Args = "pull --verbose --progress ";
 
             if (useRebase)
-                Args += "--rebase ";
+                Args += "--rebase=true ";
+
             if (noTags)
                 Args += "--no-tags ";
 

From aa0d4b42969271dbc9f42edaadac4d521e09f634 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Mar 2025 11:50:22 +0800
Subject: [PATCH 200/364] ux: adjust column width of commit hash and time after
 font size changed (#994)

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

diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 5cde532f..40b2636f 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -24,7 +24,7 @@
     </v:LayoutableGrid.ColumnDefinitions>
     
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
-      <Grid RowDefinitions="24,*">
+      <Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True">
         <!-- Headers -->
         <Border Grid.Row="0"
                 Background="{DynamicResource Brush.Window}"
@@ -35,8 +35,8 @@
               <ColumnDefinition Width="*" MinWidth="100"/>
               <ColumnDefinition Width="3"/>
               <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/>
-              <ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
-              <ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
+              <ColumnDefinition SharedSizeGroup="SHA"/>
+              <ColumnDefinition SharedSizeGroup="Time"/>
             </Grid.ColumnDefinitions>
 
             <TextBlock Grid.Column="0" Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
@@ -121,8 +121,8 @@
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=OneWay}"/>
-                    <ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
-                    <ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
+                    <ColumnDefinition SharedSizeGroup="SHA" Width="Auto" MinWidth="100"/>
+                    <ColumnDefinition SharedSizeGroup="Time" Width="Auto" MinWidth="160"/>
                   </Grid.ColumnDefinitions>
 
                   <!-- Subject & REFS -->
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index b4499ddc..1ef2b6cd 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -59,7 +59,8 @@
                                     SelectionMode="Single"
                                     SelectedItem="{Binding SelectedItem, Mode=OneWayToSource}"
                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto">
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                    Grid.IsSharedSizeScope="True">
           <v:InteractiveRebaseListBox.Styles>
             <Style Selector="ListBoxItem">
               <Setter Property="Margin" Value="0"/>
@@ -78,7 +79,19 @@
 
           <v:InteractiveRebaseListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,170,32,32" ClipToBounds="True">                
+              <Grid Height="26" Margin="8,0" ClipToBounds="True">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="16"/>
+                  <ColumnDefinition Width="110"/>
+                  <ColumnDefinition Width="*"/>
+                  <ColumnDefinition Width="32"/>
+                  <ColumnDefinition Width="108"/>
+                  <ColumnDefinition Width="Auto" SharedSizeGroup="CommitHashColumn"/>
+                  <ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
+                  <ColumnDefinition Width="32"/>
+                  <ColumnDefinition Width="32"/>
+                </Grid.ColumnDefinitions>
+                
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"
@@ -210,7 +223,10 @@
 
                 <!-- Commit Time -->
                 <Border Grid.Column="6">
-                  <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" HorizontalAlignment="Center"/>
+                  <TextBlock Classes="primary"
+                             Margin="16,0,8,0"
+                             Text="{Binding Commit.CommitterTimeStr}"
+                             HorizontalAlignment="Center"/>
                 </Border>
 
                 <!-- MoveUp Button -->

From 92fa25ae8d54f8608334fffe6da58092b95bf993 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Mar 2025 15:14:05 +0800
Subject: [PATCH 201/364] ux: disable scrollbar in `NumericUpDown` control
 (#1023)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Styles.axaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 9b43d8af..38321356 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -1299,6 +1299,8 @@
       <Setter Property="MinHeight" Value="0"/>
       <Setter Property="Height" Value="28"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
     </Style>
     <Style Selector="^:focus-within /template/ ButtonSpinner#PART_Spinner">
       <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>

From 14877d4d63613929200420ca610552f572cc63ad 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: Thu, 6 Mar 2025 19:32:05 -0600
Subject: [PATCH 202/364] localization: update spanish translations (#1061)

add missing spanish translations
update previous references of `patch` as `parche`
---
 src/Resources/Locales/es_ES.axaml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index bf635321..4073f512 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -24,17 +24,17 @@
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GENERAR</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usar OpenAI para generar mensaje de commit</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APLICAR CÓMO MENSAJE DE COMMIT</x:String>
-  <x:String x:Key="Text.Apply" xml:space="preserve">Aplicar Patch</x:String>
+  <x:String x:Key="Text.Apply" xml:space="preserve">Aplicar Parche</x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Error</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Genera errores y se niega a aplicar el patch</x:String>
+  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Genera errores y se niega a aplicar el parche</x:String>
   <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Error Todo</x:String>
   <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Similar a 'error', pero muestra más</x:String>
-  <x:String x:Key="Text.Apply.File" xml:space="preserve">Archivo Patch:</x:String>
+  <x:String x:Key="Text.Apply.File" xml:space="preserve">Archivo del Parche:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Seleccionar archivo .patch para aplicar</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignorar cambios de espacios en blanco</x:String>
   <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">Sin Advertencia</x:String>
   <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Desactiva la advertencia de espacios en blanco al final</x:String>
-  <x:String x:Key="Text.Apply.Title" xml:space="preserve">Aplicar Patch</x:String>
+  <x:String x:Key="Text.Apply.Title" xml:space="preserve">Aplicar Parche</x:String>
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Advertencia</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Genera advertencias para algunos de estos errores, pero aplica</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Espacios en Blanco:</x:String>
@@ -126,7 +126,7 @@
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Reset ${0}$ hasta Aquí</x:String>
   <x:String x:Key="Text.CommitCM.Revert" xml:space="preserve">Revertir Commit</x:String>
   <x:String x:Key="Text.CommitCM.Reword" xml:space="preserve">Reescribir</x:String>
-  <x:String x:Key="Text.CommitCM.SaveAsPatch" xml:space="preserve">Guardar como Patch...</x:String>
+  <x:String x:Key="Text.CommitCM.SaveAsPatch" xml:space="preserve">Guardar como Parche...</x:String>
   <x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">Squash en Parent</x:String>
   <x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">Squash Commits Hijos hasta Aquí</x:String>
   <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">CAMBIOS</x:String>
@@ -259,7 +259,7 @@
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Siguiente Diferencia</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">SIN CAMBIOS O SOLO CAMBIOS DE EOL</x:String>
   <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Diferencia Anterior</x:String>
-  <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Guardar como Patch</x:String>
+  <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Guardar como Parche</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Mostrar símbolos ocultos</x:String>
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Diferencia Lado a Lado</x:String>
   <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SUBMÓDULO</x:String>
@@ -300,7 +300,7 @@
   <x:String x:Key="Text.FileCM.DiscardSelectedLines" xml:space="preserve">Descartar Cambios en Línea(s) Seleccionada(s)</x:String>
   <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">Abrir Herramienta de Merge Externa</x:String>
   <x:String x:Key="Text.FileCM.ResolveUsing" xml:space="preserve">Resolver usando ${0}$</x:String>
-  <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">Guardar Como Patch...</x:String>
+  <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">Guardar como Parche...</x:String>
   <x:String x:Key="Text.FileCM.Stage" xml:space="preserve">Stage</x:String>
   <x:String x:Key="Text.FileCM.StageMulti" xml:space="preserve">Stage {0} archivos</x:String>
   <x:String x:Key="Text.FileCM.StageSelectedLines" xml:space="preserve">Stage Cambios en Línea(s) Seleccionada(s)</x:String>
@@ -468,6 +468,7 @@
   <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Activar Transmisión</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APARIENCIA</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Fuente por defecto</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Ancho de la Pestaña del Editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Tamaño de fuente</x:String>
   <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>
@@ -638,7 +639,7 @@
   <x:String x:Key="Text.Running" xml:space="preserve">Ejecutando. Por favor espera...</x:String>
   <x:String x:Key="Text.Save" xml:space="preserve">GUARDAR</x:String>
   <x:String x:Key="Text.SaveAs" xml:space="preserve">Guardar Como...</x:String>
-  <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">¡El patch se ha guardado exitosamente!</x:String>
+  <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">¡El parche se ha guardado exitosamente!</x:String>
   <x:String x:Key="Text.ScanRepositories" xml:space="preserve">Escanear Repositorios</x:String>
   <x:String x:Key="Text.ScanRepositories.RootDir" xml:space="preserve">Directorio Raíz:</x:String>
   <x:String x:Key="Text.SelfUpdate" xml:space="preserve">Buscar Actualizaciones...</x:String>
@@ -672,6 +673,7 @@
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Aplicar</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Eliminar</x:String>
   <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Guardar como Parche...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Eliminar Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Eliminar:</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>

From 773e27fda71ff9170deb7ca3af65d9703a0044f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 01:32:14 +0000
Subject: [PATCH 203/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 849407b3..bc1ba416 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.08%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.74%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.68%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.94%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.08%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.68%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.94%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 8a7bd378..f4450c0d 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -14,14 +14,13 @@
 
 </details>
 
-### es_ES.axaml: 99.74%
+### es_ES.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Preferences.Appearance.EditorTabWidth
-- Text.StashCM.SaveAsPatch
+
 
 </details>
 

From ca6d41ee60f57a44bf7edfb87a908212e8575838 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Mar 2025 11:26:17 +0800
Subject: [PATCH 204/364] enhance: try to get stopped at revision info from
 .git/rebase-merge/head

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryRevisionByRefName.cs | 21 +++++++++++++++++++++
 src/ViewModels/InProgressContexts.cs   | 25 +++++++++++++++----------
 2 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 src/Commands/QueryRevisionByRefName.cs

diff --git a/src/Commands/QueryRevisionByRefName.cs b/src/Commands/QueryRevisionByRefName.cs
new file mode 100644
index 00000000..7fb4ecfa
--- /dev/null
+++ b/src/Commands/QueryRevisionByRefName.cs
@@ -0,0 +1,21 @@
+namespace SourceGit.Commands
+{
+    public class QueryRevisionByRefName : Command
+    {
+        public QueryRevisionByRefName(string repo, string refname)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Args = $"rev-parse {refname}";
+        }
+
+        public string Result()
+        {
+            var rs = ReadToEnd();
+            if (rs.IsSuccess && !string.IsNullOrEmpty(rs.StdOut))
+                return rs.StdOut.Trim();
+
+            return null;
+        }
+    }
+}
diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
index 2892b7cc..24b07332 100644
--- a/src/ViewModels/InProgressContexts.cs
+++ b/src/ViewModels/InProgressContexts.cs
@@ -107,19 +107,24 @@ namespace SourceGit.ViewModels
         {
             _gitDir = repo.GitDir;
 
-            var stoppedSHAPath = Path.Combine(repo.GitDir, "rebase-merge", "stopped-sha");
-            if (File.Exists(stoppedSHAPath))
-            {
-                var stoppedSHA = File.ReadAllText(stoppedSHAPath).Trim();
-                StoppedAt = new Commands.QuerySingleCommit(repo.FullPath, stoppedSHA).Result() ?? new Models.Commit() { SHA = stoppedSHA };
-            }
-
-            var ontoSHA = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "onto")).Trim();
-            Onto = new Commands.QuerySingleCommit(repo.FullPath, ontoSHA).Result() ?? new Models.Commit() { SHA = ontoSHA };
-
             HeadName = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "head-name")).Trim();
             if (HeadName.StartsWith("refs/heads/"))
                 HeadName = HeadName.Substring(11);
+            else if (HeadName.StartsWith("refs/tags/"))
+                HeadName = HeadName.Substring(10);
+
+            var stoppedSHAPath = Path.Combine(repo.GitDir, "rebase-merge", "stopped-sha");
+            var stoppedSHA = string.Empty;
+            if (File.Exists(stoppedSHAPath))
+                stoppedSHA = File.ReadAllText(stoppedSHAPath).Trim();
+            else
+                stoppedSHA = new Commands.QueryRevisionByRefName(repo.FullPath, HeadName).Result();
+
+            if (!string.IsNullOrEmpty(stoppedSHA))
+                StoppedAt = new Commands.QuerySingleCommit(repo.FullPath, stoppedSHA).Result() ?? new Models.Commit() { SHA = stoppedSHA };
+
+            var ontoSHA = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "onto")).Trim();
+            Onto = new Commands.QuerySingleCommit(repo.FullPath, ontoSHA).Result() ?? new Models.Commit() { SHA = ontoSHA };
         }
 
         public override bool Continue()

From 83f23583be039203802ae6d331ffc1a3120eaeba Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Mar 2025 12:22:47 +0800
Subject: [PATCH 205/364] enhance: supports to navigate to target commit while
 resolving conflicts

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Conflict.cs     | 10 ++--------
 src/Views/WorkingCopy.axaml    | 22 ++++++++++++----------
 src/Views/WorkingCopy.axaml.cs | 10 ++++++++++
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs
index 41a0a137..153a8d4f 100644
--- a/src/ViewModels/Conflict.cs
+++ b/src/ViewModels/Conflict.cs
@@ -35,14 +35,8 @@
             }
             else if (context is RebaseInProgress rebase)
             {
-                Theirs = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName) ??
-                    new Models.Branch()
-                    {
-                        IsLocal = true,
-                        Name = rebase.HeadName,
-                        FullName = $"refs/heads/{rebase.HeadName}"
-                    };
-
+                var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
+                Theirs = (object)b ?? rebase.StoppedAt;
                 Mine = rebase.Onto;
             }
             else if (context is RevertInProgress revert)
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 0120eda5..e5728df2 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -211,7 +211,12 @@
                         <StackPanel Orientation="Horizontal">
                           <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
                           <TextBlock Margin="4,0,0,0" Text="{Binding FriendlyName}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+                          <TextBlock Margin="4,0,0,0"
+                                     Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                                     Foreground="DarkOrange"
+                                     TextDecorations="Underline"
+                                     Cursor="Hand"
+                                     PointerPressed="OnPressedSHA"/>
                         </StackPanel>
                       </DataTemplate>
 
@@ -225,18 +230,15 @@
                                                  FontSize="11"
                                                  VerticalAlignment="Center"
                                                  UseGraphColor="False"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+                          <TextBlock Margin="4,0,0,0"
+                                     Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                                     Foreground="DarkOrange"
+                                     TextDecorations="Underline"
+                                     Cursor="Hand"
+                                     PointerPressed="OnPressedSHA"/>
                           <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
                         </StackPanel>
                       </DataTemplate>
-
-                      <DataTemplate DataType="m:Tag">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Tag}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding Name}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
-                        </StackPanel>
-                      </DataTemplate>
                     </StackPanel.DataTemplates>
                     
                     <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index 4ae4d779..04674f86 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
@@ -159,5 +160,14 @@ namespace SourceGit.Views
 
             e.Handled = true;
         }
+
+        private void OnPressedSHA(object sender, PointerPressedEventArgs e)
+        {
+            var repoView = this.FindAncestorOfType<Repository>();
+            if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text)
+                repo.NavigateToCommit(text.Text);
+
+            e.Handled = true;
+        }
     }
 }

From 43fed8e04df8bd3c5e58745b2b39e2d70c3322f7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Mar 2025 15:12:09 +0800
Subject: [PATCH 206/364] refactor: re-write `About` window

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/About.axaml    |  8 ++++----
 src/Views/About.axaml.cs | 30 +++++++++---------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 6e45ab70..ecdf156e 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -5,7 +5,7 @@
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                     x:Class="SourceGit.Views.About"
-                    x:DataType="v:About"
+                    x:Name="ThisControl"
                     Icon="/App.ico"
                     Title="{DynamicResource Text.About}"
                     SizeToContent="WidthAndHeight"
@@ -13,7 +13,7 @@
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !UseSystemWindowFrame}">
+    <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"/>
@@ -46,13 +46,13 @@
         <StackPanel Height="48" Orientation="Horizontal">
           <TextBlock Classes="bold" Text="SourceGit" FontSize="32" />
           <Border Margin="12,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 Version}" FontSize="12" Foreground="White"/>
+            <TextBlock x:Name="TxtVersion" Classes="primary" Margin="8,0" FontSize="12" Foreground="White"/>
           </Border>
         </StackPanel>
 
         <TextBlock Margin="2,0,0,0" Text="{DynamicResource Text.About.SubTitle}" FontSize="16"/>
 
-        <TextBlock Margin="2,8,0,0" Text="{Binding Copyright}" Foreground="{DynamicResource Brush.FG2}"/>
+        <TextBlock x:Name="TxtCopyright" Margin="2,8,0,0" Foreground="{DynamicResource Brush.FG2}"/>
 
         <StackPanel Orientation="Vertical" Margin="0,24,0,0">
           <StackPanel Orientation="Horizontal" Height="18">
diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs
index bbfd659c..631df0f9 100644
--- a/src/Views/About.axaml.cs
+++ b/src/Views/About.axaml.cs
@@ -5,30 +5,18 @@ namespace SourceGit.Views
 {
     public partial class About : ChromelessWindow
     {
-        public string Version
-        {
-            get;
-            private set;
-        }
-
-        public string Copyright
-        {
-            get;
-            private set;
-        }
-
         public About()
         {
-            var ver = Assembly.GetExecutingAssembly().GetName().Version;
-            if (ver != null)
-                Version = $"{ver.Major}.{ver.Minor}";
-            var attributes = Assembly.GetExecutingAssembly()
-                .GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
-            if (attributes.Length > 0)
-                Copyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
-
-            DataContext = this;
             InitializeComponent();
+
+            var assembly = Assembly.GetExecutingAssembly();
+            var ver = assembly.GetName().Version;
+            if (ver != null)
+                TxtVersion.Text = $"{ver.Major}.{ver.Minor:D2}";
+
+            var copyright = assembly.GetCustomAttribute<AssemblyCopyrightAttribute>();
+            if (copyright != null)
+                TxtCopyright.Text = copyright.Copyright;
         }
 
         private void OnVisitAvaloniaUI(object _, PointerPressedEventArgs e)

From 0860245674b7f3e42277eaf1e9aa438d4a2853de Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Mar 2025 15:44:50 +0800
Subject: [PATCH 207/364] code_style: simple window do not using DataContext

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.axaml.cs                              | 12 +++++--
 src/Views/Askpass.axaml                       | 20 +++++------
 src/Views/Askpass.axaml.cs                    | 34 ++-----------------
 src/Views/ChangeViewModeSwitcher.axaml        | 14 ++++----
 src/Views/ChangeViewModeSwitcher.axaml.cs     | 19 +++++++++--
 .../StandaloneCommitMessageEditor.axaml.cs    | 20 +++++------
 6 files changed, 54 insertions(+), 65 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 95b396de..25e32323 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -445,10 +445,14 @@ namespace SourceGit
 
             var file = args[1];
             if (!File.Exists(file))
+            {
                 desktop.Shutdown(-1);
-            else
-                desktop.MainWindow = new Views.StandaloneCommitMessageEditor(file);
+                return true;
+            }
 
+            var editor = new Views.StandaloneCommitMessageEditor();
+            editor.SetFile(file);
+            desktop.MainWindow = editor;
             return true;
         }
 
@@ -461,7 +465,9 @@ namespace SourceGit
             var args = desktop.Args;
             if (args?.Length > 0)
             {
-                desktop.MainWindow = new Views.Askpass(args[0]);
+                var askpass = new Views.Askpass();
+                askpass.TxtDescription.Text = args[0];
+                desktop.MainWindow = askpass;
                 return true;
             }
 
diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml
index f2308805..811f9c3c 100644
--- a/src/Views/Askpass.axaml
+++ b/src/Views/Askpass.axaml
@@ -5,7 +5,7 @@
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                     x:Class="SourceGit.Views.Askpass"
-                    x:DataType="v:Askpass"
+                    x:Name="ThisControl"
                     Icon="/App.ico"
                     Title="{DynamicResource Text.Askpass}"
                     SizeToContent="WidthAndHeight"
@@ -13,7 +13,7 @@
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !UseSystemWindowFrame}">
+    <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"/>
@@ -36,23 +36,23 @@
 
     <StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
       <Border Margin="16,0">
-        <TextBlock Text="{Binding Description}" TextWrapping="Wrap"/>
+        <TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/>
       </Border>
       
-      <TextBox Margin="16"
-               MinWidth="300" 
-               Height="32" 
+      <TextBox x:Name="TxtPassphrase"
+               Margin="16"
+               MinWidth="300"
+               Height="32"
                Focusable="True"
-               Text="{Binding Passphrase, Mode=TwoWay}" 
                PasswordChar="*"
-               RevealPassword="{Binding ShowPassword, Mode=OneWay}"
+               RevealPassword="{Binding #ToggleShowPassword.IsChecked, Mode=OneWay}"
                HorizontalAlignment="Stretch"
                v:AutoFocusBehaviour.IsEnabled="True">
         <TextBox.InnerRightContent>
           <ToggleButton Grid.Column="6"
+                        x:Name="ToggleShowPassword"
                         Classes="toggle_untracked"
-                        Width="26" Height="14"
-                        IsChecked="{Binding ShowPassword, Mode=TwoWay}"/>
+                        Width="26" Height="14"/>
         </TextBox.InnerRightContent>
       </TextBox>
       
diff --git a/src/Views/Askpass.axaml.cs b/src/Views/Askpass.axaml.cs
index 673fd8ef..bbe26e98 100644
--- a/src/Views/Askpass.axaml.cs
+++ b/src/Views/Askpass.axaml.cs
@@ -1,43 +1,12 @@
 using System;
-
-using Avalonia;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
     public partial class Askpass : ChromelessWindow
     {
-        public static readonly StyledProperty<bool> ShowPasswordProperty =
-            AvaloniaProperty.Register<Askpass, bool>(nameof(ShowPassword));
-
-        public bool ShowPassword
-        {
-            get => GetValue(ShowPasswordProperty);
-            set => SetValue(ShowPasswordProperty, value);
-        }
-
-        public string Description
-        {
-            get;
-            private set;
-        } = string.Empty;
-
-        public string Passphrase
-        {
-            get;
-            set;
-        } = string.Empty;
-
         public Askpass()
         {
-            DataContext = this;
-            InitializeComponent();
-        }
-
-        public Askpass(string description)
-        {
-            Description = description;
-            DataContext = this;
             InitializeComponent();
         }
 
@@ -49,7 +18,8 @@ namespace SourceGit.Views
 
         private void EnterPassword(object _1, RoutedEventArgs _2)
         {
-            Console.Out.Write($"{Passphrase}\n");
+            var passphrase = TxtPassphrase.Text ?? string.Empty;
+            Console.Out.Write($"{passphrase}\n");
             App.Quit(0);
         }
     }
diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml
index 4ded60c7..4825c2e2 100644
--- a/src/Views/ChangeViewModeSwitcher.axaml
+++ b/src/Views/ChangeViewModeSwitcher.axaml
@@ -6,21 +6,21 @@
              xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.ChangeViewModeSwitcher"
-             x:DataType="v:ChangeViewModeSwitcher">
+             x:Name="ThisControl">
   <Button Classes="icon_button" ToolTip.Tip="{DynamicResource Text.ChangeDisplayMode}">
     <Button.Flyout>
       <MenuFlyout Placement="BottomEdgeAlignedLeft">
-        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.List}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.List}">
+        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.List}" Click="SwitchToList">
           <MenuItem.Icon>
             <Path Width="12" Height="12" Data="{StaticResource Icons.List}"/>
           </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Grid}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.Grid}">
+        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Grid}" Click="SwitchToGrid">
           <MenuItem.Icon>
             <Path Width="12" Height="12" Data="{StaticResource Icons.Grid}"/>
           </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Tree}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.Tree}">
+        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Tree}" Click="SwitchToTree">
           <MenuItem.Icon>
             <Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
           </MenuItem.Icon>
@@ -31,13 +31,13 @@
     <Grid Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center">
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.List}"
-            IsVisible="{Binding ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.List}}"/>
+            IsVisible="{Binding #ThisControl.ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.List}}"/>
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.Grid}"
-            IsVisible="{Binding ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Grid}}"/>
+            IsVisible="{Binding #ThisControl.ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Grid}}"/>
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.Tree}"
-            IsVisible="{Binding ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Tree}}"/>
+            IsVisible="{Binding #ThisControl.ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Tree}}"/>
     </Grid>
   </Button>
 </UserControl>
diff --git a/src/Views/ChangeViewModeSwitcher.axaml.cs b/src/Views/ChangeViewModeSwitcher.axaml.cs
index 0cb2c4a9..ed306619 100644
--- a/src/Views/ChangeViewModeSwitcher.axaml.cs
+++ b/src/Views/ChangeViewModeSwitcher.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -16,13 +17,25 @@ namespace SourceGit.Views
 
         public ChangeViewModeSwitcher()
         {
-            DataContext = this;
             InitializeComponent();
         }
 
-        public void SwitchMode(object param)
+        private void SwitchToList(object sender, RoutedEventArgs e)
         {
-            ViewMode = (Models.ChangeViewMode)param;
+            ViewMode = Models.ChangeViewMode.List;
+            e.Handled = true;
+        }
+
+        private void SwitchToGrid(object sender, RoutedEventArgs e)
+        {
+            ViewMode = Models.ChangeViewMode.Grid;
+            e.Handled = true;
+        }
+
+        private void SwitchToTree(object sender, RoutedEventArgs e)
+        {
+            ViewMode = Models.ChangeViewMode.Tree;
+            e.Handled = true;
         }
     }
 }
diff --git a/src/Views/StandaloneCommitMessageEditor.axaml.cs b/src/Views/StandaloneCommitMessageEditor.axaml.cs
index 6833fb33..8a49ee74 100644
--- a/src/Views/StandaloneCommitMessageEditor.axaml.cs
+++ b/src/Views/StandaloneCommitMessageEditor.axaml.cs
@@ -9,18 +9,14 @@ namespace SourceGit.Views
     {
         public StandaloneCommitMessageEditor()
         {
-            _file = string.Empty;
-            DataContext = this;
             InitializeComponent();
         }
 
-        public StandaloneCommitMessageEditor(string file)
+        public void SetFile(string file)
         {
             _file = file;
-            DataContext = this;
-            InitializeComponent();
 
-            var content = File.ReadAllText(file).ReplaceLineEndings("\n");
+            var content = File.ReadAllText(file).ReplaceLineEndings("\n").Trim();
             var firstLineEnd = content.IndexOf('\n');
             if (firstLineEnd == -1)
             {
@@ -29,7 +25,7 @@ namespace SourceGit.Views
             else
             {
                 Editor.SubjectEditor.Text = content.Substring(0, firstLineEnd);
-                Editor.DescriptionEditor.Text = content.Substring(firstLineEnd + 1);
+                Editor.DescriptionEditor.Text = content.Substring(firstLineEnd + 1).Trim();
             }
         }
 
@@ -41,12 +37,16 @@ namespace SourceGit.Views
 
         private void SaveAndClose(object _1, RoutedEventArgs _2)
         {
-            File.WriteAllText(_file, Editor.Text);
-            _exitCode = 0;
+            if (!string.IsNullOrEmpty(_file))
+            {
+                File.WriteAllText(_file, Editor.Text);
+                _exitCode = 0;
+            }
+
             Close();
         }
 
-        private readonly string _file;
+        private string _file = string.Empty;
         private int _exitCode = -1;
     }
 }

From 89f655c84d462aa6b292da729048fcc2d8c9020c Mon Sep 17 00:00:00 2001
From: Gustav Andersson <xhargh@users.noreply.github.com>
Date: Fri, 7 Mar 2025 09:16:15 +0100
Subject: [PATCH 208/364] fix: Show detached HEAD (#1060)

---
 src/ViewModels/Repository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 85b819c4..2294fdde 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1012,7 +1012,7 @@ namespace SourceGit.ViewModels
 
             var filters = _settings.BuildHistoriesFilter();
             if (string.IsNullOrEmpty(filters))
-                builder.Append("--branches --remotes --tags");
+                builder.Append("--branches --remotes --tags HEAD");
             else
                 builder.Append(filters);
 

From 2fb1d7e14a2d256977e0af53fad7c7b553f8c33e Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Mon, 10 Mar 2025 04:27:25 +0300
Subject: [PATCH 209/364] update and fix translation russian (#1070)

---
 src/Resources/Locales/ru_RU.axaml | 46 ++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 4468650b..b15a769b 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -20,21 +20,21 @@
   <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.AIAssistant" xml:space="preserve">OpenAI Ассистент</x:String>
+  <x:String x:Key="Text.AIAssistant" xml:space="preserve">Помощник OpenAI</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">ПЕРЕСОЗДАТЬ</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Использовать OpenAI для создания сообщения о ревизии</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">ПРИМЕНИТЬ КАК СООБЩЕНИЕ РЕВИЗИИ</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Исправить </x:String>
   <x:String x:Key="Text.Apply.Error" xml:space="preserve">Ошибка</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Выдает ошибки и отказывается применять исправление</x:String>
+  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Выдает ошибки и отказывается применять заплатку</x:String>
   <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Все ошибки</x:String>
   <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Аналогично «ошибке», но показывает больше</x:String>
-  <x:String x:Key="Text.Apply.File" 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.NoWarn" xml:space="preserve">Нет предупреждений</x:String>
   <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Отключить предупреждения о пробелах в конце</x:String>
-  <x:String x:Key="Text.Apply.Title" xml:space="preserve">Применить исправление</x:String>
+  <x:String x:Key="Text.Apply.Title" xml:space="preserve">Применить заплатку</x:String>
   <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Предупреждать</x:String>
   <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Выдавать предупреждения о нескольких таких ошибках, но применять</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Пробел:</x:String>
@@ -58,6 +58,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Сравнить с ГОЛОВОЙ (HEAD)</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.DiscardAll" xml:space="preserve">Отклонить все изменения.</x:String>
@@ -73,6 +74,7 @@
   <x:String x:Key="Text.BranchCM.Rename" 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.BranchUpstreamInvalid" xml:space="preserve">Недопустимая основная ветка!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Байты</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ОТМЕНА</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Сбросить эту ревизию</x:String>
@@ -105,7 +107,7 @@
   <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">Инициализировать и обновить подмодуль</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Создать и обновить подмодуль</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Адрес репозитория:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">ЗАКРЫТЬ</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Редактор</x:String>
@@ -119,7 +121,7 @@
   <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Пользовательское действие</x:String>
   <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Интерактивное перемещение (rebase -i) ${0}$ сюда</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.MergeMultiple" xml:space="preserve">Влить ...</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Переместить ${0}$ сюда</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Сбросить ${0}$ сюда</x:String>
   <x:String x:Key="Text.CommitCM.Revert" xml:space="preserve">Отменить ревизию</x:String>
@@ -137,7 +139,7 @@
   <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">АВТОР</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Changed" 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.Committer" xml:space="preserve">РЕВИЗОР (ИСПОЛНИТЕЛЬ)</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Найти все ветки с этой ревизией</x:String>
   <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">ВЕТКИ С ЭТОЙ РЕВИЗИЕЙ</x:String>
   <x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Отображаются только первые 100 изменений. Смотрите все изменения на вкладке ИЗМЕНЕНИЯ.</x:String>
@@ -158,6 +160,7 @@
   <x:String x:Key="Text.Configure.CustomAction.Executable" 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.Repository" xml:space="preserve">Репозиторий</x:String>
   <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Ждать для выполения выхода</x:String>
@@ -250,13 +253,15 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">СТАРЫЙ</x:String>
   <x:String x:Key="Text.Diff.Copy" 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.Last" xml:space="preserve">Последнее различие</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Показывать скрытые символы</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">ИЗМЕНЕНИЕ ОБЪЕКТА LFS</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.Prev" xml:space="preserve">Предыдущее различие</x:String>
-  <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Сохранить как исправление</x:String>
+  <x:String x:Key="Text.Diff.SaveAsPatch" 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.New" xml:space="preserve">НОВЫЙ</x:String>
@@ -286,7 +291,7 @@
   <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Быстрая перемотка вперёд (без проверки)</x:String>
   <x:String x:Key="Text.Fetch" xml:space="preserve">Извлечь</x:String>
   <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Извлечь все внешние репозитории</x:String>
-  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Разрешить опцию '--force'</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">Разрешить опцию (--force)</x:String>
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Извлечь без меток</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Внешний репозиторий:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Извлечь внешние изменения</x:String>
@@ -296,7 +301,7 @@
   <x:String x:Key="Text.FileCM.DiscardSelectedLines" xml:space="preserve">Отменить изменения в выбранной(ых) строке(ах)</x:String>
   <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">Открыть расширенный инструмент слияния</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">Сохранить как patch-файл...</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.StageSelectedLines" xml:space="preserve">Подготовленные изменения в выбранной(ых) строке(ах)</x:String>
@@ -320,7 +325,7 @@
   <x:String x:Key="Text.GitFlow.FinishTarget" 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">Префикс исправлений:</x:String>
-  <x:String x:Key="Text.GitFlow.Init" xml:space="preserve">Инициализировать Git-поток</x:String>
+  <x:String x:Key="Text.GitFlow.Init" xml:space="preserve">Создать Git-поток</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>
@@ -403,7 +408,7 @@
   <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.Hunk.Discard" xml:space="preserve">Отклонить</x:String>
-  <x:String x:Key="Text.Init" 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">Выполняется частичный перенос ревизий (cherry-pick).</x:String>
   <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Обрабтка ревизии.</x:String>
@@ -460,10 +465,12 @@
   <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.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.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.EditorTabWidth" 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>
@@ -488,7 +495,7 @@
   <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">Разрешить '--prune' при скачивании</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Разрешить (--prune) при скачивании</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.User" xml:space="preserve">Имя пользователя</x:String>
@@ -555,7 +562,7 @@
   <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.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>
@@ -578,7 +585,7 @@
   <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.FilterCommits.Prefix" xml:space="preserve">ОТФИЛЬТРОВАНО:</x:String>
-  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Включить опцию --first-parent</x:String>
+  <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Включить опцию (--first-parent)</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>
@@ -633,7 +640,7 @@
   <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.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.SHALinkCM.CopySHA" xml:space="preserve">Копировать SHA</x:String>
@@ -667,6 +674,7 @@
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Принять</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Отбросить</x:String>
   <x:String x:Key="Text.StashCM.Pop" 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>
@@ -674,7 +682,7 @@
   <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.CommitAmount" xml:space="preserve">РЕВИЗИИ</x:String>
-  <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">РЕВИЗОРЫ(ИСПОЛНИТЕЛИ)</x:String>
+  <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">РЕВИЗИИ: </x:String>
@@ -697,10 +705,10 @@
   <x:String x:Key="Text.URL" xml:space="preserve">Сетевой адрес:</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.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.UseRemote" xml:space="preserve">Использовать опцию '--remote'</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Использовать опцию (--remote)</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>

From 978801c9ff66e2f74eec659a7e379b73a7858992 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 01:27:39 +0000
Subject: [PATCH 210/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index bc1ba416..4086a641 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.08%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.68%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-98.94%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.08%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.68%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index f4450c0d..a5abbbba 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -180,20 +180,13 @@
 
 </details>
 
-### ru_RU.axaml: 98.94%
+### ru_RU.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.BranchCM.CustomAction
-- Text.BranchUpstreamInvalid
-- Text.Configure.CustomAction.Scope.Branch
-- Text.Diff.First
-- Text.Diff.Last
-- Text.Preferences.AI.Streaming
-- Text.Preferences.Appearance.EditorTabWidth
-- Text.StashCM.SaveAsPatch
+
 
 </details>
 

From 6ba26770c4e961b231e9373dbbf08d4e8d371cfa Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 10 Mar 2025 09:28:13 +0800
Subject: [PATCH 211/364] ci: enhance Linux and Windows package workflow
 (#1071)

* ci: fix Linux packaging workflow with specific Ubuntu 20.04 image

* ci: use Compress-Archive in Windows try to prevent Defender false positives
---
 .github/workflows/package.yml    | 14 +++++++++-----
 build/scripts/package.windows.sh |  6 +++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 074c9544..2dfc97fd 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -9,10 +9,10 @@ on:
 jobs:
   windows:
     name: Package Windows
-    runs-on: ubuntu-latest
+    runs-on: windows-2019
     strategy:
       matrix:
-        runtime: [win-x64, win-arm64]
+        runtime: [ win-x64, win-arm64 ]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -22,6 +22,7 @@ jobs:
           name: sourcegit.${{ matrix.runtime }}
           path: build/SourceGit
       - name: Package
+        shell: bash
         env:
           VERSION: ${{ inputs.version }}
           RUNTIME: ${{ matrix.runtime }}
@@ -69,6 +70,7 @@ jobs:
   linux:
     name: Package Linux
     runs-on: ubuntu-latest
+    container: ubuntu:20.04
     strategy:
       matrix:
         runtime: [linux-x64, linux-arm64]
@@ -77,9 +79,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Download package dependencies
         run: |
-          sudo add-apt-repository universe
-          sudo apt-get update
-          sudo apt-get install desktop-file-utils rpm libfuse2
+          export DEBIAN_FRONTEND=noninteractive
+          ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
+          apt-get update
+          apt-get install -y curl wget git dpkg-dev fakeroot tzdata zip unzip desktop-file-utils rpm libfuse2 file build-essential binutils
       - name: Download build
         uses: actions/download-artifact@v4
         with:
@@ -89,6 +92,7 @@ jobs:
         env:
           VERSION: ${{ inputs.version }}
           RUNTIME: ${{ matrix.runtime }}
+          APPIMAGE_EXTRACT_AND_RUN: 1
         run: |
           mkdir build/SourceGit
           tar -xf "build/sourcegit.${{ matrix.runtime }}.tar" -C build/SourceGit
diff --git a/build/scripts/package.windows.sh b/build/scripts/package.windows.sh
index 6bd3879b..1a8f99c1 100755
--- a/build/scripts/package.windows.sh
+++ b/build/scripts/package.windows.sh
@@ -9,4 +9,8 @@ cd build
 
 rm -rf SourceGit/*.pdb
 
-zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit
+if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OSTYPE" == "win32" ]]; then
+  powershell -Command "Compress-Archive -Path SourceGit\\* -DestinationPath \"sourcegit_$VERSION.$RUNTIME.zip\" -Force"
+else
+  zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit
+fi

From 82fdd2e9d4a9a668380998862f978e5cac4642fb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 09:36:36 +0800
Subject: [PATCH 212/364] version: Release 2025.08

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

diff --git a/VERSION b/VERSION
index a241ab9b..a75bd422 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.07
\ No newline at end of file
+2025.08
\ No newline at end of file

From 855466686dab79b4936a669082ffde6ebb47acda Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 10:22:49 +0800
Subject: [PATCH 213/364] ux: show conflict sources when it comes from a stash
 or patch (#1067)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Conflict.cs  | 5 +++++
 src/Views/WorkingCopy.axaml | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs
index 153a8d4f..03c09e8a 100644
--- a/src/ViewModels/Conflict.cs
+++ b/src/ViewModels/Conflict.cs
@@ -49,6 +49,11 @@
                 Theirs = merge.Source;
                 Mine = repo.CurrentBranch;
             }
+            else
+            {
+                Theirs = "Stash or Patch";
+                Mine = repo.CurrentBranch;
+            }
         }
 
         public void UseTheirs()
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index e5728df2..926bce6e 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -239,6 +239,13 @@
                           <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
                         </StackPanel>
                       </DataTemplate>
+
+                      <DataTemplate DataType="x:String">
+                        <StackPanel Orientation="Horizontal">
+                          <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
+                          <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
+                        </StackPanel>
+                      </DataTemplate>
                     </StackPanel.DataTemplates>
                     
                     <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>

From df6cbcaa2873f60b3ab9d6c1de5f6a4deedfe1e4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 11:33:38 +0800
Subject: [PATCH 214/364] fix: app crashed after enable `Show children in the
 commit details` (#1072)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryCommitChildren.cs | 2 +-
 src/ViewModels/CommitDetail.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Commands/QueryCommitChildren.cs b/src/Commands/QueryCommitChildren.cs
index bef09abb..d1bced52 100644
--- a/src/Commands/QueryCommitChildren.cs
+++ b/src/Commands/QueryCommitChildren.cs
@@ -12,7 +12,7 @@ namespace SourceGit.Commands
             Args = $"rev-list -{max} --parents --branches --remotes ^{commit}";
         }
 
-        public IEnumerable<string> Result()
+        public List<string> Result()
         {
             Exec();
             return _lines;
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index a4f3f595..456e99f8 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -615,7 +615,7 @@ namespace SourceGit.ViewModels
                     var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { Cancel = _cancelToken };
                     var children = cmdChildren.Result();
                     if (!cmdChildren.Cancel.Requested)
-                        Dispatcher.UIThread.Post(() => Children.AddRange(children));
+                        Dispatcher.UIThread.Post(() => Children = children);
                 });
             }
 

From c1c0e7b2a0f459669f59d073bec172d8600f032b Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 10 Mar 2025 12:04:19 +0800
Subject: [PATCH 215/364] enhance: Save Preferences after switched Workspace
 and closed Preferences (#1073)

---
 src/ViewModels/Launcher.cs     | 1 +
 src/Views/Preferences.axaml.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 6761eccf..06479394 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -525,6 +525,7 @@ namespace SourceGit.ViewModels
             }
 
             _ignoreIndexChange = false;
+            Preferences.Instance.Save();
             GC.Collect();
         }
 
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 4696b4a7..8f9917be 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -189,6 +189,7 @@ namespace SourceGit.Views
                     new Commands.Config(null).Set($"gpg.{GPGFormat.Value}.program", GPGExecutableFile);
             }
 
+            ViewModels.Preferences.Instance.Save();
             base.OnClosing(e);
         }
 

From cdae9168ed534256027bca2eb50fd1593c70a8b6 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 10 Mar 2025 15:44:39 +0800
Subject: [PATCH 216/364] ci(windows): maintain SourceGit folder structure
 (#1076)

---
 build/scripts/package.windows.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/scripts/package.windows.sh b/build/scripts/package.windows.sh
index 1a8f99c1..c22a9d35 100755
--- a/build/scripts/package.windows.sh
+++ b/build/scripts/package.windows.sh
@@ -10,7 +10,7 @@ cd build
 rm -rf SourceGit/*.pdb
 
 if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OSTYPE" == "win32" ]]; then
-  powershell -Command "Compress-Archive -Path SourceGit\\* -DestinationPath \"sourcegit_$VERSION.$RUNTIME.zip\" -Force"
+    powershell -Command "Compress-Archive -Path SourceGit -DestinationPath \"sourcegit_$VERSION.$RUNTIME.zip\" -Force"
 else
-  zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit
+    zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit
 fi

From e65cb5049578f24d4cc033e5c63722afa645c733 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 17:48:02 +0800
Subject: [PATCH 217/364] fix: use `\` as path delim on Windows when executing
 custom actions (#1077)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/ExecuteCustomAction.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/ViewModels/ExecuteCustomAction.cs b/src/ViewModels/ExecuteCustomAction.cs
index 8e34379f..16a6410c 100644
--- a/src/ViewModels/ExecuteCustomAction.cs
+++ b/src/ViewModels/ExecuteCustomAction.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
@@ -13,7 +14,7 @@ namespace SourceGit.ViewModels
         public ExecuteCustomAction(Repository repo, Models.CustomAction action)
         {
             _repo = repo;
-            _args = action.Arguments.Replace("${REPO}", _repo.FullPath);
+            _args = action.Arguments.Replace("${REPO}", GetWorkdir());
             CustomAction = action;
             View = new Views.ExecuteCustomAction() { DataContext = this };
         }
@@ -21,7 +22,7 @@ namespace SourceGit.ViewModels
         public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Branch branch)
         {
             _repo = repo;
-            _args = action.Arguments.Replace("${REPO}", _repo.FullPath).Replace("${BRANCH}", branch.FriendlyName);
+            _args = action.Arguments.Replace("${REPO}", GetWorkdir()).Replace("${BRANCH}", branch.FriendlyName);
             CustomAction = action;
             View = new Views.ExecuteCustomAction() { DataContext = this };
         }
@@ -29,7 +30,7 @@ namespace SourceGit.ViewModels
         public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Commit commit)
         {
             _repo = repo;
-            _args = action.Arguments.Replace("${REPO}", _repo.FullPath).Replace("${SHA}", commit.SHA);
+            _args = action.Arguments.Replace("${REPO}", GetWorkdir()).Replace("${SHA}", commit.SHA);
             CustomAction = action;
             View = new Views.ExecuteCustomAction() { DataContext = this };
         }
@@ -51,6 +52,11 @@ namespace SourceGit.ViewModels
             });
         }
 
+        private string GetWorkdir()
+        {
+            return OperatingSystem.IsWindows() ? _repo.FullPath.Replace("/", "\\") : _repo.FullPath;
+        }
+
         private readonly Repository _repo = null;
         private string _args = string.Empty;
     }

From 2b2f070c4aae5789f848a8fe56dead45cd425c34 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 18:29:11 +0800
Subject: [PATCH 218/364] enhance: use `--no-optional-locks` parameter for `git
 status` command

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/CountLocalChangesWithoutUntracked.cs | 2 +-
 src/Commands/QueryLocalChanges.cs                 | 2 +-
 src/Commands/QuerySubmodules.cs                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Commands/CountLocalChangesWithoutUntracked.cs b/src/Commands/CountLocalChangesWithoutUntracked.cs
index afb62840..7ab9a54a 100644
--- a/src/Commands/CountLocalChangesWithoutUntracked.cs
+++ b/src/Commands/CountLocalChangesWithoutUntracked.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "status -uno --ignore-submodules=dirty --porcelain";
+            Args = "--no-optional-locks status -uno --ignore-submodules=dirty --porcelain";
         }
 
         public int Result()
diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs
index ea422215..9458e5f5 100644
--- a/src/Commands/QueryLocalChanges.cs
+++ b/src/Commands/QueryLocalChanges.cs
@@ -13,7 +13,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"status -u{UNTRACKED[includeUntracked ? 1 : 0]} --ignore-submodules=dirty --porcelain";
+            Args = $"--no-optional-locks status -u{UNTRACKED[includeUntracked ? 1 : 0]} --ignore-submodules=dirty --porcelain";
         }
 
         public List<Models.Change> Result()
diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs
index 6ebfa8b1..1ceccf78 100644
--- a/src/Commands/QuerySubmodules.cs
+++ b/src/Commands/QuerySubmodules.cs
@@ -49,7 +49,7 @@ namespace SourceGit.Commands
 
             if (submodules.Count > 0)
             {
-                Args = $"status -uno --porcelain -- {builder}";
+                Args = $"--no-optional-locks status -uno --porcelain -- {builder}";
                 rs = ReadToEnd();
                 if (!rs.IsSuccess)
                     return submodules;

From b4fbc2372ba5c097ec611a33a4136ede8b438a79 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 20:02:09 +0800
Subject: [PATCH 219/364] enhance: show commit info tip when hover SHA in
 conflict view

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Conflict.cs     |  35 ++++++++--
 src/Views/Conflict.axaml       | 122 +++++++++++++++++++++++++++++++++
 src/Views/Conflict.axaml.cs    |  23 +++++++
 src/Views/WorkingCopy.axaml    |  79 +--------------------
 src/Views/WorkingCopy.axaml.cs |   9 ---
 5 files changed, 176 insertions(+), 92 deletions(-)
 create mode 100644 src/Views/Conflict.axaml
 create mode 100644 src/Views/Conflict.axaml.cs

diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs
index 03c09e8a..1ccf4a33 100644
--- a/src/ViewModels/Conflict.cs
+++ b/src/ViewModels/Conflict.cs
@@ -1,5 +1,26 @@
 namespace SourceGit.ViewModels
 {
+    public class ConflictSourceBranch
+    {
+        public string Name { get; private set; }
+        public string Head { get; private set; }
+        public Models.Commit Revision { get; private set; }
+
+        public ConflictSourceBranch(string name, string head, Models.Commit revision)
+        {
+            Name = name;
+            Head = head;
+            Revision = revision;
+        }
+
+        public ConflictSourceBranch(Repository repo, Models.Branch branch)
+        {
+            Name = branch.Name;
+            Head = branch.Head;
+            Revision = new Commands.QuerySingleCommit(repo.FullPath, branch.Head).Result() ?? new Models.Commit() { SHA = branch.Head };
+        }
+    }
+
     public class Conflict
     {
         public object Theirs
@@ -31,28 +52,32 @@
             if (context is CherryPickInProgress cherryPick)
             {
                 Theirs = cherryPick.Head;
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
             else if (context is RebaseInProgress rebase)
             {
                 var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
-                Theirs = (object)b ?? rebase.StoppedAt;
+                if (b != null)
+                    Theirs = new ConflictSourceBranch(b.Name, b.Head, rebase.StoppedAt);
+                else
+                    Theirs = new ConflictSourceBranch(rebase.HeadName, rebase.StoppedAt?.SHA ?? "----------", rebase.StoppedAt);
+
                 Mine = rebase.Onto;
             }
             else if (context is RevertInProgress revert)
             {
                 Theirs = revert.Head;
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
             else if (context is MergeInProgress merge)
             {
                 Theirs = merge.Source;
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
             else
             {
                 Theirs = "Stash or Patch";
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
         }
 
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
new file mode 100644
index 00000000..9a056f9e
--- /dev/null
+++ b/src/Views/Conflict.axaml
@@ -0,0 +1,122 @@
+<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:m="using:SourceGit.Models"
+             xmlns:v="using:SourceGit.Views"
+             xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.Conflict"
+             x:DataType="vm:Conflict">
+  <Border Background="{DynamicResource Brush.Window}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+    <Grid VerticalAlignment="Center">
+      <StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
+        <StackPanel.DataTemplates>
+          <DataTemplate DataType="vm:ConflictSourceBranch">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
+              <TextBlock Margin="4,0,0,0" Text="{Binding Name}"/>
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                         Foreground="DarkOrange"
+                         TextDecorations="Underline"
+                         Cursor="Hand"
+                         PointerPressed="OnPressedSHA"
+                         ToolTip.Tip="{Binding Revision}"
+                         ToolTip.ShowDelay="0">
+                <TextBlock.DataTemplates>
+                  <DataTemplate DataType="m:Commit">
+                    <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"/>
+                      </Grid>
+
+                      <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                    </StackPanel>
+                  </DataTemplate>
+                </TextBlock.DataTemplates>
+              </TextBlock>
+            </StackPanel>
+          </DataTemplate>
+
+          <DataTemplate DataType="m:Commit">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
+              <v:CommitRefsPresenter Margin="8,0,0,0"
+                                     TagBackground="{DynamicResource Brush.DecoratorTag}"
+                                     Foreground="{DynamicResource Brush.FG1}"
+                                     FontFamily="{DynamicResource Fonts.Primary}"
+                                     FontSize="11"
+                                     VerticalAlignment="Center"
+                                     UseGraphColor="False"/>
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                         Foreground="DarkOrange"
+                         TextDecorations="Underline"
+                         Cursor="Hand"
+                         PointerPressed="OnPressedSHA"
+                         ToolTip.Tip="{Binding}"
+                         ToolTip.ShowDelay="0">
+                <TextBlock.DataTemplates>
+                  <DataTemplate DataType="m:Commit">
+                    <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"/>
+                      </Grid>
+
+                      <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                    </StackPanel>
+                  </DataTemplate>
+                </TextBlock.DataTemplates>
+              </TextBlock>
+              <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
+            </StackPanel>
+          </DataTemplate>
+
+          <DataTemplate DataType="x:String">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
+              <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
+            </StackPanel>
+          </DataTemplate>
+        </StackPanel.DataTemplates>
+
+        <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+        <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+
+        <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+          <Border.IsVisible>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+              <Binding Path="Mine" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+            </MultiBinding>
+          </Border.IsVisible>
+
+          <Grid Margin="8,0,0,0" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
+            <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
+            <ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="MINE"/>
+            <ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
+          </Grid>
+        </Border>
+
+        <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
+          <Button Classes="flat" Content="USE THEIRS" Command="{Binding UseTheirs}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="USE MINE" Command="{Binding UseMine}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="OPEN EXTERNAL MERGETOOL" Command="{Binding OpenExternalMergeTool}"/>
+        </StackPanel>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical" IsVisible="{Binding IsResolved}">
+        <Path Width="64" Height="64" Data="{StaticResource Icons.Check}" Fill="Green"/>
+        <TextBlock Margin="0,16,0,8" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts.Resolved}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+        <TextBlock Text="{DynamicResource Text.WorkingCopy.CanStageTip}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+      </StackPanel>
+    </Grid>
+  </Border>
+</UserControl>
diff --git a/src/Views/Conflict.axaml.cs b/src/Views/Conflict.axaml.cs
new file mode 100644
index 00000000..6121b5c8
--- /dev/null
+++ b/src/Views/Conflict.axaml.cs
@@ -0,0 +1,23 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+
+namespace SourceGit.Views
+{
+    public partial class Conflict : UserControl
+    {
+        public Conflict()
+        {
+            InitializeComponent();
+        }
+
+        private void OnPressedSHA(object sender, PointerPressedEventArgs e)
+        {
+            var repoView = this.FindAncestorOfType<Repository>();
+            if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text)
+                repo.NavigateToCommit(text.Text);
+
+            e.Handled = true;
+        }
+    }
+}
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 926bce6e..c9b94d59 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -203,84 +203,7 @@
         <ContentControl Content="{Binding DetailContext}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="vm:Conflict">
-              <Border Background="{DynamicResource Brush.Window}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
-                <Grid VerticalAlignment="Center">
-                  <StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
-                    <StackPanel.DataTemplates>
-                      <DataTemplate DataType="m:Branch">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding FriendlyName}"/>
-                          <TextBlock Margin="4,0,0,0"
-                                     Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                                     Foreground="DarkOrange"
-                                     TextDecorations="Underline"
-                                     Cursor="Hand"
-                                     PointerPressed="OnPressedSHA"/>
-                        </StackPanel>
-                      </DataTemplate>
-
-                      <DataTemplate DataType="m:Commit">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
-                          <v:CommitRefsPresenter Margin="8,0,0,0"
-                                                 TagBackground="{DynamicResource Brush.DecoratorTag}"
-                                                 Foreground="{DynamicResource Brush.FG1}"
-                                                 FontFamily="{DynamicResource Fonts.Primary}"
-                                                 FontSize="11"
-                                                 VerticalAlignment="Center"
-                                                 UseGraphColor="False"/>
-                          <TextBlock Margin="4,0,0,0"
-                                     Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                                     Foreground="DarkOrange"
-                                     TextDecorations="Underline"
-                                     Cursor="Hand"
-                                     PointerPressed="OnPressedSHA"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
-                        </StackPanel>
-                      </DataTemplate>
-
-                      <DataTemplate DataType="x:String">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
-                        </StackPanel>
-                      </DataTemplate>
-                    </StackPanel.DataTemplates>
-                    
-                    <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-                    <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-
-                    <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
-                      <Border.IsVisible>
-                        <MultiBinding Converter="{x:Static BoolConverters.And}">
-                          <Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                          <Binding Path="Mine" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                        </MultiBinding>
-                      </Border.IsVisible>
-
-                      <Grid Margin="8,0,0,0" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
-                        <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
-                        <ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
-                        <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="MINE"/>
-                        <ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
-                      </Grid>
-                    </Border>
-
-                    <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
-                      <Button Classes="flat" Content="USE THEIRS" Command="{Binding UseTheirs}"/>
-                      <Button Classes="flat" Margin="8,0,0,0" Content="USE MINE" Command="{Binding UseMine}"/>
-                      <Button Classes="flat" Margin="8,0,0,0" Content="OPEN EXTERNAL MERGETOOL" Command="{Binding OpenExternalMergeTool}"/>
-                    </StackPanel>
-                  </StackPanel>
-
-                  <StackPanel Orientation="Vertical" IsVisible="{Binding IsResolved}">
-                    <Path Width="64" Height="64" Data="{StaticResource Icons.Check}" Fill="Green"/>
-                    <TextBlock Margin="0,16,0,8" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts.Resolved}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-                    <TextBlock Text="{DynamicResource Text.WorkingCopy.CanStageTip}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-                  </StackPanel>
-                </Grid>                
-              </Border>
+              <v:Conflict/>
             </DataTemplate>
 
             <DataTemplate DataType="vm:DiffContext">
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index 04674f86..dfaad858 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -160,14 +160,5 @@ namespace SourceGit.Views
 
             e.Handled = true;
         }
-
-        private void OnPressedSHA(object sender, PointerPressedEventArgs e)
-        {
-            var repoView = this.FindAncestorOfType<Repository>();
-            if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text)
-                repo.NavigateToCommit(text.Text);
-
-            e.Handled = true;
-        }
     }
 }

From 860f52153b1056f0101ff982570a6845f67644e0 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 10 Mar 2025 20:05:37 +0800
Subject: [PATCH 220/364] fix: Force English locale in branch query command.
 (#1078)

---
 src/Commands/Command.cs             |  8 ++++++--
 src/Commands/ExecuteCustomAction.cs | 10 ++++++++--
 src/Commands/QueryBranches.cs       |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index 3f61de17..f0896526 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -37,6 +37,7 @@ namespace SourceGit.Commands
         public string Args { get; set; } = string.Empty;
         public bool RaiseError { get; set; } = true;
         public bool TraitErrorAsOutput { get; set; } = false;
+        protected bool ForceEnglishLocale { get; set; } = false;
 
         public bool Exec()
         {
@@ -193,8 +194,11 @@ namespace SourceGit.Commands
                 start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
 
             // Force using en_US.UTF-8 locale to avoid GCM crash
-            if (OperatingSystem.IsLinux())
-                start.Environment.Add("LANG", "en_US.UTF-8");
+            if (ForceEnglishLocale || OperatingSystem.IsLinux())
+            {
+                start.Environment.Add("LANG", "C");
+                start.Environment.Add("LC_ALL", "C");
+            }
 
             // Fix macOS `PATH` env
             if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs
index 7775da34..e343700f 100644
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@@ -19,7 +19,10 @@ namespace SourceGit.Commands
 
             // Force using en_US.UTF-8 locale to avoid GCM crash
             if (OperatingSystem.IsLinux())
-                start.Environment.Add("LANG", "en_US.UTF-8");
+            {
+                start.Environment.Add("LANG", "C");
+                start.Environment.Add("LC_ALL", "C");
+            }
 
             // Fix macOS `PATH` env
             if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
@@ -50,7 +53,10 @@ namespace SourceGit.Commands
 
             // Force using en_US.UTF-8 locale to avoid GCM crash
             if (OperatingSystem.IsLinux())
-                start.Environment.Add("LANG", "en_US.UTF-8");
+            {
+                start.Environment.Add("LANG", "C");
+                start.Environment.Add("LC_ALL", "C");
+            }
 
             // Fix macOS `PATH` env
             if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
index 44438cef..effd25b0 100644
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@@ -14,6 +14,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
+            ForceEnglishLocale = true;
             Args = "branch -l --all -v --format=\"%(refname)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
         }
 

From 0f9087fac6088712240a3b109ed8e469162a9c9f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 20:08:42 +0800
Subject: [PATCH 221/364] code_review: PR #1078

- Remove `ForceEnglishLocale` because we want all `git` outputs in English
- Remove locale settings for `ExecuteCustomAction`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Command.cs             |  5 ++---
 src/Commands/ExecuteCustomAction.cs | 14 --------------
 src/Commands/QueryBranches.cs       |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index f0896526..a3e6673b 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -37,7 +37,6 @@ namespace SourceGit.Commands
         public string Args { get; set; } = string.Empty;
         public bool RaiseError { get; set; } = true;
         public bool TraitErrorAsOutput { get; set; } = false;
-        protected bool ForceEnglishLocale { get; set; } = false;
 
         public bool Exec()
         {
@@ -193,8 +192,8 @@ namespace SourceGit.Commands
             if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
                 start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
 
-            // Force using en_US.UTF-8 locale to avoid GCM crash
-            if (ForceEnglishLocale || OperatingSystem.IsLinux())
+            // Force using en_US.UTF-8 locale
+            if (OperatingSystem.IsLinux())
             {
                 start.Environment.Add("LANG", "C");
                 start.Environment.Add("LC_ALL", "C");
diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs
index e343700f..894637a5 100644
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@@ -17,13 +17,6 @@ namespace SourceGit.Commands
             start.CreateNoWindow = true;
             start.WorkingDirectory = repo;
 
-            // Force using en_US.UTF-8 locale to avoid GCM crash
-            if (OperatingSystem.IsLinux())
-            {
-                start.Environment.Add("LANG", "C");
-                start.Environment.Add("LC_ALL", "C");
-            }
-
             // Fix macOS `PATH` env
             if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
                 start.Environment.Add("PATH", Native.OS.CustomPathEnv);
@@ -51,13 +44,6 @@ namespace SourceGit.Commands
             start.StandardErrorEncoding = Encoding.UTF8;
             start.WorkingDirectory = repo;
 
-            // Force using en_US.UTF-8 locale to avoid GCM crash
-            if (OperatingSystem.IsLinux())
-            {
-                start.Environment.Add("LANG", "C");
-                start.Environment.Add("LC_ALL", "C");
-            }
-
             // Fix macOS `PATH` env
             if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
                 start.Environment.Add("PATH", Native.OS.CustomPathEnv);
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
index effd25b0..44438cef 100644
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@@ -14,7 +14,6 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            ForceEnglishLocale = true;
             Args = "branch -l --all -v --format=\"%(refname)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
         }
 

From 5c279b4b5618d4d859ff23b3e624cf6ccb293112 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 21:19:38 +0800
Subject: [PATCH 222/364] feature: add global configuration for custom action
 (#1077)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/RepositorySettings.cs |   6 +-
 src/ViewModels/Histories.cs      |   5 ++
 src/ViewModels/Preferences.cs    |   6 ++
 src/ViewModels/Repository.cs     |  12 ++++
 src/Views/Preferences.axaml      | 116 ++++++++++++++++++++++++++++++-
 src/Views/Preferences.axaml.cs   |  43 ++++++++++++
 6 files changed, 182 insertions(+), 6 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 08bf48ca..76a7f160 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -471,11 +471,7 @@ namespace SourceGit.Models
 
         public CustomAction AddNewCustomAction()
         {
-            var act = new CustomAction()
-            {
-                Name = "Unnamed Custom Action",
-            };
-
+            var act = new CustomAction() { Name = "Unnamed Action" };
             CustomActions.Add(act);
             return act;
         }
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 48ce114d..301cbb3c 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -695,6 +695,11 @@ namespace SourceGit.ViewModels
             menu.Items.Add(new MenuItem() { Header = "-" });
 
             var actions = new List<Models.CustomAction>();
+            foreach (var action in Preferences.Instance.CustomActions)
+            {
+                if (action.Scope == Models.CustomActionScope.Commit)
+                    actions.Add(action);
+            }
             foreach (var action in _repo.Settings.CustomActions)
             {
                 if (action.Scope == Models.CustomActionScope.Commit)
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 016fd4c4..dae90517 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -342,6 +342,12 @@ namespace SourceGit.ViewModels
             set;
         } = [];
 
+        public AvaloniaList<Models.CustomAction> CustomActions
+        {
+            get;
+            set;
+        } = [];
+
         public AvaloniaList<Models.OpenAIService> OpenAIServices
         {
             get;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 2294fdde..5d2778c9 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1444,6 +1444,12 @@ namespace SourceGit.ViewModels
         public ContextMenu CreateContextMenuForCustomAction()
         {
             var actions = new List<Models.CustomAction>();
+            foreach (var action in Preferences.Instance.CustomActions)
+            {
+                if (action.Scope == Models.CustomActionScope.Repository)
+                    actions.Add(action);
+            }
+
             foreach (var action in _settings.CustomActions)
             {
                 if (action.Scope == Models.CustomActionScope.Repository)
@@ -2350,6 +2356,12 @@ namespace SourceGit.ViewModels
         private void TryToAddCustomActionsToBranchContextMenu(ContextMenu menu, Models.Branch branch)
         {
             var actions = new List<Models.CustomAction>();
+            foreach (var action in Preferences.Instance.CustomActions)
+            {
+                if (action.Scope == Models.CustomActionScope.Branch)
+                    actions.Add(action);
+            }
+
             foreach (var action in Settings.CustomActions)
             {
                 if (action.Scope == Models.CustomActionScope.Branch)
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 12679e50..236deb1f 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -527,12 +527,126 @@
           </StackPanel>
         </TabItem>
 
+        <TabItem>
+          <TabItem.Header>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.CustomAction}"/>
+          </TabItem.Header>
+
+          <Grid MinHeight="340" Margin="0,8,0,16">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="200"/>
+              <ColumnDefinition Width="*" MaxWidth="400"/>
+            </Grid.ColumnDefinitions>
+            
+            <Border Grid.Column="0"
+                    BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
+                    Background="{DynamicResource Brush.Contents}">
+              <Grid RowDefinitions="*,1,Auto">
+                <ListBox Grid.Row="0"
+                         Background="Transparent"
+                         ItemsSource="{Binding CustomActions}"
+                         SelectedItem="{Binding #ThisControl.SelectedCustomAction, Mode=TwoWay}"
+                         SelectionMode="Single">
+                  <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                      <Setter Property="MinHeight" Value="0"/>
+                      <Setter Property="Height" Value="26"/>
+                      <Setter Property="Padding" Value="4,2"/>
+                    </Style>
+                  </ListBox.Styles>
+
+                  <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                      <StackPanel Orientation="Vertical"/>
+                    </ItemsPanelTemplate>
+                  </ListBox.ItemsPanel>
+
+                  <ListBox.ItemTemplate>
+                    <DataTemplate DataType="m:CustomAction">
+                      <Grid Margin="4,0" ColumnDefinitions="Auto,*">
+                        <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.Action}" Fill="{DynamicResource Brush.FG1}"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="6,0,0,0" TextTrimming="CharacterEllipsis"/>
+                      </Grid>
+                    </DataTemplate>
+                  </ListBox.ItemTemplate>
+                </ListBox>
+
+                <Rectangle Grid.Row="1" Height="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
+
+                <StackPanel Grid.Row="2" Orientation="Horizontal" Background="{DynamicResource Brush.ToolBar}">
+                  <Button Classes="icon_button" Click="OnAddCustomAction">
+                    <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="OnRemoveSelectedCustomAction">
+                    <Path Width="14" Height="14" Data="{StaticResource Icons.Window.Minimize}"/>
+                  </Button>
+
+                  <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
+                </StackPanel>
+              </Grid>
+            </Border>
+
+            <ContentControl Grid.Column="1" Margin="16,0,0,0">
+              <ContentControl.Content>
+                <Binding Path="SelectedCustomAction" ElementName="ThisControl">
+                  <Binding.TargetNullValue>
+                    <Path Width="64" Height="64"
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          Fill="{DynamicResource Brush.FG2}"
+                          Data="{StaticResource Icons.Empty}"/>
+                  </Binding.TargetNullValue>
+                </Binding>
+              </ContentControl.Content>
+
+              <ContentControl.DataTemplates>
+                <DataTemplate DataType="m:CustomAction">
+                  <StackPanel Orientation="Vertical">
+                    <TextBlock Text="{DynamicResource Text.Configure.CustomAction.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.CustomAction.Scope}"/>
+                    <ComboBox Margin="0,4,0,0" Height="28" HorizontalAlignment="Stretch" SelectedIndex="{Binding Scope, Mode=TwoWay}">
+                      <ComboBoxItem Content="{DynamicResource Text.Configure.CustomAction.Scope.Repository}"/>
+                      <ComboBoxItem Content="{DynamicResource Text.Configure.CustomAction.Scope.Commit}"/>
+                      <ComboBoxItem Content="{DynamicResource Text.Configure.CustomAction.Scope.Branch}"/>
+                    </ComboBox>
+
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Executable}"/>
+                    <TextBox Margin="0,4,0,0" Height="28" CornerRadius="3" Text="{Binding Executable, Mode=TwoWay}">
+                      <TextBox.InnerRightContent>
+                        <Button Classes="icon_button" Width="30" Height="30" Click="SelectExecutableForCustomAction">
+                          <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+                        </Button>
+                      </TextBox.InnerRightContent>
+                    </TextBox>
+
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Arguments}"/>
+                    <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Arguments, Mode=TwoWay}"/>
+                    <TextBlock Margin="0,2,0,0" TextWrapping="Wrap" Text="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}" Foreground="{DynamicResource Brush.FG2}"/>
+
+                    <CheckBox Margin="0,8,0,0" Content="{DynamicResource Text.Configure.CustomAction.WaitForExit}" IsChecked="{Binding WaitForExit, Mode=TwoWay}"/>
+                  </StackPanel>
+                </DataTemplate>
+              </ContentControl.DataTemplates>
+            </ContentControl>
+          </Grid>
+        </TabItem>
+        
         <TabItem>
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.AI}"/>
           </TabItem.Header>
 
-          <Grid ColumnDefinitions="200,*" Margin="0,8,0,16" MinHeight="400">
+          <Grid Margin="0,8,0,16" MinHeight="400">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="200"/>
+              <ColumnDefinition Width="*" MaxWidth="400"/>
+            </Grid.ColumnDefinitions>
+            
             <Border Grid.Column="0"
                     BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                     Background="{DynamicResource Brush.Contents}">
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 8f9917be..324d2375 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -103,6 +103,15 @@ namespace SourceGit.Views
             set => SetValue(SelectedOpenAIServiceProperty, value);
         }
 
+        public static readonly StyledProperty<Models.CustomAction> SelectedCustomActionProperty =
+            AvaloniaProperty.Register<Preferences, Models.CustomAction>(nameof(SelectedCustomAction));
+
+        public Models.CustomAction SelectedCustomAction
+        {
+            get => GetValue(SelectedCustomActionProperty);
+            set => SetValue(SelectedCustomActionProperty, value);
+        }
+
         public Preferences()
         {
             var pref = ViewModels.Preferences.Instance;
@@ -368,6 +377,40 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
+        private void OnAddCustomAction(object sender, RoutedEventArgs e)
+        {
+            var action = new Models.CustomAction() { Name = "Unnamed Action (Global)" };
+            ViewModels.Preferences.Instance.CustomActions.Add(action);
+            SelectedCustomAction = action;
+
+            e.Handled = true;
+        }
+
+        private async void SelectExecutableForCustomAction(object sender, RoutedEventArgs e)
+        {
+            var options = new FilePickerOpenOptions()
+            {
+                FileTypeFilter = [new FilePickerFileType("Executable file(script)") { Patterns = ["*.*"] }],
+                AllowMultiple = false,
+            };
+
+            var selected = await StorageProvider.OpenFilePickerAsync(options);
+            if (selected.Count == 1 && sender is Button { DataContext: Models.CustomAction action })
+                action.Executable = selected[0].Path.LocalPath;
+
+            e.Handled = true;
+        }
+
+        private void OnRemoveSelectedCustomAction(object sender, RoutedEventArgs e)
+        {
+            if (SelectedCustomAction == null)
+                return;
+
+            ViewModels.Preferences.Instance.CustomActions.Remove(SelectedCustomAction);
+            SelectedCustomAction = null;
+            e.Handled = true;
+        }
+
         private void UpdateGitVersion()
         {
             GitVersion = Native.OS.GitVersionString;

From cf8cff6b64eb78c96800ce5dbf46e75ebe2e9903 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 21:30:04 +0800
Subject: [PATCH 223/364] code_style: add
 `ViewModels.Repository.GetCustomAction(scope)`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Histories.cs  | 12 +--------
 src/ViewModels/Repository.cs | 47 ++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 301cbb3c..707e8c43 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -694,17 +694,7 @@ namespace SourceGit.ViewModels
             menu.Items.Add(archive);
             menu.Items.Add(new MenuItem() { Header = "-" });
 
-            var actions = new List<Models.CustomAction>();
-            foreach (var action in Preferences.Instance.CustomActions)
-            {
-                if (action.Scope == Models.CustomActionScope.Commit)
-                    actions.Add(action);
-            }
-            foreach (var action in _repo.Settings.CustomActions)
-            {
-                if (action.Scope == Models.CustomActionScope.Commit)
-                    actions.Add(action);
-            }
+            var actions = _repo.GetCustomActions(Models.CustomActionScope.Commit);
             if (actions.Count > 0)
             {
                 var custom = new MenuItem();
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 5d2778c9..96d0b36c 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -943,6 +943,25 @@ namespace SourceGit.ViewModels
             _workingCopy?.AbortMerge();
         }
 
+        public List<Models.CustomAction> GetCustomActions(Models.CustomActionScope scope)
+        {
+            var actions = new List<Models.CustomAction>();
+
+            foreach (var act in Preferences.Instance.CustomActions)
+            {
+                if (act.Scope == scope)
+                    actions.Add(act);
+            }
+
+            foreach (var act in _settings.CustomActions)
+            {
+                if (act.Scope == scope)
+                    actions.Add(act);
+            }
+
+            return actions;
+        }
+
         public void RefreshBranches()
         {
             var branches = new Commands.QueryBranches(_fullpath).Result();
@@ -1443,22 +1462,10 @@ namespace SourceGit.ViewModels
 
         public ContextMenu CreateContextMenuForCustomAction()
         {
-            var actions = new List<Models.CustomAction>();
-            foreach (var action in Preferences.Instance.CustomActions)
-            {
-                if (action.Scope == Models.CustomActionScope.Repository)
-                    actions.Add(action);
-            }
-
-            foreach (var action in _settings.CustomActions)
-            {
-                if (action.Scope == Models.CustomActionScope.Repository)
-                    actions.Add(action);
-            }
-
             var menu = new ContextMenu();
             menu.Placement = PlacementMode.BottomEdgeAlignedLeft;
 
+            var actions = GetCustomActions(Models.CustomActionScope.Repository);
             if (actions.Count > 0)
             {
                 foreach (var action in actions)
@@ -2355,19 +2362,7 @@ namespace SourceGit.ViewModels
 
         private void TryToAddCustomActionsToBranchContextMenu(ContextMenu menu, Models.Branch branch)
         {
-            var actions = new List<Models.CustomAction>();
-            foreach (var action in Preferences.Instance.CustomActions)
-            {
-                if (action.Scope == Models.CustomActionScope.Branch)
-                    actions.Add(action);
-            }
-
-            foreach (var action in Settings.CustomActions)
-            {
-                if (action.Scope == Models.CustomActionScope.Branch)
-                    actions.Add(action);
-            }
-
+            var actions = GetCustomActions(Models.CustomActionScope.Branch);
             if (actions.Count == 0)
                 return;
 

From f496d15f70a7ae5395170f6289bce511129baeff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=A3=D1=81=D0=BE?=
 =?UTF-8?q?=D1=86=D0=BA=D0=B8=D0=B9?= <aquarius-stella@yandex.ru>
Date: Mon, 10 Mar 2025 20:15:29 +0300
Subject: [PATCH 224/364] update russian localization

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

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index b15a769b..ff24912e 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -11,9 +11,9 @@
   <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Исходный код можно найти по адресу </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Бесплатный графический клиент Git с исходным кодом</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Добавить рабочий каталог</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Что проверить:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" 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" xml:space="preserve">Переключиться на:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">ветку из списка</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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>
@@ -126,7 +126,7 @@
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Сбросить ${0}$ сюда</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">Сохранить как patch-файл...</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.CommitCM.SquashCommitsSinceThis" xml:space="preserve">Объединить все следующие ревизии с этим</x:String>
   <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">ИЗМЕНЕНИЯ</x:String>
@@ -167,7 +167,7 @@
   <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">Автоматическая загрузка изменений</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.DefaultRemote" xml:space="preserve">Внешний репозиторий по умолчанию</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ОТСЛЕЖИВАНИЕ ПРОБЛЕМ</x:String>
@@ -218,15 +218,15 @@
   <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" xml:space="preserve">Сообщение с&#13;меткой:</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.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.DeleteBranch" xml:space="preserve">Удалить ветку</x:String>
@@ -237,7 +237,7 @@
   <x:String x:Key="Text.DeleteMultiBranch.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">Path:</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.TitleForGroup" xml:space="preserve">Подтвердите удаление группы</x:String>
@@ -262,7 +262,7 @@
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">НИКАКИХ ИЗМЕНЕНИЙ ИЛИ МЕНЯЕТСЯ ТОЛЬКО EOL</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.SideBySide" 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.New" xml:space="preserve">НОВЫЙ</x:String>
   <x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">Обмен</x:String>
@@ -553,7 +553,7 @@
   <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">Адрес репозитория:</x:String>
+  <x:String x:Key="Text.Remote.URL" xml:space="preserve">Адрес:</x:String>
   <x:String x:Key="Text.Remote.URL.Placeholder" xml:space="preserve">Адрес внешнего репозитория git</x:String>
   <x:String x:Key="Text.RemoteCM.CopyURL" xml:space="preserve">Копировать адрес</x:String>
   <x:String x:Key="Text.RemoteCM.Delete" xml:space="preserve">Удалить...</x:String>
@@ -693,8 +693,8 @@
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Копировать относительный путь</x:String>
   <x:String x:Key="Text.Submodule.FetchNested" 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.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.Sure" xml:space="preserve">ОК</x:String>
   <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Копировать имя метки</x:String>

From 5f2bd8ad943c3fb5af83d95ec2e1bb0483653b87 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 09:27:32 +0800
Subject: [PATCH 225/364] ux: layout for `Preferences` window

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

diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 236deb1f..7bc83b10 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -422,7 +422,7 @@
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Integration}"/>
           </TabItem.Header>
 
-          <StackPanel Margin="8" MaxWidth="580" Orientation="Vertical" Grid.IsSharedSizeScope="True">
+          <StackPanel Margin="8" Orientation="Vertical" Grid.IsSharedSizeScope="True">
             <StackPanel Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Terminal}"/>
               <TextBlock Classes="bold" Margin="4,0,0,0" Text="{DynamicResource Text.Preferences.Shell}"/>

From 54d49a9edafbec871f4c862011bedbcf21b7e51e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 09:36:13 +0800
Subject: [PATCH 226/364] fix: app crashes when close a repository on read-only
 drive (#1080)

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

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 96d0b36c..31de381a 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -518,7 +518,7 @@ namespace SourceGit.ViewModels
             {
                 File.WriteAllText(Path.Combine(_gitDir, "sourcegit.settings"), settingsSerialized);
             }
-            catch (DirectoryNotFoundException)
+            catch
             {
                 // Ignore
             }

From f23e3478e625362bc23fc428757139e57d270fea Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 11:41:37 +0800
Subject: [PATCH 227/364] fix: do not save preference in design mode

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/ConfigureWorkspace.axaml.cs  | 4 +++-
 src/Views/Launcher.axaml.cs            | 4 +++-
 src/Views/Preferences.axaml.cs         | 6 +++++-
 src/Views/RepositoryConfigure.axaml.cs | 4 +++-
 src/Views/WorkingCopy.axaml.cs         | 1 -
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Views/ConfigureWorkspace.axaml.cs b/src/Views/ConfigureWorkspace.axaml.cs
index 012c2e85..9e458f6f 100644
--- a/src/Views/ConfigureWorkspace.axaml.cs
+++ b/src/Views/ConfigureWorkspace.axaml.cs
@@ -11,8 +11,10 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            ViewModels.Preferences.Instance.Save();
             base.OnClosing(e);
+
+            if (!Design.IsDesignMode)
+                ViewModels.Preferences.Instance.Save();
         }
     }
 }
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index b8c09b35..9ccec78c 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -273,8 +273,10 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            (DataContext as ViewModels.Launcher)?.Quit(Width, Height);
             base.OnClosing(e);
+
+            if (!Design.IsDesignMode && DataContext is ViewModels.Launcher launcher)
+                launcher.Quit(Width, Height);
         }
 
         private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 324d2375..73b2e995 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -169,6 +169,11 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
+            base.OnClosing(e);
+
+            if (Design.IsDesignMode)
+                return;
+
             var config = new Commands.Config(null).ListAll();
             SetIfChanged(config, "user.name", DefaultUser, "");
             SetIfChanged(config, "user.email", DefaultEmail, "");
@@ -199,7 +204,6 @@ namespace SourceGit.Views
             }
 
             ViewModels.Preferences.Instance.Save();
-            base.OnClosing(e);
         }
 
         private async void SelectThemeOverrideFile(object _, RoutedEventArgs e)
diff --git a/src/Views/RepositoryConfigure.axaml.cs b/src/Views/RepositoryConfigure.axaml.cs
index 3faba5ee..455731aa 100644
--- a/src/Views/RepositoryConfigure.axaml.cs
+++ b/src/Views/RepositoryConfigure.axaml.cs
@@ -13,8 +13,10 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            (DataContext as ViewModels.RepositoryConfigure)?.Save();
             base.OnClosing(e);
+
+            if (!Design.IsDesignMode && DataContext is ViewModels.RepositoryConfigure configure)
+                configure.Save();
         }
 
         private async void SelectExecutableForCustomAction(object sender, RoutedEventArgs e)
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index dfaad858..4ae4d779 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {

From 471452646b48c58b6bf64a069e777ba6fe0d9afa Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 16:53:51 +0800
Subject: [PATCH 228/364] refactor: use `System.Threading.CancellationToken`
 instead of `SourceGit.Commands.Command.CancelToken` to cancel fetching
 information of selected commit

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Command.cs        | 48 ++++++++++++++--------------------
 src/ViewModels/CommitDetail.cs | 35 ++++++++++++++-----------
 2 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index a3e6673b..cedaf674 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 
 using Avalonia.Threading;
 
@@ -10,11 +11,6 @@ namespace SourceGit.Commands
 {
     public partial class Command
     {
-        public class CancelToken
-        {
-            public bool Requested { get; set; } = false;
-        }
-
         public class ReadToEndResult
         {
             public bool IsSuccess { get; set; } = false;
@@ -30,7 +26,7 @@ namespace SourceGit.Commands
         }
 
         public string Context { get; set; } = string.Empty;
-        public CancelToken Cancel { get; set; } = null;
+        public CancellationToken CancellationToken { get; set; } = CancellationToken.None;
         public string WorkingDirectory { get; set; } = null;
         public EditorType Editor { get; set; } = EditorType.CoreEditor; // Only used in Exec() mode
         public string SSHKey { get; set; } = string.Empty;
@@ -43,36 +39,15 @@ namespace SourceGit.Commands
             var start = CreateGitStartInfo();
             var errs = new List<string>();
             var proc = new Process() { StartInfo = start };
-            var isCancelled = false;
 
             proc.OutputDataReceived += (_, e) =>
             {
-                if (Cancel != null && Cancel.Requested)
-                {
-                    isCancelled = true;
-                    proc.CancelErrorRead();
-                    proc.CancelOutputRead();
-                    if (!proc.HasExited)
-                        proc.Kill(true);
-                    return;
-                }
-
                 if (e.Data != null)
                     OnReadline(e.Data);
             };
 
             proc.ErrorDataReceived += (_, e) =>
             {
-                if (Cancel != null && Cancel.Requested)
-                {
-                    isCancelled = true;
-                    proc.CancelErrorRead();
-                    proc.CancelOutputRead();
-                    if (!proc.HasExited)
-                        proc.Kill(true);
-                    return;
-                }
-
                 if (string.IsNullOrEmpty(e.Data))
                 {
                     errs.Add(string.Empty);
@@ -97,9 +72,25 @@ namespace SourceGit.Commands
                 errs.Add(e.Data);
             };
 
+            var dummy = null as Process;
             try
             {
                 proc.Start();
+
+                // It not safe, please only use `CancellationToken` in readonly commands.
+                if (CancellationToken.CanBeCanceled)
+                {
+                    dummy = proc;
+                    CancellationToken.Register(() =>
+                    {
+                        if (dummy is { HasExited: false })
+                        {
+                            dummy.CancelErrorRead();
+                            dummy.CancelOutputRead();
+                            dummy.Kill();
+                        }
+                    });
+                }
             }
             catch (Exception e)
             {
@@ -113,10 +104,11 @@ namespace SourceGit.Commands
             proc.BeginErrorReadLine();
             proc.WaitForExit();
 
+            dummy = null;
             int exitCode = proc.ExitCode;
             proc.Close();
 
-            if (!isCancelled && exitCode != 0)
+            if (!CancellationToken.IsCancellationRequested && exitCode != 0)
             {
                 if (RaiseError)
                 {
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 456e99f8..c6ef8367 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia.Controls;
@@ -171,7 +172,7 @@ namespace SourceGit.ViewModels
             _searchChangeFilter = null;
             _diffContext = null;
             _viewRevisionFileContent = null;
-            _cancelToken = null;
+            _cancellationSource = null;
             WebLinks.Clear();
             _revisionFiles = null;
             _revisionFileSearchSuggestion = null;
@@ -589,32 +590,36 @@ namespace SourceGit.ViewModels
             if (_commit == null)
                 return;
 
+            if (_cancellationSource is { IsCancellationRequested: false })
+                _cancellationSource.Cancel();
+
+            _cancellationSource = new CancellationTokenSource();
+            var token = _cancellationSource.Token;
+
             Task.Run(() =>
             {
                 var message = new Commands.QueryCommitFullMessage(_repo.FullPath, _commit.SHA).Result();
                 var links = ParseLinksInMessage(message);
-                Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Links = links });
+
+                if (!token.IsCancellationRequested)
+                    Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Links = links });
             });
 
             Task.Run(() =>
             {
                 var signInfo = new Commands.QueryCommitSignInfo(_repo.FullPath, _commit.SHA, !_repo.HasAllowedSignersFile).Result();
-                Dispatcher.UIThread.Invoke(() => SignInfo = signInfo);
+                if (!token.IsCancellationRequested)
+                    Dispatcher.UIThread.Invoke(() => SignInfo = signInfo);
             });
 
-            if (_cancelToken != null)
-                _cancelToken.Requested = true;
-
-            _cancelToken = new Commands.Command.CancelToken();
-
             if (Preferences.Instance.ShowChildren)
             {
                 Task.Run(() =>
                 {
                     var max = Preferences.Instance.MaxHistoryCommits;
-                    var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { Cancel = _cancelToken };
-                    var children = cmdChildren.Result();
-                    if (!cmdChildren.Cancel.Requested)
+                    var cmd = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { CancellationToken = token };
+                    var children = cmd.Result();
+                    if (!token.IsCancellationRequested)
                         Dispatcher.UIThread.Post(() => Children = children);
                 });
             }
@@ -622,8 +627,8 @@ namespace SourceGit.ViewModels
             Task.Run(() =>
             {
                 var parent = _commit.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : _commit.Parents[0];
-                var cmdChanges = new Commands.CompareRevisions(_repo.FullPath, parent, _commit.SHA) { Cancel = _cancelToken };
-                var changes = cmdChanges.Result();
+                var cmd = new Commands.CompareRevisions(_repo.FullPath, parent, _commit.SHA) { CancellationToken = token };
+                var changes = cmd.Result();
                 var visible = changes;
                 if (!string.IsNullOrWhiteSpace(_searchChangeFilter))
                 {
@@ -635,7 +640,7 @@ namespace SourceGit.ViewModels
                     }
                 }
 
-                if (!cmdChanges.Cancel.Requested)
+                if (!token.IsCancellationRequested)
                 {
                     Dispatcher.UIThread.Post(() =>
                     {
@@ -873,7 +878,7 @@ namespace SourceGit.ViewModels
         private string _searchChangeFilter = string.Empty;
         private DiffContext _diffContext = null;
         private object _viewRevisionFileContent = null;
-        private Commands.Command.CancelToken _cancelToken = null;
+        private CancellationTokenSource _cancellationSource = null;
         private List<string> _revisionFiles = null;
         private string _revisionFileSearchFilter = string.Empty;
         private List<string> _revisionFileSearchSuggestion = null;

From 2fc03025eef98c6641e8045232256691675ce7db Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 19:52:50 +0800
Subject: [PATCH 229/364] fix: file suggestion popup did not show while
 searching commit by file path

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

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 31de381a..ebf9210e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -321,7 +321,7 @@ namespace SourceGit.ViewModels
             set
             {
                 if (SetProperty(ref _searchCommitFilter, value) &&
-                    _searchCommitFilterType == 3 &&
+                    _searchCommitFilterType == 4 &&
                     !string.IsNullOrEmpty(value) &&
                     value.Length >= 2 &&
                     _revisionFiles.Count > 0)
@@ -2395,14 +2395,14 @@ namespace SourceGit.ViewModels
         {
             _revisionFiles.Clear();
 
-            if (_searchCommitFilterType == 3)
+            if (_searchCommitFilterType == 4)
             {
                 Task.Run(() =>
                 {
                     var files = new Commands.QueryRevisionFileNames(_fullpath, "HEAD").Result();
                     Dispatcher.UIThread.Invoke(() =>
                     {
-                        if (_searchCommitFilterType != 3)
+                        if (_searchCommitFilterType != 4)
                             return;
 
                         _revisionFiles.AddRange(files);

From 91c5c96afc3a070ca8b491a3e992ef5dbcb70d54 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 20:05:05 +0800
Subject: [PATCH 230/364] fix: accessing `dummy` in multi-threads throws
 exception

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Command.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index cedaf674..5197de11 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -73,6 +73,7 @@ namespace SourceGit.Commands
             };
 
             var dummy = null as Process;
+            var dummyProcLock = new object();
             try
             {
                 proc.Start();
@@ -83,11 +84,10 @@ namespace SourceGit.Commands
                     dummy = proc;
                     CancellationToken.Register(() =>
                     {
-                        if (dummy is { HasExited: false })
+                        lock (dummyProcLock)
                         {
-                            dummy.CancelErrorRead();
-                            dummy.CancelOutputRead();
-                            dummy.Kill();
+                            if (dummy is { HasExited: false })
+                                dummy.Kill();
                         }
                     });
                 }
@@ -104,7 +104,14 @@ namespace SourceGit.Commands
             proc.BeginErrorReadLine();
             proc.WaitForExit();
 
-            dummy = null;
+            if (dummy != null)
+            {
+                lock (dummyProcLock)
+                {
+                    dummy = null;
+                }
+            }
+
             int exitCode = proc.ExitCode;
             proc.Close();
 

From fa4d9d24e9ab5f1dfd8bf8f75fadddd8b903a23c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 20:22:32 +0800
Subject: [PATCH 231/364] enhance: hide suggestion popups when window is
 deactived (#963)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Repository.axaml    | 10 ++++++++--
 src/Views/RevisionFiles.axaml | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 30180f7d..bfa5a5e1 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -421,8 +421,14 @@
 
           <Popup PlacementTarget="{Binding #TxtSearchCommitsBox}"
                  Placement="BottomEdgeAlignedLeft"
-                 HorizontalOffset="-8" VerticalAlignment="-8"
-                 IsOpen="{Binding IsSearchCommitSuggestionOpen}">
+                 HorizontalOffset="-8" VerticalAlignment="-8">
+            <Popup.IsOpen>
+              <MultiBinding Converter="{x:Static BoolConverters.And}">
+                <Binding Path="IsSearchCommitSuggestionOpen"/>
+                <Binding Path="$parent[Window].IsActive"/>
+              </MultiBinding>
+            </Popup.IsOpen>
+            
             <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
               <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
                 <ListBox x:Name="SearchSuggestionBox"
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 6847b14b..ed381bf8 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -43,8 +43,14 @@
 
         <Popup PlacementTarget="{Binding #TxtSearchRevisionFiles}"
                Placement="BottomEdgeAlignedLeft"
-               HorizontalOffset="-8" VerticalAlignment="-8"
-               IsOpen="{Binding RevisionFileSearchSuggestion, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}">
+               HorizontalOffset="-8" VerticalAlignment="-8">
+          <Popup.IsOpen>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="RevisionFileSearchSuggestion" Converter="{x:Static c:ListConverters.IsNotNullOrEmpty}}"/>
+              <Binding Path="$parent[Window].IsActive"/>
+            </MultiBinding>
+          </Popup.IsOpen>
+          
           <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
             <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
               <ListBox x:Name="SearchSuggestionBox"

From 64a41dce39a5ccc9915ce0ef82ed0b5c24202243 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 20:55:39 +0800
Subject: [PATCH 232/364] refactor: rewrite searching commit by file path

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs  | 112 +++++++++++++++-------------------
 src/Views/Repository.axaml    |   4 +-
 src/Views/Repository.axaml.cs |  13 +---
 3 files changed, 53 insertions(+), 76 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index ebf9210e..9e10390a 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -271,14 +271,13 @@ namespace SourceGit.ViewModels
                 {
                     SearchedCommits = new List<Models.Commit>();
                     SearchCommitFilter = string.Empty;
-                    SearchCommitFilterSuggestion.Clear();
-                    IsSearchCommitSuggestionOpen = false;
-                    _revisionFiles.Clear();
+                    MatchedFilesForSearching = null;
+                    _worktreeFiles = null;
 
                     if (value)
                     {
                         SelectedViewIndex = 0;
-                        UpdateCurrentRevisionFilesForSearchSuggestion();
+                        CalcWorktreeFilesForSearching();
                     }
                 }
             }
@@ -307,7 +306,7 @@ namespace SourceGit.ViewModels
             {
                 if (SetProperty(ref _searchCommitFilterType, value))
                 {
-                    UpdateCurrentRevisionFilesForSearchSuggestion();
+                    CalcWorktreeFilesForSearching();
 
                     if (!string.IsNullOrEmpty(_searchCommitFilter))
                         StartSearchCommits();
@@ -320,47 +319,22 @@ namespace SourceGit.ViewModels
             get => _searchCommitFilter;
             set
             {
-                if (SetProperty(ref _searchCommitFilter, value) &&
-                    _searchCommitFilterType == 4 &&
-                    !string.IsNullOrEmpty(value) &&
-                    value.Length >= 2 &&
-                    _revisionFiles.Count > 0)
+                if (SetProperty(ref _searchCommitFilter, value))
                 {
-                    var suggestion = new List<string>();
-                    foreach (var file in _revisionFiles)
-                    {
-                        if (file.Contains(value, StringComparison.OrdinalIgnoreCase) && file.Length != value.Length)
-                        {
-                            suggestion.Add(file);
-                            if (suggestion.Count > 100)
-                                break;
-                        }
-                    }
-
-                    SearchCommitFilterSuggestion.Clear();
-                    SearchCommitFilterSuggestion.AddRange(suggestion);
-                    IsSearchCommitSuggestionOpen = SearchCommitFilterSuggestion.Count > 0;
-                }
-                else if (SearchCommitFilterSuggestion.Count > 0)
-                {
-                    SearchCommitFilterSuggestion.Clear();
-                    IsSearchCommitSuggestionOpen = false;
+                    if (_searchCommitFilterType == 4 && value is { Length: > 2 })
+                        CalcMatchedFilesForSearching();
+                    else if (_matchedFilesForSearching is { })
+                        MatchedFilesForSearching = null;
                 }
             }
         }
 
-        public bool IsSearchCommitSuggestionOpen
+        public List<string> MatchedFilesForSearching
         {
-            get => _isSearchCommitSuggestionOpen;
-            set => SetProperty(ref _isSearchCommitSuggestionOpen, value);
+            get => _matchedFilesForSearching;
+            private set => SetProperty(ref _matchedFilesForSearching, value);
         }
 
-        public AvaloniaList<string> SearchCommitFilterSuggestion
-        {
-            get;
-            private set;
-        } = new AvaloniaList<string>();
-
         public List<Models.Commit> SearchedCommits
         {
             get => _searchedCommits;
@@ -551,8 +525,8 @@ namespace SourceGit.ViewModels
             _visibleSubmodules.Clear();
             _searchedCommits.Clear();
 
-            _revisionFiles.Clear();
-            SearchCommitFilterSuggestion.Clear();
+            _worktreeFiles = null;
+            _matchedFilesForSearching = null;
         }
 
         public bool CanCreatePopup()
@@ -723,6 +697,11 @@ namespace SourceGit.ViewModels
             SearchCommitFilter = string.Empty;
         }
 
+        public void ClearMatchedFilesForSearching()
+        {
+            MatchedFilesForSearching = null;
+        }
+
         public void StartSearchCommits()
         {
             if (_histories == null)
@@ -730,8 +709,7 @@ namespace SourceGit.ViewModels
 
             IsSearchLoadingVisible = true;
             SearchResultSelectedCommit = null;
-            IsSearchCommitSuggestionOpen = false;
-            SearchCommitFilterSuggestion.Clear();
+            MatchedFilesForSearching = null;
 
             Task.Run(() =>
             {
@@ -2391,9 +2369,9 @@ namespace SourceGit.ViewModels
             menu.Items.Add(new MenuItem() { Header = "-" });
         }
 
-        private void UpdateCurrentRevisionFilesForSearchSuggestion()
+        private void CalcWorktreeFilesForSearching()
         {
-            _revisionFiles.Clear();
+            _worktreeFiles = null;
 
             if (_searchCommitFilterType == 4)
             {
@@ -2405,30 +2383,36 @@ namespace SourceGit.ViewModels
                         if (_searchCommitFilterType != 4)
                             return;
 
-                        _revisionFiles.AddRange(files);
+                        _worktreeFiles = new List<string>();
+                        foreach (var f in files)
+                            _worktreeFiles.Add(f);
 
-                        if (!string.IsNullOrEmpty(_searchCommitFilter) && _searchCommitFilter.Length > 2 && _revisionFiles.Count > 0)
-                        {
-                            var suggestion = new List<string>();
-                            foreach (var file in _revisionFiles)
-                            {
-                                if (file.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) && file.Length != _searchCommitFilter.Length)
-                                {
-                                    suggestion.Add(file);
-                                    if (suggestion.Count > 100)
-                                        break;
-                                }
-                            }
-
-                            SearchCommitFilterSuggestion.Clear();
-                            SearchCommitFilterSuggestion.AddRange(suggestion);
-                            IsSearchCommitSuggestionOpen = SearchCommitFilterSuggestion.Count > 0;
-                        }
+                        if (_searchCommitFilter is { Length: > 2 })
+                            CalcMatchedFilesForSearching();
                     });
                 });
             }
         }
 
+        private void CalcMatchedFilesForSearching()
+        {
+            if (_worktreeFiles == null || _worktreeFiles.Count == 0)
+                return;
+
+            var matched = new List<string>();
+            foreach (var file in _worktreeFiles)
+            {
+                if (file.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) && file.Length != _searchCommitFilter.Length)
+                {
+                    matched.Add(file);
+                    if (matched.Count > 100)
+                        break;
+                }
+            }
+
+            MatchedFilesForSearching = matched;
+        }
+
         private void AutoFetchImpl(object sender)
         {
             if (!_settings.EnableAutoFetch || _isAutoFetching)
@@ -2475,13 +2459,13 @@ namespace SourceGit.ViewModels
 
         private bool _isSearching = false;
         private bool _isSearchLoadingVisible = false;
-        private bool _isSearchCommitSuggestionOpen = false;
         private int _searchCommitFilterType = 3;
         private bool _onlySearchCommitsInCurrentBranch = false;
         private string _searchCommitFilter = string.Empty;
         private List<Models.Commit> _searchedCommits = new List<Models.Commit>();
         private Models.Commit _searchResultSelectedCommit = null;
-        private List<string> _revisionFiles = new List<string>();
+        private List<string> _worktreeFiles = null;
+        private List<string> _matchedFilesForSearching = null;
 
         private string _filter = string.Empty;
         private object _lockRemotes = new object();
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index bfa5a5e1..9caac015 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -424,7 +424,7 @@
                  HorizontalOffset="-8" VerticalAlignment="-8">
             <Popup.IsOpen>
               <MultiBinding Converter="{x:Static BoolConverters.And}">
-                <Binding Path="IsSearchCommitSuggestionOpen"/>
+                <Binding Path="MatchedFilesForSearching" Converter="{x:Static c:ListConverters.IsNotNullOrEmpty}"/>
                 <Binding Path="$parent[Window].IsActive"/>
               </MultiBinding>
             </Popup.IsOpen>
@@ -434,7 +434,7 @@
                 <ListBox x:Name="SearchSuggestionBox"
                          Background="Transparent"
                          SelectionMode="Single"
-                         ItemsSource="{Binding SearchCommitFilterSuggestion}"
+                         ItemsSource="{Binding MatchedFilesForSearching}"
                          MaxHeight="400"
                          Focusable="True"
                          KeyDown="OnSearchSuggestionBoxKeyDown">
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 2b3b7c30..00218a85 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -134,7 +134,7 @@ namespace SourceGit.Views
             }
             else if (e.Key == Key.Down)
             {
-                if (repo.IsSearchCommitSuggestionOpen)
+                if (repo.MatchedFilesForSearching is { Count: > 0 })
                 {
                     SearchSuggestionBox.Focus(NavigationMethod.Tab);
                     SearchSuggestionBox.SelectedIndex = 0;
@@ -144,12 +144,7 @@ namespace SourceGit.Views
             }
             else if (e.Key == Key.Escape)
             {
-                if (repo.IsSearchCommitSuggestionOpen)
-                {
-                    repo.SearchCommitFilterSuggestion.Clear();
-                    repo.IsSearchCommitSuggestionOpen = false;
-                }
-
+                repo.ClearMatchedFilesForSearching();
                 e.Handled = true;
             }
         }
@@ -369,9 +364,7 @@ namespace SourceGit.Views
 
             if (e.Key == Key.Escape)
             {
-                repo.IsSearchCommitSuggestionOpen = false;
-                repo.SearchCommitFilterSuggestion.Clear();
-
+                repo.ClearMatchedFilesForSearching();
                 e.Handled = true;
             }
             else if (e.Key == Key.Enter && SearchSuggestionBox.SelectedItem is string content)

From f5d6e1264d6e587c3ac6b90a9df3e0df30650f9e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 11 Mar 2025 23:01:34 +0800
Subject: [PATCH 233/364] refactor: use `List<T>` instead of `AvaloniaList<T>`
 since it is not used for bindings

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

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 9e10390a..59ab6a1b 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -6,7 +6,6 @@ using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
-using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
@@ -1221,23 +1220,26 @@ namespace SourceGit.ViewModels
             App.GetLauncer()?.OpenRepositoryInTab(node, null);
         }
 
-        public AvaloniaList<Models.OpenAIService> GetPreferedOpenAIServices()
+        public List<Models.OpenAIService> GetPreferedOpenAIServices()
         {
             var services = Preferences.Instance.OpenAIServices;
             if (services == null || services.Count == 0)
                 return [];
 
             if (services.Count == 1)
-                return services;
+                return [services[0]];
 
             var prefered = _settings.PreferedOpenAIService;
+            var all = new List<Models.OpenAIService>();
             foreach (var service in services)
             {
                 if (service.Name.Equals(prefered, StringComparison.Ordinal))
                     return [service];
+
+                all.Add(service);
             }
 
-            return services;
+            return all;
         }
 
         public ContextMenu CreateContextMenuForGitFlow()
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 35db11b9..f9ddb288 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -1452,28 +1452,24 @@ namespace SourceGit.ViewModels
                 App.OpenDialog(dialog);
                 return null;
             }
-            else
+
+            var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft };
+            foreach (var service in services)
             {
-                var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft };
-
-                foreach (var service in services)
+                var dup = service;
+                var item = new MenuItem();
+                item.Header = service.Name;
+                item.Click += (_, e) =>
                 {
-                    var dup = service;
+                    var dialog = new Views.AIAssistant(dup, _repo.FullPath, this, _staged);
+                    App.OpenDialog(dialog);
+                    e.Handled = true;
+                };
 
-                    var item = new MenuItem();
-                    item.Header = service.Name;
-                    item.Click += (_, e) =>
-                    {
-                        var dialog = new Views.AIAssistant(dup, _repo.FullPath, this, _staged);
-                        App.OpenDialog(dialog);
-                        e.Handled = true;
-                    };
-
-                    menu.Items.Add(item);
-                }
-
-                return menu;
+                menu.Items.Add(item);
             }
+
+            return menu;
         }
 
         private List<Models.Change> GetVisibleUnstagedChanges(List<Models.Change> unstaged)

From 231f3bf6688485be75a5295f5307e115889e5296 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 10:11:00 +0800
Subject: [PATCH 234/364] enhance: use `--ancestry-path=<commit_oid>` to reduce
 unnecessary outpus while querying children commits

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

diff --git a/src/Commands/QueryCommitChildren.cs b/src/Commands/QueryCommitChildren.cs
index d1bced52..6a6ed909 100644
--- a/src/Commands/QueryCommitChildren.cs
+++ b/src/Commands/QueryCommitChildren.cs
@@ -9,7 +9,7 @@ namespace SourceGit.Commands
             WorkingDirectory = repo;
             Context = repo;
             _commit = commit;
-            Args = $"rev-list -{max} --parents --branches --remotes ^{commit}";
+            Args = $"rev-list -{max} --parents --branches --remotes --ancestry-path={commit} ^{commit}";
         }
 
         public List<string> Result()

From ee7ccc0391ee5e7e03f5f8d9cf496804170cda4a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 11:05:19 +0800
Subject: [PATCH 235/364] refactor: re-write commit searching (part 2)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Commit.cs         |   1 +
 src/ViewModels/Histories.cs  |  12 ++--
 src/ViewModels/Repository.cs | 132 +++++++++++++++++------------------
 src/Views/Repository.axaml   |   2 +-
 4 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index 5c48b0c0..72ce54bd 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -8,6 +8,7 @@ namespace SourceGit.Models
 {
     public enum CommitSearchMethod
     {
+        BySHA = 0,
         ByAuthor,
         ByCommitter,
         ByMessage,
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 707e8c43..0e67915c 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -148,14 +148,14 @@ namespace SourceGit.ViewModels
         {
             if (commits.Count == 0)
             {
-                _repo.SearchResultSelectedCommit = null;
+                _repo.SelectedSearchedCommit = null;
                 DetailContext = null;
             }
             else if (commits.Count == 1)
             {
                 var commit = (commits[0] as Models.Commit)!;
-                if (_repo.SearchResultSelectedCommit == null || _repo.SearchResultSelectedCommit.SHA != commit.SHA)
-                    _repo.SearchResultSelectedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA);
+                if (_repo.SelectedSearchedCommit == null || _repo.SelectedSearchedCommit.SHA != commit.SHA)
+                    _repo.SelectedSearchedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA);
 
                 AutoSelectedCommit = commit;
                 NavigationId = _navigationId + 1;
@@ -173,7 +173,7 @@ namespace SourceGit.ViewModels
             }
             else if (commits.Count == 2)
             {
-                _repo.SearchResultSelectedCommit = null;
+                _repo.SelectedSearchedCommit = null;
 
                 var end = commits[0] as Models.Commit;
                 var start = commits[1] as Models.Commit;
@@ -181,7 +181,7 @@ namespace SourceGit.ViewModels
             }
             else
             {
-                _repo.SearchResultSelectedCommit = null;
+                _repo.SelectedSearchedCommit = null;
                 DetailContext = commits.Count;
             }
         }
@@ -599,7 +599,7 @@ namespace SourceGit.ViewModels
                     var head = _commits.Find(x => x.SHA == current.Head);
                     if (head == null)
                     {
-                        _repo.SearchResultSelectedCommit = null;
+                        _repo.SelectedSearchedCommit = null;
                         head = new Commands.QuerySingleCommit(_repo.FullPath, current.Head).Result();
                         if (head != null)
                             DetailContext = new RevisionCompare(_repo.FullPath, commit, head);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 59ab6a1b..c7557356 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -268,16 +268,19 @@ namespace SourceGit.ViewModels
             {
                 if (SetProperty(ref _isSearching, value))
                 {
-                    SearchedCommits = new List<Models.Commit>();
-                    SearchCommitFilter = string.Empty;
-                    MatchedFilesForSearching = null;
-                    _worktreeFiles = null;
-
                     if (value)
                     {
                         SelectedViewIndex = 0;
                         CalcWorktreeFilesForSearching();
                     }
+                    else
+                    {
+                        SearchedCommits = new List<Models.Commit>();
+                        SelectedSearchedCommit = null;
+                        SearchCommitFilter = string.Empty;
+                        MatchedFilesForSearching = null;
+                        _worktreeFiles = null;
+                    }
                 }
             }
         }
@@ -306,7 +309,6 @@ namespace SourceGit.ViewModels
                 if (SetProperty(ref _searchCommitFilterType, value))
                 {
                     CalcWorktreeFilesForSearching();
-
                     if (!string.IsNullOrEmpty(_searchCommitFilter))
                         StartSearchCommits();
                 }
@@ -318,13 +320,8 @@ namespace SourceGit.ViewModels
             get => _searchCommitFilter;
             set
             {
-                if (SetProperty(ref _searchCommitFilter, value))
-                {
-                    if (_searchCommitFilterType == 4 && value is { Length: > 2 })
-                        CalcMatchedFilesForSearching();
-                    else if (_matchedFilesForSearching is { })
-                        MatchedFilesForSearching = null;
-                }
+                if (SetProperty(ref _searchCommitFilter, value) && IsSearchingCommitsByFilePath())
+                    CalcMatchedFilesForSearching();
             }
         }
 
@@ -340,6 +337,16 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _searchedCommits, value);
         }
 
+        public Models.Commit SelectedSearchedCommit
+        {
+            get => _selectedSearchedCommit;
+            set
+            {
+                if (SetProperty(ref _selectedSearchedCommit, value) && value != null)
+                    NavigateToCommit(value.SHA);
+            }
+        }
+
         public bool IsLocalBranchGroupExpanded
         {
             get => _settings.IsLocalBranchesExpandedInSideBar;
@@ -410,16 +417,6 @@ namespace SourceGit.ViewModels
             get => _workingCopy?.InProgressContext;
         }
 
-        public Models.Commit SearchResultSelectedCommit
-        {
-            get => _searchResultSelectedCommit;
-            set
-            {
-                if (SetProperty(ref _searchResultSelectedCommit, value) && value != null)
-                    NavigateToCommit(value.SHA);
-            }
-        }
-
         public bool IsAutoFetching
         {
             get => _isAutoFetching;
@@ -523,6 +520,7 @@ namespace SourceGit.ViewModels
             _submodules.Clear();
             _visibleSubmodules.Clear();
             _searchedCommits.Clear();
+            _selectedSearchedCommit = null;
 
             _worktreeFiles = null;
             _matchedFilesForSearching = null;
@@ -707,32 +705,22 @@ namespace SourceGit.ViewModels
                 return;
 
             IsSearchLoadingVisible = true;
-            SearchResultSelectedCommit = null;
+            SelectedSearchedCommit = null;
             MatchedFilesForSearching = null;
 
             Task.Run(() =>
             {
-                var visible = new List<Models.Commit>();
+                var visible = null as List<Models.Commit>;
+                var method = (Models.CommitSearchMethod)_searchCommitFilterType;
 
-                switch (_searchCommitFilterType)
+                if (method == Models.CommitSearchMethod.BySHA)
                 {
-                    case 0:
-                        var commit = new Commands.QuerySingleCommit(_fullpath, _searchCommitFilter).Result();
-                        if (commit != null)
-                            visible.Add(commit);
-                        break;
-                    case 1:
-                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByAuthor, _onlySearchCommitsInCurrentBranch).Result();
-                        break;
-                    case 2:
-                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByCommitter, _onlySearchCommitsInCurrentBranch).Result();
-                        break;
-                    case 3:
-                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByMessage, _onlySearchCommitsInCurrentBranch).Result();
-                        break;
-                    case 4:
-                        visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, Models.CommitSearchMethod.ByFile, _onlySearchCommitsInCurrentBranch).Result();
-                        break;
+                    var commit = new Commands.QuerySingleCommit(_fullpath, _searchCommitFilter).Result();
+                    visible = commit == null ? [] : [commit];
+                }
+                else
+                {
+                    visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, method, _onlySearchCommitsInCurrentBranch).Result();
                 }
 
                 Dispatcher.UIThread.Invoke(() =>
@@ -1636,7 +1624,7 @@ namespace SourceGit.ViewModels
                     compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare");
                     compareWithWorktree.Click += (_, _) =>
                     {
-                        SearchResultSelectedCommit = null;
+                        SelectedSearchedCommit = null;
 
                         if (_histories != null)
                         {
@@ -1918,7 +1906,7 @@ namespace SourceGit.ViewModels
                 compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare");
                 compareWithWorktree.Click += (_, _) =>
                 {
-                    SearchResultSelectedCommit = null;
+                    SelectedSearchedCommit = null;
 
                     if (_histories != null)
                     {
@@ -2371,35 +2359,45 @@ namespace SourceGit.ViewModels
             menu.Items.Add(new MenuItem() { Header = "-" });
         }
 
+        private bool IsSearchingCommitsByFilePath()
+        {
+            return _isSearching && _searchCommitFilterType == (int)Models.CommitSearchMethod.ByFile;
+        }
+
         private void CalcWorktreeFilesForSearching()
         {
-            _worktreeFiles = null;
-
-            if (_searchCommitFilterType == 4)
+            if (!IsSearchingCommitsByFilePath())
             {
-                Task.Run(() =>
-                {
-                    var files = new Commands.QueryRevisionFileNames(_fullpath, "HEAD").Result();
-                    Dispatcher.UIThread.Invoke(() =>
-                    {
-                        if (_searchCommitFilterType != 4)
-                            return;
-
-                        _worktreeFiles = new List<string>();
-                        foreach (var f in files)
-                            _worktreeFiles.Add(f);
-
-                        if (_searchCommitFilter is { Length: > 2 })
-                            CalcMatchedFilesForSearching();
-                    });
-                });
+                _worktreeFiles = null;
+                MatchedFilesForSearching = null;
+                GC.Collect();
+                return;
             }
+
+            Task.Run(() =>
+            {
+                var files = new Commands.QueryRevisionFileNames(_fullpath, "HEAD").Result();
+                Dispatcher.UIThread.Invoke(() =>
+                {
+                    if (!IsSearchingCommitsByFilePath())
+                        return;
+
+                    _worktreeFiles = new List<string>();
+                    foreach (var f in files)
+                        _worktreeFiles.Add(f);
+
+                    CalcMatchedFilesForSearching();
+                });
+            });
         }
 
         private void CalcMatchedFilesForSearching()
         {
-            if (_worktreeFiles == null || _worktreeFiles.Count == 0)
+            if (_worktreeFiles == null || _worktreeFiles.Count == 0 || _searchCommitFilter.Length < 3)
+            {
+                MatchedFilesForSearching = null;
                 return;
+            }
 
             var matched = new List<string>();
             foreach (var file in _worktreeFiles)
@@ -2461,11 +2459,11 @@ namespace SourceGit.ViewModels
 
         private bool _isSearching = false;
         private bool _isSearchLoadingVisible = false;
-        private int _searchCommitFilterType = 3;
+        private int _searchCommitFilterType = (int)Models.CommitSearchMethod.ByMessage;
         private bool _onlySearchCommitsInCurrentBranch = false;
         private string _searchCommitFilter = string.Empty;
         private List<Models.Commit> _searchedCommits = new List<Models.Commit>();
-        private Models.Commit _searchResultSelectedCommit = null;
+        private Models.Commit _selectedSearchedCommit = null;
         private List<string> _worktreeFiles = null;
         private List<string> _matchedFilesForSearching = null;
 
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 9caac015..1d94e9b2 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -504,7 +504,7 @@
                  Margin="0,8,0,0"
                  ItemsSource="{Binding SearchedCommits}"
                  SelectionMode="Single"
-                 SelectedItem="{Binding SearchResultSelectedCommit, Mode=TwoWay}"
+                 SelectedItem="{Binding SelectedSearchedCommit, Mode=TwoWay}"
                  BorderThickness="1"
                  BorderBrush="{DynamicResource Brush.Border2}"
                  Background="{DynamicResource Brush.Contents}"

From bb2284c4c91d4c95ddbc3bb0d5c0d3c951b2e756 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 11:53:24 +0800
Subject: [PATCH 236/364] refactor: re-write commit searching (part 3)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryRevisionFileNames.cs | 16 +++++++++++-----
 src/ViewModels/CommitDetail.cs         |  5 +----
 src/ViewModels/Repository.cs           | 12 +++---------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/Commands/QueryRevisionFileNames.cs b/src/Commands/QueryRevisionFileNames.cs
index d2d69614..c6fd7373 100644
--- a/src/Commands/QueryRevisionFileNames.cs
+++ b/src/Commands/QueryRevisionFileNames.cs
@@ -1,4 +1,6 @@
-namespace SourceGit.Commands
+using System.Collections.Generic;
+
+namespace SourceGit.Commands
 {
     public class QueryRevisionFileNames : Command
     {
@@ -9,13 +11,17 @@
             Args = $"ls-tree -r -z --name-only {revision}";
         }
 
-        public string[] Result()
+        public List<string> Result()
         {
             var rs = ReadToEnd();
-            if (rs.IsSuccess)
-                return rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries);
+            if (!rs.IsSuccess)
+                return [];
 
-            return [];
+            var lines = rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries);
+            var outs = new List<string>();
+            foreach (var line in lines)
+                outs.Add(line);
+            return outs;
         }
     }
 }
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index c6ef8367..34ac8308 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -814,14 +814,11 @@ namespace SourceGit.ViewModels
                     Task.Run(() =>
                     {
                         var files = new Commands.QueryRevisionFileNames(_repo.FullPath, sha).Result();
-                        var filesList = new List<string>();
-                        filesList.AddRange(files);
-
                         Dispatcher.UIThread.Invoke(() =>
                         {
                             if (sha == Commit.SHA)
                             {
-                                _revisionFiles = filesList;
+                                _revisionFiles = files;
                                 if (!string.IsNullOrEmpty(_revisionFileSearchFilter))
                                     CalcRevisionFileSearchSuggestion();
                             }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index c7557356..97c52d8e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -2376,17 +2376,11 @@ namespace SourceGit.ViewModels
 
             Task.Run(() =>
             {
-                var files = new Commands.QueryRevisionFileNames(_fullpath, "HEAD").Result();
+                _worktreeFiles = new Commands.QueryRevisionFileNames(_fullpath, "HEAD").Result();
                 Dispatcher.UIThread.Invoke(() =>
                 {
-                    if (!IsSearchingCommitsByFilePath())
-                        return;
-
-                    _worktreeFiles = new List<string>();
-                    foreach (var f in files)
-                        _worktreeFiles.Add(f);
-
-                    CalcMatchedFilesForSearching();
+                    if (IsSearchingCommitsByFilePath())
+                        CalcMatchedFilesForSearching();
                 });
             });
         }

From 0476a825efffa277e751eeb8352ed9c93d41f1c5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 14:58:59 +0800
Subject: [PATCH 237/364] code_style: move some code from `Histories.axaml` to
 separate files

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/CommitGraph.cs            | 228 +++++++++
 src/Views/CommitStatusIndicator.cs  |  90 ++++
 src/Views/CommitSubjectPresenter.cs | 189 ++++++++
 src/Views/CommitTimeTextBlock.cs    | 163 +++++++
 src/Views/Histories.axaml           |  12 +-
 src/Views/Histories.axaml.cs        | 695 ++--------------------------
 6 files changed, 705 insertions(+), 672 deletions(-)
 create mode 100644 src/Views/CommitGraph.cs
 create mode 100644 src/Views/CommitStatusIndicator.cs
 create mode 100644 src/Views/CommitSubjectPresenter.cs
 create mode 100644 src/Views/CommitTimeTextBlock.cs

diff --git a/src/Views/CommitGraph.cs b/src/Views/CommitGraph.cs
new file mode 100644
index 00000000..015eaca5
--- /dev/null
+++ b/src/Views/CommitGraph.cs
@@ -0,0 +1,228 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+
+namespace SourceGit.Views
+{
+    public class CommitGraph : Control
+    {
+        public static readonly StyledProperty<Models.CommitGraph> GraphProperty =
+            AvaloniaProperty.Register<CommitGraph, Models.CommitGraph>(nameof(Graph));
+
+        public Models.CommitGraph Graph
+        {
+            get => GetValue(GraphProperty);
+            set => SetValue(GraphProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> DotBrushProperty =
+            AvaloniaProperty.Register<CommitGraph, IBrush>(nameof(DotBrush), Brushes.Transparent);
+
+        public IBrush DotBrush
+        {
+            get => GetValue(DotBrushProperty);
+            set => SetValue(DotBrushProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> OnlyHighlightCurrentBranchProperty =
+            AvaloniaProperty.Register<CommitGraph, bool>(nameof(OnlyHighlightCurrentBranch), true);
+
+        public bool OnlyHighlightCurrentBranch
+        {
+            get => GetValue(OnlyHighlightCurrentBranchProperty);
+            set => SetValue(OnlyHighlightCurrentBranchProperty, value);
+        }
+
+        static CommitGraph()
+        {
+            AffectsRender<CommitGraph>(GraphProperty, DotBrushProperty, OnlyHighlightCurrentBranchProperty);
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            base.Render(context);
+
+            var graph = Graph;
+            if (graph == null)
+                return;
+
+            var histories = this.FindAncestorOfType<Histories>();
+            if (histories == null)
+                return;
+
+            var list = histories.CommitListContainer;
+            if (list == null)
+                return;
+
+            // Calculate drawing area.
+            double width = Bounds.Width - 273 - histories.AuthorNameColumnWidth.Value;
+            double height = Bounds.Height;
+            double startY = list.Scroll?.Offset.Y ?? 0;
+            double endY = startY + height + 28;
+
+            // Apply scroll offset and clip.
+            using (context.PushClip(new Rect(0, 0, width, height)))
+            using (context.PushTransform(Matrix.CreateTranslation(0, -startY)))
+            {
+                // Draw contents
+                DrawCurves(context, graph, startY, endY);
+                DrawAnchors(context, graph, startY, endY);
+            }
+        }
+
+        private void DrawCurves(DrawingContext context, Models.CommitGraph graph, double top, double bottom)
+        {
+            var grayedPen = new Pen(new SolidColorBrush(Colors.Gray, 0.4), Models.CommitGraph.Pens[0].Thickness);
+            var onlyHighlightCurrentBranch = OnlyHighlightCurrentBranch;
+
+            if (onlyHighlightCurrentBranch)
+            {
+                foreach (var link in graph.Links)
+                {
+                    if (link.IsMerged)
+                        continue;
+                    if (link.End.Y < top)
+                        continue;
+                    if (link.Start.Y > bottom)
+                        break;
+
+                    var geo = new StreamGeometry();
+                    using (var ctx = geo.Open())
+                    {
+                        ctx.BeginFigure(link.Start, false);
+                        ctx.QuadraticBezierTo(link.Control, link.End);
+                    }
+
+                    context.DrawGeometry(null, grayedPen, geo);
+                }
+            }
+
+            foreach (var line in graph.Paths)
+            {
+                var last = line.Points[0];
+                var size = line.Points.Count;
+
+                if (line.Points[size - 1].Y < top)
+                    continue;
+                if (last.Y > bottom)
+                    break;
+
+                var geo = new StreamGeometry();
+                var pen = Models.CommitGraph.Pens[line.Color];
+
+                using (var ctx = geo.Open())
+                {
+                    var started = false;
+                    var ended = false;
+                    for (int i = 1; i < size; i++)
+                    {
+                        var cur = line.Points[i];
+                        if (cur.Y < top)
+                        {
+                            last = cur;
+                            continue;
+                        }
+
+                        if (!started)
+                        {
+                            ctx.BeginFigure(last, false);
+                            started = true;
+                        }
+
+                        if (cur.Y > bottom)
+                        {
+                            cur = new Point(cur.X, bottom);
+                            ended = true;
+                        }
+
+                        if (cur.X > last.X)
+                        {
+                            ctx.QuadraticBezierTo(new Point(cur.X, last.Y), cur);
+                        }
+                        else if (cur.X < last.X)
+                        {
+                            if (i < size - 1)
+                            {
+                                var midY = (last.Y + cur.Y) / 2;
+                                ctx.CubicBezierTo(new Point(last.X, midY + 4), new Point(cur.X, midY - 4), cur);
+                            }
+                            else
+                            {
+                                ctx.QuadraticBezierTo(new Point(last.X, cur.Y), cur);
+                            }
+                        }
+                        else
+                        {
+                            ctx.LineTo(cur);
+                        }
+
+                        if (ended)
+                            break;
+                        last = cur;
+                    }
+                }
+
+                if (!line.IsMerged && onlyHighlightCurrentBranch)
+                    context.DrawGeometry(null, grayedPen, geo);
+                else
+                    context.DrawGeometry(null, pen, geo);
+            }
+
+            foreach (var link in graph.Links)
+            {
+                if (onlyHighlightCurrentBranch && !link.IsMerged)
+                    continue;
+                if (link.End.Y < top)
+                    continue;
+                if (link.Start.Y > bottom)
+                    break;
+
+                var geo = new StreamGeometry();
+                using (var ctx = geo.Open())
+                {
+                    ctx.BeginFigure(link.Start, false);
+                    ctx.QuadraticBezierTo(link.Control, link.End);
+                }
+
+                context.DrawGeometry(null, Models.CommitGraph.Pens[link.Color], geo);
+            }
+        }
+
+        private void DrawAnchors(DrawingContext context, Models.CommitGraph graph, double top, double bottom)
+        {
+            var dotFill = DotBrush;
+            var dotFillPen = new Pen(dotFill, 2);
+            var grayedPen = new Pen(Brushes.Gray, Models.CommitGraph.Pens[0].Thickness);
+            var onlyHighlightCurrentBranch = OnlyHighlightCurrentBranch;
+
+            foreach (var dot in graph.Dots)
+            {
+                if (dot.Center.Y < top)
+                    continue;
+                if (dot.Center.Y > bottom)
+                    break;
+
+                var pen = Models.CommitGraph.Pens[dot.Color];
+                if (!dot.IsMerged && onlyHighlightCurrentBranch)
+                    pen = grayedPen;
+
+                switch (dot.Type)
+                {
+                    case Models.CommitGraph.DotType.Head:
+                        context.DrawEllipse(dotFill, pen, dot.Center, 6, 6);
+                        context.DrawEllipse(pen.Brush, null, dot.Center, 3, 3);
+                        break;
+                    case Models.CommitGraph.DotType.Merge:
+                        context.DrawEllipse(pen.Brush, null, dot.Center, 6, 6);
+                        context.DrawLine(dotFillPen, new Point(dot.Center.X, dot.Center.Y - 3), new Point(dot.Center.X, dot.Center.Y + 3));
+                        context.DrawLine(dotFillPen, new Point(dot.Center.X - 3, dot.Center.Y), new Point(dot.Center.X + 3, dot.Center.Y));
+                        break;
+                    default:
+                        context.DrawEllipse(dotFill, pen, dot.Center, 3, 3);
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Views/CommitStatusIndicator.cs b/src/Views/CommitStatusIndicator.cs
new file mode 100644
index 00000000..c2f4184e
--- /dev/null
+++ b/src/Views/CommitStatusIndicator.cs
@@ -0,0 +1,90 @@
+using System;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace SourceGit.Views
+{
+    public class CommitStatusIndicator : Control
+    {
+        public static readonly StyledProperty<Models.Branch> CurrentBranchProperty =
+            AvaloniaProperty.Register<CommitStatusIndicator, Models.Branch>(nameof(CurrentBranch));
+
+        public Models.Branch CurrentBranch
+        {
+            get => GetValue(CurrentBranchProperty);
+            set => SetValue(CurrentBranchProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> AheadBrushProperty =
+            AvaloniaProperty.Register<CommitStatusIndicator, IBrush>(nameof(AheadBrush));
+
+        public IBrush AheadBrush
+        {
+            get => GetValue(AheadBrushProperty);
+            set => SetValue(AheadBrushProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> BehindBrushProperty =
+            AvaloniaProperty.Register<CommitStatusIndicator, IBrush>(nameof(BehindBrush));
+
+        public IBrush BehindBrush
+        {
+            get => GetValue(BehindBrushProperty);
+            set => SetValue(BehindBrushProperty, value);
+        }
+
+        enum Status
+        {
+            Normal,
+            Ahead,
+            Behind,
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            if (_status == Status.Normal)
+                return;
+
+            context.DrawEllipse(_status == Status.Ahead ? AheadBrush : BehindBrush, null, new Rect(0, 0, 5, 5));
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            if (DataContext is Models.Commit commit && CurrentBranch is not null)
+            {
+                var sha = commit.SHA;
+                var track = CurrentBranch.TrackStatus;
+
+                if (track.Ahead.Contains(sha))
+                    _status = Status.Ahead;
+                else if (track.Behind.Contains(sha))
+                    _status = Status.Behind;
+                else
+                    _status = Status.Normal;
+            }
+            else
+            {
+                _status = Status.Normal;
+            }
+
+            return _status == Status.Normal ? new Size(0, 0) : new Size(9, 5);
+        }
+
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            InvalidateMeasure();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == CurrentBranchProperty)
+                InvalidateMeasure();
+        }
+
+        private Status _status = Status.Normal;
+    }
+}
diff --git a/src/Views/CommitSubjectPresenter.cs b/src/Views/CommitSubjectPresenter.cs
new file mode 100644
index 00000000..32f6838d
--- /dev/null
+++ b/src/Views/CommitSubjectPresenter.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Avalonia;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+
+namespace SourceGit.Views
+{
+    public partial class CommitSubjectPresenter : TextBlock
+    {
+        public static readonly StyledProperty<string> SubjectProperty =
+            AvaloniaProperty.Register<CommitSubjectPresenter, string>(nameof(Subject));
+
+        public string Subject
+        {
+            get => GetValue(SubjectProperty);
+            set => SetValue(SubjectProperty, value);
+        }
+
+        public static readonly StyledProperty<AvaloniaList<Models.IssueTrackerRule>> IssueTrackerRulesProperty =
+            AvaloniaProperty.Register<CommitSubjectPresenter, AvaloniaList<Models.IssueTrackerRule>>(nameof(IssueTrackerRules));
+
+        public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
+        {
+            get => GetValue(IssueTrackerRulesProperty);
+            set => SetValue(IssueTrackerRulesProperty, value);
+        }
+
+        protected override Type StyleKeyOverride => typeof(TextBlock);
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == SubjectProperty || change.Property == IssueTrackerRulesProperty)
+            {
+                Inlines!.Clear();
+                _matches = null;
+                ClearHoveredIssueLink();
+
+                var subject = Subject;
+                if (string.IsNullOrEmpty(subject))
+                    return;
+
+                var keywordMatch = REG_KEYWORD_FORMAT1().Match(subject);
+                if (!keywordMatch.Success)
+                    keywordMatch = REG_KEYWORD_FORMAT2().Match(subject);
+
+                var rules = IssueTrackerRules ?? [];
+                var matches = new List<Models.Hyperlink>();
+                foreach (var rule in rules)
+                    rule.Matches(matches, subject);
+
+                if (matches.Count == 0)
+                {
+                    if (keywordMatch.Success)
+                    {
+                        Inlines.Add(new Run(subject.Substring(0, keywordMatch.Length)) { FontWeight = FontWeight.Bold });
+                        Inlines.Add(new Run(subject.Substring(keywordMatch.Length)));
+                    }
+                    else
+                    {
+                        Inlines.Add(new Run(subject));
+                    }
+                    return;
+                }
+
+                matches.Sort((l, r) => l.Start - r.Start);
+                _matches = matches;
+
+                var inlines = new List<Inline>();
+                var pos = 0;
+                foreach (var match in matches)
+                {
+                    if (match.Start > pos)
+                    {
+                        if (keywordMatch.Success && pos < keywordMatch.Length)
+                        {
+                            if (keywordMatch.Length < match.Start)
+                            {
+                                inlines.Add(new Run(subject.Substring(pos, keywordMatch.Length - pos)) { FontWeight = FontWeight.Bold });
+                                inlines.Add(new Run(subject.Substring(keywordMatch.Length, match.Start - keywordMatch.Length)));
+                            }
+                            else
+                            {
+                                inlines.Add(new Run(subject.Substring(pos, match.Start - pos)) { FontWeight = FontWeight.Bold });
+                            }
+                        }
+                        else
+                        {
+                            inlines.Add(new Run(subject.Substring(pos, match.Start - pos)));
+                        }
+                    }
+
+                    var link = new Run(subject.Substring(match.Start, match.Length));
+                    link.Classes.Add("issue_link");
+                    inlines.Add(link);
+
+                    pos = match.Start + match.Length;
+                }
+
+                if (pos < subject.Length)
+                {
+                    if (keywordMatch.Success && pos < keywordMatch.Length)
+                    {
+                        inlines.Add(new Run(subject.Substring(pos, keywordMatch.Length - pos)) { FontWeight = FontWeight.Bold });
+                        inlines.Add(new Run(subject.Substring(keywordMatch.Length)));
+                    }
+                    else
+                    {
+                        inlines.Add(new Run(subject.Substring(pos)));
+                    }
+                }
+
+                Inlines.AddRange(inlines);
+            }
+        }
+
+        protected override void OnPointerMoved(PointerEventArgs e)
+        {
+            base.OnPointerMoved(e);
+
+            if (_matches != null)
+            {
+                var point = e.GetPosition(this) - new Point(Padding.Left, Padding.Top);
+                var x = Math.Min(Math.Max(point.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0));
+                var y = Math.Min(Math.Max(point.Y, 0), Math.Max(TextLayout.Height, 0));
+                point = new Point(x, y);
+
+                var textPosition = TextLayout.HitTestPoint(point).TextPosition;
+                foreach (var match in _matches)
+                {
+                    if (!match.Intersect(textPosition, 1))
+                        continue;
+
+                    if (match == _lastHover)
+                        return;
+
+                    _lastHover = match;
+                    SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
+                    ToolTip.SetTip(this, match.Link);
+                    ToolTip.SetIsOpen(this, true);
+                    e.Handled = true;
+                    return;
+                }
+
+                ClearHoveredIssueLink();
+            }
+        }
+
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+
+            if (_lastHover != null)
+                Native.OS.OpenBrowser(_lastHover.Link);
+        }
+
+        protected override void OnPointerExited(PointerEventArgs e)
+        {
+            base.OnPointerExited(e);
+            ClearHoveredIssueLink();
+        }
+
+        private void ClearHoveredIssueLink()
+        {
+            if (_lastHover != null)
+            {
+                ToolTip.SetTip(this, null);
+                SetCurrentValue(CursorProperty, Cursor.Parse("Arrow"));
+                _lastHover = null;
+            }
+        }
+
+        [GeneratedRegex(@"^\[[\w\s]+\]")]
+        private static partial Regex REG_KEYWORD_FORMAT1();
+
+        [GeneratedRegex(@"^\S+([\<\(][\w\s_\-\*,]+[\>\)])?\!?\s?:\s")]
+        private static partial Regex REG_KEYWORD_FORMAT2();
+
+        private List<Models.Hyperlink> _matches = null;
+        private Models.Hyperlink _lastHover = null;
+    }
+}
diff --git a/src/Views/CommitTimeTextBlock.cs b/src/Views/CommitTimeTextBlock.cs
new file mode 100644
index 00000000..6947f7f2
--- /dev/null
+++ b/src/Views/CommitTimeTextBlock.cs
@@ -0,0 +1,163 @@
+using System;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+
+namespace SourceGit.Views
+{
+    public class CommitTimeTextBlock : TextBlock
+    {
+        public static readonly StyledProperty<bool> ShowAsDateTimeProperty =
+            AvaloniaProperty.Register<CommitTimeTextBlock, bool>(nameof(ShowAsDateTime), true);
+
+        public bool ShowAsDateTime
+        {
+            get => GetValue(ShowAsDateTimeProperty);
+            set => SetValue(ShowAsDateTimeProperty, value);
+        }
+
+        public static readonly StyledProperty<int> DateTimeFormatProperty =
+            AvaloniaProperty.Register<CommitTimeTextBlock, int>(nameof(DateTimeFormat), 0);
+
+        public int DateTimeFormat
+        {
+            get => GetValue(DateTimeFormatProperty);
+            set => SetValue(DateTimeFormatProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> UseAuthorTimeProperty =
+            AvaloniaProperty.Register<CommitTimeTextBlock, bool>(nameof(UseAuthorTime), true);
+
+        public bool UseAuthorTime
+        {
+            get => GetValue(UseAuthorTimeProperty);
+            set => SetValue(UseAuthorTimeProperty, value);
+        }
+
+        protected override Type StyleKeyOverride => typeof(TextBlock);
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == UseAuthorTimeProperty)
+            {
+                SetCurrentValue(TextProperty, GetDisplayText());
+            }
+            else if (change.Property == ShowAsDateTimeProperty)
+            {
+                SetCurrentValue(TextProperty, GetDisplayText());
+
+                if (ShowAsDateTime)
+                    StopTimer();
+                else
+                    StartTimer();
+            }
+            else if (change.Property == DateTimeFormatProperty)
+            {
+                if (ShowAsDateTime)
+                    SetCurrentValue(TextProperty, GetDisplayText());
+            }
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            if (!ShowAsDateTime)
+                StartTimer();
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            base.OnUnloaded(e);
+            StopTimer();
+        }
+
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            SetCurrentValue(TextProperty, GetDisplayText());
+        }
+
+        private void StartTimer()
+        {
+            if (_refreshTimer != null)
+                return;
+
+            _refreshTimer = DispatcherTimer.Run(() =>
+            {
+                Dispatcher.UIThread.Invoke(() =>
+                {
+                    var text = GetDisplayText();
+                    if (!text.Equals(Text, StringComparison.Ordinal))
+                        Text = text;
+                });
+
+                return true;
+            }, TimeSpan.FromSeconds(10));
+        }
+
+        private void StopTimer()
+        {
+            if (_refreshTimer != null)
+            {
+                _refreshTimer.Dispose();
+                _refreshTimer = null;
+            }
+        }
+
+        private string GetDisplayText()
+        {
+            var commit = DataContext as Models.Commit;
+            if (commit == null)
+                return string.Empty;
+
+            if (ShowAsDateTime)
+                return UseAuthorTime ? commit.AuthorTimeStr : commit.CommitterTimeStr;
+
+            var timestamp = UseAuthorTime ? commit.AuthorTime : commit.CommitterTime;
+            var now = DateTime.Now;
+            var localTime = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
+            var span = now - localTime;
+            if (span.TotalMinutes < 1)
+                return App.Text("Period.JustNow");
+
+            if (span.TotalHours < 1)
+                return App.Text("Period.MinutesAgo", (int)span.TotalMinutes);
+
+            if (span.TotalDays < 1)
+                return App.Text("Period.HoursAgo", (int)span.TotalHours);
+
+            var lastDay = now.AddDays(-1).Date;
+            if (localTime >= lastDay)
+                return App.Text("Period.Yesterday");
+
+            if ((localTime.Year == now.Year && localTime.Month == now.Month) || span.TotalDays < 28)
+            {
+                var diffDay = now.Date - localTime.Date;
+                return App.Text("Period.DaysAgo", (int)diffDay.TotalDays);
+            }
+
+            var lastMonth = now.AddMonths(-1).Date;
+            if (localTime.Year == lastMonth.Year && localTime.Month == lastMonth.Month)
+                return App.Text("Period.LastMonth");
+
+            if (localTime.Year == now.Year || localTime > now.AddMonths(-11))
+            {
+                var diffMonth = (12 + now.Month - localTime.Month) % 12;
+                return App.Text("Period.MonthsAgo", diffMonth);
+            }
+
+            var diffYear = now.Year - localTime.Year;
+            if (diffYear == 1)
+                return App.Text("Period.LastYear");
+
+            return App.Text("Period.YearsAgo", diffYear);
+        }
+
+        private IDisposable _refreshTimer = null;
+    }
+}
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 40b2636f..583e17c1 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -10,18 +10,18 @@
              x:Class="SourceGit.Views.Histories"
              x:DataType="vm:Histories"
              x:Name="ThisControl">
-  <v:LayoutableGrid UseHorizontal="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseTwoColumnsLayoutInHistories}">
-    <v:LayoutableGrid.RowDefinitions>
+  <v:HistoriesLayout UseHorizontal="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseTwoColumnsLayoutInHistories}">
+    <v:HistoriesLayout.RowDefinitions>
       <RowDefinition Height="{Binding TopArea, Mode=TwoWay}" MinHeight="100"/>
       <RowDefinition Height="3"/>
       <RowDefinition Height="{Binding BottomArea, Mode=TwoWay}" MinHeight="200"/>
-    </v:LayoutableGrid.RowDefinitions>
+    </v:HistoriesLayout.RowDefinitions>
 
-    <v:LayoutableGrid.ColumnDefinitions>
+    <v:HistoriesLayout.ColumnDefinitions>
       <ColumnDefinition Width="{Binding LeftArea, Mode=TwoWay}" MinWidth="100"/>
       <ColumnDefinition Width="3"/>
       <ColumnDefinition Width="{Binding RightArea, Mode=TwoWay}" MinWidth="100"/>
-    </v:LayoutableGrid.ColumnDefinitions>
+    </v:HistoriesLayout.ColumnDefinitions>
     
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
       <Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True">
@@ -264,5 +264,5 @@
         </ContentControl.DataTemplates>
       </ContentControl>
     </Grid>
-  </v:LayoutableGrid>
+  </v:HistoriesLayout>
 </UserControl>
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index 8b5142ad..62c283e5 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -1,24 +1,18 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
-using System.Text.RegularExpressions;
 
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Controls.Documents;
 using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
-    public class LayoutableGrid : Grid
+    public class HistoriesLayout : Grid
     {
         public static readonly StyledProperty<bool> UseHorizontalProperty =
-            AvaloniaProperty.Register<LayoutableGrid, bool>(nameof(UseHorizontal));
+            AvaloniaProperty.Register<HistoriesLayout, bool>(nameof(UseHorizontal));
 
         public bool UseHorizontal
         {
@@ -28,17 +22,20 @@ namespace SourceGit.Views
 
         protected override Type StyleKeyOverride => typeof(Grid);
 
-        static LayoutableGrid()
-        {
-            UseHorizontalProperty.Changed.AddClassHandler<LayoutableGrid>((o, _) => o.RefreshLayout());
-        }
-
         public override void ApplyTemplate()
         {
             base.ApplyTemplate();
             RefreshLayout();
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == UseHorizontalProperty)
+                RefreshLayout();
+        }
+
         private void RefreshLayout()
         {
             if (UseHorizontal)
@@ -74,639 +71,6 @@ namespace SourceGit.Views
         }
     }
 
-    public class CommitStatusIndicator : Control
-    {
-        public static readonly StyledProperty<Models.Branch> CurrentBranchProperty =
-            AvaloniaProperty.Register<CommitStatusIndicator, Models.Branch>(nameof(CurrentBranch));
-
-        public Models.Branch CurrentBranch
-        {
-            get => GetValue(CurrentBranchProperty);
-            set => SetValue(CurrentBranchProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> AheadBrushProperty =
-            AvaloniaProperty.Register<CommitStatusIndicator, IBrush>(nameof(AheadBrush));
-
-        public IBrush AheadBrush
-        {
-            get => GetValue(AheadBrushProperty);
-            set => SetValue(AheadBrushProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> BehindBrushProperty =
-            AvaloniaProperty.Register<CommitStatusIndicator, IBrush>(nameof(BehindBrush));
-
-        public IBrush BehindBrush
-        {
-            get => GetValue(BehindBrushProperty);
-            set => SetValue(BehindBrushProperty, value);
-        }
-
-        enum Status
-        {
-            Normal,
-            Ahead,
-            Behind,
-        }
-
-        public override void Render(DrawingContext context)
-        {
-            if (_status == Status.Normal)
-                return;
-
-            context.DrawEllipse(_status == Status.Ahead ? AheadBrush : BehindBrush, null, new Rect(0, 0, 5, 5));
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            if (DataContext is Models.Commit commit && CurrentBranch is not null)
-            {
-                var sha = commit.SHA;
-                var track = CurrentBranch.TrackStatus;
-
-                if (track.Ahead.Contains(sha))
-                    _status = Status.Ahead;
-                else if (track.Behind.Contains(sha))
-                    _status = Status.Behind;
-                else
-                    _status = Status.Normal;
-            }
-            else
-            {
-                _status = Status.Normal;
-            }
-
-            return _status == Status.Normal ? new Size(0, 0) : new Size(9, 5);
-        }
-
-        protected override void OnDataContextChanged(EventArgs e)
-        {
-            base.OnDataContextChanged(e);
-            InvalidateMeasure();
-        }
-
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
-            if (change.Property == CurrentBranchProperty)
-                InvalidateMeasure();
-        }
-
-        private Status _status = Status.Normal;
-    }
-
-    public partial class CommitSubjectPresenter : TextBlock
-    {
-        public static readonly StyledProperty<string> SubjectProperty =
-            AvaloniaProperty.Register<CommitSubjectPresenter, string>(nameof(Subject));
-
-        public string Subject
-        {
-            get => GetValue(SubjectProperty);
-            set => SetValue(SubjectProperty, value);
-        }
-
-        public static readonly StyledProperty<AvaloniaList<Models.IssueTrackerRule>> IssueTrackerRulesProperty =
-            AvaloniaProperty.Register<CommitSubjectPresenter, AvaloniaList<Models.IssueTrackerRule>>(nameof(IssueTrackerRules));
-
-        public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
-        {
-            get => GetValue(IssueTrackerRulesProperty);
-            set => SetValue(IssueTrackerRulesProperty, value);
-        }
-
-        protected override Type StyleKeyOverride => typeof(TextBlock);
-
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == SubjectProperty || change.Property == IssueTrackerRulesProperty)
-            {
-                Inlines!.Clear();
-                _matches = null;
-                ClearHoveredIssueLink();
-
-                var subject = Subject;
-                if (string.IsNullOrEmpty(subject))
-                    return;
-
-                var keywordMatch = REG_KEYWORD_FORMAT1().Match(subject);
-                if (!keywordMatch.Success)
-                    keywordMatch = REG_KEYWORD_FORMAT2().Match(subject);
-
-                var rules = IssueTrackerRules ?? [];
-                var matches = new List<Models.Hyperlink>();
-                foreach (var rule in rules)
-                    rule.Matches(matches, subject);
-
-                if (matches.Count == 0)
-                {
-                    if (keywordMatch.Success)
-                    {
-                        Inlines.Add(new Run(subject.Substring(0, keywordMatch.Length)) { FontWeight = FontWeight.Bold });
-                        Inlines.Add(new Run(subject.Substring(keywordMatch.Length)));
-                    }
-                    else
-                    {
-                        Inlines.Add(new Run(subject));
-                    }
-                    return;
-                }
-
-                matches.Sort((l, r) => l.Start - r.Start);
-                _matches = matches;
-
-                var inlines = new List<Inline>();
-                var pos = 0;
-                foreach (var match in matches)
-                {
-                    if (match.Start > pos)
-                    {
-                        if (keywordMatch.Success && pos < keywordMatch.Length)
-                        {
-                            if (keywordMatch.Length < match.Start)
-                            {
-                                inlines.Add(new Run(subject.Substring(pos, keywordMatch.Length - pos)) { FontWeight = FontWeight.Bold });
-                                inlines.Add(new Run(subject.Substring(keywordMatch.Length, match.Start - keywordMatch.Length)));
-                            }
-                            else
-                            {
-                                inlines.Add(new Run(subject.Substring(pos, match.Start - pos)) { FontWeight = FontWeight.Bold });
-                            }
-                        }
-                        else
-                        {
-                            inlines.Add(new Run(subject.Substring(pos, match.Start - pos)));
-                        }
-                    }
-
-                    var link = new Run(subject.Substring(match.Start, match.Length));
-                    link.Classes.Add("issue_link");
-                    inlines.Add(link);
-
-                    pos = match.Start + match.Length;
-                }
-
-                if (pos < subject.Length)
-                {
-                    if (keywordMatch.Success && pos < keywordMatch.Length)
-                    {
-                        inlines.Add(new Run(subject.Substring(pos, keywordMatch.Length - pos)) { FontWeight = FontWeight.Bold });
-                        inlines.Add(new Run(subject.Substring(keywordMatch.Length)));
-                    }
-                    else
-                    {
-                        inlines.Add(new Run(subject.Substring(pos)));
-                    }
-                }
-
-                Inlines.AddRange(inlines);
-            }
-        }
-
-        protected override void OnPointerMoved(PointerEventArgs e)
-        {
-            base.OnPointerMoved(e);
-
-            if (_matches != null)
-            {
-                var point = e.GetPosition(this) - new Point(Padding.Left, Padding.Top);
-                var x = Math.Min(Math.Max(point.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0));
-                var y = Math.Min(Math.Max(point.Y, 0), Math.Max(TextLayout.Height, 0));
-                point = new Point(x, y);
-
-                var textPosition = TextLayout.HitTestPoint(point).TextPosition;
-                foreach (var match in _matches)
-                {
-                    if (!match.Intersect(textPosition, 1))
-                        continue;
-
-                    if (match == _lastHover)
-                        return;
-
-                    _lastHover = match;
-                    SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
-                    ToolTip.SetTip(this, match.Link);
-                    ToolTip.SetIsOpen(this, true);
-                    e.Handled = true;
-                    return;
-                }
-
-                ClearHoveredIssueLink();
-            }
-        }
-
-        protected override void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            base.OnPointerPressed(e);
-
-            if (_lastHover != null)
-                Native.OS.OpenBrowser(_lastHover.Link);
-        }
-
-        protected override void OnPointerExited(PointerEventArgs e)
-        {
-            base.OnPointerExited(e);
-            ClearHoveredIssueLink();
-        }
-
-        private void ClearHoveredIssueLink()
-        {
-            if (_lastHover != null)
-            {
-                ToolTip.SetTip(this, null);
-                SetCurrentValue(CursorProperty, Cursor.Parse("Arrow"));
-                _lastHover = null;
-            }
-        }
-
-        [GeneratedRegex(@"^\[[\w\s]+\]")]
-        private static partial Regex REG_KEYWORD_FORMAT1();
-
-        [GeneratedRegex(@"^\S+([\<\(][\w\s_\-\*,]+[\>\)])?\!?\s?:\s")]
-        private static partial Regex REG_KEYWORD_FORMAT2();
-
-        private List<Models.Hyperlink> _matches = null;
-        private Models.Hyperlink _lastHover = null;
-    }
-
-    public class CommitTimeTextBlock : TextBlock
-    {
-        public static readonly StyledProperty<bool> ShowAsDateTimeProperty =
-            AvaloniaProperty.Register<CommitTimeTextBlock, bool>(nameof(ShowAsDateTime), true);
-
-        public bool ShowAsDateTime
-        {
-            get => GetValue(ShowAsDateTimeProperty);
-            set => SetValue(ShowAsDateTimeProperty, value);
-        }
-
-        public static readonly StyledProperty<int> DateTimeFormatProperty =
-            AvaloniaProperty.Register<CommitTimeTextBlock, int>(nameof(DateTimeFormat), 0);
-
-        public int DateTimeFormat
-        {
-            get => GetValue(DateTimeFormatProperty);
-            set => SetValue(DateTimeFormatProperty, value);
-        }
-
-        public static readonly StyledProperty<bool> UseAuthorTimeProperty =
-            AvaloniaProperty.Register<CommitTimeTextBlock, bool>(nameof(UseAuthorTime), true);
-
-        public bool UseAuthorTime
-        {
-            get => GetValue(UseAuthorTimeProperty);
-            set => SetValue(UseAuthorTimeProperty, value);
-        }
-
-        protected override Type StyleKeyOverride => typeof(TextBlock);
-
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == UseAuthorTimeProperty)
-            {
-                SetCurrentValue(TextProperty, GetDisplayText());
-            }
-            else if (change.Property == ShowAsDateTimeProperty)
-            {
-                SetCurrentValue(TextProperty, GetDisplayText());
-
-                if (ShowAsDateTime)
-                    StopTimer();
-                else
-                    StartTimer();
-            }
-            else if (change.Property == DateTimeFormatProperty)
-            {
-                if (ShowAsDateTime)
-                    SetCurrentValue(TextProperty, GetDisplayText());
-            }
-        }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            if (!ShowAsDateTime)
-                StartTimer();
-        }
-
-        protected override void OnUnloaded(RoutedEventArgs e)
-        {
-            base.OnUnloaded(e);
-            StopTimer();
-        }
-
-        protected override void OnDataContextChanged(EventArgs e)
-        {
-            base.OnDataContextChanged(e);
-            SetCurrentValue(TextProperty, GetDisplayText());
-        }
-
-        private void StartTimer()
-        {
-            if (_refreshTimer != null)
-                return;
-
-            _refreshTimer = DispatcherTimer.Run(() =>
-            {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    var text = GetDisplayText();
-                    if (!text.Equals(Text, StringComparison.Ordinal))
-                        Text = text;
-                });
-
-                return true;
-            }, TimeSpan.FromSeconds(10));
-        }
-
-        private void StopTimer()
-        {
-            if (_refreshTimer != null)
-            {
-                _refreshTimer.Dispose();
-                _refreshTimer = null;
-            }
-        }
-
-        private string GetDisplayText()
-        {
-            var commit = DataContext as Models.Commit;
-            if (commit == null)
-                return string.Empty;
-
-            if (ShowAsDateTime)
-                return UseAuthorTime ? commit.AuthorTimeStr : commit.CommitterTimeStr;
-
-            var timestamp = UseAuthorTime ? commit.AuthorTime : commit.CommitterTime;
-            var now = DateTime.Now;
-            var localTime = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
-            var span = now - localTime;
-            if (span.TotalMinutes < 1)
-                return App.Text("Period.JustNow");
-
-            if (span.TotalHours < 1)
-                return App.Text("Period.MinutesAgo", (int)span.TotalMinutes);
-
-            if (span.TotalDays < 1)
-                return App.Text("Period.HoursAgo", (int)span.TotalHours);
-
-            var lastDay = now.AddDays(-1).Date;
-            if (localTime >= lastDay)
-                return App.Text("Period.Yesterday");
-
-            if ((localTime.Year == now.Year && localTime.Month == now.Month) || span.TotalDays < 28)
-            {
-                var diffDay = now.Date - localTime.Date;
-                return App.Text("Period.DaysAgo", (int)diffDay.TotalDays);
-            }
-
-            var lastMonth = now.AddMonths(-1).Date;
-            if (localTime.Year == lastMonth.Year && localTime.Month == lastMonth.Month)
-                return App.Text("Period.LastMonth");
-
-            if (localTime.Year == now.Year || localTime > now.AddMonths(-11))
-            {
-                var diffMonth = (12 + now.Month - localTime.Month) % 12;
-                return App.Text("Period.MonthsAgo", diffMonth);
-            }
-
-            var diffYear = now.Year - localTime.Year;
-            if (diffYear == 1)
-                return App.Text("Period.LastYear");
-
-            return App.Text("Period.YearsAgo", diffYear);
-        }
-
-        private IDisposable _refreshTimer = null;
-    }
-
-    public class CommitGraph : Control
-    {
-        public static readonly StyledProperty<Models.CommitGraph> GraphProperty =
-            AvaloniaProperty.Register<CommitGraph, Models.CommitGraph>(nameof(Graph));
-
-        public Models.CommitGraph Graph
-        {
-            get => GetValue(GraphProperty);
-            set => SetValue(GraphProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> DotBrushProperty =
-            AvaloniaProperty.Register<CommitGraph, IBrush>(nameof(DotBrush), Brushes.Transparent);
-
-        public IBrush DotBrush
-        {
-            get => GetValue(DotBrushProperty);
-            set => SetValue(DotBrushProperty, value);
-        }
-
-        public static readonly StyledProperty<bool> OnlyHighlightCurrentBranchProperty =
-            AvaloniaProperty.Register<CommitGraph, bool>(nameof(OnlyHighlightCurrentBranch), true);
-
-        public bool OnlyHighlightCurrentBranch
-        {
-            get => GetValue(OnlyHighlightCurrentBranchProperty);
-            set => SetValue(OnlyHighlightCurrentBranchProperty, value);
-        }
-
-        static CommitGraph()
-        {
-            AffectsRender<CommitGraph>(GraphProperty, DotBrushProperty, OnlyHighlightCurrentBranchProperty);
-        }
-
-        public override void Render(DrawingContext context)
-        {
-            base.Render(context);
-
-            var graph = Graph;
-            if (graph == null)
-                return;
-
-            var histories = this.FindAncestorOfType<Histories>();
-            if (histories == null)
-                return;
-
-            var list = histories.CommitListContainer;
-            if (list == null)
-                return;
-
-            // Calculate drawing area.
-            double width = Bounds.Width - 273 - histories.AuthorNameColumnWidth.Value;
-            double height = Bounds.Height;
-            double startY = list.Scroll?.Offset.Y ?? 0;
-            double endY = startY + height + 28;
-
-            // Apply scroll offset and clip.
-            using (context.PushClip(new Rect(0, 0, width, height)))
-            using (context.PushTransform(Matrix.CreateTranslation(0, -startY)))
-            {
-                // Draw contents
-                DrawCurves(context, graph, startY, endY);
-                DrawAnchors(context, graph, startY, endY);
-            }
-        }
-
-        private void DrawCurves(DrawingContext context, Models.CommitGraph graph, double top, double bottom)
-        {
-            var grayedPen = new Pen(new SolidColorBrush(Colors.Gray, 0.4), Models.CommitGraph.Pens[0].Thickness);
-            var onlyHighlightCurrentBranch = OnlyHighlightCurrentBranch;
-
-            if (onlyHighlightCurrentBranch)
-            {
-                foreach (var link in graph.Links)
-                {
-                    if (link.IsMerged)
-                        continue;
-                    if (link.End.Y < top)
-                        continue;
-                    if (link.Start.Y > bottom)
-                        break;
-
-                    var geo = new StreamGeometry();
-                    using (var ctx = geo.Open())
-                    {
-                        ctx.BeginFigure(link.Start, false);
-                        ctx.QuadraticBezierTo(link.Control, link.End);
-                    }
-
-                    context.DrawGeometry(null, grayedPen, geo);
-                }
-            }
-
-            foreach (var line in graph.Paths)
-            {
-                var last = line.Points[0];
-                var size = line.Points.Count;
-
-                if (line.Points[size - 1].Y < top)
-                    continue;
-                if (last.Y > bottom)
-                    break;
-
-                var geo = new StreamGeometry();
-                var pen = Models.CommitGraph.Pens[line.Color];
-
-                using (var ctx = geo.Open())
-                {
-                    var started = false;
-                    var ended = false;
-                    for (int i = 1; i < size; i++)
-                    {
-                        var cur = line.Points[i];
-                        if (cur.Y < top)
-                        {
-                            last = cur;
-                            continue;
-                        }
-
-                        if (!started)
-                        {
-                            ctx.BeginFigure(last, false);
-                            started = true;
-                        }
-
-                        if (cur.Y > bottom)
-                        {
-                            cur = new Point(cur.X, bottom);
-                            ended = true;
-                        }
-
-                        if (cur.X > last.X)
-                        {
-                            ctx.QuadraticBezierTo(new Point(cur.X, last.Y), cur);
-                        }
-                        else if (cur.X < last.X)
-                        {
-                            if (i < size - 1)
-                            {
-                                var midY = (last.Y + cur.Y) / 2;
-                                ctx.CubicBezierTo(new Point(last.X, midY + 4), new Point(cur.X, midY - 4), cur);
-                            }
-                            else
-                            {
-                                ctx.QuadraticBezierTo(new Point(last.X, cur.Y), cur);
-                            }
-                        }
-                        else
-                        {
-                            ctx.LineTo(cur);
-                        }
-
-                        if (ended)
-                            break;
-                        last = cur;
-                    }
-                }
-
-                if (!line.IsMerged && onlyHighlightCurrentBranch)
-                    context.DrawGeometry(null, grayedPen, geo);
-                else
-                    context.DrawGeometry(null, pen, geo);
-            }
-
-            foreach (var link in graph.Links)
-            {
-                if (onlyHighlightCurrentBranch && !link.IsMerged)
-                    continue;
-                if (link.End.Y < top)
-                    continue;
-                if (link.Start.Y > bottom)
-                    break;
-
-                var geo = new StreamGeometry();
-                using (var ctx = geo.Open())
-                {
-                    ctx.BeginFigure(link.Start, false);
-                    ctx.QuadraticBezierTo(link.Control, link.End);
-                }
-
-                context.DrawGeometry(null, Models.CommitGraph.Pens[link.Color], geo);
-            }
-        }
-
-        private void DrawAnchors(DrawingContext context, Models.CommitGraph graph, double top, double bottom)
-        {
-            var dotFill = DotBrush;
-            var dotFillPen = new Pen(dotFill, 2);
-            var grayedPen = new Pen(Brushes.Gray, Models.CommitGraph.Pens[0].Thickness);
-            var onlyHighlightCurrentBranch = OnlyHighlightCurrentBranch;
-
-            foreach (var dot in graph.Dots)
-            {
-                if (dot.Center.Y < top)
-                    continue;
-                if (dot.Center.Y > bottom)
-                    break;
-
-                var pen = Models.CommitGraph.Pens[dot.Color];
-                if (!dot.IsMerged && onlyHighlightCurrentBranch)
-                    pen = grayedPen;
-
-                switch (dot.Type)
-                {
-                    case Models.CommitGraph.DotType.Head:
-                        context.DrawEllipse(dotFill, pen, dot.Center, 6, 6);
-                        context.DrawEllipse(pen.Brush, null, dot.Center, 3, 3);
-                        break;
-                    case Models.CommitGraph.DotType.Merge:
-                        context.DrawEllipse(pen.Brush, null, dot.Center, 6, 6);
-                        context.DrawLine(dotFillPen, new Point(dot.Center.X, dot.Center.Y - 3), new Point(dot.Center.X, dot.Center.Y + 3));
-                        context.DrawLine(dotFillPen, new Point(dot.Center.X - 3, dot.Center.Y), new Point(dot.Center.X + 3, dot.Center.Y));
-                        break;
-                    default:
-                        context.DrawEllipse(dotFill, pen, dot.Center, 3, 3);
-                        break;
-                }
-            }
-        }
-    }
-
     public partial class Histories : UserControl
     {
         public static readonly StyledProperty<GridLength> AuthorNameColumnWidthProperty =
@@ -754,36 +118,34 @@ namespace SourceGit.Views
             set => SetValue(NavigationIdProperty, value);
         }
 
-        static Histories()
-        {
-            NavigationIdProperty.Changed.AddClassHandler<Histories>((h, _) =>
-            {
-                if (h.DataContext == null)
-                    return;
-
-                // Force scroll selected item (current head) into view. see issue #58
-                var list = h.CommitListContainer;
-                if (list != null && list.SelectedItems.Count == 1)
-                    list.ScrollIntoView(list.SelectedIndex);
-            });
-
-            AuthorNameColumnWidthProperty.Changed.AddClassHandler<Histories>((h, _) =>
-            {
-                h.CommitGraph.InvalidateVisual();
-            });
-        }
-
         public Histories()
         {
             InitializeComponent();
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == NavigationIdProperty)
+            {
+                if (DataContext is ViewModels.Histories)
+                {
+                    var list = CommitListContainer;
+                    if (list != null && list.SelectedItems.Count == 1)
+                        list.ScrollIntoView(list.SelectedIndex);
+                }
+            }
+        }
+
         private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
         {
             var y = CommitListContainer.Scroll?.Offset.Y ?? 0;
-            if (y != _lastScrollY)
+            var authorNameColumnWidth = AuthorNameColumnWidth.Value;
+            if (y != _lastScrollY || authorNameColumnWidth != _lastAuthorNameColumnWidth)
             {
                 _lastScrollY = y;
+                _lastAuthorNameColumnWidth = authorNameColumnWidth;
                 CommitGraph.InvalidateVisual();
             }
         }
@@ -863,5 +225,6 @@ namespace SourceGit.Views
         }
 
         private double _lastScrollY = 0;
+        private double _lastAuthorNameColumnWidth = 0;
     }
 }

From 77d8afe056963fe23f78b15660948fcbb8bd1c91 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 15:10:43 +0800
Subject: [PATCH 238/364] refactor: reduce the times to call `RefreshLayout`

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

diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index 62c283e5..f7055dfa 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -22,9 +22,8 @@ namespace SourceGit.Views
 
         protected override Type StyleKeyOverride => typeof(Grid);
 
-        public override void ApplyTemplate()
+        public HistoriesLayout()
         {
-            base.ApplyTemplate();
             RefreshLayout();
         }
 

From eaa322dfabd9b91eb4afe360a68645b874f16ed8 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 17:57:31 +0800
Subject: [PATCH 239/364] enhance: re-design commit search result display
 (#1083)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Commit.cs       |  1 +
 src/Views/Repository.axaml | 49 ++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index 72ce54bd..0bad8376 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -36,6 +36,7 @@ namespace SourceGit.Models
         public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
         public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
         public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateOnly);
+        public string CommitterTimeShortStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateOnly);
 
         public bool IsMerged { get; set; } = false;
         public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 1d94e9b2..c8bbde5f 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -482,13 +482,13 @@
                     Padding="4,0"
                     Background="Transparent"
                     BorderThickness="0"
-                    SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}">
+                    SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}">            
             <ComboBox.Items>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}" FontSize="12"/>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.ByAuthor}" FontSize="12"/>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.ByCommitter}" FontSize="12"/>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}" FontSize="12"/>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.ByFile}" FontSize="12"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByAuthor}"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByCommitter}"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByFile}"/>
             </ComboBox.Items>
           </ComboBox>
 
@@ -496,12 +496,13 @@
                     Margin="4,0,0,0"
                     IsChecked="{Binding OnlySearchCommitsInCurrentBranch, Mode=TwoWay}"
                     IsVisible="{Binding SearchCommitFilterType, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
-            <TextBlock Text="{DynamicResource Text.Repository.Search.InCurrentBranch}" FontSize="12"/>
+            <TextBlock Text="{DynamicResource Text.Repository.Search.InCurrentBranch}"/>
           </CheckBox>
         </StackPanel>
 
         <ListBox Grid.Row="2"
                  Margin="0,8,0,0"
+                 Padding="4"
                  ItemsSource="{Binding SearchedCommits}"
                  SelectionMode="Single"
                  SelectedItem="{Binding SelectedSearchedCommit, Mode=TwoWay}"
@@ -510,12 +511,14 @@
                  Background="{DynamicResource Brush.Contents}"
                  CornerRadius="4"
                  ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                 ScrollViewer.VerticalScrollBarVisibility="Auto">
+                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                 Grid.IsSharedSizeScope="True">
           <ListBox.Styles>
             <Style Selector="ListBoxItem">
               <Setter Property="Margin" Value="0"/>
               <Setter Property="Padding" Value="0"/>
-              <Setter Property="Height" Value="50"/>
+              <Setter Property="Height" Value="28"/>
+              <Setter Property="CornerRadius" Value="4"/>
             </Style>
           </ListBox.Styles>
 
@@ -527,18 +530,22 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="m:Commit">
-              <Border BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="0,0,0,1" Padding="4" Background="Transparent">
-                <Grid RowDefinitions="Auto,*">
-                  <Grid Grid.Row="0" ColumnDefinitions="Auto,*,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" ClipToBounds="True"/>
-                    <TextBlock Grid.Column="2" Classes="primary" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
-                    <TextBlock Grid.Column="3" Classes="primary" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
-                  </Grid>
-
-                  <TextBlock Grid.Row="1" Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
-                </Grid>
-              </Border>
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="24"/>
+                  <ColumnDefinition Width="*"/>
+                  <ColumnDefinition Width="Auto" SharedSizeGroup="SearchCommitTimeColumn"/>
+                </Grid.ColumnDefinitions>
+                <v:Avatar Grid.Column="0" Width="16" Height="16" HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
+                <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Subject}" Margin="2,0,0,0" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
+                <TextBlock Grid.Column="2"
+                           Classes="primary"
+                           Margin="4,0"
+                           Foreground="{DynamicResource Brush.FG2}"
+                           Text="{Binding CommitterTimeShortStr}"
+                           HorizontalAlignment="Right" VerticalAlignment="Center"
+                           TextTrimming="CharacterEllipsis"/>
+              </Grid>
             </DataTemplate>
           </ListBox.ItemTemplate>
         </ListBox>

From e4f5c34e0cbe62345e370e723d47b00aacddc626 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 12 Mar 2025 17:58:57 +0800
Subject: [PATCH 240/364] code_style: remove whitespaces

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Repository.axaml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index c8bbde5f..b16447fa 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -86,7 +86,7 @@
                 <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/>
-                  
+
                   <ToggleButton Grid.Column="2"
                                 Classes="line_path"
                                 Width="26" Height="26"
@@ -160,7 +160,7 @@
             </ListBox>
           </Border>
         </Border>
-        
+
         <!-- Filter Branches/Tags/Submodules -->
         <TextBox Grid.Row="1"
                  Height="26"
@@ -170,7 +170,7 @@
                  BorderBrush="{DynamicResource Brush.Border2}"
                  Watermark="{DynamicResource Text.Repository.Filter}"
                  Text="{Binding Filter, Mode=TwoWay}"
-                 VerticalContentAlignment="Center">          
+                 VerticalContentAlignment="Center">
           <TextBox.InnerLeftContent>
             <Path Width="14" Height="14"
                   Margin="6,0,0,0"
@@ -235,9 +235,9 @@
               <Path Grid.Column="0" Width="11" Height="11" Margin="2,1,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Tags}" Fill="{DynamicResource Brush.FG2}"/>
               <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/>
               <TextBlock Grid.Column="2" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-              <ToggleButton Grid.Column="3" 
-                            Classes="tag_display_mode" 
-                            Width="14" 
+              <ToggleButton Grid.Column="3"
+                            Classes="tag_display_mode"
+                            Width="14"
                             IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}"
                             ToolTip.Tip="{DynamicResource Text.Repository.ShowTagsAsTree}"/>
               <Button Grid.Column="4"
@@ -252,7 +252,7 @@
                       Classes="icon_button"
                       Width="14"
                       Margin="8,0"
-                      Command="{Binding CreateNewTag}" 
+                      Command="{Binding CreateNewTag}"
                       ToolTip.Tip="{DynamicResource Text.Repository.Tags.Add}">
                 <Path Width="12" Height="12" Data="{StaticResource Icons.Tag.Add}"/>
               </Button>
@@ -428,7 +428,7 @@
                 <Binding Path="$parent[Window].IsActive"/>
               </MultiBinding>
             </Popup.IsOpen>
-            
+
             <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
               <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
                 <ListBox x:Name="SearchSuggestionBox"
@@ -482,7 +482,7 @@
                     Padding="4,0"
                     Background="Transparent"
                     BorderThickness="0"
-                    SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}">            
+                    SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}">
             <ComboBox.Items>
               <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByAuthor}"/>
@@ -562,7 +562,7 @@
             </MultiBinding>
           </Path.IsVisible>
         </Path>
-        
+
         <v:LoadingIcon Grid.Row="2"
                        Width="48" Height="48"
                        HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -594,7 +594,7 @@
                 <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
               </StackPanel>
             </DataTemplate>
-            
+
             <DataTemplate DataType="vm:CherryPickInProgress">
               <Grid ColumnDefinitions="*,Auto">
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
@@ -649,7 +649,7 @@
             </DataTemplate>
           </ContentControl.DataTemplates>
         </ContentControl>
-        
+
         <Button Grid.Column="1"
                 Classes="flat"
                 FontWeight="Regular"
@@ -680,14 +680,14 @@
                 Data="{StaticResource Icons.EyeClose}"
                 Fill="{DynamicResource Brush.FG2}"
                 IsVisible="{Binding HistoriesFilterMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:FilterMode.Excluded}}"/>
-          
+
           <ItemsControl Grid.Column="1" Margin="8,0,0,0" ItemsSource="{Binding Settings.HistoriesFilters}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
                 <VirtualizingStackPanel Orientation="Horizontal" VerticalAlignment="Center"/>
               </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
-            
+
             <ItemsControl.ItemTemplate>
               <DataTemplate DataType="m:Filter">
                 <Border Height="20"
@@ -708,7 +708,7 @@
               </DataTemplate>
             </ItemsControl.ItemTemplate>
           </ItemsControl>
-          
+
           <Button Grid.Column="2" Classes="icon_button" Command="{Binding ClearHistoriesFilter}" ToolTip.Tip="{DynamicResource Text.Repository.ClearAllCommitsFilter}">
             <Path Width="14" Height="14" Margin="16,0,8,0" Data="{StaticResource Icons.RemoveAll}"/>
           </Button>

From f07832c38553cf35b4f7bc521290cc16507e954d Mon Sep 17 00:00:00 2001
From: Morgan Courbet <nagromc@users.noreply.github.com>
Date: Wed, 12 Mar 2025 15:37:28 +0100
Subject: [PATCH 241/364] docs: fix typo in README.md

(cherry picked from commit 59fd2aaab144aa8313ecbfcb5457457359fa0c4f)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4086a641..399916c9 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ For **Windows** users:
   ```
 > [!NOTE]
 > `winget` will install this software as a commandline tool. You need run `SourceGit` from console or `Win+R` at the first time. Then you can add it to the taskbar.
-* You can install the latest stable by `scoope` with follow commands:
+* You can install the latest stable by `scoop` with follow commands:
   ```shell
   scoop bucket add extras
   scoop install sourcegit

From 7331167be2ca09e0fc9378934fad18c48062d329 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Thu, 13 Mar 2025 09:38:08 +0800
Subject: [PATCH 242/364] fix: schedule DWM frame extension to next render
 frame on Windows 10 (#1087)

The DwmExtendFrameIntoClientArea call needs to be posted to the next render frame to ensure the window handle is fully initialized and avoid potential race conditions.
---
 src/Native/Windows.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index 11b6bd13..eb354f10 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -8,6 +8,7 @@ using System.Text;
 
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Threading;
 
 namespace SourceGit.Native
 {
@@ -214,12 +215,17 @@ namespace SourceGit.Native
 
         private void FixWindowFrameOnWin10(Window w)
         {
-            var platformHandle = w.TryGetPlatformHandle();
-            if (platformHandle == null)
-                return;
+            // Schedule the DWM frame extension to run in the next render frame
+            // to ensure proper timing with the window initialization sequence
+            Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                var platformHandle = w.TryGetPlatformHandle();
+                if (platformHandle == null)
+                    return;
 
-            var margins = new MARGINS { cxLeftWidth = 1, cxRightWidth = 1, cyTopHeight = 1, cyBottomHeight = 1 };
-            DwmExtendFrameIntoClientArea(platformHandle.Handle, ref margins);
+                var margins = new MARGINS { cxLeftWidth = 1, cxRightWidth = 1, cyTopHeight = 1, cyBottomHeight = 1 };
+                DwmExtendFrameIntoClientArea(platformHandle.Handle, ref margins);
+            }, DispatcherPriority.Render);
         }
 
         #region EXTERNAL_EDITOR_FINDER

From e430e847ff957e23c9e146197f6ce8690730645e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Mar 2025 09:49:25 +0800
Subject: [PATCH 243/364] enhance: auto convert spaces with dashes while
 renaming a branch (#1088)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/RenameBranch.cs | 21 ++++++++++++++++-----
 src/Views/CreateBranch.axaml   | 12 ++----------
 src/Views/RenameBranch.axaml   | 10 +++++++++-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/ViewModels/RenameBranch.cs b/src/ViewModels/RenameBranch.cs
index bd0b4664..0679a5b5 100644
--- a/src/ViewModels/RenameBranch.cs
+++ b/src/ViewModels/RenameBranch.cs
@@ -12,7 +12,7 @@ namespace SourceGit.ViewModels
         }
 
         [Required(ErrorMessage = "Branch name is required!!!")]
-        [RegularExpression(@"^[\w\-/\.#]+$", ErrorMessage = "Bad branch name format!")]
+        [RegularExpression(@"^[\w \-/\.#]+$", ErrorMessage = "Bad branch name format!")]
         [CustomValidation(typeof(RenameBranch), nameof(ValidateBranchName))]
         public string Name
         {
@@ -32,9 +32,10 @@ namespace SourceGit.ViewModels
         {
             if (ctx.ObjectInstance is RenameBranch rename)
             {
+                var fixedName = rename.FixName(name);
                 foreach (var b in rename._repo.Branches)
                 {
-                    if (b.IsLocal && b != rename.Target && b.Name == name)
+                    if (b.IsLocal && b != rename.Target && b.Name == fixedName)
                     {
                         return new ValidationResult("A branch with same name already exists!!!");
                     }
@@ -46,7 +47,8 @@ namespace SourceGit.ViewModels
 
         public override Task<bool> Sure()
         {
-            if (_name == Target.Name)
+            var fixedName = FixName(_name);
+            if (fixedName == Target.Name)
                 return null;
 
             _repo.SetWatcherEnabled(false);
@@ -55,7 +57,7 @@ namespace SourceGit.ViewModels
             return Task.Run(() =>
             {
                 var oldName = Target.FullName;
-                var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, _name);
+                var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, fixedName);
                 CallUIThread(() =>
                 {
                     if (succ)
@@ -65,7 +67,7 @@ namespace SourceGit.ViewModels
                             if (filter.Type == Models.FilterType.LocalBranch &&
                                 filter.Pattern.Equals(oldName, StringComparison.Ordinal))
                             {
-                                filter.Pattern = $"refs/heads/{_name}";
+                                filter.Pattern = $"refs/heads/{fixedName}";
                                 break;
                             }
                         }
@@ -78,6 +80,15 @@ namespace SourceGit.ViewModels
             });
         }
 
+        private string FixName(string name)
+        {
+            if (!name.Contains(' '))
+                return name;
+
+            var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+            return string.Join("-", parts);
+        }
+
         private readonly Repository _repo;
         private string _name;
     }
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index ec56ff20..b757bd78 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -14,15 +14,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.CreateBranch.Title}"/>
-    <Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto"/>
-        <RowDefinition Height="Auto"/>
-        <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,Auto,Auto" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -94,7 +86,7 @@
                        IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         </WrapPanel>
       </Border>
-      
+
       <CheckBox Grid.Row="4" Grid.Column="1"
                 Content="{DynamicResource Text.CreateBranch.Checkout}"
                 IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index 59a849fe..efbbf323 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:v="using:SourceGit.Views"
+             xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RenameBranch"
              x:DataType="vm:RenameBranch">
@@ -11,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.RenameBranch}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -32,6 +33,13 @@
                Text="{Binding Name, Mode=TwoWay}"
                Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"
                v:AutoFocusBehaviour.IsEnabled="True"/>
+
+      <StackPanel Grid.Row="2" Grid.Column="1"
+                  Orientation="Horizontal"
+                  IsVisible="{Binding Name, Converter={x:Static c:StringConverters.ContainsSpaces}}">
+        <Path Width="10" Height="10" Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
+        <TextBlock Classes="small" Text="{DynamicResource Text.CreateBranch.Name.WarnSpace}" Margin="4,0,0,0"/>
+      </StackPanel>
     </Grid>
   </StackPanel>
 </UserControl>

From 0e261cffd20a39847f4a6377715eecb7a8c307aa Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Mar 2025 10:21:54 +0800
Subject: [PATCH 244/364] refactor: rewrite the way to deal with uncommitted
 local changes when checkout/pull/create branch (#1085)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/DealWithLocalChanges.cs |  9 ------
 src/Resources/Locales/de_DE.axaml  |  3 --
 src/Resources/Locales/en_US.axaml  |  3 --
 src/Resources/Locales/es_ES.axaml  |  3 --
 src/Resources/Locales/fr_FR.axaml  |  3 --
 src/Resources/Locales/it_IT.axaml  |  3 --
 src/Resources/Locales/pt_BR.axaml  |  3 --
 src/Resources/Locales/ru_RU.axaml  |  3 --
 src/Resources/Locales/zh_CN.axaml  |  3 --
 src/Resources/Locales/zh_TW.axaml  |  3 --
 src/ViewModels/Checkout.cs         | 17 ++++++-----
 src/ViewModels/CheckoutCommit.cs   | 20 ++++++-------
 src/ViewModels/CreateBranch.cs     | 19 +++++++-----
 src/ViewModels/Pull.cs             | 16 +++++-----
 src/Views/Checkout.axaml           | 22 +++++---------
 src/Views/Checkout.axaml.cs        | 47 ------------------------------
 src/Views/CheckoutCommit.axaml     | 12 ++++----
 src/Views/CreateBranch.axaml       | 18 ++++--------
 src/Views/CreateBranch.axaml.cs    | 47 ------------------------------
 src/Views/Pull.axaml               | 22 +++++---------
 src/Views/Pull.axaml.cs            | 47 ------------------------------
 21 files changed, 63 insertions(+), 260 deletions(-)
 delete mode 100644 src/Models/DealWithLocalChanges.cs

diff --git a/src/Models/DealWithLocalChanges.cs b/src/Models/DealWithLocalChanges.cs
deleted file mode 100644
index f308a90c..00000000
--- a/src/Models/DealWithLocalChanges.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace SourceGit.Models
-{
-    public enum DealWithLocalChanges
-    {
-        DoNothing,
-        StashAndReaply,
-        Discard,
-    }
-}
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 1d0ca895..759e3a53 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -90,7 +90,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Quelle an Commit-Nachricht anhängen</x:String>
@@ -206,7 +205,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Erstellten Branch auschecken</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Neuer Branch-Name:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Branch-Namen eingeben.</x:String>
@@ -517,7 +515,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Lokaler Branch:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Ohne Tags fetchen</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5df3ca71..90125de8 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -88,7 +88,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Append source to commit message</x:String>
@@ -205,7 +204,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Check out the created branch</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">New Branch Name:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Enter branch name.</x:String>
@@ -520,7 +518,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Into:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch without tags</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 4073f512..bcf09e1a 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Rama:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">No Hacer Nada</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Añadir fuente al mensaje de commit</x:String>
@@ -208,7 +207,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">No Hacer Nada</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nombre de la Nueva Rama:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Introduzca el nombre de la rama.</x:String>
@@ -524,7 +522,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">En:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">No Hacer Nada</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch sin etiquetas</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 59fe00a8..76405b21 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -83,7 +83,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Annuler</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Mettre en stash et réappliquer</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick de ce commit</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Ajouter la source au message de commit</x:String>
@@ -198,7 +197,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Récupérer la branche créée</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nom de la nouvelle branche :</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Entrez le nom de la branche.</x:String>
@@ -492,7 +490,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Dans :</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch sans les tags</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Dépôt distant :</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 6e99decf..f944689c 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Non fare nulla</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Aggiungi sorgente al messaggio di commit</x:String>
@@ -208,7 +207,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout del Branch Creato</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Non Fare Nulla</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nome Nuovo Branch:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Inserisci il nome del branch.</x:String>
@@ -523,7 +521,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">In:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Non fare nulla</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Riapplica</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Recupera senza tag</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 78445bfb..ebff746c 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -107,7 +107,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nada</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Adicionar origem à mensagem de commit</x:String>
@@ -215,7 +214,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checar o branch criado</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Não Fazer Nada</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Guardar &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nome do Novo Branch:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Insira o nome do branch.</x:String>
@@ -506,7 +504,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Para:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Não Fazer Nada</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Guardar &amp; Reaplicar</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Buscar sem tags</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index ff24912e..6815bbeb 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Ветка:</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.DoNothing" xml:space="preserve">Ничего не делать</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Отложить и примненить повторно</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>
@@ -209,7 +208,6 @@
   <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.DoNothing" xml:space="preserve">Ничего не делать</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Отложить и применить повторно</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>
@@ -524,7 +522,6 @@
   <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.DoNothing" xml:space="preserve">Ничего не делать</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Отложить и применить повторно</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Забрать без меток</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Внешний репозиторий:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 72b434f9..cf796805 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目标分支 ：</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.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</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>
@@ -208,7 +207,6 @@
   <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.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</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>
@@ -524,7 +522,6 @@
   <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.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">不拉取远程标签</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">远程 ：</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index bc9991f6..539001bd 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目標分支:</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.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</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>
@@ -208,7 +207,6 @@
   <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.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</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>
@@ -523,7 +521,6 @@
   <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.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">不拉取遠端標籤</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">遠端:</x:String>
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index 9376741d..3334eba4 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -9,16 +9,17 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public Models.DealWithLocalChanges PreAction
+        public bool DiscardLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public Checkout(Repository repo, string branch)
         {
             _repo = repo;
             Branch = branch;
+            DiscardLocalChanges = false;
             View = new Views.Checkout() { DataContext = this };
         }
 
@@ -33,7 +34,12 @@ namespace SourceGit.ViewModels
                 var needPopStash = false;
                 if (changes > 0)
                 {
-                    if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath, false);
+                    }
+                    else
                     {
                         SetProgressDescription("Stash local changes ...");
                         var succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
@@ -45,11 +51,6 @@ namespace SourceGit.ViewModels
 
                         needPopStash = true;
                     }
-                    else if (PreAction == Models.DealWithLocalChanges.Discard)
-                    {
-                        SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath, false);
-                    }
                 }
 
                 SetProgressDescription("Checkout branch ...");
diff --git a/src/ViewModels/CheckoutCommit.cs b/src/ViewModels/CheckoutCommit.cs
index ddc0a0c6..1876a425 100644
--- a/src/ViewModels/CheckoutCommit.cs
+++ b/src/ViewModels/CheckoutCommit.cs
@@ -9,16 +9,17 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public bool AutoStash
+        public bool DiscardLocalChanges
         {
-            get => _autoStash;
-            set => SetProperty(ref _autoStash, value);
+            get;
+            set;
         }
 
         public CheckoutCommit(Repository repo, Models.Commit commit)
         {
             _repo = repo;
             Commit = commit;
+            DiscardLocalChanges = false;
             View = new Views.CheckoutCommit() { DataContext = this };
         }
 
@@ -33,7 +34,12 @@ namespace SourceGit.ViewModels
                 var needPopStash = false;
                 if (changes > 0)
                 {
-                    if (AutoStash)
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath, false);
+                    }
+                    else
                     {
                         SetProgressDescription("Stash local changes ...");
                         var succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
@@ -45,11 +51,6 @@ namespace SourceGit.ViewModels
 
                         needPopStash = true;
                     }
-                    else
-                    {
-                        SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath, false);
-                    }
                 }
 
                 SetProgressDescription("Checkout commit ...");
@@ -67,6 +68,5 @@ namespace SourceGit.ViewModels
         }
 
         private readonly Repository _repo = null;
-        private bool _autoStash = true;
     }
 }
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index 01bff031..37db0065 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -19,11 +19,11 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public Models.DealWithLocalChanges PreAction
+        public bool DiscardLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public bool CheckoutAfterCreated
         {
@@ -47,6 +47,7 @@ namespace SourceGit.ViewModels
             }
 
             BasedOn = branch;
+            DiscardLocalChanges = false;
             View = new Views.CreateBranch() { DataContext = this };
         }
 
@@ -56,6 +57,7 @@ namespace SourceGit.ViewModels
             _baseOnRevision = commit.SHA;
 
             BasedOn = commit;
+            DiscardLocalChanges = false;
             View = new Views.CreateBranch() { DataContext = this };
         }
 
@@ -65,6 +67,7 @@ namespace SourceGit.ViewModels
             _baseOnRevision = tag.SHA;
 
             BasedOn = tag;
+            DiscardLocalChanges = false;
             View = new Views.CreateBranch() { DataContext = this };
         }
 
@@ -98,7 +101,12 @@ namespace SourceGit.ViewModels
                     var needPopStash = false;
                     if (changes > 0)
                     {
-                        if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
+                        if (DiscardLocalChanges)
+                        {
+                            SetProgressDescription("Discard local changes...");
+                            Commands.Discard.All(_repo.FullPath, false);
+                        }
+                        else
                         {
                             SetProgressDescription("Stash local changes");
                             succ = new Commands.Stash(_repo.FullPath).Push("CREATE_BRANCH_AUTO_STASH");
@@ -110,11 +118,6 @@ namespace SourceGit.ViewModels
 
                             needPopStash = true;
                         }
-                        else if (PreAction == Models.DealWithLocalChanges.Discard)
-                        {
-                            SetProgressDescription("Discard local changes...");
-                            Commands.Discard.All(_repo.FullPath, false);
-                        }
                     }
 
                     SetProgressDescription($"Create new branch '{fixedName}'");
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index ff557792..62d68834 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -38,11 +38,11 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _selectedBranch, value, true);
         }
 
-        public Models.DealWithLocalChanges PreAction
+        public bool DiscardLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public bool UseRebase
         {
@@ -124,7 +124,12 @@ namespace SourceGit.ViewModels
                 var needPopStash = false;
                 if (changes > 0)
                 {
-                    if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath, false);
+                    }
+                    else
                     {
                         SetProgressDescription("Stash local changes...");
                         var succ = new Commands.Stash(_repo.FullPath).Push("PULL_AUTO_STASH");
@@ -136,11 +141,6 @@ namespace SourceGit.ViewModels
 
                         needPopStash = true;
                     }
-                    else if (PreAction == Models.DealWithLocalChanges.Discard)
-                    {
-                        SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath, false);
-                    }
                 }
 
                 bool rs;
diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
index eb1c9de0..3cdfd94e 100644
--- a/src/Views/Checkout.axaml
+++ b/src/Views/Checkout.axaml
@@ -18,7 +18,7 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
       </Grid.RowDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -32,21 +32,13 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Checkout.LocalChanges}"/>
-      <WrapPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">        
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
-                     x:Name="RadioDoNothing"
-                     GroupName="LocalChanges"
+      <WrapPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
+        <RadioButton GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
-                     x:Name="RadioStashAndReply"
-                     GroupName="LocalChanges"
-                     Margin="0,0,8,0"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
-                     x:Name="RadioDiscard"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+                     Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                     IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
+        <RadioButton GroupName="LocalChanges"
+                     Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"/>
       </WrapPanel>
     </Grid>
   </StackPanel>
diff --git a/src/Views/Checkout.axaml.cs b/src/Views/Checkout.axaml.cs
index da6e6b31..f8398a1d 100644
--- a/src/Views/Checkout.axaml.cs
+++ b/src/Views/Checkout.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -9,51 +8,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var vm = DataContext as ViewModels.Checkout;
-            if (vm == null)
-                return;
-
-            switch (vm.PreAction)
-            {
-                case Models.DealWithLocalChanges.DoNothing:
-                    RadioDoNothing.IsChecked = true;
-                    break;
-                case Models.DealWithLocalChanges.StashAndReaply:
-                    RadioStashAndReply.IsChecked = true;
-                    break;
-                default:
-                    RadioDiscard.IsChecked = true;
-                    break;
-            }
-        }
-
-        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            var vm = DataContext as ViewModels.Checkout;
-            if (vm == null)
-                return;
-
-            if (RadioDoNothing.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
-                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
-                return;
-            }
-
-            if (RadioStashAndReply.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
-                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
-                return;
-            }
-
-            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
-                vm.PreAction = Models.DealWithLocalChanges.Discard;
-        }
     }
 }
diff --git a/src/Views/CheckoutCommit.axaml b/src/Views/CheckoutCommit.axaml
index 3ee3943f..9b418823 100644
--- a/src/Views/CheckoutCommit.axaml
+++ b/src/Views/CheckoutCommit.axaml
@@ -30,16 +30,16 @@
       <StackPanel Grid.Row="1" Grid.Column="1" Height="32" Orientation="Horizontal">
         <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.StashAndReply}"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding AutoStash, Mode=TwoWay}" />
+                     Margin="0,0,8,0"
+                     IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
         <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"
-                     GroupName="LocalChanges"
-                     Margin="8,0,0,0" />
+                     GroupName="LocalChanges"/>
       </StackPanel>
 
       <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="0,6,0,0">
-        <Path Grid.Column="0" 
-              Width="14" Height="14" 
-              Data="{StaticResource Icons.Error}" 
+        <Path Grid.Column="0"
+              Width="14" Height="14"
+              Data="{StaticResource Icons.Error}"
               Fill="DarkOrange"/>
         <TextBlock Grid.Column="1" Margin="8,0,0,0"
                    Text="{DynamicResource Text.Checkout.Commit.Warning}"
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index b757bd78..a5f1f212 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -70,20 +70,12 @@
                  IsVisible="{Binding !IsBareRepository}"/>
       <Border Grid.Row="3" Grid.Column="1" MinHeight="32" IsVisible="{Binding !IsBareRepository}">
         <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
-          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
-                       x:Name="RadioDoNothing"
-                       GroupName="LocalChanges"
+          <RadioButton GroupName="LocalChanges"
                        Margin="0,0,8,0"
-                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
-                       x:Name="RadioStashAndReply"
-                       GroupName="LocalChanges"
-                       Margin="0,0,8,0"
-                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
-                       x:Name="RadioDiscard"
-                       GroupName="LocalChanges"
-                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+                       Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                       IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
+          <RadioButton GroupName="LocalChanges"
+                       Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"/>
         </WrapPanel>
       </Border>
 
diff --git a/src/Views/CreateBranch.axaml.cs b/src/Views/CreateBranch.axaml.cs
index 6499e1c7..6626871b 100644
--- a/src/Views/CreateBranch.axaml.cs
+++ b/src/Views/CreateBranch.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -9,51 +8,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var vm = DataContext as ViewModels.CreateBranch;
-            if (vm == null)
-                return;
-
-            switch (vm.PreAction)
-            {
-                case Models.DealWithLocalChanges.DoNothing:
-                    RadioDoNothing.IsChecked = true;
-                    break;
-                case Models.DealWithLocalChanges.StashAndReaply:
-                    RadioStashAndReply.IsChecked = true;
-                    break;
-                default:
-                    RadioDiscard.IsChecked = true;
-                    break;
-            }
-        }
-
-        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            var vm = DataContext as ViewModels.CreateBranch;
-            if (vm == null)
-                return;
-
-            if (RadioDoNothing.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
-                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
-                return;
-            }
-
-            if (RadioStashAndReply.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
-                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
-                return;
-            }
-
-            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
-                vm.PreAction = Models.DealWithLocalChanges.Discard;
-        }
     }
 }
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index 3e1f96d9..67121826 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -22,7 +22,7 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="32"/>
       </Grid.RowDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -84,22 +84,14 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Pull.LocalChanges}"/>
       <WrapPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.DoNothing}"
-                     x:Name="RadioDoNothing"
+        <RadioButton GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.StashAndReply}"
-                     x:Name="RadioStashAndReply"
-                     Margin="0,0,8,0"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.Discard}"
-                     x:Name="RadioDiscard"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+                     Content="{DynamicResource Text.Pull.LocalChanges.StashAndReply}"
+                     IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
+        <RadioButton GroupName="LocalChanges"
+                     Content="{DynamicResource Text.Pull.LocalChanges.Discard}"/>
       </WrapPanel>
-      
+
       <CheckBox Grid.Row="4" Grid.Column="1"
                 Content="{DynamicResource Text.Pull.FetchAllBranches}"
                 IsChecked="{Binding FetchAllBranches, Mode=TwoWay}"/>
diff --git a/src/Views/Pull.axaml.cs b/src/Views/Pull.axaml.cs
index 3003f02c..c6b4923e 100644
--- a/src/Views/Pull.axaml.cs
+++ b/src/Views/Pull.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -9,51 +8,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var vm = DataContext as ViewModels.Pull;
-            if (vm == null)
-                return;
-
-            switch (vm.PreAction)
-            {
-                case Models.DealWithLocalChanges.DoNothing:
-                    RadioDoNothing.IsChecked = true;
-                    break;
-                case Models.DealWithLocalChanges.StashAndReaply:
-                    RadioStashAndReply.IsChecked = true;
-                    break;
-                default:
-                    RadioDiscard.IsChecked = true;
-                    break;
-            }
-        }
-
-        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            var vm = DataContext as ViewModels.Pull;
-            if (vm == null)
-                return;
-
-            if (RadioDoNothing.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
-                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
-                return;
-            }
-
-            if (RadioStashAndReply.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
-                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
-                return;
-            }
-
-            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
-                vm.PreAction = Models.DealWithLocalChanges.Discard;
-        }
     }
 }

From 519bdf1ddc1bb7bba6fb0187d1d9d208797115e6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Mar 2025 02:22:09 +0000
Subject: [PATCH 245/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 399916c9..cc37aae9 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.08%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.68%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.41%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.07%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.64%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.38%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index a5abbbba..155e031a 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.08%
+### de_DE.axaml: 99.07%
 
 
 <details>
@@ -24,7 +24,7 @@
 
 </details>
 
-### fr_FR.axaml: 91.68%
+### fr_FR.axaml: 91.64%
 
 
 <details>
@@ -106,7 +106,7 @@
 
 </details>
 
-### pt_BR.axaml: 91.41%
+### pt_BR.axaml: 91.38%
 
 
 <details>

From b9b684a83d58740d2bd802e08ad83746fcb97359 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Thu, 13 Mar 2025 15:05:30 +0800
Subject: [PATCH 246/364] fix: improve font string processing in SetFonts
 method (#1092)

---
 src/App.axaml.cs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 25e32323..504981f7 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -181,6 +181,9 @@ namespace SourceGit
                 app._fontsOverrides = null;
             }
 
+            defaultFont = ProcessFontString(defaultFont);
+            monospaceFont = ProcessFontString(monospaceFont);
+
             var resDic = new ResourceDictionary();
             if (!string.IsNullOrEmpty(defaultFont))
                 resDic.Add("Fonts.Default", new FontFamily(defaultFont));
@@ -437,6 +440,28 @@ namespace SourceGit
             return true;
         }
 
+        private static string ProcessFontString(string input)
+        {
+            if (string.IsNullOrEmpty(input)) return string.Empty;
+
+            var parts = input.Split(',');
+            var result = new StringBuilder();
+            var isFirst = true;
+
+            foreach (var part in parts)
+            {
+                var trimmed = part.Trim();
+                if (!string.IsNullOrEmpty(trimmed))
+                {
+                    if (!isFirst) result.Append(',');
+                    result.Append(trimmed);
+                    isFirst = false;
+                }
+            }
+
+            return result.ToString();
+        }
+
         private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
         {
             var args = desktop.Args;

From 9560496c7bf9cec50f98f19d8b37dbe98d71fcf9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Mar 2025 15:17:20 +0800
Subject: [PATCH 247/364] code_review: PR #1092

- Remove `SourceGit.ViewModels.Preference.FixFontFamilyName` (it is not necessary any more)
- Use `string.Join` instead of `StringBuilder` to make the logic more clear

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.axaml.cs              | 24 +++++++++------------
 src/ViewModels/Preferences.cs | 40 ++++-------------------------------
 2 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 504981f7..79eeda4e 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -181,8 +181,8 @@ namespace SourceGit
                 app._fontsOverrides = null;
             }
 
-            defaultFont = ProcessFontString(defaultFont);
-            monospaceFont = ProcessFontString(monospaceFont);
+            defaultFont = FixFontFamilyName(defaultFont);
+            monospaceFont = FixFontFamilyName(monospaceFont);
 
             var resDic = new ResourceDictionary();
             if (!string.IsNullOrEmpty(defaultFont))
@@ -440,26 +440,22 @@ namespace SourceGit
             return true;
         }
 
-        private static string ProcessFontString(string input)
+        private static string FixFontFamilyName(string input)
         {
-            if (string.IsNullOrEmpty(input)) return string.Empty;
+            if (string.IsNullOrEmpty(input))
+                return string.Empty;
 
             var parts = input.Split(',');
-            var result = new StringBuilder();
-            var isFirst = true;
+            var trimmed = new List<string>();
 
             foreach (var part in parts)
             {
-                var trimmed = part.Trim();
-                if (!string.IsNullOrEmpty(trimmed))
-                {
-                    if (!isFirst) result.Append(',');
-                    result.Append(trimmed);
-                    isFirst = false;
-                }
+                var t = part.Trim();
+                if (!string.IsNullOrEmpty(t))
+                    trimmed.Add(t);
             }
 
-            return result.ToString();
+            return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;
         }
 
         private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index dae90517..0b1d841e 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Avalonia.Collections;
@@ -66,9 +65,8 @@ namespace SourceGit.ViewModels
             get => _defaultFontFamily;
             set
             {
-                var name = FixFontFamilyName(value);
-                if (SetProperty(ref _defaultFontFamily, name) && !_isLoading)
-                    App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);
+                if (SetProperty(ref _defaultFontFamily, value) && !_isLoading)
+                    App.SetFonts(value, _monospaceFontFamily, _onlyUseMonoFontInEditor);
             }
         }
 
@@ -77,9 +75,8 @@ namespace SourceGit.ViewModels
             get => _monospaceFontFamily;
             set
             {
-                var name = FixFontFamilyName(value);
-                if (SetProperty(ref _monospaceFontFamily, name) && !_isLoading)
-                    App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);
+                if (SetProperty(ref _monospaceFontFamily, value) && !_isLoading)
+                    App.SetFonts(_defaultFontFamily, value, _onlyUseMonoFontInEditor);
             }
         }
 
@@ -620,35 +617,6 @@ namespace SourceGit.ViewModels
             return changed;
         }
 
-        private string FixFontFamilyName(string name)
-        {
-            var trimmed = name.Trim();
-            if (string.IsNullOrEmpty(trimmed))
-                return string.Empty;
-
-            var builder = new StringBuilder();
-            var lastIsSpace = false;
-            for (int i = 0; i < trimmed.Length; i++)
-            {
-                var c = trimmed[i];
-                if (char.IsWhiteSpace(c))
-                {
-                    if (lastIsSpace)
-                        continue;
-
-                    lastIsSpace = true;
-                }
-                else
-                {
-                    lastIsSpace = false;
-                }
-
-                builder.Append(c);
-            }
-
-            return builder.ToString();
-        }
-
         private static Preferences _instance = null;
         private static bool _isLoading = false;
 

From 67f4330dd4799c4358be3852a566207aae30cb3f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Mar 2025 15:23:43 +0800
Subject: [PATCH 248/364] code_style: arrange methods in `App.axaml.cs`

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

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 79eeda4e..f59d35db 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -77,6 +77,31 @@ namespace SourceGit
             Native.OS.SetupApp(builder);
             return builder;
         }
+
+        private static void LogException(Exception ex)
+        {
+            if (ex == null)
+                return;
+
+            var builder = new StringBuilder();
+            builder.Append($"Crash::: {ex.GetType().FullName}: {ex.Message}\n\n");
+            builder.Append("----------------------------\n");
+            builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n");
+            builder.Append($"OS: {Environment.OSVersion}\n");
+            builder.Append($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n");
+            builder.Append($"Source: {ex.Source}\n");
+            builder.Append($"Thread Name: {Thread.CurrentThread.Name ?? "Unnamed"}\n");
+            builder.Append($"User: {Environment.UserName}\n");
+            builder.Append($"App Start Time: {Process.GetCurrentProcess().StartTime}\n");
+            builder.Append($"Exception Time: {DateTime.Now}\n");
+            builder.Append($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB\n");
+            builder.Append($"---------------------------\n\n");
+            builder.Append(ex);
+
+            var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
+            var file = Path.Combine(Native.OS.DataDir, $"crash_{time}.log");
+            File.WriteAllText(file, builder.ToString());
+        }
         #endregion
 
         #region Utility Functions
@@ -181,8 +206,8 @@ namespace SourceGit
                 app._fontsOverrides = null;
             }
 
-            defaultFont = FixFontFamilyName(defaultFont);
-            monospaceFont = FixFontFamilyName(monospaceFont);
+            defaultFont = app.FixFontFamilyName(defaultFont);
+            monospaceFont = app.FixFontFamilyName(monospaceFont);
 
             var resDic = new ResourceDictionary();
             if (!string.IsNullOrEmpty(defaultFont))
@@ -328,31 +353,6 @@ namespace SourceGit
         }
         #endregion
 
-        private static void LogException(Exception ex)
-        {
-            if (ex == null)
-                return;
-
-            var builder = new StringBuilder();
-            builder.Append($"Crash::: {ex.GetType().FullName}: {ex.Message}\n\n");
-            builder.Append("----------------------------\n");
-            builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n");
-            builder.Append($"OS: {Environment.OSVersion}\n");
-            builder.Append($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n");
-            builder.Append($"Source: {ex.Source}\n");
-            builder.Append($"Thread Name: {Thread.CurrentThread.Name ?? "Unnamed"}\n");
-            builder.Append($"User: {Environment.UserName}\n");
-            builder.Append($"App Start Time: {Process.GetCurrentProcess().StartTime}\n");
-            builder.Append($"Exception Time: {DateTime.Now}\n");
-            builder.Append($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB\n");
-            builder.Append($"---------------------------\n\n");
-            builder.Append(ex);
-
-            var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
-            var file = Path.Combine(Native.OS.DataDir, $"crash_{time}.log");
-            File.WriteAllText(file, builder.ToString());
-        }
-
         private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode)
         {
             exitCode = -1;
@@ -440,24 +440,6 @@ namespace SourceGit
             return true;
         }
 
-        private static string FixFontFamilyName(string input)
-        {
-            if (string.IsNullOrEmpty(input))
-                return string.Empty;
-
-            var parts = input.Split(',');
-            var trimmed = new List<string>();
-
-            foreach (var part in parts)
-            {
-                var t = part.Trim();
-                if (!string.IsNullOrEmpty(t))
-                    trimmed.Add(t);
-            }
-
-            return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;
-        }
-
         private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
         {
             var args = desktop.Args;
@@ -567,6 +549,24 @@ namespace SourceGit
             });
         }
 
+        private string FixFontFamilyName(string input)
+        {
+            if (string.IsNullOrEmpty(input))
+                return string.Empty;
+
+            var parts = input.Split(',');
+            var trimmed = new List<string>();
+
+            foreach (var part in parts)
+            {
+                var t = part.Trim();
+                if (!string.IsNullOrEmpty(t))
+                    trimmed.Add(t);
+            }
+
+            return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;
+        }
+
         private ViewModels.Launcher _launcher = null;
         private ResourceDictionary _activeLocale = null;
         private ResourceDictionary _themeOverrides = null;

From 9645b65db669af8fa2b5b24df0e2765d0d576182 Mon Sep 17 00:00:00 2001
From: Michael Pakhantsov <michael.pakhantsov@gmail.com>
Date: Fri, 14 Mar 2025 03:26:59 +0200
Subject: [PATCH 249/364] Explicitly provided fully qualified reference for the
 git branch, becase can be exists a tag and a branch with identical names
 (#1093)

Fix push command for branch deletion

Updated the `push` command to use `--delete refs/heads/{name}` instead of `--delete {name}` for clearer branch reference when deleting a remote branch.

Co-authored-by: Michael Pakhantsov <michae.pakhantsov@gmail.com>
---
 src/Commands/Branch.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Commands/Branch.cs b/src/Commands/Branch.cs
index 391aeeb2..d56dfa97 100644
--- a/src/Commands/Branch.cs
+++ b/src/Commands/Branch.cs
@@ -62,7 +62,7 @@
             if (exists)
             {
                 cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
-                cmd.Args = $"push {remote} --delete {name}";
+                cmd.Args = $"push {remote} --delete refs/heads/{name}";
             }
             else
             {

From c8bee2f6ba9f611e125126b7729a91ebdb2b7d31 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 14 Mar 2025 09:36:34 +0800
Subject: [PATCH 250/364] code_review: PR #1093

Merge deleting branch and tag on remote into `SourceGit.Commands.Push(repo, remote, refname, isDelete)`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Branch.cs      | 17 +++++------------
 src/Commands/Push.cs        |  4 ++--
 src/Commands/Tag.cs         |  4 +---
 src/ViewModels/CreateTag.cs |  2 +-
 src/ViewModels/PushTag.cs   |  7 ++++---
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Commands/Branch.cs b/src/Commands/Branch.cs
index d56dfa97..2dc8a98d 100644
--- a/src/Commands/Branch.cs
+++ b/src/Commands/Branch.cs
@@ -54,21 +54,14 @@
 
         public static bool DeleteRemote(string repo, string remote, string name)
         {
+            bool exists = new Remote(repo).HasBranch(remote, name);
+            if (exists)
+                return new Push(repo, remote, $"refs/heads/{name}", true).Exec();
+
             var cmd = new Command();
             cmd.WorkingDirectory = repo;
             cmd.Context = repo;
-
-            bool exists = new Remote(repo).HasBranch(remote, name);
-            if (exists)
-            {
-                cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
-                cmd.Args = $"push {remote} --delete refs/heads/{name}";
-            }
-            else
-            {
-                cmd.Args = $"branch -D -r {remote}/{name}";
-            }
-
+            cmd.Args = $"branch -D -r {remote}/{name}";
             return cmd.Exec();
         }
     }
diff --git a/src/Commands/Push.cs b/src/Commands/Push.cs
index 69b859ab..dc81f606 100644
--- a/src/Commands/Push.cs
+++ b/src/Commands/Push.cs
@@ -26,7 +26,7 @@ namespace SourceGit.Commands
             Args += $"{remote} {local}:{remoteBranch}";
         }
 
-        public Push(string repo, string remote, string tag, bool isDelete)
+        public Push(string repo, string remote, string refname, bool isDelete)
         {
             WorkingDirectory = repo;
             Context = repo;
@@ -36,7 +36,7 @@ namespace SourceGit.Commands
             if (isDelete)
                 Args += "--delete ";
 
-            Args += $"{remote} refs/tags/{tag}";
+            Args += $"{remote} {refname}";
         }
 
         protected override void OnReadline(string line)
diff --git a/src/Commands/Tag.cs b/src/Commands/Tag.cs
index fa11e366..23dbb11c 100644
--- a/src/Commands/Tag.cs
+++ b/src/Commands/Tag.cs
@@ -48,9 +48,7 @@ namespace SourceGit.Commands
             if (remotes != null)
             {
                 foreach (var r in remotes)
-                {
-                    new Push(repo, r.Name, name, true).Exec();
-                }
+                    new Push(repo, r.Name, $"refs/tags/{name}", true).Exec();
             }
 
             return true;
diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs
index a6d7255b..86ae7118 100644
--- a/src/ViewModels/CreateTag.cs
+++ b/src/ViewModels/CreateTag.cs
@@ -96,7 +96,7 @@ namespace SourceGit.ViewModels
                     foreach (var remote in remotes)
                     {
                         SetProgressDescription($"Pushing tag to remote {remote.Name} ...");
-                        new Commands.Push(_repo.FullPath, remote.Name, _tagName, false).Exec();
+                        new Commands.Push(_repo.FullPath, remote.Name, $"refs/tags/{_tagName}", false).Exec();
                     }
                 }
 
diff --git a/src/ViewModels/PushTag.cs b/src/ViewModels/PushTag.cs
index 54673fbe..de2941d2 100644
--- a/src/ViewModels/PushTag.cs
+++ b/src/ViewModels/PushTag.cs
@@ -43,13 +43,14 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                bool succ = true;
+                var succ = true;
+                var tag = $"refs/tags/{Target.Name}";
                 if (_pushAllRemotes)
                 {
                     foreach (var remote in _repo.Remotes)
                     {
                         SetProgressDescription($"Pushing tag to remote {remote.Name} ...");
-                        succ = new Commands.Push(_repo.FullPath, remote.Name, Target.Name, false).Exec();
+                        succ = new Commands.Push(_repo.FullPath, remote.Name, tag, false).Exec();
                         if (!succ)
                             break;
                     }
@@ -57,7 +58,7 @@ namespace SourceGit.ViewModels
                 else
                 {
                     SetProgressDescription($"Pushing tag to remote {SelectedRemote.Name} ...");
-                    succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, Target.Name, false).Exec();
+                    succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, tag, false).Exec();
                 }
 
                 CallUIThread(() => _repo.SetWatcherEnabled(true));

From c3e1fb93b6fcd42b5156c999371e1f4f61537fb5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 14 Mar 2025 10:54:09 +0800
Subject: [PATCH 251/364] refactor: fix maxOS `PATH` env

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Command.cs             |  4 ----
 src/Commands/ExecuteCustomAction.cs |  8 --------
 src/Native/MacOS.cs                 | 15 ++++++++++++++-
 src/Native/OS.cs                    |  6 ------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index 5197de11..0fef1235 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -198,10 +198,6 @@ namespace SourceGit.Commands
                 start.Environment.Add("LC_ALL", "C");
             }
 
-            // Fix macOS `PATH` env
-            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
-                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
-
             // Force using this app as git editor.
             switch (Editor)
             {
diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs
index 894637a5..000c8fd1 100644
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@@ -17,10 +17,6 @@ namespace SourceGit.Commands
             start.CreateNoWindow = true;
             start.WorkingDirectory = repo;
 
-            // Fix macOS `PATH` env
-            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
-                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
-
             try
             {
                 Process.Start(start);
@@ -44,10 +40,6 @@ namespace SourceGit.Commands
             start.StandardErrorEncoding = Encoding.UTF8;
             start.WorkingDirectory = repo;
 
-            // Fix macOS `PATH` env
-            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
-                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
-
             var proc = new Process() { StartInfo = start };
             var builder = new StringBuilder();
 
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 633ef5eb..123b160b 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -18,9 +18,22 @@ namespace SourceGit.Native
                 DisableDefaultApplicationMenuItems = true,
             });
 
+            // Fix `PATH` env on macOS.
+            var path = Environment.GetEnvironmentVariable("PATH");
+            if (string.IsNullOrEmpty(path))
+                path = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+            else if (!path.Contains("/opt/homebrew/", StringComparison.Ordinal))
+                path = "/opt/homebrew/bin:/opt/homebrew/sbin:" + path;
+
             var customPathFile = Path.Combine(OS.DataDir, "PATH");
             if (File.Exists(customPathFile))
-                OS.CustomPathEnv = File.ReadAllText(customPathFile).Trim();
+            {
+                var env = File.ReadAllText(customPathFile).Trim();
+                if (!string.IsNullOrEmpty(env))
+                    path = env;
+            }            
+
+            Environment.SetEnvironmentVariable("PATH", path);
         }
 
         public string FindGitExecutable()
diff --git a/src/Native/OS.cs b/src/Native/OS.cs
index 3a688654..f11d1e7f 100644
--- a/src/Native/OS.cs
+++ b/src/Native/OS.cs
@@ -31,12 +31,6 @@ namespace SourceGit.Native
             private set;
         } = string.Empty;
 
-        public static string CustomPathEnv
-        {
-            get;
-            set;
-        } = string.Empty;
-
         public static string GitExecutable
         {
             get => _gitExecutable;

From db504241eae8fc93813b4eca2ddbdab3c52306b8 Mon Sep 17 00:00:00 2001
From: Asurada <43401755+ousugo@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:57:03 +0800
Subject: [PATCH 252/364] feat: add translation for "1 hour ago" in multiple
 languages (#1096)

---
 src/Resources/Locales/de_DE.axaml | 1 +
 src/Resources/Locales/en_US.axaml | 1 +
 src/Resources/Locales/es_ES.axaml | 1 +
 src/Resources/Locales/fr_FR.axaml | 1 +
 src/Resources/Locales/it_IT.axaml | 1 +
 src/Resources/Locales/pt_BR.axaml | 1 +
 src/Resources/Locales/ru_RU.axaml | 1 +
 src/Resources/Locales/zh_CN.axaml | 1 +
 src/Resources/Locales/zh_TW.axaml | 1 +
 src/Views/CommitTimeTextBlock.cs  | 5 ++++-
 10 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 759e3a53..aff8ffc5 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -443,6 +443,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Einfügen</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Gerade eben</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Vor {0} Minuten</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">Vor 1 Stunde</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">Vor {0} Stunden</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Gestern</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Vor {0} Tagen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 90125de8..818bd9bb 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -444,6 +444,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Paste</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Just now</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutes ago</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 hour ago</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} hours ago</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Yesterday</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} days ago</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index bcf09e1a..e909a14e 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -447,6 +447,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Pegar</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Justo ahora</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Hace {0} minutos</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">Hace 1 hora</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">Hace {0} horas</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ayer</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Hace {0} días</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 76405b21..aecea9ad 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -422,6 +422,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Coller</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">A l'instant</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">il y a {0} minutes</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">il y a 1 heure</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">il y a {0} heures</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Hier</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">il y a {0} jours</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index f944689c..4dcc8771 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -448,6 +448,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Incolla</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Proprio ora</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minuti fa</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 ora fa</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} ore fa</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ieri</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} giorni fa</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index ebff746c..b146bf0e 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -435,6 +435,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Colar</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Agora mesmo</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutos atrás</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 hora atrás</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} horas atrás</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ontem</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} dias atrás</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 6815bbeb..07fb7c94 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -448,6 +448,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">Вставить</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Сейчас</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" 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.Yesterday" xml:space="preserve">Вчера</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} дней назад</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index cf796805..2d160ad2 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -447,6 +447,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">粘贴</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">刚刚</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" 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.Yesterday" xml:space="preserve">昨天</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0}天前</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 539001bd..e50a600d 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -447,6 +447,7 @@
   <x:String x:Key="Text.Paste" xml:space="preserve">貼上</x:String>
   <x:String x:Key="Text.Period.JustNow" xml:space="preserve">剛剛</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" 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.Yesterday" xml:space="preserve">昨天</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} 天前</x:String>
diff --git a/src/Views/CommitTimeTextBlock.cs b/src/Views/CommitTimeTextBlock.cs
index 6947f7f2..db63e8a6 100644
--- a/src/Views/CommitTimeTextBlock.cs
+++ b/src/Views/CommitTimeTextBlock.cs
@@ -129,7 +129,10 @@ namespace SourceGit.Views
                 return App.Text("Period.MinutesAgo", (int)span.TotalMinutes);
 
             if (span.TotalDays < 1)
-                return App.Text("Period.HoursAgo", (int)span.TotalHours);
+            {
+                var hours = (int)span.TotalHours;
+                return hours == 1 ? App.Text("Period.HourAgo") : App.Text("Period.HoursAgo", hours);
+            }
 
             var lastDay = now.AddDays(-1).Date;
             if (localTime >= lastDay)

From a46e52582fd9f8e5930fe76bec86386380d4cf7a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 08:57:15 +0000
Subject: [PATCH 253/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cc37aae9..c932ec8a 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.07%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.64%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.38%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.07%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.66%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.39%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 155e031a..e3f9d2a1 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -24,7 +24,7 @@
 
 </details>
 
-### fr_FR.axaml: 91.64%
+### fr_FR.axaml: 91.66%
 
 
 <details>
@@ -106,7 +106,7 @@
 
 </details>
 
-### pt_BR.axaml: 91.38%
+### pt_BR.axaml: 91.39%
 
 
 <details>

From 66517fd4bf1ed05bd91a1002cfc9d9a508559131 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Sun, 16 Mar 2025 11:23:42 +0800
Subject: [PATCH 254/364] enhance: add tooltips to various UI elements for
 better accessibility (#1097)

* enhance: add tooltips to various UI elements for better accessibility

* refactor: simplify user string conversion
---
 src/Models/User.cs                   |  5 +++++
 src/Views/ChangeCollectionView.axaml | 13 ++++++++++---
 src/Views/DiffView.axaml             |  2 +-
 src/Views/Histories.axaml            | 11 +++++++++--
 src/Views/RevisionFiles.axaml        |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/Models/User.cs b/src/Models/User.cs
index 850bcf2f..066ab747 100644
--- a/src/Models/User.cs
+++ b/src/Models/User.cs
@@ -43,6 +43,11 @@ namespace SourceGit.Models
             return _caches.GetOrAdd(data, key => new User(key));
         }
 
+        public override string ToString()
+        {
+            return $"{Name} <{Email}>";
+        }
+
         private static ConcurrentDictionary<string, User> _caches = new ConcurrentDictionary<string, User>();
         private readonly int _hash;
     }
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index 6ce3d033..2b0f5bfa 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -39,7 +39,8 @@
             <Grid ColumnDefinitions="16,Auto,Auto,*"
                   Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                   Background="Transparent"
-                  DoubleTapped="OnRowDoubleTapped">
+                  DoubleTapped="OnRowDoubleTapped"
+                  ToolTip.Tip="{Binding FullPath}">
               <v:ChangeTreeNodeToggleButton Grid.Column="0"
                                             Classes="tree_expander"
                                             Focusable="False"
@@ -71,7 +72,10 @@
                                    SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="m:Change">
-            <Grid ColumnDefinitions="Auto,Auto,Auto,*" Background="Transparent" DoubleTapped="OnRowDoubleTapped">
+            <Grid ColumnDefinitions="Auto,Auto,Auto,*"
+                  Background="Transparent"
+                  DoubleTapped="OnRowDoubleTapped"
+                  ToolTip.Tip="{Binding Path}">
               <v:ChangeStatusIcon Grid.Column="0"
                                   Width="14" Height="14"
                                   Margin="4,0,0,0"
@@ -100,7 +104,10 @@
                                    SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="m:Change">
-            <Grid ColumnDefinitions="Auto,Auto,*" Background="Transparent" DoubleTapped="OnRowDoubleTapped">
+            <Grid ColumnDefinitions="Auto,Auto,*"
+                  Background="Transparent"
+                  DoubleTapped="OnRowDoubleTapped"
+                  ToolTip.Tip="{Binding Path}">
               <v:ChangeStatusIcon Grid.Column="0"
                                   Width="14" Height="14"
                                   Margin="4,0,0,0"
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 2842715c..8df3e4f6 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -30,7 +30,7 @@
           </Border>
 
           <!-- Title -->
-          <TextBlock Grid.Column="2" Classes="primary" Margin="4,0,0,0" Text="{Binding Title}" FontSize="11" TextTrimming="CharacterEllipsis"/>
+          <TextBlock Grid.Column="2" Classes="primary" 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">
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 583e17c1..afe2c1b7 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -126,7 +126,11 @@
                   </Grid.ColumnDefinitions>
 
                   <!-- Subject & REFS -->
-                  <Border Grid.Column="0" Padding="{Binding Margin}" ClipToBounds="True">
+                  <Border Grid.Column="0"
+                          Padding="{Binding Margin}"
+                          ClipToBounds="True"
+                          Background="Transparent"
+                          ToolTip.Tip="{Binding Subject}">
                     <Grid ColumnDefinitions="Auto,Auto,*" Margin="2,0,4,0" ClipToBounds="True">
                       <v:CommitStatusIndicator Grid.Column="0" 
                                                CurrentBranch="{Binding $parent[v:Histories].CurrentBranch}"
@@ -159,7 +163,10 @@
                   </Border>
 
                   <!-- Author -->
-                  <Grid Grid.Column="1" ColumnDefinitions="20,*" IsHitTestVisible="False">
+                  <Grid Grid.Column="1"
+                        ColumnDefinitions="20,*"
+                        Background="Transparent"
+                        ToolTip.Tip="{Binding Author}">
                     <v:Avatar Grid.Column="0"
                               Width="16" Height="16"
                               Margin="4,0,0,0"
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index ed381bf8..e0c6577d 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -46,7 +46,7 @@
                HorizontalOffset="-8" VerticalAlignment="-8">
           <Popup.IsOpen>
             <MultiBinding Converter="{x:Static BoolConverters.And}">
-              <Binding Path="RevisionFileSearchSuggestion" Converter="{x:Static c:ListConverters.IsNotNullOrEmpty}}"/>
+              <Binding Path="RevisionFileSearchSuggestion" Converter="{x:Static c:ListConverters.IsNotNullOrEmpty}"/>
               <Binding Path="$parent[Window].IsActive"/>
             </MultiBinding>
           </Popup.IsOpen>

From 84979b20b330144a0dea8ea41ae48986943e079c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 09:32:31 +0800
Subject: [PATCH 255/364] ux: force using `VertialAlignment="Center"` for sign
 info of commit (#1098)

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

diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 4ff8f20f..692d04b8 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -80,10 +80,10 @@
                       <StackPanel Orientation="Vertical">
                         <TextBlock Margin="0,0,0,12" Text="{Binding ToolTip}"/>
                         <Grid ColumnDefinitions="Auto,8,Auto" RowDefinitions="Auto,Auto">
-                          <TextBlock Grid.Row="0" Grid.Column="0" Text="Signer:" IsVisible="{Binding HasSigner}"/>
-                          <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Signer}" IsVisible="{Binding HasSigner}"/>
-                          <TextBlock Grid.Row="1" Grid.Column="0" Text="Key:"/>
-                          <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding Key}"/>
+                          <TextBlock Grid.Row="0" Grid.Column="0" Text="Signer:" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
+                          <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Signer}" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
+                          <TextBlock Grid.Row="1" Grid.Column="0" Text="Key:" VerticalAlignment="Center"/>
+                          <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding Key}" VerticalAlignment="Center"/>
                         </Grid>
                       </StackPanel>
                     </ToolTip.Tip>

From 34f86189895c74e7ddd798ead684782f4263ff49 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 09:37:40 +0800
Subject: [PATCH 256/364] version: Release 2025.09

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

diff --git a/VERSION b/VERSION
index a75bd422..23993bfb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.08
\ No newline at end of file
+2025.09
\ No newline at end of file

From 7caa03a09bbc7770cbf85ba8d16f23a9aa077864 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 09:57:52 +0800
Subject: [PATCH 257/364] project: upgrade `AvaloniaEdit` to `11.2.0`

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

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 34e4eab2..3578d59f 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -46,8 +46,8 @@
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.5" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
-    <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.2.0" />
+    <PackageReference Include="AvaloniaEdit.TextMate" Version="11.2.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.2" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.4" />

From 450dadf76ce582b3f1e59dd56f822d7c1f194c86 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 17 Mar 2025 10:12:44 +0800
Subject: [PATCH 258/364] feat: Add JSP grammar support and improve
 TextMateHelper file type handling (#1100)

- Extend grammar support by allowing multiple file extensions per grammar and adding JSP file type handling.
- Add a new JSON grammar file for JavaServer Pages (JSP) syntax highlighting.
---
 src/Models/TextMateHelper.cs    |   22 +-
 src/Resources/Grammars/jsp.json | 1206 +++++++++++++++++++++++++++++++
 2 files changed, 1218 insertions(+), 10 deletions(-)
 create mode 100644 src/Resources/Grammars/jsp.json

diff --git a/src/Models/TextMateHelper.cs b/src/Models/TextMateHelper.cs
index 0eb5e489..b7efae72 100644
--- a/src/Models/TextMateHelper.cs
+++ b/src/Models/TextMateHelper.cs
@@ -21,10 +21,11 @@ namespace SourceGit.Models
     {
         private static readonly ExtraGrammar[] s_extraGrammars =
         [
-            new ExtraGrammar("source.toml", ".toml", "toml.json"),
-            new ExtraGrammar("source.kotlin", ".kotlin", "kotlin.json"),
-            new ExtraGrammar("source.hx", ".hx", "haxe.json"),
-            new ExtraGrammar("source.hxml", ".hxml", "hxml.json"),
+            new ExtraGrammar("source.toml", [".toml"], "toml.json"),
+            new ExtraGrammar("source.kotlin", [".kotlin", ".kt", ".kts"], "kotlin.json"),
+            new ExtraGrammar("source.hx", [".hx"], "haxe.json"),
+            new ExtraGrammar("source.hxml", [".hxml"], "hxml.json"),
+            new ExtraGrammar("text.html.jsp", [".jsp", ".jspf", ".tag"], "jsp.json"),
         ];
 
         public static string GetScope(string file, RegistryOptions reg)
@@ -36,13 +37,14 @@ namespace SourceGit.Models
                 extension = ".xml";
             else if (extension == ".command")
                 extension = ".sh";
-            else if (extension == ".kt" || extension == ".kts")
-                extension = ".kotlin";
 
             foreach (var grammar in s_extraGrammars)
             {
-                if (grammar.Extension.Equals(extension, StringComparison.OrdinalIgnoreCase))
-                    return grammar.Scope;
+                foreach (var ext in grammar.Extensions)
+                {
+                    if (ext.Equals(extension, StringComparison.OrdinalIgnoreCase))
+                        return grammar.Scope;
+                }
             }
 
             return reg.GetScopeByExtension(extension);
@@ -71,10 +73,10 @@ namespace SourceGit.Models
             return reg.GetGrammar(scopeName);
         }
 
-        private record ExtraGrammar(string Scope, string Extension, string File)
+        private record ExtraGrammar(string Scope, List<string> Extensions, string File)
         {
             public readonly string Scope = Scope;
-            public readonly string Extension = Extension;
+            public readonly List<string> Extensions = Extensions;
             public readonly string File = File;
         }
     }
diff --git a/src/Resources/Grammars/jsp.json b/src/Resources/Grammars/jsp.json
new file mode 100644
index 00000000..f0067748
--- /dev/null
+++ b/src/Resources/Grammars/jsp.json
@@ -0,0 +1,1206 @@
+{
+  "information_for_contributors": [
+    "This file has been copied from https://github.com/J0hnMilt0n/vscode-jsp/blob/b33b7e4d47f3b5f4b82e93dfcadd180149153d02/syntaxes/jsp.tmLanguage.json"
+  ],
+  "fileTypes": [
+    "jsp",
+    "jspf",
+    "tag"
+  ],
+  "injections": {
+    "text.html.jsp - (meta.embedded.block.jsp | meta.embedded.line.jsp | meta.tag | comment), meta.tag string.quoted": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#declaration"
+        },
+        {
+          "include": "#expression"
+        },
+        {
+          "include": "#el_expression"
+        },
+        {
+          "include": "#tags"
+        },
+        {
+          "begin": "(^\\s*)(?=<%(?=\\s))",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.whitespace.embedded.leading.erb"
+            }
+          },
+          "end": "(?!\\G)(\\s*$\\n)?",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.whitespace.embedded.trailing.erb"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#scriptlet"
+            }
+          ]
+        },
+        {
+          "include": "#scriptlet"
+        }
+      ]
+    }
+  },
+  "keyEquivalent": "^~J",
+  "name": "JavaServer Pages",
+  "patterns": [
+    {
+      "include": "#xml_tags"
+    },
+    {
+      "include": "text.html.basic"
+    }
+  ],
+  "repository": {
+    "comment": {
+      "begin": "<%--",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.jsp"
+        }
+      },
+      "end": "--%>",
+      "name": "comment.block.jsp"
+    },
+    "declaration": {
+      "begin": "<%!",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.begin.jsp"
+        }
+      },
+      "contentName": "source.java",
+      "end": "(%)>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.end.jsp"
+        },
+        "1": {
+          "name": "source.java"
+        }
+      },
+      "name": "meta.embedded.line.declaration.jsp",
+      "patterns": [
+        {
+          "include": "source.java"
+        }
+      ]
+    },
+    "el_expression": {
+      "begin": "\\$\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.begin.jsp"
+        }
+      },
+      "contentName": "source.java",
+      "end": "(\\})",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.end.jsp"
+        },
+        "1": {
+          "name": "source.java"
+        }
+      },
+      "name": "meta.embedded.line.el_expression.jsp",
+      "patterns": [
+        {
+          "include": "source.java"
+        }
+      ]
+    },
+    "expression": {
+      "begin": "<%=",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.begin.jsp"
+        }
+      },
+      "contentName": "source.java",
+      "end": "(%)>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.end.jsp"
+        },
+        "1": {
+          "name": "source.java"
+        }
+      },
+      "name": "meta.embedded.line.expression.jsp",
+      "patterns": [
+        {
+          "include": "source.java"
+        }
+      ]
+    },
+    "scriptlet": {
+      "begin": "<%",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.begin.jsp"
+        }
+      },
+      "contentName": "source.java",
+      "end": "(%)>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.end.jsp"
+        },
+        "1": {
+          "name": "source.java"
+        }
+      },
+      "name": "meta.embedded.block.scriptlet.jsp",
+      "patterns": [
+        {
+          "match": "\\{",
+          "name": "punctuation.section.scope.begin.java"
+        },
+        {
+          "match": "\\}",
+          "name": "punctuation.section.scope.end.java"
+        },
+        {
+          "include": "source.java"
+        }
+      ]
+    },
+    "tags": {
+      "begin": "(<%@)\\s*(?=(attribute|include|page|tag|taglib|variable)\\s)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag.begin.jsp"
+        }
+      },
+      "end": "%>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag.end.jsp"
+        }
+      },
+      "name": "meta.tag.template.include.jsp",
+      "patterns": [
+        {
+          "begin": "\\G(attribute)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.attribute.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.other.attribute-name.jsp"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.jsp"
+                },
+                "3": {
+                  "name": "string.quoted.double.jsp"
+                },
+                "4": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                },
+                "5": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "match": "(name|required|fragment|rtexprvalue|type|description)(=)((\")[^\"]*(\"))"
+            }
+          ]
+        },
+        {
+          "begin": "\\G(include)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.include.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.other.attribute-name.jsp"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.jsp"
+                },
+                "3": {
+                  "name": "string.quoted.double.jsp"
+                },
+                "4": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                },
+                "5": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "match": "(file)(=)((\")[^\"]*(\"))"
+            }
+          ]
+        },
+        {
+          "begin": "\\G(page)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.page.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.other.attribute-name.jsp"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.jsp"
+                },
+                "3": {
+                  "name": "string.quoted.double.jsp"
+                },
+                "4": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                },
+                "5": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "match": "(language|extends|import|session|buffer|autoFlush|isThreadSafe|info|errorPage|isErrorPage|contentType|pageEncoding|isElIgnored)(=)((\")[^\"]*(\"))"
+            }
+          ]
+        },
+        {
+          "begin": "\\G(tag)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.tag.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.other.attribute-name.jsp"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.jsp"
+                },
+                "3": {
+                  "name": "string.quoted.double.jsp"
+                },
+                "4": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                },
+                "5": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "match": "(display-name|body-content|dynamic-attributes|small-icon|large-icon|description|example|language|import|pageEncoding|isELIgnored)(=)((\")[^\"]*(\"))"
+            }
+          ]
+        },
+        {
+          "begin": "\\G(taglib)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.taglib.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.other.attribute-name.jsp"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.jsp"
+                },
+                "3": {
+                  "name": "string.quoted.double.jsp"
+                },
+                "4": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                },
+                "5": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "match": "(uri|tagdir|prefix)(=)((\")[^\"]*(\"))"
+            }
+          ]
+        },
+        {
+          "begin": "\\G(variable)(?=\\s)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.variable.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.other.attribute-name.jsp"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.jsp"
+                },
+                "3": {
+                  "name": "string.quoted.double.jsp"
+                },
+                "4": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                },
+                "5": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "match": "(name-given|alias|variable-class|declare|scope|description)(=)((\")[^\"]*(\"))"
+            }
+          ]
+        }
+      ]
+    },
+    "xml_tags": {
+      "patterns": [
+        {
+          "begin": "(^\\s*)(?=<jsp:(declaration|expression|scriptlet)>)",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.whitespace.embedded.leading.erb"
+            }
+          },
+          "end": "(?!\\G)(\\s*$\\n)?",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.whitespace.embedded.trailing.erb"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#embedded"
+            }
+          ]
+        },
+        {
+          "include": "#embedded"
+        },
+        {
+          "include": "#directive"
+        },
+        {
+          "include": "#actions"
+        }
+      ],
+      "repository": {
+        "actions": {
+          "patterns": [
+            {
+              "begin": "(</?)(jsp:attribute)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": ">",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.attribute.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name|trim)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                },
+                "3": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "match": "(</?)(jsp:body)(>)",
+              "name": "meta.tag.template.body.jsp"
+            },
+            {
+              "begin": "(</?)(jsp:element)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": ">",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.element.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(<)(jsp:doBody)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.dobody.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(var|varReader|scope)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(</?)(jsp:forward)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/?>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.forward.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(page)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(<)(jsp:param)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.param.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name|value)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(<)(jsp:getProperty)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.getproperty.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name|property)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(</?)(jsp:include)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/?>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.include.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(page|flush)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(<)(jsp:invoke)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.invoke.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(fragment|var|varReader|scope)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(<)(jsp:output)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.output.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(omit-xml-declaration|doctype-root-element|doctype-system|doctype-public)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(</?)(jsp:plugin)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": ">",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.plugin.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(type|code|codebase|name|archive|align|height|hspace|jreversion|nspluginurl|iepluginurl)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                },
+                "3": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "end": ">",
+              "match": "(</?)(jsp:fallback)(>)",
+              "name": "meta.tag.template.fallback.jsp"
+            },
+            {
+              "begin": "(</?)(jsp:root)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": ">",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.root.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(xmlns|version|xmlns:taglibPrefix)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "(<)(jsp:setProperty)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.setproperty.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name|property|value)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                },
+                "3": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "end": ">",
+              "match": "(</?)(jsp:text)(>)",
+              "name": "meta.tag.template.text.jsp"
+            },
+            {
+              "begin": "(</?)(jsp:useBean)\\b",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.begin.jsp"
+                },
+                "2": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "/?>",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.end.jsp"
+                }
+              },
+              "name": "meta.tag.template.usebean.jsp",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(id|scope|class|type|beanName)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            }
+          ]
+        },
+        "directive": {
+          "begin": "(<)(jsp:directive\\.(?=(attribute|include|page|tag|variable)\\s))",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.jsp"
+            },
+            "2": {
+              "name": "entity.name.tag.jsp"
+            }
+          },
+          "end": "/>",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.tag.end.jsp"
+            }
+          },
+          "name": "meta.tag.template.$3.jsp",
+          "patterns": [
+            {
+              "begin": "\\G(attribute)(?=\\s)",
+              "captures": {
+                "1": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "(?=/>)",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name|required|fragment|rtexprvalue|type|description)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "\\G(include)(?=\\s)",
+              "captures": {
+                "1": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "(?=/>)",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(file)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "\\G(page)(?=\\s)",
+              "captures": {
+                "1": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "(?=/>)",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(language|extends|import|session|buffer|autoFlush|isThreadSafe|info|errorPage|isErrorPage|contentType|pageEncoding|isElIgnored)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "\\G(tag)(?=\\s)",
+              "captures": {
+                "1": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "(?=/>)",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(display-name|body-content|dynamic-attributes|small-icon|large-icon|description|example|language|import|pageEncoding|isELIgnored)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            },
+            {
+              "begin": "\\G(variable)(?=\\s)",
+              "captures": {
+                "1": {
+                  "name": "entity.name.tag.jsp"
+                }
+              },
+              "end": "(?=/>)",
+              "patterns": [
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.other.attribute-name.jsp"
+                    },
+                    "2": {
+                      "name": "punctuation.separator.key-value.jsp"
+                    },
+                    "3": {
+                      "name": "string.quoted.double.jsp"
+                    },
+                    "4": {
+                      "name": "punctuation.definition.string.begin.jsp"
+                    },
+                    "5": {
+                      "name": "punctuation.definition.string.end.jsp"
+                    }
+                  },
+                  "match": "(name-given|alias|variable-class|declare|scope|description)(=)((\")[^\"]*(\"))"
+                }
+              ]
+            }
+          ]
+        },
+        "embedded": {
+          "begin": "(<)(jsp:(declaration|expression|scriptlet))(>)",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.tag.template.$3.jsp"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.jsp"
+            },
+            "2": {
+              "name": "entity.name.tag.jsp"
+            },
+            "4": {
+              "name": "punctuation.definition.tag.end.jsp"
+            }
+          },
+          "contentName": "source.java",
+          "end": "((<)/)(jsp:\\3)(>)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.tag.template.$4.jsp"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.jsp"
+            },
+            "2": {
+              "name": "source.java"
+            },
+            "3": {
+              "name": "entity.name.tag.jsp"
+            },
+            "4": {
+              "name": "punctuation.definition.tag.end.jsp"
+            }
+          },
+          "name": "meta.embedded.block.jsp",
+          "patterns": [
+            {
+              "include": "source.java"
+            }
+          ]
+        }
+      }
+    }
+  },
+  "scopeName": "text.html.jsp",
+  "uuid": "FFF2D8D5-6282-45DF-A508-5C254E29FFC2"
+}

From 6273c01d7125304e4098f473050ac831c26d6317 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 10:55:54 +0800
Subject: [PATCH 259/364] fix: `git rev-list` raises errors after selected
 commit in `Histories` page (#1101)

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

diff --git a/src/Commands/QueryCommitChildren.cs b/src/Commands/QueryCommitChildren.cs
index 6a6ed909..31fb34f8 100644
--- a/src/Commands/QueryCommitChildren.cs
+++ b/src/Commands/QueryCommitChildren.cs
@@ -9,7 +9,7 @@ namespace SourceGit.Commands
             WorkingDirectory = repo;
             Context = repo;
             _commit = commit;
-            Args = $"rev-list -{max} --parents --branches --remotes --ancestry-path={commit} ^{commit}";
+            Args = $"rev-list -{max} --parents --branches --remotes --ancestry-path ^{commit}";
         }
 
         public List<string> Result()

From 4b41029768fd7a808e13d57c579dd88e7e7d8dae Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 17 Mar 2025 11:31:50 +0800
Subject: [PATCH 260/364] fix: use better JSP grammar file and add licensing
 information (#1102)

---
 src/Resources/Grammars/haxe.json   |    6 +-
 src/Resources/Grammars/hxml.json   |    6 +-
 src/Resources/Grammars/jsp.json    | 1226 ++--------------------------
 src/Resources/Grammars/kotlin.json |    6 +-
 src/Resources/Grammars/toml.json   |    5 +-
 5 files changed, 76 insertions(+), 1173 deletions(-)

diff --git a/src/Resources/Grammars/haxe.json b/src/Resources/Grammars/haxe.json
index 12acc538..3f78154d 100644
--- a/src/Resources/Grammars/haxe.json
+++ b/src/Resources/Grammars/haxe.json
@@ -1,7 +1,9 @@
 {
   "information_for_contributors": [
     "This file has been copied from https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/haxe.tmLanguage",
-    "and converted to JSON using https://marketplace.visualstudio.com/items?itemName=pedro-w.tmlanguage"
+    "and converted to JSON using https://marketplace.visualstudio.com/items?itemName=pedro-w.tmlanguage",
+    "The original file was licensed under the MIT License",
+    "https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md"
   ],
   "fileTypes": [
     "hx",
@@ -2485,4 +2487,4 @@
       "name": "variable.other.hx"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/Resources/Grammars/hxml.json b/src/Resources/Grammars/hxml.json
index 829c403e..3be42577 100644
--- a/src/Resources/Grammars/hxml.json
+++ b/src/Resources/Grammars/hxml.json
@@ -1,7 +1,9 @@
 {
   "information_for_contributors": [
     "This file has been copied from https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/hxml.tmLanguage",
-    "and converted to JSON using https://marketplace.visualstudio.com/items?itemName=pedro-w.tmlanguage"
+    "and converted to JSON using https://marketplace.visualstudio.com/items?itemName=pedro-w.tmlanguage",
+    "The original file was licensed under the MIT License",
+    "https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md"
   ],
   "fileTypes": [
     "hxml"
@@ -67,4 +69,4 @@
   ],
   "scopeName": "source.hxml",
   "uuid": "CB1B853A-C4C8-42C3-BA70-1B1605BE51C1"
-}
\ No newline at end of file
+}
diff --git a/src/Resources/Grammars/jsp.json b/src/Resources/Grammars/jsp.json
index f0067748..2fbfd97c 100644
--- a/src/Resources/Grammars/jsp.json
+++ b/src/Resources/Grammars/jsp.json
@@ -1,1206 +1,100 @@
 {
   "information_for_contributors": [
-    "This file has been copied from https://github.com/J0hnMilt0n/vscode-jsp/blob/b33b7e4d47f3b5f4b82e93dfcadd180149153d02/syntaxes/jsp.tmLanguage.json"
+    "This file has been copied from https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/syntaxes/jsp.tmLanguage.json",
+    "The original file was licensed under the MIT License",
+    "https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE"
   ],
-  "fileTypes": [
-    "jsp",
-    "jspf",
-    "tag"
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+  "name": "Jakarta Server Pages",
+  "fileTypes": ["jsp", "jspf", "tag"],
+  "scopeName": "text.html.jsp",
+  "patterns": [
+    { "include": "#comment" },
+    { "include": "#directive" },
+    { "include": "#expression" },
+    { "include": "text.html.derivative" }
   ],
   "injections": {
-    "text.html.jsp - (meta.embedded.block.jsp | meta.embedded.line.jsp | meta.tag | comment), meta.tag string.quoted": {
+    "L:text.html.jsp -comment -meta.tag.directive.jsp -meta.tag.scriptlet.jsp": {
       "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#declaration"
-        },
-        {
-          "include": "#expression"
-        },
-        {
-          "include": "#el_expression"
-        },
-        {
-          "include": "#tags"
-        },
-        {
-          "begin": "(^\\s*)(?=<%(?=\\s))",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.whitespace.embedded.leading.erb"
-            }
-          },
-          "end": "(?!\\G)(\\s*$\\n)?",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.whitespace.embedded.trailing.erb"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#scriptlet"
-            }
-          ]
-        },
-        {
-          "include": "#scriptlet"
-        }
-      ]
+        { "include": "#scriptlet" }
+      ],
+      "comment": "allow scriptlets anywhere except comments and nested"
+    },
+    "L:meta.attribute (string.quoted.single.html | string.quoted.double.html) -string.template.expression.jsp": {
+      "patterns": [
+        { "include": "#expression" },
+        { "include": "text.html.derivative" }
+      ],
+      "comment": "allow expressions and tags within HTML attributes (not nested)"
     }
   },
-  "keyEquivalent": "^~J",
-  "name": "JavaServer Pages",
-  "patterns": [
-    {
-      "include": "#xml_tags"
-    },
-    {
-      "include": "text.html.basic"
-    }
-  ],
   "repository": {
     "comment": {
+      "name": "comment.block.jsp",
       "begin": "<%--",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.jsp"
-        }
-      },
-      "end": "--%>",
-      "name": "comment.block.jsp"
+      "end": "--%>"
     },
-    "declaration": {
-      "begin": "<%!",
+    "directive": {
+      "name": "meta.tag.directive.jsp",
+      "begin": "(<)(%@)",
+      "end": "(%)(>)",
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.jsp"
-        }
+        "1": { "name": "punctuation.definition.tag.jsp" },
+        "2": { "name": "entity.name.tag.jsp" }
       },
-      "contentName": "source.java",
-      "end": "(%)>",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.jsp"
-        },
-        "1": {
-          "name": "source.java"
-        }
+        "1": { "name": "entity.name.tag.jsp" },
+        "2": { "name": "punctuation.definition.tag.jsp" }
       },
-      "name": "meta.embedded.line.declaration.jsp",
       "patterns": [
         {
-          "include": "source.java"
-        }
-      ]
-    },
-    "el_expression": {
-      "begin": "\\$\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.jsp"
-        }
-      },
-      "contentName": "source.java",
-      "end": "(\\})",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.jsp"
+          "match": "\\b(attribute|include|page|tag|taglib|variable)\\b(?!\\s*=)",
+          "name": "keyword.control.directive.jsp"
         },
-        "1": {
-          "name": "source.java"
-        }
-      },
-      "name": "meta.embedded.line.el_expression.jsp",
-      "patterns": [
-        {
-          "include": "source.java"
-        }
-      ]
-    },
-    "expression": {
-      "begin": "<%=",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.jsp"
-        }
-      },
-      "contentName": "source.java",
-      "end": "(%)>",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.jsp"
-        },
-        "1": {
-          "name": "source.java"
-        }
-      },
-      "name": "meta.embedded.line.expression.jsp",
-      "patterns": [
-        {
-          "include": "source.java"
-        }
+        { "include": "text.html.basic#attribute" }
       ]
     },
     "scriptlet": {
-      "begin": "<%",
+      "name": "meta.tag.scriptlet.jsp",
+      "contentName": "meta.embedded.block.java",
+      "begin": "(<)(%[\\s!=])",
+      "end": "(%)(>)",
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.jsp"
-        }
+        "1": { "name": "punctuation.definition.tag.jsp" },
+        "2": { "name": "entity.name.tag.jsp" }
       },
-      "contentName": "source.java",
-      "end": "(%)>",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.jsp"
-        },
-        "1": {
-          "name": "source.java"
-        }
+        "1": { "name": "entity.name.tag.jsp" },
+        "2": { "name": "punctuation.definition.tag.jsp" }
       },
-      "name": "meta.embedded.block.scriptlet.jsp",
       "patterns": [
         {
-          "match": "\\{",
-          "name": "punctuation.section.scope.begin.java"
+          "match": "\\{(?=\\s*(%>|$))",
+          "comment": "consume trailing curly brackets for fragmented scriptlets"
         },
-        {
-          "match": "\\}",
-          "name": "punctuation.section.scope.end.java"
-        },
-        {
-          "include": "source.java"
-        }
+        { "include": "source.java" }
       ]
     },
-    "tags": {
-      "begin": "(<%@)\\s*(?=(attribute|include|page|tag|taglib|variable)\\s)",
+    "expression": {
+      "name": "string.template.expression.jsp",
+      "contentName": "meta.embedded.block.java",
+      "begin": "[$#]\\{",
+      "end": "\\}",
       "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.begin.jsp"
-        }
+        "0": { "name": "punctuation.definition.template-expression.begin.jsp" }
       },
-      "end": "%>",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.tag.end.jsp"
-        }
+        "0": { "name": "punctuation.definition.template-expression.end.jsp" }
       },
-      "name": "meta.tag.template.include.jsp",
       "patterns": [
-        {
-          "begin": "\\G(attribute)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.attribute.jsp"
-            }
-          },
-          "end": "(?=%>)",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "entity.other.attribute-name.jsp"
-                },
-                "2": {
-                  "name": "punctuation.separator.key-value.jsp"
-                },
-                "3": {
-                  "name": "string.quoted.double.jsp"
-                },
-                "4": {
-                  "name": "punctuation.definition.string.begin.jsp"
-                },
-                "5": {
-                  "name": "punctuation.definition.string.end.jsp"
-                }
-              },
-              "match": "(name|required|fragment|rtexprvalue|type|description)(=)((\")[^\"]*(\"))"
-            }
-          ]
-        },
-        {
-          "begin": "\\G(include)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.include.jsp"
-            }
-          },
-          "end": "(?=%>)",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "entity.other.attribute-name.jsp"
-                },
-                "2": {
-                  "name": "punctuation.separator.key-value.jsp"
-                },
-                "3": {
-                  "name": "string.quoted.double.jsp"
-                },
-                "4": {
-                  "name": "punctuation.definition.string.begin.jsp"
-                },
-                "5": {
-                  "name": "punctuation.definition.string.end.jsp"
-                }
-              },
-              "match": "(file)(=)((\")[^\"]*(\"))"
-            }
-          ]
-        },
-        {
-          "begin": "\\G(page)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.page.jsp"
-            }
-          },
-          "end": "(?=%>)",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "entity.other.attribute-name.jsp"
-                },
-                "2": {
-                  "name": "punctuation.separator.key-value.jsp"
-                },
-                "3": {
-                  "name": "string.quoted.double.jsp"
-                },
-                "4": {
-                  "name": "punctuation.definition.string.begin.jsp"
-                },
-                "5": {
-                  "name": "punctuation.definition.string.end.jsp"
-                }
-              },
-              "match": "(language|extends|import|session|buffer|autoFlush|isThreadSafe|info|errorPage|isErrorPage|contentType|pageEncoding|isElIgnored)(=)((\")[^\"]*(\"))"
-            }
-          ]
-        },
-        {
-          "begin": "\\G(tag)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.tag.jsp"
-            }
-          },
-          "end": "(?=%>)",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "entity.other.attribute-name.jsp"
-                },
-                "2": {
-                  "name": "punctuation.separator.key-value.jsp"
-                },
-                "3": {
-                  "name": "string.quoted.double.jsp"
-                },
-                "4": {
-                  "name": "punctuation.definition.string.begin.jsp"
-                },
-                "5": {
-                  "name": "punctuation.definition.string.end.jsp"
-                }
-              },
-              "match": "(display-name|body-content|dynamic-attributes|small-icon|large-icon|description|example|language|import|pageEncoding|isELIgnored)(=)((\")[^\"]*(\"))"
-            }
-          ]
-        },
-        {
-          "begin": "\\G(taglib)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.taglib.jsp"
-            }
-          },
-          "end": "(?=%>)",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "entity.other.attribute-name.jsp"
-                },
-                "2": {
-                  "name": "punctuation.separator.key-value.jsp"
-                },
-                "3": {
-                  "name": "string.quoted.double.jsp"
-                },
-                "4": {
-                  "name": "punctuation.definition.string.begin.jsp"
-                },
-                "5": {
-                  "name": "punctuation.definition.string.end.jsp"
-                }
-              },
-              "match": "(uri|tagdir|prefix)(=)((\")[^\"]*(\"))"
-            }
-          ]
-        },
-        {
-          "begin": "\\G(variable)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.variable.jsp"
-            }
-          },
-          "end": "(?=%>)",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "entity.other.attribute-name.jsp"
-                },
-                "2": {
-                  "name": "punctuation.separator.key-value.jsp"
-                },
-                "3": {
-                  "name": "string.quoted.double.jsp"
-                },
-                "4": {
-                  "name": "punctuation.definition.string.begin.jsp"
-                },
-                "5": {
-                  "name": "punctuation.definition.string.end.jsp"
-                }
-              },
-              "match": "(name-given|alias|variable-class|declare|scope|description)(=)((\")[^\"]*(\"))"
-            }
-          ]
-        }
+        { "include": "#escape" },
+        { "include": "source.java" }
       ]
     },
-    "xml_tags": {
-      "patterns": [
-        {
-          "begin": "(^\\s*)(?=<jsp:(declaration|expression|scriptlet)>)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.whitespace.embedded.leading.erb"
-            }
-          },
-          "end": "(?!\\G)(\\s*$\\n)?",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.whitespace.embedded.trailing.erb"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#embedded"
-            }
-          ]
-        },
-        {
-          "include": "#embedded"
-        },
-        {
-          "include": "#directive"
-        },
-        {
-          "include": "#actions"
-        }
-      ],
-      "repository": {
-        "actions": {
-          "patterns": [
-            {
-              "begin": "(</?)(jsp:attribute)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": ">",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.attribute.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name|trim)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "match": "(</?)(jsp:body)(>)",
-              "name": "meta.tag.template.body.jsp"
-            },
-            {
-              "begin": "(</?)(jsp:element)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": ">",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.element.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(<)(jsp:doBody)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.dobody.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(var|varReader|scope)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(</?)(jsp:forward)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/?>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.forward.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(page)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(<)(jsp:param)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.param.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name|value)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(<)(jsp:getProperty)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.getproperty.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name|property)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(</?)(jsp:include)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/?>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.include.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(page|flush)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(<)(jsp:invoke)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.invoke.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(fragment|var|varReader|scope)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(<)(jsp:output)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.output.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(omit-xml-declaration|doctype-root-element|doctype-system|doctype-public)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(</?)(jsp:plugin)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": ">",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.plugin.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(type|code|codebase|name|archive|align|height|hspace|jreversion|nspluginurl|iepluginurl)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "end": ">",
-              "match": "(</?)(jsp:fallback)(>)",
-              "name": "meta.tag.template.fallback.jsp"
-            },
-            {
-              "begin": "(</?)(jsp:root)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": ">",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.root.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(xmlns|version|xmlns:taglibPrefix)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "(<)(jsp:setProperty)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.setproperty.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name|property|value)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "end": ">",
-              "match": "(</?)(jsp:text)(>)",
-              "name": "meta.tag.template.text.jsp"
-            },
-            {
-              "begin": "(</?)(jsp:useBean)\\b",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.begin.jsp"
-                },
-                "2": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "/?>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.jsp"
-                }
-              },
-              "name": "meta.tag.template.usebean.jsp",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(id|scope|class|type|beanName)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            }
-          ]
-        },
-        "directive": {
-          "begin": "(<)(jsp:directive\\.(?=(attribute|include|page|tag|variable)\\s))",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.jsp"
-            },
-            "2": {
-              "name": "entity.name.tag.jsp"
-            }
-          },
-          "end": "/>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.jsp"
-            }
-          },
-          "name": "meta.tag.template.$3.jsp",
-          "patterns": [
-            {
-              "begin": "\\G(attribute)(?=\\s)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "(?=/>)",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name|required|fragment|rtexprvalue|type|description)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "\\G(include)(?=\\s)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "(?=/>)",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(file)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "\\G(page)(?=\\s)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "(?=/>)",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(language|extends|import|session|buffer|autoFlush|isThreadSafe|info|errorPage|isErrorPage|contentType|pageEncoding|isElIgnored)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "\\G(tag)(?=\\s)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "(?=/>)",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(display-name|body-content|dynamic-attributes|small-icon|large-icon|description|example|language|import|pageEncoding|isELIgnored)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            },
-            {
-              "begin": "\\G(variable)(?=\\s)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.tag.jsp"
-                }
-              },
-              "end": "(?=/>)",
-              "patterns": [
-                {
-                  "captures": {
-                    "1": {
-                      "name": "entity.other.attribute-name.jsp"
-                    },
-                    "2": {
-                      "name": "punctuation.separator.key-value.jsp"
-                    },
-                    "3": {
-                      "name": "string.quoted.double.jsp"
-                    },
-                    "4": {
-                      "name": "punctuation.definition.string.begin.jsp"
-                    },
-                    "5": {
-                      "name": "punctuation.definition.string.end.jsp"
-                    }
-                  },
-                  "match": "(name-given|alias|variable-class|declare|scope|description)(=)((\")[^\"]*(\"))"
-                }
-              ]
-            }
-          ]
-        },
-        "embedded": {
-          "begin": "(<)(jsp:(declaration|expression|scriptlet))(>)",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.tag.template.$3.jsp"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.jsp"
-            },
-            "2": {
-              "name": "entity.name.tag.jsp"
-            },
-            "4": {
-              "name": "punctuation.definition.tag.end.jsp"
-            }
-          },
-          "contentName": "source.java",
-          "end": "((<)/)(jsp:\\3)(>)",
-          "endCaptures": {
-            "0": {
-              "name": "meta.tag.template.$4.jsp"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.jsp"
-            },
-            "2": {
-              "name": "source.java"
-            },
-            "3": {
-              "name": "entity.name.tag.jsp"
-            },
-            "4": {
-              "name": "punctuation.definition.tag.end.jsp"
-            }
-          },
-          "name": "meta.embedded.block.jsp",
-          "patterns": [
-            {
-              "include": "source.java"
-            }
-          ]
-        }
-      }
+    "escape": {
+      "match": "\\\\.",
+      "name": "constant.character.escape.jsp"
     }
-  },
-  "scopeName": "text.html.jsp",
-  "uuid": "FFF2D8D5-6282-45DF-A508-5C254E29FFC2"
+  }
 }
diff --git a/src/Resources/Grammars/kotlin.json b/src/Resources/Grammars/kotlin.json
index e8f844d0..2857f717 100644
--- a/src/Resources/Grammars/kotlin.json
+++ b/src/Resources/Grammars/kotlin.json
@@ -1,6 +1,8 @@
 {
     "information_for_contributors": [
-        "This file has been copied from https://github.com/eclipse/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/org.eclipse.buildship.kotlindsl.provider/kotlin.tmLanguage.json"
+        "This file has been copied from https://github.com/eclipse/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/org.eclipse.buildship.kotlindsl.provider/kotlin.tmLanguage.json",
+        "The original file was licensed under the Eclipse Public License, Version 1.0",
+        "https://github.com/eclipse-buildship/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/README.md"
     ],
     "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
     "name": "Kotlin",
@@ -698,4 +700,4 @@
             "name": "variable.language.this.kotlin"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Resources/Grammars/toml.json b/src/Resources/Grammars/toml.json
index 86c2ef87..6be4678f 100644
--- a/src/Resources/Grammars/toml.json
+++ b/src/Resources/Grammars/toml.json
@@ -3,7 +3,10 @@
   "scopeName": "source.toml",
   "uuid": "8b4e5008-c50d-11ea-a91b-54ee75aeeb97",
   "information_for_contributors": [
-    "Originally was maintained by aster (galaster@foxmail.com). This notice is only kept here for the record, please don't send e-mails about bugs and other issues."
+    "Originally was maintained by aster (galaster@foxmail.com). This notice is only kept here for the record, please don't send e-mails about bugs and other issues.",
+    "This file has been copied from https://github.com/kkiyama117/coc-toml/blob/main/toml.tmLanguage.json",
+    "The original file was licensed under the MIT License",
+    "https://github.com/kkiyama117/coc-toml/blob/main/LICENSE"
   ],
   "patterns": [
     {

From a480ba0139f0f5c792a722b017ca6bcfcb70d389 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 17 Mar 2025 11:41:13 +0800
Subject: [PATCH 261/364] docs: Add third-party components and licenses section

(cherry picked from commit 95c697248755f7b6de4d2d0bfdaa9de1e572c9f6)
---
 README.md               |  4 ++++
 THIRD-PARTY-LICENSES.md | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 THIRD-PARTY-LICENSES.md

diff --git a/README.md b/README.md
index c932ec8a..670456c2 100644
--- a/README.md
+++ b/README.md
@@ -201,3 +201,7 @@ dotnet run --project src/SourceGit.csproj
 Thanks to all the people who contribute.
 
 [![Contributors](https://contrib.rocks/image?repo=sourcegit-scm/sourcegit&columns=20)](https://github.com/sourcegit-scm/sourcegit/graphs/contributors)
+
+## Third-Party Components
+
+For detailed license information, see [THIRD-PARTY-LICENSES.md](THIRD-PARTY-LICENSES.md).
diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
new file mode 100644
index 00000000..6188ad8b
--- /dev/null
+++ b/THIRD-PARTY-LICENSES.md
@@ -0,0 +1,38 @@
+# Third-Party Licenses
+
+This project incorporates components from the following third parties:
+
+## haxe-TmLanguage
+
+- **Source**: https://github.com/vshaxe/haxe-TmLanguage
+- **Commit**: ddad8b4c6d0781ac20be0481174ec1be772c5da5
+- **License**: MIT License
+- **License Link**: https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md
+
+## coc-toml
+
+- **Source**: https://github.com/kkiyama117/coc-toml
+- **Commit**: aac3e0c65955c03314b2733041b19f903b7cc447
+- **License**: MIT License
+- **License Link**: https://github.com/kkiyama117/coc-toml/blob/aac3e0c65955c03314b2733041b19f903b7cc447/LICENSE
+
+## eclipse-buildship
+
+- **Source**: https://github.com/eclipse/buildship
+- **Commit**: 6bb773e7692f913dec27105129ebe388de34e68b
+- **License**: Eclipse Public License 1.0
+- **License Link**: https://github.com/eclipse-buildship/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/README.md
+
+## vscode-jsp-lang
+
+- **Source**: https://github.com/samuel-weinhardt/vscode-jsp-lang
+- **Commit**: 0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355
+- **License**: MIT License
+- **License Link**: https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE
+
+## JetBrainsMono
+
+- **Source**: https://github.com/JetBrains/JetBrainsMono
+- **Commit**: v2.304
+- **License**: SIL Open Font License, Version 1.1
+- **License Link**: https://github.com/JetBrains/JetBrainsMono/blob/v2.304/OFL.txt

From 8f8385072c7a0ef1bb527c93921d335d38edfc94 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 11:56:33 +0800
Subject: [PATCH 262/364] doc: add third-party components

Signed-off-by: leo <longshuang@msn.cn>
---
 THIRD-PARTY-LICENSES.md | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index 6188ad8b..e4e0e07b 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -2,6 +2,48 @@
 
 This project incorporates components from the following third parties:
 
+## AvaloniaUI
+
+- **Source**: https://github.com/AvaloniaUI/Avalonia
+- **Version**: 11.2.5
+- **License**: MIT License
+- **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
+
+## AvaloniaEdit
+
+- **Source**: https://github.com/AvaloniaUI/AvaloniaEdit
+- **Version**: 11.2.0
+- **License**: MIT License
+- **License Link**: https://github.com/AvaloniaUI/AvaloniaEdit/blob/master/LICENSE
+
+## LiveChartsCore.SkiaSharpView.Avalonia
+
+- **Source**: https://github.com/beto-rodriguez/LiveCharts2
+- **Version**: 2.0.0-rc5.4
+- **License**: MIT License
+- **License Link**: https://github.com/beto-rodriguez/LiveCharts2/blob/master/LICENSE
+
+## TextMateSharp
+
+- **Source**: https://github.com/danipen/TextMateSharp
+- **Version**: 1.0.66
+- **License**: MIT License
+- **License Link**: https://github.com/danipen/TextMateSharp/blob/master/LICENSE.md
+
+## OpenAI .NET SDK
+
+- **Source**: https://github.com/openai/openai-dotnet
+- **Version**: 2.2.0-beta2
+- **License**: MIT License
+- **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
+
+## Azure.AI.OpenAI
+
+- **Source**: https://github.com/Azure/azure-sdk-for-net
+- **Version**: 2.2.0-beta2
+- **License**: MIT License
+- **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
+
 ## haxe-TmLanguage
 
 - **Source**: https://github.com/vshaxe/haxe-TmLanguage
@@ -36,3 +78,4 @@ This project incorporates components from the following third parties:
 - **Commit**: v2.304
 - **License**: SIL Open Font License, Version 1.1
 - **License Link**: https://github.com/JetBrains/JetBrainsMono/blob/v2.304/OFL.txt
+

From 99a45335feb91dc588baabab01676d4abe4eb880 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 12:01:29 +0800
Subject: [PATCH 263/364] doc: group third-party components by types

Signed-off-by: leo <longshuang@msn.cn>
---
 THIRD-PARTY-LICENSES.md | 73 ++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index e4e0e07b..722414b2 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -2,80 +2,85 @@
 
 This project incorporates components from the following third parties:
 
-## AvaloniaUI
+## Packages
+
+### AvaloniaUI
 
 - **Source**: https://github.com/AvaloniaUI/Avalonia
 - **Version**: 11.2.5
 - **License**: MIT License
 - **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
 
-## AvaloniaEdit
+### AvaloniaEdit
 
 - **Source**: https://github.com/AvaloniaUI/AvaloniaEdit
 - **Version**: 11.2.0
 - **License**: MIT License
 - **License Link**: https://github.com/AvaloniaUI/AvaloniaEdit/blob/master/LICENSE
 
-## LiveChartsCore.SkiaSharpView.Avalonia
+### LiveChartsCore.SkiaSharpView.Avalonia
 
 - **Source**: https://github.com/beto-rodriguez/LiveCharts2
 - **Version**: 2.0.0-rc5.4
 - **License**: MIT License
 - **License Link**: https://github.com/beto-rodriguez/LiveCharts2/blob/master/LICENSE
 
-## TextMateSharp
+### TextMateSharp
 
 - **Source**: https://github.com/danipen/TextMateSharp
 - **Version**: 1.0.66
 - **License**: MIT License
 - **License Link**: https://github.com/danipen/TextMateSharp/blob/master/LICENSE.md
 
-## OpenAI .NET SDK
+### OpenAI .NET SDK
 
 - **Source**: https://github.com/openai/openai-dotnet
 - **Version**: 2.2.0-beta2
 - **License**: MIT License
 - **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
 
-## Azure.AI.OpenAI
+### Azure.AI.OpenAI
 
 - **Source**: https://github.com/Azure/azure-sdk-for-net
 - **Version**: 2.2.0-beta2
 - **License**: MIT License
 - **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
 
-## haxe-TmLanguage
+## Fonts
 
-- **Source**: https://github.com/vshaxe/haxe-TmLanguage
-- **Commit**: ddad8b4c6d0781ac20be0481174ec1be772c5da5
-- **License**: MIT License
-- **License Link**: https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md
-
-## coc-toml
-
-- **Source**: https://github.com/kkiyama117/coc-toml
-- **Commit**: aac3e0c65955c03314b2733041b19f903b7cc447
-- **License**: MIT License
-- **License Link**: https://github.com/kkiyama117/coc-toml/blob/aac3e0c65955c03314b2733041b19f903b7cc447/LICENSE
-
-## eclipse-buildship
-
-- **Source**: https://github.com/eclipse/buildship
-- **Commit**: 6bb773e7692f913dec27105129ebe388de34e68b
-- **License**: Eclipse Public License 1.0
-- **License Link**: https://github.com/eclipse-buildship/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/README.md
-
-## vscode-jsp-lang
-
-- **Source**: https://github.com/samuel-weinhardt/vscode-jsp-lang
-- **Commit**: 0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355
-- **License**: MIT License
-- **License Link**: https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE
-
-## JetBrainsMono
+### JetBrainsMono
 
 - **Source**: https://github.com/JetBrains/JetBrainsMono
 - **Commit**: v2.304
 - **License**: SIL Open Font License, Version 1.1
 - **License Link**: https://github.com/JetBrains/JetBrainsMono/blob/v2.304/OFL.txt
 
+## Gramar Files
+
+### haxe-TmLanguage
+
+- **Source**: https://github.com/vshaxe/haxe-TmLanguage
+- **Commit**: ddad8b4c6d0781ac20be0481174ec1be772c5da5
+- **License**: MIT License
+- **License Link**: https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md
+
+### coc-toml
+
+- **Source**: https://github.com/kkiyama117/coc-toml
+- **Commit**: aac3e0c65955c03314b2733041b19f903b7cc447
+- **License**: MIT License
+- **License Link**: https://github.com/kkiyama117/coc-toml/blob/aac3e0c65955c03314b2733041b19f903b7cc447/LICENSE
+
+### eclipse-buildship
+
+- **Source**: https://github.com/eclipse/buildship
+- **Commit**: 6bb773e7692f913dec27105129ebe388de34e68b
+- **License**: Eclipse Public License 1.0
+- **License Link**: https://github.com/eclipse-buildship/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/README.md
+
+### vscode-jsp-lang
+
+- **Source**: https://github.com/samuel-weinhardt/vscode-jsp-lang
+- **Commit**: 0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355
+- **License**: MIT License
+- **License Link**: https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE

From 10fd0f9d15d0d58f0f27c5128c97b9abbdaea161 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 12:02:32 +0800
Subject: [PATCH 264/364] doc: fix typo

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

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index 722414b2..2338263c 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -55,7 +55,7 @@ This project incorporates components from the following third parties:
 - **License**: SIL Open Font License, Version 1.1
 - **License Link**: https://github.com/JetBrains/JetBrainsMono/blob/v2.304/OFL.txt
 
-## Gramar Files
+## Grammar Files
 
 ### haxe-TmLanguage
 

From ddfc868df3c20acd77a74d4c12ecaf07c22c6c04 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 15:08:49 +0800
Subject: [PATCH 265/364] ux: re-design merge option style

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/MergeMode.cs |  2 +-
 src/ViewModels/Merge.cs | 10 +++++-----
 src/Views/Merge.axaml   | 27 ++++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/Models/MergeMode.cs b/src/Models/MergeMode.cs
index 15e3f7e9..e4389b32 100644
--- a/src/Models/MergeMode.cs
+++ b/src/Models/MergeMode.cs
@@ -6,7 +6,7 @@
         [
             new MergeMode("Default", "Fast-forward if possible", ""),
             new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
-            new MergeMode("Squash", "Use '--squash'", "--squash"),
+            new MergeMode("Squash", "Squash merge", "--squash"),
             new MergeMode("Don't commit", "Merge without commit", "--no-ff --no-commit"),
         ];
 
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index 174bb1e1..bde9b66d 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -15,7 +15,7 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public Models.MergeMode SelectedMode
+        public Models.MergeMode Mode
         {
             get;
             set;
@@ -28,7 +28,7 @@ namespace SourceGit.ViewModels
 
             Source = source;
             Into = into;
-            SelectedMode = AutoSelectMergeMode();
+            Mode = AutoSelectMergeMode();
             View = new Views.Merge() { DataContext = this };
         }
 
@@ -39,7 +39,7 @@ namespace SourceGit.ViewModels
 
             Source = source;
             Into = into;
-            SelectedMode = AutoSelectMergeMode();
+            Mode = AutoSelectMergeMode();
             View = new Views.Merge() { DataContext = this };
         }
 
@@ -50,7 +50,7 @@ namespace SourceGit.ViewModels
 
             Source = source;
             Into = into;
-            SelectedMode = AutoSelectMergeMode();
+            Mode = AutoSelectMergeMode();
             View = new Views.Merge() { DataContext = this };
         }
 
@@ -61,7 +61,7 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                new Commands.Merge(_repo.FullPath, _sourceName, SelectedMode.Arg, SetProgressDescription).Exec();
+                new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, SetProgressDescription).Exec();
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return true;
             });
diff --git a/src/Views/Merge.axaml b/src/Views/Merge.axaml
index 805ac6d0..b7c76b6b 100644
--- a/src/Views/Merge.axaml
+++ b/src/Views/Merge.axaml
@@ -60,15 +60,32 @@
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding Source={x:Static m:MergeMode.Supported}}"
-                SelectedItem="{Binding SelectedMode, Mode=TwoWay}">
+                SelectedItem="{Binding Mode, Mode=TwoWay}"
+                Grid.IsSharedSizeScope="True">
         <ComboBox.ItemTemplate>
           <DataTemplate DataType="m:MergeMode">
-            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <TextBlock Text="{Binding Name}"/>
-              <TextBlock Text="{Binding Desc}" Margin="8,0,0,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
-            </StackPanel>
+            <Grid Height="20">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeNameColumn"/>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeDescriptionColumn"/>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeOptionColumn"/>
+              </Grid.ColumnDefinitions>
+              
+              <TextBlock Grid.Column="0" Text="{Binding Name}"/>
+              <TextBlock Grid.Column="1" Text="{Binding Desc}" Margin="8,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+              <TextBlock Grid.Column="2" Text="{Binding Arg}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+            </Grid>
           </DataTemplate>
         </ComboBox.ItemTemplate>
+
+        <ComboBox.SelectionBoxItemTemplate>
+          <DataTemplate DataType="m:MergeMode">
+            <Grid ColumnDefinitions="Auto,*">
+              <TextBlock Grid.Column="0" Text="{Binding Name}" Margin="0,0,8,0"/>
+              <TextBlock Grid.Column="1" Text="{Binding Desc}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+            </Grid>
+          </DataTemplate>
+        </ComboBox.SelectionBoxItemTemplate>
       </ComboBox>
     </Grid>
   </StackPanel>

From cdd1926e2f2eb4be2c1ee381c2e567787ea79599 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 15:30:32 +0800
Subject: [PATCH 266/364] refactor: rewrite `git apply` implementation

- Do not translate commandline options for `git`
- Re-design combox layout for `git apply` popup

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/ApplyWhiteSpaceMode.cs | 12 ++++++++++--
 src/Resources/Locales/de_DE.axaml |  8 --------
 src/Resources/Locales/en_US.axaml |  8 --------
 src/Resources/Locales/es_ES.axaml |  8 --------
 src/Resources/Locales/fr_FR.axaml |  8 --------
 src/Resources/Locales/it_IT.axaml |  8 --------
 src/Resources/Locales/pt_BR.axaml |  8 --------
 src/Resources/Locales/ru_RU.axaml |  8 --------
 src/Resources/Locales/zh_CN.axaml |  8 --------
 src/Resources/Locales/zh_TW.axaml |  8 --------
 src/ViewModels/Apply.cs           | 20 ++------------------
 src/Views/Apply.axaml             | 31 ++++++++++++++++++++++++-------
 12 files changed, 36 insertions(+), 99 deletions(-)

diff --git a/src/Models/ApplyWhiteSpaceMode.cs b/src/Models/ApplyWhiteSpaceMode.cs
index 6fbce0b2..aad45f57 100644
--- a/src/Models/ApplyWhiteSpaceMode.cs
+++ b/src/Models/ApplyWhiteSpaceMode.cs
@@ -2,14 +2,22 @@
 {
     public class ApplyWhiteSpaceMode
     {
+        public static readonly ApplyWhiteSpaceMode[] Supported =
+        [
+            new ApplyWhiteSpaceMode("No Warn", "Turns off the trailing whitespace warning", "nowarn"),
+            new ApplyWhiteSpaceMode("Warn", "Outputs warnings for a few such errors, but applies", "warn"),
+            new ApplyWhiteSpaceMode("Error", "Raise errors and refuses to apply the patch", "error"),
+            new ApplyWhiteSpaceMode("Error All", "Similar to 'error', but shows more", "error-all"),
+        ];
+
         public string Name { get; set; }
         public string Desc { get; set; }
         public string Arg { get; set; }
 
         public ApplyWhiteSpaceMode(string n, string d, string a)
         {
-            Name = App.Text(n);
-            Desc = App.Text(d);
+            Name = n;
+            Desc = d;
             Arg = a;
         }
     }
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index aff8ffc5..31dc1d9b 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -25,18 +25,10 @@
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Verwende OpenAI, um Commit-Nachrichten zu generieren</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">Als Commit-Nachricht verwenden</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Fehler</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Fehler werfen und anwenden des Patches verweigern</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Alle Fehler</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Ähnlich wie 'Fehler', zeigt aber mehr an</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Patch-Datei:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Wähle die anzuwendende .patch-Datei</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignoriere Leerzeichenänderungen</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">Keine Warnungen</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Keine Warnung vor Leerzeichen am Zeilenende</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Patch anwenden</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Warnen</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Gibt eine Warnung für ein paar solcher Fehler aus, aber wendet es an</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Leerzeichen:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Stash anwenden</x:String>
   <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Nach dem Anwenden löschen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 818bd9bb..b1f83836 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -22,18 +22,10 @@
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Use AI to generate commit message</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLY AS COMMIT MESSAGE</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Error</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Raise errors and refuses to apply the patch</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Error All</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Similar to 'error', but shows more</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Patch File:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Select .patch file to apply</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignore whitespace changes</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">No Warn</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Turns off the trailing whitespace warning</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Apply Patch</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Warn</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Outputs warnings for a few such errors, but applies</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Whitespace:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Apply Stash</x:String>
   <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Delete after applying</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index e909a14e..6bf38df1 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -25,18 +25,10 @@
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usar OpenAI para generar mensaje de commit</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APLICAR CÓMO MENSAJE DE COMMIT</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Aplicar Parche</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Error</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Genera errores y se niega a aplicar el parche</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Error Todo</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Similar a 'error', pero muestra más</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Archivo del Parche:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Seleccionar archivo .patch para aplicar</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignorar cambios de espacios en blanco</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">Sin Advertencia</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Desactiva la advertencia de espacios en blanco al final</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Aplicar Parche</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Advertencia</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Genera advertencias para algunos de estos errores, pero aplica</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Espacios en Blanco:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Aplicar Stash</x:String>
   <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Borrar después de aplicar</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index aecea9ad..ebb3ba89 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -23,18 +23,10 @@
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assistant IA</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Utiliser l'IA pour générer un message de commit</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Appliquer</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Erreur</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Soulever les erreurs et refuser d'appliquer le patch</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Toutes les erreurs</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Similaire à 'Erreur', mais plus détaillé</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Fichier de patch :</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Selectionner le fichier .patch à appliquer</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignorer les changements d'espaces blancs</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">Pas d'avertissement</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Désactiver l'avertissement sur les espaces blancs terminaux</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Appliquer le patch</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Avertissement</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Affiche des avertissements pour ce type d'erreurs tout en appliquant le patch</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Espaces blancs :</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Archiver...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Enregistrer l'archive sous :</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 4dcc8771..ebfd3939 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -25,18 +25,10 @@
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usa AI per generare il messaggio di commit</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLICA COME MESSAGGIO DI COMMIT</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Applica</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Errore</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Genera errori e si rifiuta di applicare la patch</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Tutti gli errori</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Simile a 'errore', ma mostra di più</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">File Patch:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Seleziona file .patch da applicare</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignora modifiche agli spazi</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">Nessun avviso</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Disattiva l'avviso sugli spazi finali</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Applica Patch</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Avviso</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Mostra avvisi per alcuni errori, ma applica comunque</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Spazi:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Applica lo stash</x:String>
   <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Rimuovi dopo aver applicato</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index b146bf0e..b4677840 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -48,18 +48,10 @@
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assietente IA</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Utilizar IA para gerar mensagem de commit</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Erro</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Erros levantados e se recusa a aplicar o patch</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Erro Total</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Semelhante a 'erro', mas mostra mais</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Arquivo de Patch:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Selecione o arquivo .patch para aplicar</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignorar mudanças de espaço em branco</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">Sem Aviso</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Desativa o aviso de espaço em branco no final</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Aplicar Patch</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Aviso</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" xml:space="preserve">Emite avisos para alguns erros, mas aplica</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Espaço em Branco:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Arquivar...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Salvar Arquivo Como:</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 07fb7c94..b2ba2158 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -25,18 +25,10 @@
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Использовать OpenAI для создания сообщения о ревизии</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">ПРИМЕНИТЬ КАК СООБЩЕНИЕ РЕВИЗИИ</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Исправить </x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Ошибка</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">Выдает ошибки и отказывается применять заплатку</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">Все ошибки</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" 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.NoWarn" xml:space="preserve">Нет предупреждений</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">Отключить предупреждения о пробелах в конце</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Применить заплатку</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">Предупреждать</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" 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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 2d160ad2..768061dd 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -25,18 +25,10 @@
   <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.Apply" xml:space="preserve">应用补丁(apply)</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">错误</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">输出错误，并终止应用补丁</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">更多错误</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" 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">选择补丁文件</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">忽略空白符号</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">忽略</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">关闭所有警告</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">应用补丁</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">警告</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index e50a600d..6d63c1ee 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -25,18 +25,10 @@
   <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.Apply" xml:space="preserve">套用修補檔 (apply patch)</x:String>
-  <x:String x:Key="Text.Apply.Error" xml:space="preserve">錯誤</x:String>
-  <x:String x:Key="Text.Apply.Error.Desc" xml:space="preserve">輸出錯誤，並中止套用修補檔</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll" xml:space="preserve">更多錯誤</x:String>
-  <x:String x:Key="Text.Apply.ErrorAll.Desc" 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">選擇修補檔</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">忽略空白符號</x:String>
-  <x:String x:Key="Text.Apply.NoWarn" xml:space="preserve">忽略</x:String>
-  <x:String x:Key="Text.Apply.NoWarn.Desc" xml:space="preserve">關閉所有警告</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">套用修補檔</x:String>
-  <x:String x:Key="Text.Apply.Warn" xml:space="preserve">警告</x:String>
-  <x:String x:Key="Text.Apply.Warn.Desc" 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>
diff --git a/src/ViewModels/Apply.cs b/src/ViewModels/Apply.cs
index 09567761..60001476 100644
--- a/src/ViewModels/Apply.cs
+++ b/src/ViewModels/Apply.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -21,12 +20,6 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _ignoreWhiteSpace, value);
         }
 
-        public List<Models.ApplyWhiteSpaceMode> WhiteSpaceModes
-        {
-            get;
-            private set;
-        }
-
         public Models.ApplyWhiteSpaceMode SelectedWhiteSpaceMode
         {
             get;
@@ -37,23 +30,14 @@ namespace SourceGit.ViewModels
         {
             _repo = repo;
 
-            WhiteSpaceModes = new List<Models.ApplyWhiteSpaceMode> {
-                new Models.ApplyWhiteSpaceMode("Apply.NoWarn", "Apply.NoWarn.Desc", "nowarn"),
-                new Models.ApplyWhiteSpaceMode("Apply.Warn", "Apply.Warn.Desc", "warn"),
-                new Models.ApplyWhiteSpaceMode("Apply.Error", "Apply.Error.Desc", "error"),
-                new Models.ApplyWhiteSpaceMode("Apply.ErrorAll", "Apply.ErrorAll.Desc", "error-all")
-            };
-            SelectedWhiteSpaceMode = WhiteSpaceModes[0];
-
+            SelectedWhiteSpaceMode = Models.ApplyWhiteSpaceMode.Supported[0];
             View = new Views.Apply() { DataContext = this };
         }
 
         public static ValidationResult ValidatePatchFile(string file, ValidationContext _)
         {
             if (File.Exists(file))
-            {
                 return ValidationResult.Success;
-            }
 
             return new ValidationResult($"File '{file}' can NOT be found!!!");
         }
diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml
index a5100cd6..6c2478bb 100644
--- a/src/Views/Apply.axaml
+++ b/src/Views/Apply.axaml
@@ -39,17 +39,34 @@
       <ComboBox Grid.Row="1" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding WhiteSpaceModes}"
+                ItemsSource="{Binding Source={x:Static m:ApplyWhiteSpaceMode.Supported}}"
                 SelectedItem="{Binding SelectedWhiteSpaceMode, Mode=TwoWay}"
-                IsEnabled="{Binding !IgnoreWhiteSpace}">
+                IsEnabled="{Binding !IgnoreWhiteSpace}"
+                Grid.IsSharedSizeScope="True">
         <ComboBox.ItemTemplate>
-          <DataTemplate x:DataType="{x:Type m:ApplyWhiteSpaceMode}">
-            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <TextBlock Text="{Binding Name}"/>
-              <TextBlock Text="{Binding Desc}" Margin="8,0,0,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
-            </StackPanel>
+          <DataTemplate DataType="m:ApplyWhiteSpaceMode">
+            <Grid Height="20" VerticalAlignment="Center">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="ApplyModeNameColumn"/>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="ApplyModeDescColumn"/>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="ApplyModeArgsColumn"/>
+              </Grid.ColumnDefinitions>
+
+              <TextBlock Grid.Column="0" Text="{Binding Name}"/>
+              <TextBlock Grid.Column="1" Text="{Binding Desc}" Margin="8,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+              <TextBlock Grid.Column="2" Text="{Binding Arg}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+            </Grid>
           </DataTemplate>
         </ComboBox.ItemTemplate>
+
+        <ComboBox.SelectionBoxItemTemplate>
+          <DataTemplate DataType="m:ApplyWhiteSpaceMode">
+            <Grid ColumnDefinitions="Auto,*">
+              <TextBlock Grid.Column="0" Text="{Binding Name}" Margin="0,0,8,0"/>
+              <TextBlock Grid.Column="1" Text="{Binding Desc}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+            </Grid>
+          </DataTemplate>
+        </ComboBox.SelectionBoxItemTemplate>
       </ComboBox>
 
       <CheckBox Grid.Row="2" Grid.Column="1"

From 265aaa1d67dc82bf7b5097cf6201f8d00b3e24be Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 07:30:48 +0000
Subject: [PATCH 267/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 670456c2..f9216874 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.07%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.66%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.39%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.06%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.57%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.30%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index e3f9d2a1..ae9f4777 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.07%
+### de_DE.axaml: 99.06%
 
 
 <details>
@@ -24,7 +24,7 @@
 
 </details>
 
-### fr_FR.axaml: 91.66%
+### fr_FR.axaml: 91.57%
 
 
 <details>
@@ -106,7 +106,7 @@
 
 </details>
 
-### pt_BR.axaml: 91.39%
+### pt_BR.axaml: 91.30%
 
 
 <details>

From cea8a90680a46a9bf54e0b1649af1f4607138e4b Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 17 Mar 2025 15:56:13 +0800
Subject: [PATCH 268/364] refactor: use $GIT_COMMON_DIR instead of cut
 $GIT_DIR/worktrees (#1103)

---
 src/Commands/QueryGitCommonDir.cs | 26 ++++++++++++++++++++++++++
 src/Models/IRepository.cs         |  1 +
 src/Models/Watcher.cs             |  6 +-----
 src/Resources/Locales/de_DE.axaml |  2 +-
 src/Resources/Locales/en_US.axaml |  2 +-
 src/Resources/Locales/es_ES.axaml |  2 +-
 src/Resources/Locales/fr_FR.axaml |  2 +-
 src/Resources/Locales/it_IT.axaml |  2 +-
 src/Resources/Locales/pt_BR.axaml |  2 +-
 src/Resources/Locales/ru_RU.axaml |  2 +-
 src/Resources/Locales/zh_CN.axaml |  2 +-
 src/Resources/Locales/zh_TW.axaml |  2 +-
 src/ViewModels/Launcher.cs        |  6 +++++-
 src/ViewModels/Repository.cs      | 10 +++++++++-
 14 files changed, 51 insertions(+), 16 deletions(-)
 create mode 100644 src/Commands/QueryGitCommonDir.cs

diff --git a/src/Commands/QueryGitCommonDir.cs b/src/Commands/QueryGitCommonDir.cs
new file mode 100644
index 00000000..1076243e
--- /dev/null
+++ b/src/Commands/QueryGitCommonDir.cs
@@ -0,0 +1,26 @@
+using System.IO;
+
+namespace SourceGit.Commands
+{
+    public class QueryGitCommonDir : Command
+    {
+        public QueryGitCommonDir(string workDir)
+        {
+            WorkingDirectory = workDir;
+            Args = "rev-parse --git-common-dir";
+            RaiseError = false;
+        }
+
+        public string Result()
+        {
+            var rs = ReadToEnd().StdOut;
+            if (string.IsNullOrEmpty(rs))
+                return null;
+
+            rs = rs.Trim();
+            if (Path.IsPathRooted(rs))
+                return rs;
+            return Path.GetFullPath(Path.Combine(WorkingDirectory, rs));
+        }
+    }
+}
diff --git a/src/Models/IRepository.cs b/src/Models/IRepository.cs
index 12b1adba..90409c2f 100644
--- a/src/Models/IRepository.cs
+++ b/src/Models/IRepository.cs
@@ -4,6 +4,7 @@
     {
         string FullPath { get; set; }
         string GitDir { get; set; }
+        string GitCommonDir { get; set; }
 
         void RefreshBranches();
         void RefreshWorktrees();
diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index d0ccdea5..320f31d6 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -24,11 +24,7 @@ namespace SourceGit.Models
             _wcWatcher.EnableRaisingEvents = true;
 
             // If this repository is a worktree repository, just watch the main repository's gitdir.
-            var gitDirNormalized = _repo.GitDir.Replace("\\", "/");
-            var worktreeIdx = gitDirNormalized.IndexOf(".git/worktrees/", StringComparison.Ordinal);
-            var repoWatchDir = _repo.GitDir;
-            if (worktreeIdx > 0)
-                repoWatchDir = _repo.GitDir.Substring(0, worktreeIdx + 4);
+            var repoWatchDir = _repo.GitCommonDir.Replace("\\", "/");
 
             _repoWatcher = new FileSystemWatcher();
             _repoWatcher.Path = repoWatchDir;
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 31dc1d9b..2ebc1ae7 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -501,7 +501,7 @@
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Remote löschen</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Ziel:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Worktrees löschen</x:String>
-  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Worktree Informationen in `$GIT_DIR/worktrees` löschen</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Worktree Informationen in `$GIT_COMMON_DIR/worktrees` löschen</x:String>
   <x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Remote-Branch:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Alle Branches fetchen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index b1f83836..4401e8bc 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -504,7 +504,7 @@
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Prune Remote</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Target:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Prune Worktrees</x:String>
-  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Prune worktree information in `$GIT_DIR/worktrees`</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Prune worktree information in `$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">Remote Branch:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch all branches</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 6bf38df1..f57ee230 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -508,7 +508,7 @@
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Podar Remoto</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destino:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Podar Worktrees</x:String>
-  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Podar información de worktree en `$GIT_DIR/worktrees`</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Podar información de worktree en `$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">Rama Remota:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch todas las ramas</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index ebb3ba89..94df8d66 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -476,7 +476,7 @@
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Élaguer une branche distant</x:String> <!-- If it is indeed about a branch -->
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Cible :</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Élaguer les Worktrees</x:String>
-  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve"> Élaguer les information de worktree dans `$GIT_DIR/worktrees`</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve"> Élaguer les information de worktree dans `$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">Branche distante :</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch toutes les branches</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index ebfd3939..8e6f73fa 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -507,7 +507,7 @@
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Potatura Remota</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destinazione:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Potatura Worktrees</x:String>
-  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Potatura delle informazioni di worktree in `$GIT_DIR/worktrees`</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Potatura delle informazioni di worktree in `$GIT_COMMON_DIR/worktrees`</x:String>
   <x:String x:Key="Text.Pull" xml:space="preserve">Scarica</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch Remoto:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Recupera tutti i branch</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index b4677840..c03e39d2 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -490,7 +490,7 @@
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Prunar Remoto</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Alvo:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Podar Worktrees</x:String>
-  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Podar informações de worktree em `$GIT_DIR/worktrees`</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Podar informações de worktree em `$GIT_COMMON_DIR/worktrees`</x:String>
   <x:String x:Key="Text.Pull" xml:space="preserve">Puxar</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch Remoto:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Buscar todos os branches</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index b2ba2158..3273ac07 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -508,7 +508,7 @@
   <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_DIR/worktrees»</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">Забрать</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Ветка внешнего репозитория:</x:String>
   <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Извлечь все ветки</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 768061dd..2a8d08b5 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -508,7 +508,7 @@
   <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_DIR/worktrees`中的无效工作树信息</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.FetchAllBranches" xml:space="preserve">拉取远程中的所有分支变更</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 6d63c1ee..5bb68782 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -507,7 +507,7 @@
   <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_DIR/worktrees` 中的無效工作區資訊</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.FetchAllBranches" xml:space="preserve">拉取遠端中的所有分支</x:String>
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 06479394..4307665d 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -282,6 +282,7 @@ namespace SourceGit.ViewModels
 
             var isBare = new Commands.IsBareRepository(node.Id).Result();
             var gitDir = node.Id;
+            var gitCommonDir = gitDir;
             if (!isBare)
             {
                 gitDir = new Commands.QueryGitDir(node.Id).Result();
@@ -291,9 +292,12 @@ namespace SourceGit.ViewModels
                     App.RaiseException(ctx, "Given path is not a valid git repository!");
                     return;
                 }
+                gitCommonDir = new Commands.QueryGitCommonDir(node.Id).Result();
+                if (string.IsNullOrEmpty(gitCommonDir))
+                    gitCommonDir = gitDir;
             }
 
-            var repo = new Repository(isBare, node.Id, gitDir);
+            var repo = new Repository(isBare, node.Id, gitDir, gitCommonDir);
             repo.Open();
 
             if (page == null)
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 97c52d8e..5cc933e9 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -45,6 +45,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _gitDir, value);
         }
 
+        public string GitCommonDir
+        {
+            get => _gitCommonDir;
+            set => SetProperty(ref _gitCommonDir, value);
+        }
+
         public Models.RepositorySettings Settings
         {
             get => _settings;
@@ -429,11 +435,12 @@ namespace SourceGit.ViewModels
             set;
         } = 0;
 
-        public Repository(bool isBare, string path, string gitDir)
+        public Repository(bool isBare, string path, string gitDir, string gitCommonDir)
         {
             IsBare = isBare;
             FullPath = path;
             GitDir = gitDir;
+            GitCommonDir = gitCommonDir;
         }
 
         public void Open()
@@ -2437,6 +2444,7 @@ namespace SourceGit.ViewModels
 
         private string _fullpath = string.Empty;
         private string _gitDir = string.Empty;
+        private string _gitCommonDir = string.Empty;
         private Models.RepositorySettings _settings = null;
         private Models.FilterMode _historiesFilterMode = Models.FilterMode.None;
         private bool _hasAllowedSignersFile = false;

From b4ab4afd3ab8eded049ea7b4849d821f64d14273 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 16:17:20 +0800
Subject: [PATCH 269/364] code_review: PR #1103

Since we only use `$GIT_COMMON_DIR` in filesystem watcher, it is unnecessary to store this value in `Repository`, and we can query the `$GIT_COMMON_DIR` only when it looks like a worktree

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/IRepository.cs    |  3 +--
 src/Models/Watcher.cs        |  5 +----
 src/ViewModels/Launcher.cs   |  6 +-----
 src/ViewModels/Repository.cs | 19 +++++++++++++------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Models/IRepository.cs b/src/Models/IRepository.cs
index 90409c2f..9283266e 100644
--- a/src/Models/IRepository.cs
+++ b/src/Models/IRepository.cs
@@ -3,8 +3,7 @@
     public interface IRepository
     {
         string FullPath { get; set; }
-        string GitDir { get; set; }
-        string GitCommonDir { get; set; }
+        string GitDirForWatcher { get; }
 
         void RefreshBranches();
         void RefreshWorktrees();
diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index 320f31d6..d419363a 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -23,11 +23,8 @@ namespace SourceGit.Models
             _wcWatcher.Deleted += OnWorkingCopyChanged;
             _wcWatcher.EnableRaisingEvents = true;
 
-            // If this repository is a worktree repository, just watch the main repository's gitdir.
-            var repoWatchDir = _repo.GitCommonDir.Replace("\\", "/");
-
             _repoWatcher = new FileSystemWatcher();
-            _repoWatcher.Path = repoWatchDir;
+            _repoWatcher.Path = _repo.GitDirForWatcher;
             _repoWatcher.Filter = "*";
             _repoWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName;
             _repoWatcher.IncludeSubdirectories = true;
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 4307665d..06479394 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -282,7 +282,6 @@ namespace SourceGit.ViewModels
 
             var isBare = new Commands.IsBareRepository(node.Id).Result();
             var gitDir = node.Id;
-            var gitCommonDir = gitDir;
             if (!isBare)
             {
                 gitDir = new Commands.QueryGitDir(node.Id).Result();
@@ -292,12 +291,9 @@ namespace SourceGit.ViewModels
                     App.RaiseException(ctx, "Given path is not a valid git repository!");
                     return;
                 }
-                gitCommonDir = new Commands.QueryGitCommonDir(node.Id).Result();
-                if (string.IsNullOrEmpty(gitCommonDir))
-                    gitCommonDir = gitDir;
             }
 
-            var repo = new Repository(isBare, node.Id, gitDir, gitCommonDir);
+            var repo = new Repository(isBare, node.Id, gitDir);
             repo.Open();
 
             if (page == null)
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 5cc933e9..85665634 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -45,10 +45,19 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _gitDir, value);
         }
 
-        public string GitCommonDir
+        public string GitDirForWatcher
         {
-            get => _gitCommonDir;
-            set => SetProperty(ref _gitCommonDir, value);
+            get
+            {
+                // Only try to get `$GIT_COMMON_DIR` if this repository looks like a worktree.
+                if (_gitDir.Replace("\\", "/").IndexOf(".git/worktrees/", StringComparison.Ordinal) > 0)
+                {
+                    var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result();
+                    return string.IsNullOrEmpty(commonDir) ? _gitDir : commonDir;
+                }
+
+                return _gitDir;
+            }
         }
 
         public Models.RepositorySettings Settings
@@ -435,12 +444,11 @@ namespace SourceGit.ViewModels
             set;
         } = 0;
 
-        public Repository(bool isBare, string path, string gitDir, string gitCommonDir)
+        public Repository(bool isBare, string path, string gitDir)
         {
             IsBare = isBare;
             FullPath = path;
             GitDir = gitDir;
-            GitCommonDir = gitCommonDir;
         }
 
         public void Open()
@@ -2444,7 +2452,6 @@ namespace SourceGit.ViewModels
 
         private string _fullpath = string.Empty;
         private string _gitDir = string.Empty;
-        private string _gitCommonDir = string.Empty;
         private Models.RepositorySettings _settings = null;
         private Models.FilterMode _historiesFilterMode = Models.FilterMode.None;
         private bool _hasAllowedSignersFile = false;

From 7031693489d6c92da2db74393f690aba6d1b3da7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 16:29:56 +0800
Subject: [PATCH 270/364] refactor: pass dirs to watcher directly

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/IRepository.cs    |  3 ---
 src/Models/Watcher.cs        |  6 +++---
 src/ViewModels/Repository.cs | 26 ++++++++++----------------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/Models/IRepository.cs b/src/Models/IRepository.cs
index 9283266e..0224d81f 100644
--- a/src/Models/IRepository.cs
+++ b/src/Models/IRepository.cs
@@ -2,9 +2,6 @@
 {
     public interface IRepository
     {
-        string FullPath { get; set; }
-        string GitDirForWatcher { get; }
-
         void RefreshBranches();
         void RefreshWorktrees();
         void RefreshTags();
diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index d419363a..3ccecad4 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -8,12 +8,12 @@ namespace SourceGit.Models
 {
     public class Watcher : IDisposable
     {
-        public Watcher(IRepository repo)
+        public Watcher(IRepository repo, string fullpath, string gitDir)
         {
             _repo = repo;
 
             _wcWatcher = new FileSystemWatcher();
-            _wcWatcher.Path = _repo.FullPath;
+            _wcWatcher.Path = fullpath;
             _wcWatcher.Filter = "*";
             _wcWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName | NotifyFilters.Size | NotifyFilters.CreationTime;
             _wcWatcher.IncludeSubdirectories = true;
@@ -24,7 +24,7 @@ namespace SourceGit.Models
             _wcWatcher.EnableRaisingEvents = true;
 
             _repoWatcher = new FileSystemWatcher();
-            _repoWatcher.Path = _repo.GitDirForWatcher;
+            _repoWatcher.Path = gitDir;
             _repoWatcher.Filter = "*";
             _repoWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName;
             _repoWatcher.IncludeSubdirectories = true;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 85665634..4f2f3ca3 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -45,21 +45,6 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _gitDir, value);
         }
 
-        public string GitDirForWatcher
-        {
-            get
-            {
-                // Only try to get `$GIT_COMMON_DIR` if this repository looks like a worktree.
-                if (_gitDir.Replace("\\", "/").IndexOf(".git/worktrees/", StringComparison.Ordinal) > 0)
-                {
-                    var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result();
-                    return string.IsNullOrEmpty(commonDir) ? _gitDir : commonDir;
-                }
-
-                return _gitDir;
-            }
-        }
-
         public Models.RepositorySettings Settings
         {
             get => _settings;
@@ -472,7 +457,16 @@ namespace SourceGit.ViewModels
 
             try
             {
-                _watcher = new Models.Watcher(this);
+                // For worktrees, we need to watch the $GIT_COMMON_DIR instead of the $GIT_DIR.
+                var gitDirForWatcher = _gitDir;
+                if (_gitDir.Replace("\\", "/").IndexOf(".git/worktrees/", StringComparison.Ordinal) > 0)
+                {
+                    var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result();
+                    if (!string.IsNullOrEmpty(commonDir))
+                        gitDirForWatcher = commonDir;
+                }
+
+                _watcher = new Models.Watcher(this, _fullpath, gitDirForWatcher);
             }
             catch (Exception ex)
             {

From 3e8bba0d0bd3e16057791a8df6fc95e2897a8a40 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 17:06:26 +0800
Subject: [PATCH 271/364] ux: re-design `About` page

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml         |  1 +
 src/Resources/Locales/de_DE.axaml |  5 ----
 src/Resources/Locales/en_US.axaml |  5 ----
 src/Resources/Locales/es_ES.axaml |  5 ----
 src/Resources/Locales/fr_FR.axaml |  5 ----
 src/Resources/Locales/it_IT.axaml |  5 ----
 src/Resources/Locales/pt_BR.axaml |  5 ----
 src/Resources/Locales/ru_RU.axaml |  5 ----
 src/Resources/Locales/zh_CN.axaml |  5 ----
 src/Resources/Locales/zh_TW.axaml |  5 ----
 src/Views/About.axaml             | 45 +++++++++++--------------------
 src/Views/About.axaml.cs          | 26 +++---------------
 12 files changed, 21 insertions(+), 96 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index 9426d20a..66589440 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -54,6 +54,7 @@
   <StreamGeometry x:Key="Icons.GitFlow.Feature">M939 94v710L512 998 85 805V94h-64A21 21 0 010 73v-0C0 61 10 51 21 51h981c12 0 21 10 21 21v0c0 12-10 21-21 21h-64zm-536 588L512 624l109 58c6 3 13 4 20 3a32 32 0 0026-37l-21-122 88-87c5-5 8-11 9-18a32 32 0 00-27-37l-122-18-54-111a32 32 0 00-57 0l-54 111-122 18c-7 1-13 4-18 9a33 33 0 001 46l88 87-21 122c-1 7-0 14 3 20a32 32 0 0043 14z</StreamGeometry>
   <StreamGeometry x:Key="Icons.GitFlow.Hotfix">M236 542a32 32 0 109 63l86-12a180 180 0 0022 78l-71 47a32 32 0 1035 53l75-50a176 176 0 00166 40L326 529zM512 16C238 16 16 238 16 512s222 496 496 496 496-222 496-496S786 16 512 16zm0 896c-221 0-400-179-400-400a398 398 0 0186-247l561 561A398 398 0 01512 912zm314-154L690 622a179 179 0 004-29l85 12a32 32 0 109-63l-94-13v-49l94-13a32 32 0 10-9-63l-87 12a180 180 0 00-20-62l71-47A32 32 0 10708 252l-75 50a181 181 0 00-252 10l-115-115A398 398 0 01512 112c221 0 400 179 400 400a398 398 0 01-86 247z</StreamGeometry>
   <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.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.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 2ebc1ae7..7144ef43 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <x:String x:Key="Text.About" xml:space="preserve">Info</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Über SourceGit</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Erstellt mit </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Grafik gerendert durch </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• Texteditor von </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Monospace-Schriftarten von </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Quelltext findest du auf </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Open Source &amp; freier Git GUI Client</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Worktree hinzufügen</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Was auschecken:</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 4401e8bc..312d4945 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -1,11 +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">About</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">About SourceGit</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Build with </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Chart is rendered by </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• TextEditor from </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Monospace fonts come from </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Source code can be found at </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Opensource &amp; Free Git GUI Client</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Add Worktree</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">What to Checkout:</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index f57ee230..e7e953e5 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <x:String x:Key="Text.About" xml:space="preserve">Acerca de</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Acerca de SourceGit</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Construido con </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• El gráfico es renderizado por </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• Editor de texto de </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Las fuentes monoespaciadas provienen de </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• El código fuente se puede encontrar en </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Cliente Git GUI de código abierto y gratuito</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Agregar Worktree</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Qué Checkout:</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 94df8d66..f3a71390 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <x:String x:Key="Text.About" xml:space="preserve">À propos</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">À propos de SourceGit</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Compilé avec </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Le graphique est rendu par </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• TextEditor de </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Les polices Monospace proviennent de </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Le code source est disponible sur </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Client Git Open Source et Gratuit</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Ajouter un Worktree</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Que récupérer :</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 8e6f73fa..782d6e78 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <x:String x:Key="Text.About" xml:space="preserve">Informazioni</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Informazioni su SourceGit</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Creato con </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Il grafico è reso da </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• Editor di testo da </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• I font monospaziati provengono da </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Il codice sorgente è disponibile su </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Client GUI Git open source e gratuito</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Aggiungi Worktree</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Di cosa fare il checkout:</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index c03e39d2..e811cf3e 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -29,11 +29,6 @@
   
   <x:String x:Key="Text.About" xml:space="preserve">Sobre</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Sobre o SourceGit</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Construído com </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Gráfico desenhado por </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• Editor de Texto de </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Fontes monoespaçadas de </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Código-fonte pode ser encontrado em </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Cliente Git GUI Livre e de Código Aberto</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Adicionar Worktree</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">O que Checar:</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 3273ac07..99948eca 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <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.BuildWith" xml:space="preserve">• Сборка с </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Диаграмма отображается с помощью</x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• Текстовый редактор от </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Моноширинные шрифты взяты из </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• Исходный код можно найти по адресу </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Бесплатный графический клиент Git с исходным кодом</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Добавить рабочий каталог</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Переключиться на:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 2a8d08b5..aae292f3 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <x:String x:Key="Text.About" xml:space="preserve">关于软件</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">关于本软件</x:String>
-  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• 项目依赖于 </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• 图表绘制组件来自 </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• 文本编辑器使用 </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• 等宽字体来自于 </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• 项目源代码地址 </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">开源免费的Git客户端</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">新增工作树</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">检出分支方式 ：</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 5bb68782..97c96c6c 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -4,11 +4,6 @@
   </ResourceDictionary.MergedDictionaries>
   <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.BuildWith" xml:space="preserve">• 專案依賴於 </x:String>
-  <x:String x:Key="Text.About.Chart" xml:space="preserve">• 圖表繪製元件來自 </x:String>
-  <x:String x:Key="Text.About.Editor" xml:space="preserve">• 文字編輯器使用 </x:String>
-  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• 等寬字型來自於 </x:String>
-  <x:String x:Key="Text.About.SourceCode" xml:space="preserve">• 專案原始碼網址 </x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">開源免費的 Git 客戶端</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">新增工作區</x:String>
   <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">簽出分支方式:</x:String>
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index ecdf156e..28529b63 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -3,12 +3,12 @@
                     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"
+                    mc:Ignorable="d" d:DesignWidth="520" d:DesignHeight="230"
                     x:Class="SourceGit.Views.About"
                     x:Name="ThisControl"
                     Icon="/App.ico"
                     Title="{DynamicResource Text.About}"
-                    SizeToContent="WidthAndHeight"
+                    Width="520" Height="230"
                     CanResize="False"
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
@@ -34,7 +34,7 @@
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
 
-    <Grid Grid.Row="1" ColumnDefinitions="Auto,*">
+    <Grid Grid.Row="1" Height="200" ColumnDefinitions="Auto,Auto">
       <Image Grid.Column="0"
              Width="200" Height="200"
              Margin="8,0"
@@ -42,41 +42,28 @@
              HorizontalAlignment="Center"
              VerticalAlignment="Center"/>
 
-      <StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,8,32,16">
-        <StackPanel Height="48" Orientation="Horizontal">
+      <StackPanel Grid.Column="1" Orientation="Vertical" VerticalAlignment="Center">
+        <StackPanel Height="40" Orientation="Horizontal">
           <TextBlock Classes="bold" Text="SourceGit" FontSize="32" />
           <Border Margin="12,0,0,0" Height="20" CornerRadius="10" Background="{DynamicResource Brush.Accent}" Effect="drop-shadow(0 0 6 #40000000)">
             <TextBlock x:Name="TxtVersion" Classes="primary" Margin="8,0" FontSize="12" Foreground="White"/>
           </Border>
         </StackPanel>
 
-        <TextBlock Margin="2,0,0,0" Text="{DynamicResource Text.About.SubTitle}" FontSize="16"/>
+        <TextBlock Margin="2,4,0,0" Text="{DynamicResource Text.About.SubTitle}" FontSize="16"/>
 
-        <TextBlock x:Name="TxtCopyright" Margin="2,8,0,0" Foreground="{DynamicResource Brush.FG2}"/>
+        <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+          <Button Width="18" Height="18" Classes="icon_button" Click="OnVisitWebsite" ToolTip.Tip="https://sourcegit-scm.github.io/">
+            <Path Width="16" Height="16" Data="{StaticResource Icons.Remotes}"/>
+          </Button>
 
-        <StackPanel Orientation="Vertical" Margin="0,24,0,0">
-          <StackPanel Orientation="Horizontal" Height="18">
-            <TextBlock Text="{DynamicResource Text.About.BuildWith}" />
-            <TextBlock Text="Avalonia UI" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaUI"/>
-            <TextBlock Text=" &amp; " />
-            <TextBlock Text="AvaloniaEdit" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaEdit"/>
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal" Height="18" Margin="0,2,0,0">
-            <TextBlock Text="{DynamicResource Text.About.Fonts}" />
-            <TextBlock Text="JetBrains Mono" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitJetBrainsMonoFont"/>
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal" Height="18" Margin="0,2,0,0">
-            <TextBlock Text="{DynamicResource Text.About.Chart}" />
-            <TextBlock Text="LiveCharts2" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitLiveCharts2"/>
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal" Height="18" Margin="0,2,0,0">
-            <TextBlock Text="{DynamicResource Text.About.SourceCode}" />
-            <TextBlock Text="Github" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitSourceCode"/>
-          </StackPanel>
+          <Button Width="18" Height="18" Margin="8,0,0,0" Classes="icon_button" Click="OnVisitSourceCode" ToolTip.Tip="https://github.com/sourcegit-scm/sourcegit">
+            <Path Width="16" Height="16" Data="{StaticResource Icons.Github}"/>
+          </Button>
         </StackPanel>
+
+
+        <TextBlock x:Name="TxtCopyright" Margin="0,40,0,0" Foreground="{DynamicResource Brush.FG2}"/>
       </StackPanel>
     </Grid>
   </Grid>
diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs
index 631df0f9..d393f94c 100644
--- a/src/Views/About.axaml.cs
+++ b/src/Views/About.axaml.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
-using Avalonia.Input;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -19,31 +19,13 @@ namespace SourceGit.Views
                 TxtCopyright.Text = copyright.Copyright;
         }
 
-        private void OnVisitAvaloniaUI(object _, PointerPressedEventArgs e)
+        private void OnVisitWebsite(object _, RoutedEventArgs e)
         {
-            Native.OS.OpenBrowser("https://www.avaloniaui.net/");
+            Native.OS.OpenBrowser("https://sourcegit-scm.github.io/");
             e.Handled = true;
         }
 
-        private void OnVisitAvaloniaEdit(object _, PointerPressedEventArgs e)
-        {
-            Native.OS.OpenBrowser("https://github.com/AvaloniaUI/AvaloniaEdit");
-            e.Handled = true;
-        }
-
-        private void OnVisitJetBrainsMonoFont(object _, PointerPressedEventArgs e)
-        {
-            Native.OS.OpenBrowser("https://www.jetbrains.com/lp/mono/");
-            e.Handled = true;
-        }
-
-        private void OnVisitLiveCharts2(object _, PointerPressedEventArgs e)
-        {
-            Native.OS.OpenBrowser("https://livecharts.dev/");
-            e.Handled = true;
-        }
-
-        private void OnVisitSourceCode(object _, PointerPressedEventArgs e)
+        private void OnVisitSourceCode(object _, RoutedEventArgs e)
         {
             Native.OS.OpenBrowser("https://github.com/sourcegit-scm/sourcegit");
             e.Handled = true;

From 5845ef3eb64bb5651737685bb25403d169e033c6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 09:06:42 +0000
Subject: [PATCH 272/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f9216874..13887a13 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.06%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.57%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.30%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.06%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.51%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.24%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index ae9f4777..b1e1f2c8 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -24,7 +24,7 @@
 
 </details>
 
-### fr_FR.axaml: 91.57%
+### fr_FR.axaml: 91.51%
 
 
 <details>
@@ -106,7 +106,7 @@
 
 </details>
 
-### pt_BR.axaml: 91.30%
+### pt_BR.axaml: 91.24%
 
 
 <details>

From 398b14695ce9900e4b712b54e1ddf987953ac23f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 17:10:42 +0800
Subject: [PATCH 273/364] enhance: the git dir of worktree's owner repository
 may not named `.git`

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

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 4f2f3ca3..f1c43e7c 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -459,7 +459,7 @@ namespace SourceGit.ViewModels
             {
                 // For worktrees, we need to watch the $GIT_COMMON_DIR instead of the $GIT_DIR.
                 var gitDirForWatcher = _gitDir;
-                if (_gitDir.Replace("\\", "/").IndexOf(".git/worktrees/", StringComparison.Ordinal) > 0)
+                if (_gitDir.Replace("\\", "/").IndexOf("/worktrees/", StringComparison.Ordinal) > 0)
                 {
                     var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result();
                     if (!string.IsNullOrEmpty(commonDir))

From c9fe373dda59dfc87fb927aa9bac3ebf538c22ce Mon Sep 17 00:00:00 2001
From: Leonardo <leonardo.cossutta@gmail.com>
Date: Mon, 17 Mar 2025 10:15:17 +0100
Subject: [PATCH 274/364] add missing key and fix untranslated one (#1104)

---
 src/Resources/Locales/it_IT.axaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 782d6e78..d002dfef 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -454,7 +454,8 @@
   <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Abilita streaming</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">ASPETTO</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Font Predefinito</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Larghezza della Tab Editor</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Dimensione Font</x:String>
   <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>

From 2b95ea2ab1cac2cda9b27add6439406f47c163e0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 09:15:30 +0000
Subject: [PATCH 275/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 13887a13..dff78418 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.06%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.51%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.24%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.06%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.51%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.24%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index b1e1f2c8..0f8ccc2b 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -96,13 +96,13 @@
 
 </details>
 
-### it_IT.axaml: 99.87%
+### it_IT.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Preferences.Appearance.EditorTabWidth
+
 
 </details>
 

From a0cddaea8020b1ca891217df3f918a1a05560e97 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 19:53:47 +0800
Subject: [PATCH 276/364] feature: support `--ff-only` option for `git merge`
 command

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/MergeMode.cs      |  1 +
 src/ViewModels/Histories.cs  |  6 +++---
 src/ViewModels/Merge.cs      | 12 +++++++-----
 src/ViewModels/Repository.cs |  6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Models/MergeMode.cs b/src/Models/MergeMode.cs
index e4389b32..5dc70030 100644
--- a/src/Models/MergeMode.cs
+++ b/src/Models/MergeMode.cs
@@ -5,6 +5,7 @@
         public static readonly MergeMode[] Supported =
         [
             new MergeMode("Default", "Fast-forward if possible", ""),
+            new MergeMode("Fast-forward", "Refuse to merge when fast-forward is not possible", "--ff-only"),
             new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
             new MergeMode("Squash", "Squash merge", "--squash"),
             new MergeMode("Don't commit", "Merge without commit", "--no-ff --no-commit"),
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 0e67915c..01114dd3 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -871,7 +871,7 @@ namespace SourceGit.ViewModels
                         return;
 
                     if (_repo.CanCreatePopup())
-                        _repo.ShowAndStartPopup(new Merge(_repo, b, current.Name));
+                        _repo.ShowAndStartPopup(new Merge(_repo, b, current.Name, true));
 
                     e.Handled = true;
                 };
@@ -972,7 +972,7 @@ namespace SourceGit.ViewModels
                 merge.Click += (_, e) =>
                 {
                     if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new Merge(_repo, branch, current.Name));
+                        _repo.ShowPopup(new Merge(_repo, branch, current.Name, false));
                     e.Handled = true;
                 };
                 submenu.Items.Add(merge);
@@ -1060,7 +1060,7 @@ namespace SourceGit.ViewModels
             merge.Click += (_, e) =>
             {
                 if (_repo.CanCreatePopup())
-                    _repo.ShowPopup(new Merge(_repo, branch, current.Name));
+                    _repo.ShowPopup(new Merge(_repo, branch, current.Name, false));
                 e.Handled = true;
             };
 
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index bde9b66d..be938867 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -21,14 +21,14 @@ namespace SourceGit.ViewModels
             set;
         }
 
-        public Merge(Repository repo, Models.Branch source, string into)
+        public Merge(Repository repo, Models.Branch source, string into, bool forceFastForward)
         {
             _repo = repo;
             _sourceName = source.FriendlyName;
 
             Source = source;
             Into = into;
-            Mode = AutoSelectMergeMode();
+            Mode = forceFastForward ? Models.MergeMode.Supported[1] : AutoSelectMergeMode();
             View = new Views.Merge() { DataContext = this };
         }
 
@@ -72,12 +72,14 @@ namespace SourceGit.ViewModels
             var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
             if (string.IsNullOrEmpty(config))
                 return Models.MergeMode.Supported[0];
-            if (config.Equals("--no-ff", StringComparison.Ordinal))
+            if (config.Equals("--ff-only", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[1];
-            if (config.Equals("--squash", StringComparison.Ordinal))
+            if (config.Equals("--no-ff", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[2];
-            if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
+            if (config.Equals("--squash", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[3];
+            if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
+                return Models.MergeMode.Supported[4];
 
             return Models.MergeMode.Supported[0];
         }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index f1c43e7c..bf283532 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1516,7 +1516,7 @@ namespace SourceGit.ViewModels
                                 return;
 
                             if (CanCreatePopup())
-                                ShowAndStartPopup(new Merge(this, b, branch.Name));
+                                ShowAndStartPopup(new Merge(this, b, branch.Name, true));
 
                             e.Handled = true;
                         };
@@ -1595,7 +1595,7 @@ namespace SourceGit.ViewModels
                     merge.Click += (_, e) =>
                     {
                         if (CanCreatePopup())
-                            ShowPopup(new Merge(this, branch, _currentBranch.Name));
+                            ShowPopup(new Merge(this, branch, _currentBranch.Name, false));
                         e.Handled = true;
                     };
 
@@ -1876,7 +1876,7 @@ namespace SourceGit.ViewModels
                 merge.Click += (_, e) =>
                 {
                     if (CanCreatePopup())
-                        ShowPopup(new Merge(this, branch, _currentBranch.Name));
+                        ShowPopup(new Merge(this, branch, _currentBranch.Name, false));
                     e.Handled = true;
                 };
 

From b930066b5a2bc0d085a8c628f89b75c268fc6456 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 17 Mar 2025 19:59:28 +0800
Subject: [PATCH 277/364] fix: improve line splitting to handle both LF and
 CRLF line endings (#1106)

---
 src/Commands/CountLocalChangesWithoutUntracked.cs | 2 +-
 src/Commands/QueryCommitSignInfo.cs               | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Commands/CountLocalChangesWithoutUntracked.cs b/src/Commands/CountLocalChangesWithoutUntracked.cs
index 7ab9a54a..924f8a89 100644
--- a/src/Commands/CountLocalChangesWithoutUntracked.cs
+++ b/src/Commands/CountLocalChangesWithoutUntracked.cs
@@ -16,7 +16,7 @@ namespace SourceGit.Commands
             var rs = ReadToEnd();
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+                var lines = rs.StdOut.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
                 return lines.Length;
             }
 
diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs
index 5c81cf57..7b53a1f2 100644
--- a/src/Commands/QueryCommitSignInfo.cs
+++ b/src/Commands/QueryCommitSignInfo.cs
@@ -1,4 +1,6 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
 {
     public class QueryCommitSignInfo : Command
     {
@@ -22,7 +24,7 @@
             if (raw.Length <= 1)
                 return null;
 
-            var lines = raw.Split('\n');
+            var lines = raw.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
             return new Models.CommitSignInfo()
             {
                 VerifyResult = lines[0][0],

From 808302ce84813d59a6a859139dd8f84143cc5f5f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 20:35:31 +0800
Subject: [PATCH 278/364] code_review: PR #1106

- Use new syntex `[...]` instead of `new char[] {...}` to create char arrays
- Use `string.ReplaceLineEndings('\n').Split('\n')` instead of `string.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries)` because that the `Signer` part may be missing

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Config.cs                            | 2 +-
 src/Commands/CountLocalChangesWithoutUntracked.cs | 2 +-
 src/Commands/LFS.cs                               | 2 +-
 src/Commands/QueryBranches.cs                     | 2 +-
 src/Commands/QueryCommitSignInfo.cs               | 4 ++--
 src/Commands/QueryCommits.cs                      | 6 +++---
 src/Commands/QueryRefsContainsCommit.cs           | 2 +-
 src/Commands/QueryStagedChangesWithAmend.cs       | 2 +-
 src/Commands/QuerySubmodules.cs                   | 4 ++--
 src/Commands/QueryTrackStatus.cs                  | 2 +-
 src/Commands/Worktree.cs                          | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Commands/Config.cs b/src/Commands/Config.cs
index 2fb83325..49e8fcb7 100644
--- a/src/Commands/Config.cs
+++ b/src/Commands/Config.cs
@@ -29,7 +29,7 @@ namespace SourceGit.Commands
             var rs = new Dictionary<string, string>();
             if (output.IsSuccess)
             {
-                var lines = output.StdOut.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
                     var idx = line.IndexOf('=', StringComparison.Ordinal);
diff --git a/src/Commands/CountLocalChangesWithoutUntracked.cs b/src/Commands/CountLocalChangesWithoutUntracked.cs
index 924f8a89..0ba508f8 100644
--- a/src/Commands/CountLocalChangesWithoutUntracked.cs
+++ b/src/Commands/CountLocalChangesWithoutUntracked.cs
@@ -16,7 +16,7 @@ namespace SourceGit.Commands
             var rs = ReadToEnd();
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
+                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
                 return lines.Length;
             }
 
diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs
index 2b7d1de4..f7e56486 100644
--- a/src/Commands/LFS.cs
+++ b/src/Commands/LFS.cs
@@ -82,7 +82,7 @@ namespace SourceGit.Commands
             var rs = cmd.ReadToEnd();
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
                     var match = REG_LOCK().Match(line);
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
index 44438cef..8dbc4055 100644
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@@ -24,7 +24,7 @@ namespace SourceGit.Commands
             if (!rs.IsSuccess)
                 return branches;
 
-            var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
             var remoteBranches = new HashSet<string>();
             foreach (var line in lines)
             {
diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs
index 7b53a1f2..4f729a8d 100644
--- a/src/Commands/QueryCommitSignInfo.cs
+++ b/src/Commands/QueryCommitSignInfo.cs
@@ -20,11 +20,11 @@ namespace SourceGit.Commands
             if (!rs.IsSuccess)
                 return null;
 
-            var raw = rs.StdOut.Trim();
+            var raw = rs.StdOut.Trim().ReplaceLineEndings("\n");
             if (raw.Length <= 1)
                 return null;
 
-            var lines = raw.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
+            var lines = raw.Split('\n');
             return new Models.CommitSignInfo()
             {
                 VerifyResult = lines[0][0],
diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
index 312c068f..8d704aee 100644
--- a/src/Commands/QueryCommits.cs
+++ b/src/Commands/QueryCommits.cs
@@ -10,7 +10,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {limits}";
+            Args = $"log --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {limits}";
             _findFirstMerged = needFindHead;
         }
 
@@ -35,7 +35,7 @@ namespace SourceGit.Commands
                 var argsBuilder = new StringBuilder();
                 argsBuilder.Append(search);
 
-                var words = filter.Split(new[] { ' ', '\t', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+                var words = filter.Split([' ', '\t', '\r'], StringSplitOptions.RemoveEmptyEntries);
                 foreach (var word in words)
                 {
                     var escaped = word.Trim().Replace("\"", "\\\"", StringComparison.Ordinal);
@@ -124,7 +124,7 @@ namespace SourceGit.Commands
             Args = $"log --since=\"{_commits[^1].CommitterTimeStr}\" --format=\"%H\"";
 
             var rs = ReadToEnd();
-            var shas = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            var shas = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
             if (shas.Length == 0)
                 return;
 
diff --git a/src/Commands/QueryRefsContainsCommit.cs b/src/Commands/QueryRefsContainsCommit.cs
index 82e9b341..cabe1b50 100644
--- a/src/Commands/QueryRefsContainsCommit.cs
+++ b/src/Commands/QueryRefsContainsCommit.cs
@@ -20,7 +20,7 @@ namespace SourceGit.Commands
             if (!output.IsSuccess)
                 return rs;
 
-            var lines = output.StdOut.Split('\n');
+            var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
             foreach (var line in lines)
             {
                 if (line.EndsWith("/HEAD", StringComparison.Ordinal))
diff --git a/src/Commands/QueryStagedChangesWithAmend.cs b/src/Commands/QueryStagedChangesWithAmend.cs
index f5c9659f..cfea5e35 100644
--- a/src/Commands/QueryStagedChangesWithAmend.cs
+++ b/src/Commands/QueryStagedChangesWithAmend.cs
@@ -24,7 +24,7 @@ namespace SourceGit.Commands
             if (rs.IsSuccess)
             {
                 var changes = new List<Models.Change>();
-                var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
                     var match = REG_FORMAT2().Match(line);
diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs
index 1ceccf78..e2debd06 100644
--- a/src/Commands/QuerySubmodules.cs
+++ b/src/Commands/QuerySubmodules.cs
@@ -26,7 +26,7 @@ namespace SourceGit.Commands
             var rs = ReadToEnd();
 
             var builder = new StringBuilder();
-            var lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
+            var lines = rs.StdOut.Split(['r', '\n'], System.StringSplitOptions.RemoveEmptyEntries);
             foreach (var line in lines)
             {
                 var match = REG_FORMAT1().Match(line);
@@ -55,7 +55,7 @@ namespace SourceGit.Commands
                     return submodules;
 
                 var dirty = new HashSet<string>();
-                lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
+                lines = rs.StdOut.Split(['\r', '\n'], System.StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
                     var match = REG_FORMAT_STATUS().Match(line);
diff --git a/src/Commands/QueryTrackStatus.cs b/src/Commands/QueryTrackStatus.cs
index 0bf9746f..e7e1f1c9 100644
--- a/src/Commands/QueryTrackStatus.cs
+++ b/src/Commands/QueryTrackStatus.cs
@@ -19,7 +19,7 @@ namespace SourceGit.Commands
             if (!rs.IsSuccess)
                 return status;
 
-            var lines = rs.StdOut.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+            var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
             foreach (var line in lines)
             {
                 if (line[0] == '>')
diff --git a/src/Commands/Worktree.cs b/src/Commands/Worktree.cs
index b73b8573..960d5501 100644
--- a/src/Commands/Worktree.cs
+++ b/src/Commands/Worktree.cs
@@ -21,7 +21,7 @@ namespace SourceGit.Commands
             var last = null as Models.Worktree;
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
                     if (line.StartsWith("worktree ", StringComparison.Ordinal))

From 8d47bd5cd9451360acda528f9dff25fdec431686 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 20:46:01 +0800
Subject: [PATCH 279/364] refactor: use `--format=<format>` instead of
 `--pretty=format:<format>`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryCommitFullMessage.cs           | 2 +-
 src/Commands/QueryCommitSignInfo.cs              | 6 ++----
 src/Commands/QueryCommits.cs                     | 2 +-
 src/Commands/QueryCommitsForInteractiveRebase.cs | 2 +-
 src/Commands/QuerySingleCommit.cs                | 2 +-
 src/Commands/QueryStashes.cs                     | 2 +-
 src/Commands/Statistics.cs                       | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Commands/QueryCommitFullMessage.cs b/src/Commands/QueryCommitFullMessage.cs
index c8f1867d..36b6d1c7 100644
--- a/src/Commands/QueryCommitFullMessage.cs
+++ b/src/Commands/QueryCommitFullMessage.cs
@@ -6,7 +6,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"show --no-show-signature --pretty=format:%B -s {sha}";
+            Args = $"show --no-show-signature --format=%B -s {sha}";
         }
 
         public string Result()
diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs
index 4f729a8d..799e142d 100644
--- a/src/Commands/QueryCommitSignInfo.cs
+++ b/src/Commands/QueryCommitSignInfo.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
 {
     public class QueryCommitSignInfo : Command
     {
@@ -9,7 +7,7 @@ namespace SourceGit.Commands
             WorkingDirectory = repo;
             Context = repo;
 
-            const string baseArgs = "show --no-show-signature --pretty=format:\"%G?%n%GS%n%GK\" -s";
+            const string baseArgs = "show --no-show-signature --format=%G?%n%GS%n%GK -s";
             const string fakeSignersFileArg = "-c gpg.ssh.allowedSignersFile=/dev/null";
             Args = $"{(useFakeSignersFile ? fakeSignersFileArg : string.Empty)} {baseArgs} {sha}";
         }
diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
index 8d704aee..dd3c39b4 100644
--- a/src/Commands/QueryCommits.cs
+++ b/src/Commands/QueryCommits.cs
@@ -48,7 +48,7 @@ namespace SourceGit.Commands
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log -1000 --date-order --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s " + search;
+            Args = $"log -1000 --date-order --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s " + search;
             _findFirstMerged = false;
         }
 
diff --git a/src/Commands/QueryCommitsForInteractiveRebase.cs b/src/Commands/QueryCommitsForInteractiveRebase.cs
index 232d86e5..615060a5 100644
--- a/src/Commands/QueryCommitsForInteractiveRebase.cs
+++ b/src/Commands/QueryCommitsForInteractiveRebase.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Commands
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --date-order --no-show-signature --decorate=full --pretty=format:\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";
+            Args = $"log --date-order --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";
         }
 
         public List<Models.InteractiveCommit> Result()
diff --git a/src/Commands/QuerySingleCommit.cs b/src/Commands/QuerySingleCommit.cs
index 1e1c9ea4..35289ec5 100644
--- a/src/Commands/QuerySingleCommit.cs
+++ b/src/Commands/QuerySingleCommit.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"show --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s -s {sha}";
+            Args = $"show --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s -s {sha}";
         }
 
         public Models.Commit Result()
diff --git a/src/Commands/QueryStashes.cs b/src/Commands/QueryStashes.cs
index ccf601c5..dd5d10cc 100644
--- a/src/Commands/QueryStashes.cs
+++ b/src/Commands/QueryStashes.cs
@@ -9,7 +9,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "stash list --pretty=format:%H%n%P%n%ct%n%gd%n%s";
+            Args = "stash list --format=%H%n%P%n%ct%n%gd%n%s";
         }
 
         public List<Models.Stash> Result()
diff --git a/src/Commands/Statistics.cs b/src/Commands/Statistics.cs
index 511c43e8..1439cedd 100644
--- a/src/Commands/Statistics.cs
+++ b/src/Commands/Statistics.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --date-order --branches --remotes -{max} --pretty=format:\"%ct$%aN\"";
+            Args = $"log --date-order --branches --remotes -{max} --format=%ct$%aN";
         }
 
         public Models.Statistics Result()

From 695db2a319918d6ec96ec317432b0b656a154ab3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 17 Mar 2025 20:57:18 +0800
Subject: [PATCH 280/364] code_style: run `dotnet format`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryCommitSignInfo.cs       |   1 -
 src/Native/MacOS.cs                       |   2 +-
 src/Views/About.axaml                     |   2 +-
 src/Views/AddWorktree.axaml               |  10 +-
 src/Views/Askpass.axaml                   |   4 +-
 src/Views/AssumeUnchangedManager.axaml    |  10 +-
 src/Views/Blame.axaml                     |   2 +-
 src/Views/BranchCompare.axaml             |   4 +-
 src/Views/ChangeCollectionView.axaml      |   4 +-
 src/Views/ChangeViewModeSwitcher.axaml    |   2 +-
 src/Views/CherryPick.axaml                |   8 +-
 src/Views/Clone.axaml                     |  36 ++--
 src/Views/CommitBaseInfo.axaml            |  14 +-
 src/Views/CommitChanges.axaml             |   2 +-
 src/Views/CommitDetail.axaml              |  20 +--
 src/Views/CommitMessageTextBox.axaml      |   4 +-
 src/Views/CommitRelationTracking.axaml    |   2 +-
 src/Views/ConfigureWorkspace.axaml        |  10 +-
 src/Views/ConfirmCommitWithoutFiles.axaml |   2 +-
 src/Views/DeleteBranch.axaml              |   2 +-
 src/Views/DeleteRepositoryNode.axaml      |   2 +-
 src/Views/DeleteTag.axaml                 |   2 +-
 src/Views/DiffView.axaml                  |  26 +--
 src/Views/Discard.axaml                   |  16 +-
 src/Views/EditRepositoryNode.axaml        |   2 +-
 src/Views/FileHistories.axaml             |   6 +-
 src/Views/FilterModeSwitchButton.axaml    |   2 +-
 src/Views/Histories.axaml                 |  12 +-
 src/Views/Hotkeys.axaml                   |  12 +-
 src/Views/ImageDiffView.axaml             |  12 +-
 src/Views/Init.axaml                      |   2 +-
 src/Views/InteractiveRebase.axaml         |  22 +--
 src/Views/LFSFetch.axaml                  |   4 +-
 src/Views/LFSLocks.axaml                  |   4 +-
 src/Views/LFSTrackCustomPattern.axaml     |   2 +-
 src/Views/Launcher.axaml                  |   6 +-
 src/Views/LauncherPage.axaml              |   8 +-
 src/Views/LauncherTabBar.axaml            |   2 +-
 src/Views/Merge.axaml                     |   2 +-
 src/Views/MergeMultiple.axaml             |   6 +-
 src/Views/PopupRunningStatus.axaml        |   6 +-
 src/Views/Preferences.axaml               |  12 +-
 src/Views/Push.axaml                      |   4 +-
 src/Views/RepositoryConfigure.axaml       |  14 +-
 src/Views/RepositoryToolbar.axaml         | 210 +++++++++++-----------
 src/Views/RevisionCompare.axaml           |   4 +-
 src/Views/RevisionFileContentViewer.axaml |   4 +-
 src/Views/RevisionFiles.axaml             |   2 +-
 src/Views/Reword.axaml                    |   4 +-
 src/Views/SelfUpdate.axaml                |   2 +-
 src/Views/StashChanges.axaml              |  12 +-
 src/Views/TagsView.axaml                  |  20 +--
 src/Views/TextDiffView.axaml              |  10 +-
 src/Views/WelcomeToolbar.axaml            |   4 +-
 src/Views/WorkingCopy.axaml               |  16 +-
 55 files changed, 307 insertions(+), 308 deletions(-)

diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs
index 799e142d..133949af 100644
--- a/src/Commands/QueryCommitSignInfo.cs
+++ b/src/Commands/QueryCommitSignInfo.cs
@@ -29,7 +29,6 @@
                 Signer = lines[1],
                 Key = lines[2]
             };
-
         }
     }
 }
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 123b160b..d7ef4701 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -31,7 +31,7 @@ namespace SourceGit.Native
                 var env = File.ReadAllText(customPathFile).Trim();
                 if (!string.IsNullOrEmpty(env))
                     path = env;
-            }            
+            }
 
             Environment.SetEnvironmentVariable("PATH", path);
         }
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 28529b63..d0dd7b82 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -28,7 +28,7 @@
                  Text="{DynamicResource Text.About}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
-      
+
       <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
diff --git a/src/Views/AddWorktree.axaml b/src/Views/AddWorktree.axaml
index d6853aab..1811008c 100644
--- a/src/Views/AddWorktree.axaml
+++ b/src/Views/AddWorktree.axaml
@@ -27,7 +27,7 @@
           </Button>
         </TextBox.InnerRightContent>
       </TextBox>
-      
+
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -67,15 +67,15 @@
             </StackPanel>
           </DataTemplate>
         </ComboBox.ItemTemplate>
-      </ComboBox> 
+      </ComboBox>
 
-      <Border Grid.Row="3" Grid.Column="0" 
+      <Border Grid.Row="3" Grid.Column="0"
               Height="32"
               IsVisible="{Binding SetTrackingBranch, Mode=OneWay}">
         <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
                    Margin="0,0,8,0"
-                   Text="{DynamicResource Text.AddWorktree.Tracking}"/>        
-      </Border>      
+                   Text="{DynamicResource Text.AddWorktree.Tracking}"/>
+      </Border>
       <ComboBox Grid.Row="3" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml
index 811f9c3c..f4113b5e 100644
--- a/src/Views/Askpass.axaml
+++ b/src/Views/Askpass.axaml
@@ -38,7 +38,7 @@
       <Border Margin="16,0">
         <TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/>
       </Border>
-      
+
       <TextBox x:Name="TxtPassphrase"
                Margin="16"
                MinWidth="300"
@@ -55,7 +55,7 @@
                         Width="26" Height="14"/>
         </TextBox.InnerRightContent>
       </TextBox>
-      
+
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
         <Button Classes="flat primary"
                 Width="80"
diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml
index 28e4d3bd..e8baaeb4 100644
--- a/src/Views/AssumeUnchangedManager.axaml
+++ b/src/Views/AssumeUnchangedManager.axaml
@@ -14,13 +14,13 @@
                     Width="600" Height="400"
                     CanResize="False"
                     WindowStartupLocation="CenterOwner">
-  <Grid RowDefinitions="Auto,*">    
+  <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"
@@ -36,7 +36,7 @@
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
-    
+
     <!-- Unchanged Files -->
     <Grid Grid.Row="1">
       <ListBox Margin="8"
@@ -60,7 +60,7 @@
             <VirtualizingStackPanel Orientation="Vertical"/>
           </ItemsPanelTemplate>
         </ListBox.ItemsPanel>
-        
+
         <ListBox.ItemTemplate>
           <DataTemplate>
             <Grid Height="26" ColumnDefinitions="26,*,30">
@@ -83,6 +83,6 @@
         <Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/>
         <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.AssumeUnchanged.Empty}" Foreground="{DynamicResource Brush.FG2}"/>
       </StackPanel>
-    </Grid>    
+    </Grid>
   </Grid>
 </v:ChromelessWindow>
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index d5c3fd22..eaad985a 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -36,7 +36,7 @@
                  Text="{DynamicResource Text.Blame}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
-      
+
       <!-- Caption Buttons (Windows/Linux) -->
       <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml
index f73860c5..4f6f312e 100644
--- a/src/Views/BranchCompare.axaml
+++ b/src/Views/BranchCompare.axaml
@@ -38,7 +38,7 @@
                  Text="{DynamicResource Text.BranchCompare}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
-      
+
       <!-- Caption Buttons (Windows/Linux) -->
       <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
@@ -89,7 +89,7 @@
           </Grid>
         </Border>
       </Grid>
-    </Border>    
+    </Border>
 
     <!-- Changes -->
     <Border Grid.Row="2">
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index 2b0f5bfa..805028d0 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -20,14 +20,14 @@
         </ItemsPanelTemplate>
       </Setter>
     </Style>
-    
+
     <Style Selector="ListBoxItem">
       <Setter Property="Height" Value="24"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="0"/>
     </Style>
   </UserControl.Styles>
-  
+
   <UserControl.DataTemplates>
     <DataTemplate DataType="vm:ChangeCollectionAsTree">
       <v:ChangeCollectionContainer ItemsSource="{Binding Rows}"
diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml
index 4825c2e2..911fb41d 100644
--- a/src/Views/ChangeViewModeSwitcher.axaml
+++ b/src/Views/ChangeViewModeSwitcher.axaml
@@ -27,7 +27,7 @@
         </MenuItem>
       </MenuFlyout>
     </Button.Flyout>
-    
+
     <Grid Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center">
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.List}"
diff --git a/src/Views/CherryPick.axaml b/src/Views/CherryPick.axaml
index 779a0414..eb80be44 100644
--- a/src/Views/CherryPick.axaml
+++ b/src/Views/CherryPick.axaml
@@ -12,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.CherryPick}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="Auto,Auto,32,32" ColumnDefinitions="100,*">      
+    <Grid Margin="0,16,0,0" RowDefinitions="Auto,Auto,32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -73,15 +73,15 @@
           </ComboBox.ItemTemplate>
         </ComboBox>
 
-        <Border Grid.Column="1" 
-                Background="Transparent" 
+        <Border Grid.Column="1"
+                Background="Transparent"
                 ToolTip.Tip="{DynamicResource Text.CherryPick.Mainline.Tips}">
           <Path Grid.Column="1"
                 Width="14" Height="14"
                 Data="{StaticResource Icons.Info}"/>
         </Border>
       </Grid>
-      
+
       <CheckBox Grid.Row="2" Grid.Column="1"
                 Content="{DynamicResource Text.CherryPick.CommitChanges}"
                 IsChecked="{Binding AutoCommit, Mode=TwoWay}"/>
diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml
index 84d1dd74..8c7c9faf 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -11,14 +11,14 @@
     <TextBlock Classes="bold" FontSize="18" Text="{DynamicResource Text.Clone}"/>
 
     <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,32,32,32,32" ColumnDefinitions="Auto,*">
-      <TextBlock Grid.Row="0" Grid.Column="0" 
-                 HorizontalAlignment="Right" 
-                 Margin="0,0,8,0" 
+      <TextBlock Grid.Row="0" Grid.Column="0"
+                 HorizontalAlignment="Right"
+                 Margin="0,0,8,0"
                  Text="{DynamicResource Text.Clone.RemoteURL}"/>
-      <TextBox Grid.Row="0" Grid.Column="1" 
+      <TextBox Grid.Row="0" Grid.Column="1"
                Height="28"
-               CornerRadius="3" 
-               Text="{Binding Remote, Mode=TwoWay}" 
+               CornerRadius="3"
+               Text="{Binding Remote, Mode=TwoWay}"
                v:AutoFocusBehaviour.IsEnabled="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
@@ -40,9 +40,9 @@
         </TextBox.InnerRightContent>
       </TextBox>
 
-      <TextBlock Grid.Row="2" Grid.Column="0" 
-                 HorizontalAlignment="Right" 
-                 Margin="0,0,8,0" 
+      <TextBlock Grid.Row="2" Grid.Column="0"
+                 HorizontalAlignment="Right"
+                 Margin="0,0,8,0"
                  Text="{DynamicResource Text.Clone.ParentFolder}"/>
       <TextBox Grid.Row="2" Grid.Column="1"
                x:Name="TxtParentFolder"
@@ -56,24 +56,24 @@
         </TextBox.InnerRightContent>
       </TextBox>
 
-      <TextBlock Grid.Row="3" Grid.Column="0" 
-                 HorizontalAlignment="Right" 
-                 Margin="0,0,8,0" 
+      <TextBlock Grid.Row="3" Grid.Column="0"
+                 HorizontalAlignment="Right"
+                 Margin="0,0,8,0"
                  Text="{DynamicResource Text.Clone.LocalName}"/>
       <TextBox Grid.Row="3" Grid.Column="1"
                Height="28"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}" 
+               Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}"
                Text="{Binding Local, Mode=TwoWay}"/>
 
-      <TextBlock Grid.Row="4" Grid.Column="0" 
-                 HorizontalAlignment="Right" 
-                 Margin="0,0,8,0" 
+      <TextBlock Grid.Row="4" Grid.Column="0"
+                 HorizontalAlignment="Right"
+                 Margin="0,0,8,0"
                  Text="{DynamicResource Text.Clone.AdditionalParam}"/>
       <TextBox Grid.Row="4" Grid.Column="1"
                Height="28"
-               CornerRadius="3" 
-               Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}" 
+               CornerRadius="3"
+               Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}"
                Text="{Binding ExtraArgs, Mode=TwoWay}"/>
 
       <CheckBox Grid.Row="5" Grid.Column="1"
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 692d04b8..06d10fe7 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -55,9 +55,9 @@
           <!-- 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" 
+            <TextBlock Classes="primary"
+                       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}">
@@ -184,12 +184,12 @@
 
           <!-- Messages -->
           <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" 
+          <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1"
+                                    Margin="12,4,8,0"
+                                    Classes="primary"
                                     FullMessage="{Binding #ThisControl.FullMessage}"
                                     HorizontalAlignment="Stretch"
-                                    TextWrapping="Wrap">            
+                                    TextWrapping="Wrap">
             <v:CommitMessagePresenter.DataTemplates>
               <DataTemplate DataType="m:Commit">
                 <StackPanel MinWidth="400" Orientation="Vertical">
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 2fac9365..80f96c48 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -19,7 +19,7 @@
       <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
         <TextBox Grid.Column="0"
                  Height="26"
-                 BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" 
+                 BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                  Background="Transparent"
                  CornerRadius="4"
                  Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml
index 28b21eb7..e8c150a1 100644
--- a/src/Views/CommitDetail.axaml
+++ b/src/Views/CommitDetail.axaml
@@ -19,7 +19,7 @@
       <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
         <StackPanel Orientation="Vertical">
           <!-- Base Information -->
-          <v:CommitBaseInfo Content="{Binding Commit}" 
+          <v:CommitBaseInfo Content="{Binding Commit}"
                             FullMessage="{Binding FullMessage}"
                             SignInfo="{Binding SignInfo}"
                             SupportsContainsIn="True"
@@ -30,7 +30,7 @@
           <Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}"/>
 
           <!-- Change List -->
-          <ListBox Background="Transparent" 
+          <ListBox Background="Transparent"
                    Margin="64,0,8,4"
                    SelectionMode="Single"
                    ItemsSource="{Binding Changes, Converter={x:Static c:ListConverters.Top100Changes}}">
@@ -41,20 +41,20 @@
                 <Setter Property="CornerRadius" Value="4"/>
               </Style>
             </ListBox.Styles>
-            
+
             <ListBox.ItemsPanel>
               <ItemsPanelTemplate>
                 <StackPanel Orientation="Vertical"/>
               </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
-            
+
             <ListBox.ItemTemplate>
               <DataTemplate DataType="m:Change">
                 <Grid Background="Transparent" Height="24" ColumnDefinitions="36,*" ContextRequested="OnChangeContextRequested" DoubleTapped="OnChangeDoubleTapped">
-                  <v:ChangeStatusIcon Grid.Column="0" 
-                                      Width="14" Height="14" 
-                                      HorizontalAlignment="Left" 
-                                      Margin="16,0,0,0" 
+                  <v:ChangeStatusIcon Grid.Column="0"
+                                      Width="14" Height="14"
+                                      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"/>
                 </Grid>
@@ -63,8 +63,8 @@
           </ListBox>
 
           <!-- Only Top100 Tip -->
-          <TextBlock Margin="108,0,0,16" 
-                     Text="{DynamicResource Text.CommitDetail.Info.GotoChangesPage}" 
+          <TextBlock Margin="108,0,0,16"
+                     Text="{DynamicResource Text.CommitDetail.Info.GotoChangesPage}"
                      Foreground="{DynamicResource Brush.FG2}"
                      IsVisible="{Binding Changes, Converter={x:Static c:ListConverters.IsOnlyTop100Shows}}"/>
         </StackPanel>
diff --git a/src/Views/CommitMessageTextBox.axaml b/src/Views/CommitMessageTextBox.axaml
index 44d5d5fb..5132521f 100644
--- a/src/Views/CommitMessageTextBox.axaml
+++ b/src/Views/CommitMessageTextBox.axaml
@@ -36,7 +36,7 @@
                    VerticalAlignment="Stretch"
                    IsHitTestVisible="False"
                    Fill="{DynamicResource Brush.Border2}"/>
-        
+
         <StackPanel Grid.Column="2"
                     Margin="8,0"
                     VerticalAlignment="Center"
@@ -48,7 +48,7 @@
           <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>
-      
+
       <Rectangle Grid.Row="1"
                  Height="1"
                  HorizontalAlignment="Stretch"
diff --git a/src/Views/CommitRelationTracking.axaml b/src/Views/CommitRelationTracking.axaml
index 5e3574d8..9d036e10 100644
--- a/src/Views/CommitRelationTracking.axaml
+++ b/src/Views/CommitRelationTracking.axaml
@@ -30,7 +30,7 @@
         </ItemsControl.ItemTemplate>
       </ItemsControl>
     </ScrollViewer>
-    
+
     <v:LoadingIcon x:Name="LoadingIcon" Grid.Row="2" HorizontalAlignment="Center" Margin="0,8" Width="14" Height="14" IsVisible="False"/>
   </Grid>
 </UserControl>
diff --git a/src/Views/ConfigureWorkspace.axaml b/src/Views/ConfigureWorkspace.axaml
index 9c18ad04..79eab390 100644
--- a/src/Views/ConfigureWorkspace.axaml
+++ b/src/Views/ConfigureWorkspace.axaml
@@ -66,11 +66,11 @@
                 <Grid ColumnDefinitions="Auto,*,Auto">
                   <Path Grid.Column="0" Margin="4,0" Width="14" Height="14" Data="{StaticResource Icons.Workspace}" Fill="{Binding Brush}"/>
                   <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="4,0" TextTrimming="CharacterEllipsis"/>
-                  <Path Grid.Column="2" 
-                        Margin="4,0" 
-                        Width="14" Height="14" 
-                        Data="{StaticResource Icons.Check}" 
-                        Fill="{DynamicResource Brush.FG1}" 
+                  <Path Grid.Column="2"
+                        Margin="4,0"
+                        Width="14" Height="14"
+                        Data="{StaticResource Icons.Check}"
+                        Fill="{DynamicResource Brush.FG1}"
                         IsVisible="{Binding IsActive}"/>
                 </Grid>
               </DataTemplate>
diff --git a/src/Views/ConfirmCommitWithoutFiles.axaml b/src/Views/ConfirmCommitWithoutFiles.axaml
index a056f016..4c9fd1c8 100644
--- a/src/Views/ConfirmCommitWithoutFiles.axaml
+++ b/src/Views/ConfirmCommitWithoutFiles.axaml
@@ -52,7 +52,7 @@
               HorizontalAlignment="Center"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"/>
-      
+
       <Button Classes="flat primary"
               Width="80"
               Height="30"
diff --git a/src/Views/DeleteBranch.axaml b/src/Views/DeleteBranch.axaml
index 05ec6e26..9239e47b 100644
--- a/src/Views/DeleteBranch.axaml
+++ b/src/Views/DeleteBranch.axaml
@@ -10,7 +10,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.DeleteBranch}"/>
-    
+
     <Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
diff --git a/src/Views/DeleteRepositoryNode.axaml b/src/Views/DeleteRepositoryNode.axaml
index 30a3728e..5442dd19 100644
--- a/src/Views/DeleteRepositoryNode.axaml
+++ b/src/Views/DeleteRepositoryNode.axaml
@@ -36,7 +36,7 @@
 
         <TextBlock VerticalAlignment="Center" Text="{Binding Node.Name}"/>
       </StackPanel>
-      
+
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/DeleteTag.axaml b/src/Views/DeleteTag.axaml
index 23c19d35..c5b4f507 100644
--- a/src/Views/DeleteTag.axaml
+++ b/src/Views/DeleteTag.axaml
@@ -24,6 +24,6 @@
       <CheckBox Grid.Row="1" Grid.Column="1"
                 Content="{DynamicResource Text.DeleteTag.WithRemote}"
                 IsChecked="{Binding PushToRemotes, Mode=TwoWay}"/>
-    </Grid>    
+    </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 8df3e4f6..12cfa451 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -46,7 +46,7 @@
               </Button.IsVisible>
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Top}"/>
             </Button>
-            
+
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoPrevChange"
@@ -54,7 +54,7 @@
                     ToolTip.Tip="{DynamicResource Text.Diff.Prev}">
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
             </Button>
-            
+
             <Border>
               <Border.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
@@ -62,7 +62,7 @@
                   <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/>
                 </MultiBinding>
               </Border.IsVisible>
-              
+
               <TextBlock x:Name="BlockNavigationIndicator" Classes="primary" Margin="0,0,0,0" FontSize="11" Text="-/-"/>
             </Border>
 
@@ -73,7 +73,7 @@
                     ToolTip.Tip="{DynamicResource Text.Diff.Next}">
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
             </Button>
-            
+
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoLastChange"
@@ -94,10 +94,10 @@
                           ToolTip.Tip="{DynamicResource Text.Diff.UseBlockNavigation}">
               <Path Width="13" Height="13" Data="{StaticResource Icons.CodeBlock}" Margin="0,3,0,0"/>
             </ToggleButton>
-            
-            <Button Classes="icon_button" 
+
+            <Button Classes="icon_button"
                     Width="28"
-                    Command="{Binding IncrUnified}" 
+                    Command="{Binding IncrUnified}"
                     IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Incr}">
               <Button.IsEnabled>
@@ -106,10 +106,10 @@
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Incr}"/>
             </Button>
 
-            <Button Classes="icon_button" 
-                    Width="28" 
-                    Command="{Binding DecrUnified}" 
-                    IsVisible="{Binding IsTextDiff}" 
+            <Button Classes="icon_button"
+                    Width="28"
+                    Command="{Binding DecrUnified}"
+                    IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Decr}">
               <Button.IsEnabled>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
@@ -119,7 +119,7 @@
               </Button.IsEnabled>
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Decr}"/>
             </Button>
-            
+
             <ToggleButton Classes="line_path"
                           Width="28"
                           Command="{Binding ToggleFullTextDiff}"
@@ -148,7 +148,7 @@
                   <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseSideBySideDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
                 </MultiBinding>
               </ToggleButton.IsVisible>
-              
+
               <Path Width="12" Height="12" Data="{StaticResource Icons.WordWrap}" Margin="0,2,0,0"/>
             </ToggleButton>
 
diff --git a/src/Views/Discard.axaml b/src/Views/Discard.axaml
index 23162060..1699b051 100644
--- a/src/Views/Discard.axaml
+++ b/src/Views/Discard.axaml
@@ -11,16 +11,16 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Discard}"/>
-    
+
     <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-      <Path Width="14" Height="14" 
-            Data="{StaticResource Icons.Error}" 
+      <Path Width="14" Height="14"
+            Data="{StaticResource Icons.Error}"
             Fill="DarkOrange"/>
       <TextBlock Margin="4,0,0,0"
                  Text="{DynamicResource Text.Discard.Warning}"
                  Foreground="DarkOrange"/>
     </StackPanel>
-    
+
     <ContentControl Margin="0,16,0,8" Content="{Binding Mode}">
       <ContentControl.DataTemplates>
         <DataTemplate DataType="vm:DiscardAllMode">
@@ -31,13 +31,13 @@
                        Text="{DynamicResource Text.Discard.Changes}"/>
             <TextBlock Grid.Row="0" Grid.Column="1"
                        Text="{DynamicResource Text.Discard.All}"/>
-            
+
             <CheckBox Grid.Row="1" Grid.Column="1"
                       Content="{DynamicResource Text.Discard.IncludeIgnored}"
                       IsChecked="{Binding IncludeIgnored, Mode=TwoWay}"/>
           </Grid>
         </DataTemplate>
-        
+
         <DataTemplate DataType="vm:DiscardSingleFile">
           <Grid Height="32" ColumnDefinitions="120,*">
             <TextBlock Grid.Column="0"
@@ -50,7 +50,7 @@
             </StackPanel>
           </Grid>
         </DataTemplate>
-        
+
         <DataTemplate DataType="vm:DiscardMultipleFiles">
           <Grid Height="32" ColumnDefinitions="120,*">
             <TextBlock Grid.Column="0"
@@ -59,7 +59,7 @@
                        Text="{DynamicResource Text.Discard.Changes}"/>
             <StackPanel Grid.Column="1" Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
-              <TextBlock Text="{Binding Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}" 
+              <TextBlock Text="{Binding Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}"
                          Margin="4,0,0,0"/>
             </StackPanel>
           </Grid>
diff --git a/src/Views/EditRepositoryNode.axaml b/src/Views/EditRepositoryNode.axaml
index ac8f50f3..615e3f11 100644
--- a/src/Views/EditRepositoryNode.axaml
+++ b/src/Views/EditRepositoryNode.axaml
@@ -43,7 +43,7 @@
                     Fill="{Binding Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
                     HorizontalAlignment="Center" VerticalAlignment="Center"
                     Data="{StaticResource Icons.Bookmark}"/>
-            </Border>            
+            </Border>
           </DataTemplate>
         </ComboBox.ItemTemplate>
       </ComboBox>
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index 124b2e00..e33156fb 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -37,7 +37,7 @@
                  Text="{DynamicResource Text.FileHistory}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
-      
+
       <!-- Caption Buttons (Windows/Linux) -->
       <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
@@ -184,7 +184,7 @@
                     </Grid>
                   </DataTemplate>
                 </Grid.DataTemplates>
-                
+
                 <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
                   <ContentControl Content="{Binding StartPoint}"/>
                 </Border>
@@ -234,7 +234,7 @@
                      HorizontalAlignment="Center" VerticalAlignment="Center"
                      IsVisible="{Binding IsLoading}"/>
     </Grid>
-    
+
     <Border Grid.Row="1" x:Name="NotifyDonePanel" Background="Transparent" IsVisible="False" PointerPressed="OnCloseNotifyPanel">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #80000000)">
         <Border CornerRadius="8" Background="{DynamicResource Brush.Popup}" Padding="32">
diff --git a/src/Views/FilterModeSwitchButton.axaml b/src/Views/FilterModeSwitchButton.axaml
index 0fbbbf8e..b202c434 100644
--- a/src/Views/FilterModeSwitchButton.axaml
+++ b/src/Views/FilterModeSwitchButton.axaml
@@ -5,7 +5,7 @@
              xmlns:m="using:SourceGit.Models"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.FilterModeSwitchButton"
-             x:Name="ThisControl">  
+             x:Name="ThisControl">
   <Button Classes="icon_button"
           Width="12" Height="12"
           Padding="0"
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index afe2c1b7..9f010213 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -22,7 +22,7 @@
       <ColumnDefinition Width="3"/>
       <ColumnDefinition Width="{Binding RightArea, Mode=TwoWay}" MinWidth="100"/>
     </v:HistoriesLayout.ColumnDefinitions>
-    
+
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
       <Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True">
         <!-- Headers -->
@@ -132,7 +132,7 @@
                           Background="Transparent"
                           ToolTip.Tip="{Binding Subject}">
                     <Grid ColumnDefinitions="Auto,Auto,*" Margin="2,0,4,0" ClipToBounds="True">
-                      <v:CommitStatusIndicator Grid.Column="0" 
+                      <v:CommitStatusIndicator Grid.Column="0"
                                                CurrentBranch="{Binding $parent[v:Histories].CurrentBranch}"
                                                AheadBrush="{DynamicResource Brush.Accent}"
                                                BehindBrush="{DynamicResource Brush.FG1}"
@@ -177,7 +177,7 @@
                               Opacity="{Binding Opacity}"/>
 
                     <Border Grid.Column="1" Padding="8,0,0,0" ClipToBounds="True">
-                      <TextBlock Classes="primary" 
+                      <TextBlock Classes="primary"
                                  Text="{Binding Author.Name}"
                                  FontWeight="{Binding FontWeight}"
                                  HorizontalAlignment="Left"
@@ -218,7 +218,7 @@
                          ClipToBounds="True"/>
         </Grid>
       </Grid>
-      
+
       <!-- Fix memory leak -->
       <v:LoadingIcon Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>
     </Grid>
@@ -228,7 +228,7 @@
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                   Background="{DynamicResource Brush.Window}"
                   BorderBrush="{DynamicResource Brush.Border0}"/>
-    
+
     <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
       <Grid IsVisible="{Binding DetailContext, Converter={x:Static ObjectConverters.IsNull}}">
         <Path Width="128" Height="128"
@@ -243,7 +243,7 @@
           <TextBlock Text="{DynamicResource Text.Histories.Tips.MacOS}" Foreground="{DynamicResource Brush.FG2}" IsVisible="{OnPlatform False, macOS=True}"/>
         </StackPanel>
       </Grid>
-      
+
       <ContentControl Content="{Binding DetailContext}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:CommitDetail">
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 67293b50..58472daf 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -19,7 +19,7 @@
       <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"
@@ -48,7 +48,7 @@
         <Grid RowDefinitions="20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, 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="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
 
@@ -80,7 +80,7 @@
         <Grid RowDefinitions="20,20,20,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="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="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.OpenSearchCommits}" />
 
@@ -95,13 +95,13 @@
 
           <TextBlock Grid.Row="5" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Space/Enter, macOS=␣/Enter}"/>
           <TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
-          
+
           <TextBlock Grid.Row="6" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Delete/Backspace, macOS=⌫}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.DiscardSelected}" />
 
           <TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"/>
           <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Commit}" />
-          
+
           <TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+⇧+Enter}"/>
           <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CommitWithAutoStage}" />
 
@@ -144,6 +144,6 @@
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
         </Grid>
       </StackPanel>
-    </Border>    
+    </Border>
   </Grid>
 </v:ChromelessWindow>
diff --git a/src/Views/ImageDiffView.axaml b/src/Views/ImageDiffView.axaml
index 18d8cef9..c3e0f772 100644
--- a/src/Views/ImageDiffView.axaml
+++ b/src/Views/ImageDiffView.axaml
@@ -40,7 +40,7 @@
             </Border>
           </Border>
         </Grid>
-        
+
         <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">
@@ -67,7 +67,7 @@
       <TabItem.Header>
         <TextBlock Text="SWIPE" FontSize="11"/>
       </TabItem.Header>
-      
+
       <Grid RowDefinitions="Auto,*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16">
         <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">
@@ -86,13 +86,13 @@
           <TextBlock Grid.Column="6" Classes="primary" Text="{Binding NewFileSize}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
           <TextBlock Grid.Column="7" Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
         </Grid>
-        
+
         <Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)">
           <Border HorizontalAlignment="Center" Background="{DynamicResource Brush.Window}">
             <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Margin="8">
               <v:ImageSwipeControl OldImage="{Binding Old}"
                                    NewImage="{Binding New}"
-                                   RenderOptions.BitmapInterpolationMode="HighQuality"/>             
+                                   RenderOptions.BitmapInterpolationMode="HighQuality"/>
             </Border>
           </Border>
         </Border>
@@ -103,7 +103,7 @@
       <TabItem.Header>
         <TextBlock Text="BLEND" FontSize="11"/>
       </TabItem.Header>
-      
+
       <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">
@@ -135,7 +135,7 @@
 
         <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" Text="OLD"/>            
+            <TextBlock Classes="primary" Text="OLD"/>
             <TextBlock Classes="primary"
                        Margin="8,0,0,0"
                        Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}"
diff --git a/src/Views/Init.axaml b/src/Views/Init.axaml
index 0c2f70dc..10aac9b0 100644
--- a/src/Views/Init.axaml
+++ b/src/Views/Init.axaml
@@ -15,7 +15,7 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
       </Grid.RowDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  Text="{DynamicResource Text.Init.Path}"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 1ef2b6cd..0883c9dc 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -48,7 +48,7 @@
       <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="6" VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
     </Grid>
-    
+
     <!-- Body -->
     <Border Grid.Row="2" Margin="8,0,8,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
       <Grid RowDefinitions="*,3,*">
@@ -91,13 +91,13 @@
                   <ColumnDefinition Width="32"/>
                   <ColumnDefinition Width="32"/>
                 </Grid.ColumnDefinitions>
-                
+
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"
                         PointerPressed="OnRowHeaderPointerPressed">
-                  <Path Width="14" Height="14" 
-                        Data="{StaticResource Icons.Move}" 
+                  <Path Width="14" Height="14"
+                        Data="{StaticResource Icons.Move}"
                         Fill="{DynamicResource Brush.FG2}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
@@ -258,7 +258,7 @@
                 HorizontalAlignment="Center"
                 Fill="{DynamicResource Brush.FG2}"
                 IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNull}}"/>
-          
+
           <ContentControl Content="{Binding DetailContext}" IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
             <ContentControl.DataTemplates>
               <DataTemplate DataType="vm:CommitDetail">
@@ -272,12 +272,12 @@
 
     <!-- Options -->
     <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" Margin="8,0,8,8">
-      <ProgressBar x:Name="Running" 
-                   Grid.Column="0" 
-                   Margin="0,0,32,0" 
-                   Background="{DynamicResource Brush.FG2}" 
-                   Foreground="{DynamicResource Brush.Accent}" 
-                   Minimum="0" 
+      <ProgressBar x:Name="Running"
+                   Grid.Column="0"
+                   Margin="0,0,32,0"
+                   Background="{DynamicResource Brush.FG2}"
+                   Foreground="{DynamicResource Brush.Accent}"
+                   Minimum="0"
                    Maximum="100"
                    IsVisible="False"/>
       <Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="StartJobs"/>
diff --git a/src/Views/LFSFetch.axaml b/src/Views/LFSFetch.axaml
index 12556b2f..83e55e22 100644
--- a/src/Views/LFSFetch.axaml
+++ b/src/Views/LFSFetch.axaml
@@ -31,8 +31,8 @@
           </DataTemplate>
         </ComboBox.ItemTemplate>
       </ComboBox>
-      
-      <TextBlock Grid.Row="1" Grid.Column="1" 
+
+      <TextBlock Grid.Row="1" Grid.Column="1"
                  Text="{DynamicResource Text.GitLFS.Fetch.Tips}"
                  Margin="0,8,0,0"
                  TextWrapping="Wrap"/>
diff --git a/src/Views/LFSLocks.axaml b/src/Views/LFSLocks.axaml
index ac495bf1..0b455be0 100644
--- a/src/Views/LFSLocks.axaml
+++ b/src/Views/LFSLocks.axaml
@@ -84,7 +84,7 @@
               </Border>
               <Border Grid.Column="2" Margin="8,0" ClipToBounds="True">
                 <TextBlock Text="{Binding User}" HorizontalAlignment="Left"/>
-              </Border> 
+              </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}"/>
               </Button>
@@ -104,7 +104,7 @@
             <Binding Path="VisibleLocks" Converter="{x:Static c:ListConverters.IsNullOrEmpty}"/>
           </MultiBinding>
         </StackPanel.IsVisible>
-        
+
         <Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/>
         <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.GitLFS.Locks.Empty}" Foreground="{DynamicResource Brush.FG2}"/>
       </StackPanel>
diff --git a/src/Views/LFSTrackCustomPattern.axaml b/src/Views/LFSTrackCustomPattern.axaml
index 36eaef65..f60304d5 100644
--- a/src/Views/LFSTrackCustomPattern.axaml
+++ b/src/Views/LFSTrackCustomPattern.axaml
@@ -11,7 +11,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.GitLFS.AddTrackPattern.Title}"/>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index db5aeecb..0909cd08 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -12,7 +12,7 @@
                     Icon="/App.ico"
                     Title="{Binding Title}"
                     MinWidth="1024" MinHeight="600"
-                    WindowStartupLocation="CenterScreen"> 
+                    WindowStartupLocation="CenterScreen">
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="{Binding #ThisControl.CaptionHeight}"/>
@@ -80,7 +80,7 @@
             <TextBlock Text="{Binding ActiveWorkspace.Name}"/>
           </StackPanel>
         </ToolTip.Tip>
-        <Path Width="14" Height="14" 
+        <Path Width="14" Height="14"
               Data="{StaticResource Icons.Workspace}"
               Fill="{Binding ActiveWorkspace.Brush}"/>
       </Button>
@@ -93,7 +93,7 @@
         <v:CaptionButtons Height="30" VerticalAlignment="Top"/>
       </Border>
     </Grid>
-    
+
     <!-- Page -->
     <ContentControl Grid.Row="1" Content="{Binding ActivePage}">
       <ContentControl.DataTemplates>
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
index 81f504c1..7ce450de 100644
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@@ -17,14 +17,14 @@
           <DataTemplate DataType="vm:Welcome">
             <v:WelcomeToolbar/>
           </DataTemplate>
-          
+
           <DataTemplate DataType="vm:Repository">
             <v:RepositoryToolbar/>
           </DataTemplate>
         </ContentControl.DataTemplates>
       </ContentControl>
     </Border>
-    
+
     <!-- Body -->
     <Border Grid.Row="1">
       <ContentControl Content="{Binding Data}">
@@ -32,7 +32,7 @@
           <DataTemplate DataType="vm:Welcome">
             <v:Welcome/>
           </DataTemplate>
-          
+
           <DataTemplate DataType="vm:Repository">
             <v:Repository/>
           </DataTemplate>
@@ -138,7 +138,7 @@
                         </Button>
                         <Button Grid.Column="3" Classes="icon_button" Width="16" Height="16" Margin="8,0,0,0" Click="OnDismissNotification">
                           <Path Width="10" Height="10" Data="{StaticResource Icons.Window.Close}"/>
-                        </Button> 
+                        </Button>
                       </Grid>
 
                       <ScrollViewer Grid.Row="1" Margin="8" MaxHeight="200" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 9b748e91..73b48f58 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -54,7 +54,7 @@
                     <TextBlock Text="{Binding Node.Id}" IsVisible="{Binding Node.IsRepository}"/>
                   </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">
                   <Path Grid.Column="0"
                         Width="12" Height="12" Margin="12,0"
diff --git a/src/Views/Merge.axaml b/src/Views/Merge.axaml
index b7c76b6b..33d07f02 100644
--- a/src/Views/Merge.axaml
+++ b/src/Views/Merge.axaml
@@ -70,7 +70,7 @@
                 <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeDescriptionColumn"/>
                 <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeOptionColumn"/>
               </Grid.ColumnDefinitions>
-              
+
               <TextBlock Grid.Column="0" Text="{Binding Name}"/>
               <TextBlock Grid.Column="1" Text="{Binding Desc}" Margin="8,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
               <TextBlock Grid.Column="2" Text="{Binding Arg}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
diff --git a/src/Views/MergeMultiple.axaml b/src/Views/MergeMultiple.axaml
index bb543e16..332d9fef 100644
--- a/src/Views/MergeMultiple.axaml
+++ b/src/Views/MergeMultiple.axaml
@@ -12,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.MergeMultiple}"/>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="Auto,32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Top"
@@ -62,7 +62,7 @@
                 </DataTemplate>
               </ContentControl.DataTemplates>
             </ContentControl>
-          </DataTemplate>          
+          </DataTemplate>
         </ListBox.ItemTemplate>
       </ListBox>
 
@@ -84,7 +84,7 @@
           </DataTemplate>
         </ComboBox.ItemTemplate>
       </ComboBox>
-      
+
       <CheckBox Grid.Row="2" Grid.Column="1"
                 Content="{DynamicResource Text.MergeMultiple.CommitChanges}"
                 IsChecked="{Binding AutoCommit, Mode=TwoWay}"/>
diff --git a/src/Views/PopupRunningStatus.axaml b/src/Views/PopupRunningStatus.axaml
index c2d86f51..a8467415 100644
--- a/src/Views/PopupRunningStatus.axaml
+++ b/src/Views/PopupRunningStatus.axaml
@@ -9,19 +9,19 @@
              x:Name="ThisControl">
   <StackPanel Orientation="Vertical">
     <Rectangle Height="1" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
-    
+
     <StackPanel Orientation="Horizontal" Margin="0,8">
       <ContentPresenter x:Name="Icon" Width="12" Height="12"/>
       <TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/>
     </StackPanel>
-    
+
     <TextBlock x:Name="TxtDesc"
                HorizontalAlignment="Stretch"
                TextWrapping="Wrap"
                FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                FontStyle="Italic"
                Text="{Binding #ThisControl.Description}"/>
-    
+
     <ProgressBar x:Name="ProgressBar"
                  Margin="0,8,0,0"
                  HorizontalAlignment="Stretch"
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 7bc83b10..d2b08467 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -78,7 +78,7 @@
                 </DataTemplate>
               </ComboBox.ItemTemplate>
             </ComboBox>
-            
+
             <TextBlock Grid.Row="2" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}"
                        HorizontalAlignment="Right"
@@ -537,7 +537,7 @@
               <ColumnDefinition Width="200"/>
               <ColumnDefinition Width="*" MaxWidth="400"/>
             </Grid.ColumnDefinitions>
-            
+
             <Border Grid.Column="0"
                     BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                     Background="{DynamicResource Brush.Contents}">
@@ -635,7 +635,7 @@
             </ContentControl>
           </Grid>
         </TabItem>
-        
+
         <TabItem>
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.AI}"/>
@@ -646,7 +646,7 @@
               <ColumnDefinition Width="200"/>
               <ColumnDefinition Width="*" MaxWidth="400"/>
             </Grid.ColumnDefinitions>
-            
+
             <Border Grid.Column="0"
                     BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                     Background="{DynamicResource Brush.Contents}">
@@ -725,8 +725,8 @@
 
                     <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.ApiKey}"/>
                     <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding ApiKey, Mode=TwoWay}" PasswordChar="*"/>
-                    
-                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.AnalyzeDiffPrompt}"/>                    
+
+                    <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.AnalyzeDiffPrompt}"/>
                     <TextBox Height="120"
                              Margin="0,4,0,0"
                              CornerRadius="3"
diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml
index e28e2afd..743606ee 100644
--- a/src/Views/Push.axaml
+++ b/src/Views/Push.axaml
@@ -76,8 +76,8 @@
               <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
               <Border Height="14"
                       CornerRadius="7"
-                      Margin="4,0,0,0" Padding="6,0" 
-                      VerticalAlignment="Center" 
+                      Margin="4,0,0,0" Padding="6,0"
+                      VerticalAlignment="Center"
                       Background="Green"
                       IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
                 <TextBlock Text="NEW" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index f6a02c49..de777800 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -65,7 +65,7 @@
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Configure.Email.Placeholder}"
                    Text="{Binding UserEmail, Mode=TwoWay}"/>
-          
+
           <TextBlock Grid.Row="2" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
@@ -244,9 +244,9 @@
                   BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                   Background="{DynamicResource Brush.Contents}">
             <Grid RowDefinitions="*,1,Auto">
-              <ListBox Grid.Row="0" 
-                       Background="Transparent" 
-                       ItemsSource="{Binding IssueTrackerRules}" 
+              <ListBox Grid.Row="0"
+                       Background="Transparent"
+                       ItemsSource="{Binding IssueTrackerRules}"
                        SelectedItem="{Binding SelectedIssueTrackerRule, Mode=TwoWay}"
                        SelectionMode="Single">
                 <ListBox.Styles>
@@ -256,7 +256,7 @@
                     <Setter Property="Padding" Value="4,2"/>
                   </Style>
                 </ListBox.Styles>
-                
+
                 <ListBox.ItemsPanel>
                   <ItemsPanelTemplate>
                     <StackPanel Orientation="Vertical"/>
@@ -315,7 +315,7 @@
                 </Binding.TargetNullValue>
               </Binding>
             </ContentControl.Content>
-            
+
             <ContentControl.DataTemplates>
               <DataTemplate DataType="m:IssueTrackerRule">
                 <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
@@ -442,7 +442,7 @@
           </ContentControl>
         </Grid>
       </TabItem>
-      
+
       <TabItem>
         <TabItem.Header>
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.OpenAI}"/>
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
index a409d8d0..9f7f1801 100644
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@@ -8,128 +8,128 @@
              x:Class="SourceGit.Views.RepositoryToolbar"
              x:DataType="vm:Repository">
   <Grid ColumnDefinitions="*,Auto,*">
-      <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0">
-        <Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Explore}" Margin="0,2,0,0"/>
-        </Button>
+    <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0">
+      <Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Explore}" Margin="0,2,0,0"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Click="OpenWithExternalTools" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Repository.OpenWithExternalTools}">
-          <Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/>
-        </Button>
-        
-        <Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}">
-          <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
-        </Button>
+      <Button Classes="icon_button" Width="32" Click="OpenWithExternalTools" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Repository.OpenWithExternalTools}">
+        <Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Click="OpenStatistics" ToolTip.Tip="{DynamicResource Text.Repository.Statistics}">
-          <Path Width="13" Height="13" Data="{StaticResource Icons.Statistics}"/>
-        </Button>
+      <Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}">
+        <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Click="OpenConfigure" ToolTip.Tip="{DynamicResource Text.Repository.Configure}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
-        </Button>
-      </StackPanel>
+      <Button Classes="icon_button" Width="32" Click="OpenStatistics" ToolTip.Tip="{DynamicResource Text.Repository.Statistics}">
+        <Path Width="13" Height="13" Data="{StaticResource Icons.Statistics}"/>
+      </Button>
 
-      <StackPanel Grid.Column="1" Orientation="Horizontal">
-        <Button Classes="icon_button" Width="32" Click="Fetch" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}">
-          <ToolTip.Tip>
-            <StackPanel Orientation="Vertical">
-              <TextBlock Text="{DynamicResource Text.Fetch}"/>
-              <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
-            </StackPanel>
-          </ToolTip.Tip>
-          
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Fetch}"/>
-        </Button>
+      <Button Classes="icon_button" Width="32" Click="OpenConfigure" ToolTip.Tip="{DynamicResource Text.Repository.Configure}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
+      </Button>
+    </StackPanel>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" IsVisible="{Binding !IsBare}" IsEnabled="{Binding !IsBare}" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}">
-          <ToolTip.Tip>
-            <StackPanel Orientation="Vertical">
-              <TextBlock Text="{DynamicResource Text.Pull}"/>
-              <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
-            </StackPanel>
-          </ToolTip.Tip>
-          
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Pull}"/>
-        </Button>
+    <StackPanel Grid.Column="1" Orientation="Horizontal">
+      <Button Classes="icon_button" Width="32" Click="Fetch" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}">
+        <ToolTip.Tip>
+          <StackPanel Orientation="Vertical">
+            <TextBlock Text="{DynamicResource Text.Fetch}"/>
+            <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
+          </StackPanel>
+        </ToolTip.Tip>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Push" HotKey="{OnPlatform Ctrl+Shift+Up, macOS=⌘+Shift+Up}">
-          <ToolTip.Tip>
-            <StackPanel Orientation="Vertical">
-              <TextBlock Text="{DynamicResource Text.Push}"/>
-              <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
-            </StackPanel>
-          </ToolTip.Tip>
-          
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Push}"/>
-        </Button>
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Fetch}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="StashAll" IsVisible="{Binding !IsBare}">
-          <ToolTip.Tip>
-            <StackPanel Orientation="Vertical">
-              <TextBlock Text="{DynamicResource Text.Stash}"/>
-              <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
-            </StackPanel>
-          </ToolTip.Tip>
-          
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Stashes.Add}"/>
-        </Button>
+      <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" IsVisible="{Binding !IsBare}" IsEnabled="{Binding !IsBare}" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}">
+        <ToolTip.Tip>
+          <StackPanel Orientation="Vertical">
+            <TextBlock Text="{DynamicResource Text.Pull}"/>
+            <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
+          </StackPanel>
+        </ToolTip.Tip>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Diff}"/>
-        </Button>
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Pull}"/>
+      </Button>
 
-        <Rectangle Width="1" Height="16"
-                   Margin="16,0,0,0"
-                   VerticalAlignment="Center"
-                   Fill="{DynamicResource Brush.Border2}"/>
+      <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Push" HotKey="{OnPlatform Ctrl+Shift+Up, macOS=⌘+Shift+Up}">
+        <ToolTip.Tip>
+          <StackPanel Orientation="Vertical">
+            <TextBlock Text="{DynamicResource Text.Push}"/>
+            <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
+          </StackPanel>
+        </ToolTip.Tip>
 
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding CreateNewBranch}" ToolTip.Tip="{DynamicResource Text.Repository.NewBranch}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Branch.Add}"/>
-        </Button>
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Push}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitFlowMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitFlow}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.GitFlow}"/>
-        </Button>
+      <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="StashAll" IsVisible="{Binding !IsBare}">
+        <ToolTip.Tip>
+          <StackPanel Orientation="Vertical">
+            <TextBlock Text="{DynamicResource Text.Stash}"/>
+            <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
+          </StackPanel>
+        </ToolTip.Tip>
 
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitLFSMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitLFS}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.LFS}"/>
-        </Button>
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Stashes.Add}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenCustomActionMenu" ToolTip.Tip="{DynamicResource Text.Repository.CustomActions}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Action}"/>
-        </Button>
+      <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Diff}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}">
-          <Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Clean}"/>
-        </Button>
-      </StackPanel>
+      <Rectangle Width="1" Height="16"
+                 Margin="16,0,0,0"
+                 VerticalAlignment="Center"
+                 Fill="{DynamicResource Brush.Border2}"/>
 
-      <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
-        <Path Width="13" Height="13" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
+      <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding CreateNewBranch}" ToolTip.Tip="{DynamicResource Text.Repository.NewBranch}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Branch.Add}"/>
+      </Button>
 
-        <ContentControl Margin="6,0,0,0">
-          <ContentControl.Content>
-            <Binding Path="CurrentBranch">
-              <Binding.TargetNullValue>
-                <TextBlock Classes="primary" Text="--"/>
-              </Binding.TargetNullValue>
-            </Binding>
-          </ContentControl.Content>
+      <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitFlowMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitFlow}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.GitFlow}"/>
+      </Button>
 
-          <ContentControl.DataTemplates>
-            <DataTemplate DataType="m:Branch">
-              <Border Background="Transparent" ToolTip.Tip="{Binding FriendlyName}">
-                <TextBlock Classes="primary" Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/>
-              </Border>
-            </DataTemplate>
-          </ContentControl.DataTemplates>
-        </ContentControl>
+      <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitLFSMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitLFS}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.LFS}"/>
+      </Button>
 
-        <Button Classes="icon_button" Width="32" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}">
-          <Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Target}" Fill="{DynamicResource Brush.FG1}"/>
-        </Button>
-      </StackPanel>
-    </Grid>
+      <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenCustomActionMenu" ToolTip.Tip="{DynamicResource Text.Repository.CustomActions}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Action}"/>
+      </Button>
+
+      <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}">
+        <Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Clean}"/>
+      </Button>
+    </StackPanel>
+
+    <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
+      <Path Width="13" Height="13" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
+
+      <ContentControl Margin="6,0,0,0">
+        <ContentControl.Content>
+          <Binding Path="CurrentBranch">
+            <Binding.TargetNullValue>
+              <TextBlock Classes="primary" Text="--"/>
+            </Binding.TargetNullValue>
+          </Binding>
+        </ContentControl.Content>
+
+        <ContentControl.DataTemplates>
+          <DataTemplate DataType="m:Branch">
+            <Border Background="Transparent" ToolTip.Tip="{Binding FriendlyName}">
+              <TextBlock Classes="primary" Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/>
+            </Border>
+          </DataTemplate>
+        </ContentControl.DataTemplates>
+      </ContentControl>
+
+      <Button Classes="icon_button" Width="32" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}">
+        <Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Target}" Fill="{DynamicResource Brush.FG1}"/>
+      </Button>
+    </StackPanel>
+  </Grid>
 </UserControl>
 
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 73703ff1..f0498fbf 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -15,7 +15,7 @@
         <TextBlock Text="{DynamicResource Text.Worktree}" Classes="primary" Margin="4,2" Foreground="#FFDDDDDD"/>
       </Border>
     </DataTemplate>
-    
+
     <DataTemplate DataType="m:Commit">
       <Grid RowDefinitions="Auto,*">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
@@ -32,7 +32,7 @@
       </Grid>
     </DataTemplate>
   </UserControl.DataTemplates>
-  
+
   <Grid RowDefinitions="50,*" Margin="4">
     <!-- Compare Revision Info -->
     <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index a3a168cf..86393316 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -35,12 +35,12 @@
             </Border>
           </Border>
         </Border>
-        
+
         <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="{DynamicResource Brush.BadgeFG}"/>
           </Border>
-          
+
           <TextBlock Classes="primary" Text="{Binding ImageSize}" Margin="8,0,0,0"/>
           <TextBlock Classes="primary" Text="{Binding FileSize}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
           <TextBlock Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index e0c6577d..6575dc66 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -50,7 +50,7 @@
               <Binding Path="$parent[Window].IsActive"/>
             </MultiBinding>
           </Popup.IsOpen>
-          
+
           <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
             <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
               <ListBox x:Name="SearchSuggestionBox"
diff --git a/src/Views/Reword.axaml b/src/Views/Reword.axaml
index f5de4ee7..3ea1ad98 100644
--- a/src/Views/Reword.axaml
+++ b/src/Views/Reword.axaml
@@ -17,9 +17,9 @@
       <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"/>
     </StackPanel>
-    
+
     <v:CommitMessageTextBox Height="120" Margin="8,5,8,0" Text="{Binding Message, Mode=TwoWay}"/>
-    
+
     <TextBlock Margin="8"
                Text="{DynamicResource Text.Reword.Tip}"
                TextWrapping="Wrap"
diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml
index a6f68a74..0a6fef34 100644
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@@ -112,7 +112,7 @@
               <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8">
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
                 <TextBlock Margin="8,0,0,0" Text="{DynamicResource Text.SelfUpdate.UpToDate}"/>
-              </StackPanel>              
+              </StackPanel>
 
               <Button Classes="flat primary"
                       Height="30"
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index 2879c7e7..51ed87ac 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -12,13 +12,13 @@
                Classes="bold"
                Text="{DynamicResource Text.Stash.Title}"/>
     <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto,Auto" ColumnDefinitions="120,*">
-      <TextBlock Grid.Row="0" Grid.Column="0" 
-                 HorizontalAlignment="Right" 
-                 Margin="8,0" 
+      <TextBlock Grid.Row="0" Grid.Column="0"
+                 HorizontalAlignment="Right"
+                 Margin="8,0"
                  Text="{DynamicResource Text.Stash.Message}"/>
-      <TextBox Grid.Row="0" Grid.Column="1" 
-               Height="26" 
-               CornerRadius="3" 
+      <TextBox Grid.Row="0" Grid.Column="1"
+               Height="26"
+               CornerRadius="3"
                Text="{Binding Message, Mode=TwoWay}"
                Watermark="{DynamicResource Text.Stash.Message.Placeholder}"
                v:AutoFocusBehaviour.IsEnabled="True"/>
diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml
index 9832bb0a..b5384c8f 100644
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@@ -17,7 +17,7 @@
       <Setter Property="IsNoneVisible" Value="True"/>
     </Style>
   </UserControl.Styles>
-  
+
   <UserControl.DataTemplates>
     <DataTemplate DataType="vm:TagCollectionAsTree">
       <ListBox Classes="repo_left_content_list"
@@ -38,14 +38,14 @@
                                          HorizontalAlignment="Center"
                                          IsChecked="{Binding IsExpanded, Mode=OneWay}"
                                          IsVisible="{Binding IsFolder}"/>
-              
+
               <v:TagTreeNodeIcon Grid.Column="1"
                                  Node="{Binding .}"
                                  IsExpanded="{Binding IsExpanded, Mode=OneWay}"/>
 
-              <TextBlock Grid.Column="2" 
-                         Classes="primary" 
-                         Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}" 
+              <TextBlock Grid.Column="2"
+                         Classes="primary"
+                         Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}"
                          Margin="8,0,0,0"/>
 
               <ContentControl Grid.Column="3" Content="{Binding Tag}">
@@ -65,7 +65,7 @@
       <ListBox Classes="repo_left_content_list"
                Margin="8,0,0,0"
                ItemsSource="{Binding Tags}"
-               SelectionMode="Single" 
+               SelectionMode="Single"
                SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="m:Tag">
@@ -73,17 +73,17 @@
                   Background="Transparent"
                   ContextRequested="OnRowContextRequested"
                   ToolTip.Tip="{Binding Message}">
-              <Path Grid.Column="0" 
+              <Path Grid.Column="0"
                     Margin="8,0,0,0"
                     Width="12" Height="12"
                     Data="{StaticResource Icons.Tag}"/>
 
               <TextBlock Grid.Column="1"
-                         Classes="primary" 
-                         Text="{Binding Name}" 
+                         Classes="primary"
+                         Text="{Binding Name}"
                          Margin="8,0,0,0"
                          TextTrimming="CharacterEllipsis"/>
-              
+
               <v:FilterModeSwitchButton Grid.Column="2" Margin="0,0,12,0" Mode="{Binding FilterMode}"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/TextDiffView.axaml b/src/Views/TextDiffView.axaml
index 7ea6b44b..ec3475fa 100644
--- a/src/Views/TextDiffView.axaml
+++ b/src/Views/TextDiffView.axaml
@@ -14,7 +14,7 @@
       <ContentControl.DataTemplates>
         <DataTemplate DataType="m:TextDiff">
           <Grid ColumnDefinitions="*,1,8">
-            <v:CombinedTextDiffPresenter Grid.Column="0" 
+            <v:CombinedTextDiffPresenter Grid.Column="0"
                                          x:Name="CombinedPresenter"
                                          FileName="{Binding File}"
                                          Foreground="{DynamicResource Brush.FG1}"
@@ -34,7 +34,7 @@
                                          EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
                                          SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
                                          BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
-            
+
             <Rectangle Grid.Column="1" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
 
             <v:TextDiffViewMinimap Grid.Column="2"
@@ -90,7 +90,7 @@
                                            EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
                                            SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
                                            BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
-            
+
             <Rectangle Grid.Column="3" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
 
             <v:TextDiffViewMinimap Grid.Column="4"
@@ -110,7 +110,7 @@
           <Run Foreground="{DynamicResource Brush.FG2}" FontWeight="Normal" Text="{OnPlatform Ctrl+S, macOS=⌘+S}"/>
         </TextBlock>
       </Button>
-      
+
       <Button Classes="flat" Click="OnUnstageChunk" HotKey="{OnPlatform Ctrl+U, macOS=⌘+U}" IsVisible="{Binding #ThisControl.IsUnstagedChange, Converter={x:Static BoolConverters.Not}}">
         <TextBlock>
           <Run Text="{DynamicResource Text.Hunk.Unstage}"/>
@@ -118,7 +118,7 @@
           <Run Foreground="{DynamicResource Brush.FG2}" FontWeight="Normal" Text="{OnPlatform Ctrl+U, macOS=⌘+U}"/>
         </TextBlock>
       </Button>
-      
+
       <Button Classes="flat" Margin="8,0,0,0" HotKey="{OnPlatform Ctrl+D, macOS=⌘+D}" Click="OnDiscardChunk" IsVisible="{Binding #ThisControl.IsUnstagedChange}">
         <TextBlock>
           <Run Text="{DynamicResource Text.Hunk.Discard}"/>
diff --git a/src/Views/WelcomeToolbar.axaml b/src/Views/WelcomeToolbar.axaml
index 59802241..5245a130 100644
--- a/src/Views/WelcomeToolbar.axaml
+++ b/src/Views/WelcomeToolbar.axaml
@@ -18,14 +18,14 @@
 
       <Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenTerminal}">
         <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
-      </Button>      
+      </Button>
     </StackPanel>
 
     <StackPanel Grid.Column="2" Orientation="Horizontal">
       <Button Classes="icon_button" Width="32" Command="{Binding AddRootNode}" ToolTip.Tip="{DynamicResource Text.Welcome.AddRootFolder}">
         <Path Width="14" Height="14" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Add}"/>
       </Button>
-      
+
       <Button Classes="icon_button" Width="32" Command="{Binding ScanDefaultCloneDir}" ToolTip.Tip="{DynamicResource Text.Welcome.ScanDefaultCloneDir}">
         <Path Width="14" Height="14" Data="{StaticResource Icons.Scan}"/>
       </Button>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index c9b94d59..4d79135d 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -23,7 +23,7 @@
         <RowDefinition Height="1"/>
         <RowDefinition Height="*" MinHeight="100"/>
       </Grid.RowDefinitions>
-      
+
       <!-- Unstaged -->
       <Grid Grid.Row="0" RowDefinitions="28,36,*">
         <!-- Unstaged Toolbar -->
@@ -106,7 +106,7 @@
             </TextBox.InnerRightContent>
           </TextBox>
         </Border>
-        
+
         <!-- Unstaged Changes -->
         <v:ChangeCollectionView Grid.Row="2"
                                 x:Name="UnstagedChangesView"
@@ -121,7 +121,7 @@
                                 ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"
                                 KeyDown="OnUnstagedKeyDown"/>
       </Grid>
-      
+
       <!-- Splitter -->
       <GridSplitter Grid.Row="1"
                     MinHeight="1"
@@ -129,7 +129,7 @@
                     Background="{DynamicResource Brush.Border0}"/>
 
       <!-- Staged -->
-      <Grid Grid.Row="2" RowDefinitions="28,*">        
+      <Grid Grid.Row="2" RowDefinitions="28,*">
         <!-- Staged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
           <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
@@ -186,7 +186,7 @@
         <RowDefinition Height="128" MinHeight="100"/>
         <RowDefinition Height="36"/>
       </Grid.RowDefinitions>
-      
+
       <!-- Select Change Detail -->
       <Grid Grid.Row="0">
         <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
@@ -277,7 +277,7 @@
                        Width="18" Height="18"
                        HorizontalAlignment="Right"
                        IsVisible="{Binding IsCommitting}"/>
-        
+
         <SplitButton Grid.Column="6"
                      Content="{DynamicResource Text.Repository.Continue}"
                      Height="28"
@@ -323,7 +323,7 @@
             </StackPanel>
           </ToolTip.Tip>
         </Button>
-        
+
         <!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage -->
         <Button Grid.Column="7"
                 Width="0" Height="0"
@@ -350,7 +350,7 @@
               <Binding Path="UseAmend" Converter="{x:Static BoolConverters.Not}"/>
               <Binding Path="InProgressContext" Converter="{x:Static ObjectConverters.IsNull}"/>
             </MultiBinding>
-          </Button.IsVisible>  
+          </Button.IsVisible>
         </Button>
       </Grid>
     </Grid>

From 760e44877ba02104638f0f5fd31c0ee556d6ff7d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Mar 2025 12:15:00 +0800
Subject: [PATCH 281/364] fix: wrong split char

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

diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs
index e2debd06..6016b0be 100644
--- a/src/Commands/QuerySubmodules.cs
+++ b/src/Commands/QuerySubmodules.cs
@@ -26,7 +26,7 @@ namespace SourceGit.Commands
             var rs = ReadToEnd();
 
             var builder = new StringBuilder();
-            var lines = rs.StdOut.Split(['r', '\n'], System.StringSplitOptions.RemoveEmptyEntries);
+            var lines = rs.StdOut.Split(['\r', '\n'], System.StringSplitOptions.RemoveEmptyEntries);
             foreach (var line in lines)
             {
                 var match = REG_FORMAT1().Match(line);

From 822452a20c36054837612cbf43e21795bead6ecc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Mar 2025 15:55:32 +0800
Subject: [PATCH 282/364] enhance: show inner exception message if possible
 when check update failed

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.axaml.cs                         |  2 +-
 src/Models/{Version.cs => SelfUpdate.cs} | 24 ++++++++++++--
 src/Views/SelfUpdate.axaml               | 41 ++++++++++++------------
 3 files changed, 43 insertions(+), 24 deletions(-)
 rename src/Models/{Version.cs => SelfUpdate.cs} (65%)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index f59d35db..af5e6177 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -532,7 +532,7 @@ namespace SourceGit
                 catch (Exception e)
                 {
                     if (manually)
-                        ShowSelfUpdateResult(e);
+                        ShowSelfUpdateResult(new Models.SelfUpdateFailed(e));
                 }
             });
         }
diff --git a/src/Models/Version.cs b/src/Models/SelfUpdate.cs
similarity index 65%
rename from src/Models/Version.cs
rename to src/Models/SelfUpdate.cs
index 35c21778..e02f80d8 100644
--- a/src/Models/Version.cs
+++ b/src/Models/SelfUpdate.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Text.Json.Serialization;
 
 namespace SourceGit.Models
@@ -32,5 +33,24 @@ namespace SourceGit.Models
         }
     }
 
-    public class AlreadyUpToDate { }
+    public class AlreadyUpToDate
+    {
+    }
+
+    public class SelfUpdateFailed
+    {
+        public string Reason
+        {
+            get;
+            private set;
+        }
+
+        public SelfUpdateFailed(Exception e)
+        {
+            if (e.InnerException is { } inner)
+                Reason = inner.Message;
+            else
+                Reason = e.Message;
+        }
+    }
 }
diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml
index 0a6fef34..2d5990e7 100644
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@@ -5,7 +5,6 @@
                     xmlns:m="using:SourceGit.Models"
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                     x:Class="SourceGit.Views.SelfUpdate"
                     x:DataType="vm:SelfUpdate"
@@ -87,26 +86,6 @@
             </StackPanel>
           </DataTemplate>
 
-          <DataTemplate DataType="sys:Exception">
-            <StackPanel Orientation="Vertical" Margin="16,8">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
-                <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.SelfUpdate.Error}"/>
-              </StackPanel>
-
-              <TextBlock Text="{Binding Message}" MaxWidth="500" TextWrapping="Wrap" Margin="0,8"/>
-
-              <Button Classes="flat primary"
-                      Height="30"
-                      Margin="4,0"
-                      Click="CloseWindow"
-                      Content="{DynamicResource Text.Close}"
-                      HorizontalAlignment="Center"
-                      HorizontalContentAlignment="Center"
-                      VerticalContentAlignment="Center"/>
-            </StackPanel>
-          </DataTemplate>
-
           <DataTemplate DataType="m:AlreadyUpToDate">
             <StackPanel Orientation="Vertical" Margin="16,8">
               <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8">
@@ -124,6 +103,26 @@
                       VerticalContentAlignment="Center"/>
             </StackPanel>
           </DataTemplate>
+
+          <DataTemplate DataType="m:SelfUpdateFailed">
+            <StackPanel Orientation="Vertical" Margin="16,8">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
+                <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.SelfUpdate.Error}"/>
+              </StackPanel>
+
+              <TextBlock Text="{Binding Reason}" MaxWidth="500" TextWrapping="Wrap" Margin="0,8"/>
+
+              <Button Classes="flat primary"
+                      Height="30"
+                      Margin="4,0"
+                      Click="CloseWindow"
+                      Content="{DynamicResource Text.Close}"
+                      HorizontalAlignment="Center"
+                      HorizontalContentAlignment="Center"
+                      VerticalContentAlignment="Center"/>
+            </StackPanel>
+          </DataTemplate>
         </ContentControl.DataTemplates>
       </ContentControl>
     </Grid>

From ae1e46b586e354193eacd8c5378c0a1791effb05 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Mar 2025 19:47:54 +0800
Subject: [PATCH 283/364] fix: layout horizontal not working since 2025.9 after
 switching away from history screen (#1108)

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

diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index f7055dfa..84cfda2f 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -12,7 +12,7 @@ namespace SourceGit.Views
     public class HistoriesLayout : Grid
     {
         public static readonly StyledProperty<bool> UseHorizontalProperty =
-            AvaloniaProperty.Register<HistoriesLayout, bool>(nameof(UseHorizontal));
+            AvaloniaProperty.Register<HistoriesLayout, bool>(nameof(UseHorizontal), false);
 
         public bool UseHorizontal
         {
@@ -22,19 +22,20 @@ namespace SourceGit.Views
 
         protected override Type StyleKeyOverride => typeof(Grid);
 
-        public HistoriesLayout()
-        {
-            RefreshLayout();
-        }
-
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == UseHorizontalProperty)
+            if (change.Property == UseHorizontalProperty && IsLoaded)
                 RefreshLayout();
         }
 
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            RefreshLayout();
+        }
+
         private void RefreshLayout()
         {
             if (UseHorizontal)

From 2512d3be7a31013e735b418e319bea3e667054c3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 18 Mar 2025 21:40:31 +0800
Subject: [PATCH 284/364] feature: allow to hide tags in graph (#1109)

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/Resources/Themes.axaml        |  3 ---
 src/ViewModels/Preferences.cs     |  7 +++++++
 src/Views/CommitBaseInfo.axaml    |  3 +--
 src/Views/CommitRefsPresenter.cs  | 29 ++++++++++++++++-------------
 src/Views/Conflict.axaml          |  1 -
 src/Views/Histories.axaml         |  2 +-
 src/Views/Repository.axaml.cs     | 17 +++++++++++++++++
 10 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 312d4945..293dd77b 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -569,6 +569,8 @@
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOptions" xml:space="preserve">OPTIONS</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" xml:space="preserve">Show Tags in Graph</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">COMMITS ORDER</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Date</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologically</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index aae292f3..b8dcf417 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -573,6 +573,8 @@
   <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.HistoriesOptions" xml:space="preserve">其它设置</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 97c96c6c..1d2cee7c 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -572,6 +572,8 @@
   <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.HistoriesOptions" xml:space="preserve">其它設定</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" 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>
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 6326023a..ff4c0374 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -10,7 +10,6 @@
       <Color x:Key="Color.Contents">#FFFAFAFA</Color>
       <Color x:Key="Color.Badge">#FFB0CEE8</Color>
       <Color x:Key="Color.BadgeFG">#FF1F1F1F</Color>
-      <Color x:Key="Color.DecoratorTag">DarkGreen</Color>
       <Color x:Key="Color.Conflict">#FF836C2E</Color>
       <Color x:Key="Color.ConflictForeground">#FFFFFFFF</Color>
       <Color x:Key="Color.Border0">#FFCFCFCF</Color>
@@ -37,7 +36,6 @@
       <Color x:Key="Color.Contents">#FF1C1C1C</Color>
       <Color x:Key="Color.Badge">#FF8F8F8F</Color>
       <Color x:Key="Color.BadgeFG">#FFDDDDDD</Color>
-      <Color x:Key="Color.DecoratorTag">#84c88a</Color>
       <Color x:Key="Color.Conflict">#FFFAFAD2</Color>
       <Color x:Key="Color.ConflictForeground">#FF252525</Color>
       <Color x:Key="Color.Border0">#FF181818</Color>
@@ -64,7 +62,6 @@
   <SolidColorBrush x:Key="Brush.Contents" Color="{DynamicResource Color.Contents}"/>
   <SolidColorBrush x:Key="Brush.Badge" Color="{DynamicResource Color.Badge}"/>
   <SolidColorBrush x:Key="Brush.BadgeFG" Color="{DynamicResource Color.BadgeFG}"/>
-  <SolidColorBrush x:Key="Brush.DecoratorTag" Color="{DynamicResource Color.DecoratorTag}"/>
   <SolidColorBrush x:Key="Brush.Conflict" Color="{DynamicResource Color.Conflict}"/>
   <SolidColorBrush x:Key="Brush.ConflictForeground" Color="{DynamicResource Color.ConflictForeground}"/>
   <SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 0b1d841e..cad6c224 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -183,6 +183,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _showTagsAsTree, value);
         }
 
+        public bool ShowTagsInGraph
+        {
+            get => _showTagsInGraph;
+            set => SetProperty(ref _showTagsInGraph, value);
+        }
+
         public bool UseTwoColumnsLayoutInHistories
         {
             get => _useTwoColumnsLayoutInHistories;
@@ -643,6 +649,7 @@ namespace SourceGit.ViewModels
         private string _ignoreUpdateTag = string.Empty;
 
         private bool _showTagsAsTree = false;
+        private bool _showTagsInGraph = true;
         private bool _useTwoColumnsLayoutInHistories = false;
         private bool _displayTimeAsPeriodInHistories = false;
         private bool _useSideBySideDiff = false;
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 06d10fe7..f83b43fc 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -173,8 +173,7 @@
           <!-- REFS -->
           <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 TagBackground="{DynamicResource Brush.DecoratorTag}"
-                                   Foreground="{DynamicResource Brush.FG1}"
+            <v:CommitRefsPresenter Foreground="{DynamicResource Brush.FG1}"
                                    FontFamily="{DynamicResource Fonts.Primary}"
                                    FontSize="11"
                                    AllowWrap="True"
diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs
index 7ff6bafb..507da1c2 100644
--- a/src/Views/CommitRefsPresenter.cs
+++ b/src/Views/CommitRefsPresenter.cs
@@ -64,15 +64,6 @@ namespace SourceGit.Views
             set => SetValue(UseGraphColorProperty, value);
         }
 
-        public static readonly StyledProperty<IBrush> TagBackgroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(TagBackground), Brushes.White);
-
-        public IBrush TagBackground
-        {
-            get => GetValue(TagBackgroundProperty);
-            set => SetValue(TagBackgroundProperty, value);
-        }
-
         public static readonly StyledProperty<bool> AllowWrapProperty =
             AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(AllowWrap));
 
@@ -82,6 +73,15 @@ namespace SourceGit.Views
             set => SetValue(AllowWrapProperty, value);
         }
 
+        public static readonly StyledProperty<bool> ShowTagsProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(ShowTags), true);
+
+        public bool ShowTags
+        {
+            get => GetValue(ShowTagsProperty);
+            set => SetValue(ShowTagsProperty, value);
+        }
+
         static CommitRefsPresenter()
         {
             AffectsMeasure<CommitRefsPresenter>(
@@ -89,8 +89,8 @@ namespace SourceGit.Views
                 FontSizeProperty,
                 ForegroundProperty,
                 UseGraphColorProperty,
-                TagBackgroundProperty,
-                BackgroundProperty);
+                BackgroundProperty,
+                ShowTagsProperty);
         }
 
         public override void Render(DrawingContext context)
@@ -171,15 +171,18 @@ namespace SourceGit.Views
                 var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);
                 var fg = Foreground;
                 var normalBG = UseGraphColor ? commit.Brush : Brushes.Gray;
-                var tagBG = UseGraphColor ? TagBackground : Brushes.Gray;
                 var labelSize = FontSize;
                 var requiredWidth = 0.0;
                 var requiredHeight = 16.0;
                 var x = 0.0;
                 var allowWrap = AllowWrap;
+                var showTags = ShowTags;
 
                 foreach (var decorator in refs)
                 {
+                    if (!showTags && decorator.Type == Models.DecoratorType.Tag)
+                        continue;
+
                     var isHead = decorator.Type == Models.DecoratorType.CurrentBranchHead ||
                         decorator.Type == Models.DecoratorType.CurrentCommitHead;
 
@@ -209,7 +212,7 @@ namespace SourceGit.Views
                             geo = this.FindResource("Icons.Remote") as StreamGeometry;
                             break;
                         case Models.DecoratorType.Tag:
-                            item.Brush = tagBG;
+                            item.Brush = Brushes.Gray;
                             geo = this.FindResource("Icons.Tag") as StreamGeometry;
                             break;
                         default:
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index 9a056f9e..2dce264e 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -46,7 +46,6 @@
             <StackPanel Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
               <v:CommitRefsPresenter Margin="8,0,0,0"
-                                     TagBackground="{DynamicResource Brush.DecoratorTag}"
                                      Foreground="{DynamicResource Brush.FG1}"
                                      FontFamily="{DynamicResource Fonts.Primary}"
                                      FontSize="11"
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 9f010213..4fd8909d 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -140,9 +140,9 @@
 
                       <v:CommitRefsPresenter Grid.Column="1"
                                              Background="{DynamicResource Brush.Contents}"
-                                             TagBackground="{DynamicResource Brush.DecoratorTag}"
                                              Foreground="{DynamicResource Brush.FG1}"
                                              FontFamily="{DynamicResource Fonts.Primary}"
+                                             ShowTags="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsInGraph}"
                                              FontSize="11"
                                              VerticalAlignment="Center">
                         <v:CommitRefsPresenter.UseGraphColor>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 00218a85..e98adf70 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -447,6 +447,20 @@ namespace SourceGit.Views
                     ev.Handled = true;
                 };
 
+                var others = new MenuItem();
+                others.Header = App.Text("Repository.HistoriesOptions");
+                others.IsEnabled = false;
+
+                var showTagsInGraph = new MenuItem();
+                showTagsInGraph.Header = App.Text("Repository.HistoriesOptions.ShowTagsInGraph");
+                if (ViewModels.Preferences.Instance.ShowTagsInGraph)
+                    showTagsInGraph.Icon = App.CreateMenuIcon("Icons.Check");
+                showTagsInGraph.Click += (_, ev) =>
+                {
+                    ViewModels.Preferences.Instance.ShowTagsInGraph = !ViewModels.Preferences.Instance.ShowTagsInGraph;
+                    ev.Handled = true;
+                };
+
                 var menu = new ContextMenu();
                 menu.Items.Add(layout);
                 menu.Items.Add(horizontal);
@@ -455,6 +469,9 @@ namespace SourceGit.Views
                 menu.Items.Add(order);
                 menu.Items.Add(dateOrder);
                 menu.Items.Add(topoOrder);
+                menu.Items.Add(new MenuItem() { Header = "-" });
+                menu.Items.Add(others);
+                menu.Items.Add(showTagsInGraph);
                 menu.Open(button);
             }
 

From f02a7b985852cd5c39c28c4ffce5b0a794dbc003 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Mar 2025 13:40:50 +0000
Subject: [PATCH 285/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index dff78418..3cb9b6df 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.06%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.51%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.24%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.26%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-90.99%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0f8ccc2b..07fb4795 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 99.06%
+### de_DE.axaml: 98.79%
 
 
 <details>
@@ -10,21 +10,24 @@
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
 - Text.Preferences.Appearance.EditorTabWidth
+- Text.Repository.HistoriesOptions
+- Text.Repository.HistoriesOptions.ShowTagsInGraph
 - Text.StashCM.SaveAsPatch
 
 </details>
 
-### es_ES.axaml: 100.00%
+### es_ES.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Repository.HistoriesOptions
+- Text.Repository.HistoriesOptions.ShowTagsInGraph
 
 </details>
 
-### fr_FR.axaml: 91.51%
+### fr_FR.axaml: 91.26%
 
 
 <details>
@@ -72,6 +75,8 @@
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
 - Text.Repository.HistoriesLayout.Vertical
+- Text.Repository.HistoriesOptions
+- Text.Repository.HistoriesOptions.ShowTagsInGraph
 - Text.Repository.HistoriesOrder
 - Text.Repository.HistoriesOrder.ByDate
 - Text.Repository.HistoriesOrder.Topo
@@ -96,17 +101,18 @@
 
 </details>
 
-### it_IT.axaml: 100.00%
+### it_IT.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Repository.HistoriesOptions
+- Text.Repository.HistoriesOptions.ShowTagsInGraph
 
 </details>
 
-### pt_BR.axaml: 91.24%
+### pt_BR.axaml: 90.99%
 
 
 <details>
@@ -158,6 +164,8 @@
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
 - Text.Repository.HistoriesLayout.Vertical
+- Text.Repository.HistoriesOptions
+- Text.Repository.HistoriesOptions.ShowTagsInGraph
 - Text.Repository.HistoriesOrder
 - Text.Repository.Notifications.Clear
 - Text.Repository.OnlyHighlightCurrentBranchInHistories
@@ -180,13 +188,14 @@
 
 </details>
 
-### ru_RU.axaml: 100.00%
+### ru_RU.axaml: 99.73%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Repository.HistoriesOptions
+- Text.Repository.HistoriesOptions.ShowTagsInGraph
 
 </details>
 

From f7197e08ebcfedd4ebbb5b1390828249f0eeebde Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Thu, 20 Mar 2025 04:14:07 +0300
Subject: [PATCH 286/364] localization: update russian localization (#1111)

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

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 99948eca..24d296e3 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -574,6 +574,8 @@
   <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.HistoriesOptions" xml:space="preserve">ОПЦИИ</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" 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>

From 673b335a2aa2ea214a7c0140ff20f2d9214d156b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 01:14:21 +0000
Subject: [PATCH 287/364] doc: Update translation status and missing keys

---
 README.md      | 2 +-
 TRANSLATION.md | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3cb9b6df..1655d03a 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.26%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-90.99%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.26%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-90.99%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 07fb4795..55262e90 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -188,14 +188,13 @@
 
 </details>
 
-### ru_RU.axaml: 99.73%
+### ru_RU.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Repository.HistoriesOptions
-- Text.Repository.HistoriesOptions.ShowTagsInGraph
+
 
 </details>
 

From a5bdcab3415ac76caee4493e7444dd2bb3c2d2d6 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Mar 2025 09:38:02 +0800
Subject: [PATCH 288/364] code_style: move dynamic context menu creation to
 view models

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs  | 168 ++++++++++++++++++++++++++++------
 src/Views/Repository.axaml.cs | 116 +----------------------
 2 files changed, 144 insertions(+), 140 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index bf283532..4f35d215 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -118,20 +118,6 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public bool EnableTopoOrderInHistories
-        {
-            get => _settings.EnableTopoOrderInHistories;
-            set
-            {
-                if (value != _settings.EnableTopoOrderInHistories)
-                {
-                    _settings.EnableTopoOrderInHistories = value;
-                    OnPropertyChanged();
-                    Task.Run(RefreshCommits);
-                }
-            }
-        }
-
         public bool OnlyHighlightCurrentBranchInHistories
         {
             get => _settings.OnlyHighlighCurrentBranchInHistories;
@@ -145,20 +131,6 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public Models.TagSortMode TagSortMode
-        {
-            get => _settings.TagSortMode;
-            set
-            {
-                if (value != _settings.TagSortMode)
-                {
-                    _settings.TagSortMode = value;
-                    OnPropertyChanged();
-                    VisibleTags = BuildVisibleTags();
-                }
-            }
-        }
-
         public string Filter
         {
             get => _filter;
@@ -1470,6 +1442,97 @@ namespace SourceGit.ViewModels
             return menu;
         }
 
+        public ContextMenu CreateContextMenuForHistoriesPage()
+        {
+            var layout = new MenuItem();
+            layout.Header = App.Text("Repository.HistoriesLayout");
+            layout.IsEnabled = false;
+
+            var isHorizontal = Preferences.Instance.UseTwoColumnsLayoutInHistories;
+            var horizontal = new MenuItem();
+            horizontal.Header = App.Text("Repository.HistoriesLayout.Horizontal");
+            if (isHorizontal)
+                horizontal.Icon = App.CreateMenuIcon("Icons.Check");
+            horizontal.Click += (_, ev) =>
+            {
+                Preferences.Instance.UseTwoColumnsLayoutInHistories = true;
+                ev.Handled = true;
+            };
+
+            var vertical = new MenuItem();
+            vertical.Header = App.Text("Repository.HistoriesLayout.Vertical");
+            if (!isHorizontal)
+                vertical.Icon = App.CreateMenuIcon("Icons.Check");
+            vertical.Click += (_, ev) =>
+            {
+                Preferences.Instance.UseTwoColumnsLayoutInHistories = false;
+                ev.Handled = true;
+            };
+
+            var order = new MenuItem();
+            order.Header = App.Text("Repository.HistoriesOrder");
+            order.IsEnabled = false;
+
+            var dateOrder = new MenuItem();
+            dateOrder.Header = App.Text("Repository.HistoriesOrder.ByDate");
+            dateOrder.SetValue(Views.MenuItemExtension.CommandProperty, "--date-order");
+            if (!_settings.EnableTopoOrderInHistories)
+                dateOrder.Icon = App.CreateMenuIcon("Icons.Check");
+            dateOrder.Click += (_, ev) =>
+            {
+                if (_settings.EnableTopoOrderInHistories)
+                {
+                    _settings.EnableTopoOrderInHistories = false;
+                    Task.Run(RefreshCommits);
+                }
+
+                ev.Handled = true;
+            };
+
+            var topoOrder = new MenuItem();
+            topoOrder.Header = App.Text("Repository.HistoriesOrder.Topo");
+            topoOrder.SetValue(Views.MenuItemExtension.CommandProperty, "--top-order");
+            if (_settings.EnableTopoOrderInHistories)
+                topoOrder.Icon = App.CreateMenuIcon("Icons.Check");
+            topoOrder.Click += (_, ev) =>
+            {
+                if (!_settings.EnableTopoOrderInHistories)
+                {
+                    _settings.EnableTopoOrderInHistories = true;
+                    Task.Run(RefreshCommits);
+                }
+
+                ev.Handled = true;
+            };
+
+            var others = new MenuItem();
+            others.Header = App.Text("Repository.HistoriesOptions");
+            others.IsEnabled = false;
+
+            var showTagsInGraph = new MenuItem();
+            showTagsInGraph.Header = App.Text("Repository.HistoriesOptions.ShowTagsInGraph");
+            if (Preferences.Instance.ShowTagsInGraph)
+                showTagsInGraph.Icon = App.CreateMenuIcon("Icons.Check");
+            showTagsInGraph.Click += (_, ev) =>
+            {
+                Preferences.Instance.ShowTagsInGraph = !Preferences.Instance.ShowTagsInGraph;
+                ev.Handled = true;
+            };
+
+            var menu = new ContextMenu();
+            menu.Items.Add(layout);
+            menu.Items.Add(horizontal);
+            menu.Items.Add(vertical);
+            menu.Items.Add(new MenuItem() { Header = "-" });
+            menu.Items.Add(order);
+            menu.Items.Add(dateOrder);
+            menu.Items.Add(topoOrder);
+            menu.Items.Add(new MenuItem() { Header = "-" });
+            menu.Items.Add(others);
+            menu.Items.Add(showTagsInGraph);
+            return menu;
+        }
+
         public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
         {
             var menu = new ContextMenu();
@@ -2065,6 +2128,55 @@ namespace SourceGit.ViewModels
             return menu;
         }
 
+        public ContextMenu CreateContextMenuForTagSortMode()
+        {
+            var mode = _settings.TagSortMode;
+            var changeMode = new Action<Models.TagSortMode>((m) =>
+            {
+                if (_settings.TagSortMode != m)
+                {
+                    _settings.TagSortMode = m;
+                    VisibleTags = BuildVisibleTags();
+                }
+            });
+
+            var byCreatorDate = new MenuItem();
+            byCreatorDate.Header = App.Text("Repository.Tags.OrderByCreatorDate");
+            if (mode == Models.TagSortMode.CreatorDate)
+                byCreatorDate.Icon = App.CreateMenuIcon("Icons.Check");
+            byCreatorDate.Click += (_, ev) =>
+            {
+                changeMode(Models.TagSortMode.CreatorDate);
+                ev.Handled = true;
+            };
+
+            var byNameAsc = new MenuItem();
+            byNameAsc.Header = App.Text("Repository.Tags.OrderByNameAsc");
+            if (mode == Models.TagSortMode.NameInAscending)
+                byNameAsc.Icon = App.CreateMenuIcon("Icons.Check");
+            byNameAsc.Click += (_, ev) =>
+            {
+                changeMode(Models.TagSortMode.NameInAscending);
+                ev.Handled = true;
+            };
+
+            var byNameDes = new MenuItem();
+            byNameDes.Header = App.Text("Repository.Tags.OrderByNameDes");
+            if (mode == Models.TagSortMode.NameInDescending)
+                byNameDes.Icon = App.CreateMenuIcon("Icons.Check");
+            byNameDes.Click += (_, ev) =>
+            {
+                changeMode(Models.TagSortMode.NameInDescending);
+                ev.Handled = true;
+            };
+
+            var menu = new ContextMenu();
+            menu.Items.Add(byCreatorDate);
+            menu.Items.Add(byNameAsc);
+            menu.Items.Add(byNameDes);
+            return menu;
+        }
+
         public ContextMenu CreateContextMenuForSubmodule(string submodule)
         {
             var open = new MenuItem();
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index e98adf70..d848c000 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -396,83 +396,8 @@ namespace SourceGit.Views
         {
             if (sender is Button button && DataContext is ViewModels.Repository repo)
             {
-                var layout = new MenuItem();
-                layout.Header = App.Text("Repository.HistoriesLayout");
-                layout.IsEnabled = false;
-
-                var isHorizontal = ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories;
-                var horizontal = new MenuItem();
-                horizontal.Header = App.Text("Repository.HistoriesLayout.Horizontal");
-                if (isHorizontal)
-                    horizontal.Icon = App.CreateMenuIcon("Icons.Check");
-                horizontal.Click += (_, ev) =>
-                {
-                    ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories = true;
-                    ev.Handled = true;
-                };
-
-                var vertical = new MenuItem();
-                vertical.Header = App.Text("Repository.HistoriesLayout.Vertical");
-                if (!isHorizontal)
-                    vertical.Icon = App.CreateMenuIcon("Icons.Check");
-                vertical.Click += (_, ev) =>
-                {
-                    ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories = false;
-                    ev.Handled = true;
-                };
-
-                var order = new MenuItem();
-                order.Header = App.Text("Repository.HistoriesOrder");
-                order.IsEnabled = false;
-
-                var dateOrder = new MenuItem();
-                dateOrder.Header = App.Text("Repository.HistoriesOrder.ByDate");
-                dateOrder.SetValue(MenuItemExtension.CommandProperty, "--date-order");
-                if (!repo.EnableTopoOrderInHistories)
-                    dateOrder.Icon = App.CreateMenuIcon("Icons.Check");
-                dateOrder.Click += (_, ev) =>
-                {
-                    repo.EnableTopoOrderInHistories = false;
-                    ev.Handled = true;
-                };
-
-                var topoOrder = new MenuItem();
-                topoOrder.Header = App.Text("Repository.HistoriesOrder.Topo");
-                topoOrder.SetValue(MenuItemExtension.CommandProperty, "--top-order");
-                if (repo.EnableTopoOrderInHistories)
-                    topoOrder.Icon = App.CreateMenuIcon("Icons.Check");
-                topoOrder.Click += (_, ev) =>
-                {
-                    repo.EnableTopoOrderInHistories = true;
-                    ev.Handled = true;
-                };
-
-                var others = new MenuItem();
-                others.Header = App.Text("Repository.HistoriesOptions");
-                others.IsEnabled = false;
-
-                var showTagsInGraph = new MenuItem();
-                showTagsInGraph.Header = App.Text("Repository.HistoriesOptions.ShowTagsInGraph");
-                if (ViewModels.Preferences.Instance.ShowTagsInGraph)
-                    showTagsInGraph.Icon = App.CreateMenuIcon("Icons.Check");
-                showTagsInGraph.Click += (_, ev) =>
-                {
-                    ViewModels.Preferences.Instance.ShowTagsInGraph = !ViewModels.Preferences.Instance.ShowTagsInGraph;
-                    ev.Handled = true;
-                };
-
-                var menu = new ContextMenu();
-                menu.Items.Add(layout);
-                menu.Items.Add(horizontal);
-                menu.Items.Add(vertical);
-                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(order);
-                menu.Items.Add(dateOrder);
-                menu.Items.Add(topoOrder);
-                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(others);
-                menu.Items.Add(showTagsInGraph);
-                menu.Open(button);
+                var menu = repo.CreateContextMenuForHistoriesPage();
+                menu?.Open(button);
             }
 
             e.Handled = true;
@@ -482,41 +407,8 @@ namespace SourceGit.Views
         {
             if (sender is Button button && DataContext is ViewModels.Repository repo)
             {
-                var byCreatorDate = new MenuItem();
-                byCreatorDate.Header = App.Text("Repository.Tags.OrderByCreatorDate");
-                if (repo.TagSortMode == Models.TagSortMode.CreatorDate)
-                    byCreatorDate.Icon = App.CreateMenuIcon("Icons.Check");
-                byCreatorDate.Click += (_, ev) =>
-                {
-                    repo.TagSortMode = Models.TagSortMode.CreatorDate;
-                    ev.Handled = true;
-                };
-
-                var byNameAsc = new MenuItem();
-                byNameAsc.Header = App.Text("Repository.Tags.OrderByNameAsc");
-                if (repo.TagSortMode == Models.TagSortMode.NameInAscending)
-                    byNameAsc.Icon = App.CreateMenuIcon("Icons.Check");
-                byNameAsc.Click += (_, ev) =>
-                {
-                    repo.TagSortMode = Models.TagSortMode.NameInAscending;
-                    ev.Handled = true;
-                };
-
-                var byNameDes = new MenuItem();
-                byNameDes.Header = App.Text("Repository.Tags.OrderByNameDes");
-                if (repo.TagSortMode == Models.TagSortMode.NameInDescending)
-                    byNameDes.Icon = App.CreateMenuIcon("Icons.Check");
-                byNameDes.Click += (_, ev) =>
-                {
-                    repo.TagSortMode = Models.TagSortMode.NameInDescending;
-                    ev.Handled = true;
-                };
-
-                var menu = new ContextMenu();
-                menu.Items.Add(byCreatorDate);
-                menu.Items.Add(byNameAsc);
-                menu.Items.Add(byNameDes);
-                menu.Open(button);
+                var menu = repo.CreateContextMenuForTagSortMode();
+                menu?.Open(button);
             }
 
             e.Handled = true;

From 145273b4a71e2c9d91a7c0cca461d5fa6b900e86 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Mar 2025 11:10:48 +0800
Subject: [PATCH 289/364] refactor: move `Show tags in commit graph` to
 `Preferences` (#1109)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml |  3 +--
 src/Resources/Locales/ru_RU.axaml |  3 +--
 src/Resources/Locales/zh_CN.axaml |  3 +--
 src/Resources/Locales/zh_TW.axaml |  3 +--
 src/ViewModels/Repository.cs      | 17 -----------------
 src/Views/Preferences.axaml       |  9 +++++++--
 6 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 293dd77b..f24d6c65 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -471,6 +471,7 @@
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Show tags in commit graph</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</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">Enable Auto CRLF</x:String>
@@ -569,8 +570,6 @@
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOptions" xml:space="preserve">OPTIONS</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" xml:space="preserve">Show Tags in Graph</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">COMMITS ORDER</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Commit Date</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologically</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 24d296e3..707c9ed9 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -475,6 +475,7 @@
   <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.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.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">Включить автозавершение CRLF</x:String>
@@ -574,8 +575,6 @@
   <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.HistoriesOptions" xml:space="preserve">ОПЦИИ</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" 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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index b8dcf417..93d08bd0 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -475,6 +475,7 @@
   <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.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">SUBJECT字数检测</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>
@@ -573,8 +574,6 @@
   <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.HistoriesOptions" xml:space="preserve">其它设置</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 1d2cee7c..d5a7a77c 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -474,6 +474,7 @@
   <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.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.Git" xml:space="preserve">Git 設定</x:String>
   <x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">自動換行轉換</x:String>
@@ -572,8 +573,6 @@
   <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.HistoriesOptions" xml:space="preserve">其它設定</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOptions.ShowTagsInGraph" 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>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 4f35d215..6ea41e04 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1505,20 +1505,6 @@ namespace SourceGit.ViewModels
                 ev.Handled = true;
             };
 
-            var others = new MenuItem();
-            others.Header = App.Text("Repository.HistoriesOptions");
-            others.IsEnabled = false;
-
-            var showTagsInGraph = new MenuItem();
-            showTagsInGraph.Header = App.Text("Repository.HistoriesOptions.ShowTagsInGraph");
-            if (Preferences.Instance.ShowTagsInGraph)
-                showTagsInGraph.Icon = App.CreateMenuIcon("Icons.Check");
-            showTagsInGraph.Click += (_, ev) =>
-            {
-                Preferences.Instance.ShowTagsInGraph = !Preferences.Instance.ShowTagsInGraph;
-                ev.Handled = true;
-            };
-
             var menu = new ContextMenu();
             menu.Items.Add(layout);
             menu.Items.Add(horizontal);
@@ -1527,9 +1513,6 @@ namespace SourceGit.ViewModels
             menu.Items.Add(order);
             menu.Items.Add(dateOrder);
             menu.Items.Add(topoOrder);
-            menu.Items.Add(new MenuItem() { Header = "-" });
-            menu.Items.Add(others);
-            menu.Items.Add(showTagsInGraph);
             return menu;
         }
 
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index d2b08467..702ec20f 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -46,7 +46,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.General}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="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.General.Locale}"
                        HorizontalAlignment="Right"
@@ -132,11 +132,16 @@
                       IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowAuthorTimeInGraph, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="6" Grid.Column="1"
+                      Height="32"
+                      Content="{DynamicResource Text.Preferences.General.ShowTagsInGraph}"
+                      IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsInGraph, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowChildren}"
                       IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowChildren, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="7" Grid.Column="1"
+            <CheckBox Grid.Row="8" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.Check4UpdatesOnStartup}"
                       IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"

From c349ac10f3eaa98da95dda03782c2034bd31a549 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 03:11:14 +0000
Subject: [PATCH 290/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 1655d03a..5b3dbc20 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.26%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-90.99%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.92%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.39%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 55262e90..b7f87cdf 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,4 +1,4 @@
-### de_DE.axaml: 98.79%
+### de_DE.axaml: 98.92%
 
 
 <details>
@@ -10,24 +10,22 @@
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
 - Text.Preferences.Appearance.EditorTabWidth
-- Text.Repository.HistoriesOptions
-- Text.Repository.HistoriesOptions.ShowTagsInGraph
+- Text.Preferences.General.ShowTagsInGraph
 - Text.StashCM.SaveAsPatch
 
 </details>
 
-### es_ES.axaml: 99.73%
+### es_ES.axaml: 99.87%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Repository.HistoriesOptions
-- Text.Repository.HistoriesOptions.ShowTagsInGraph
+- Text.Preferences.General.ShowTagsInGraph
 
 </details>
 
-### fr_FR.axaml: 91.26%
+### fr_FR.axaml: 91.39%
 
 
 <details>
@@ -66,6 +64,7 @@
 - Text.Preferences.Appearance.FontSize.Editor
 - Text.Preferences.General.DateFormat
 - Text.Preferences.General.ShowChildren
+- Text.Preferences.General.ShowTagsInGraph
 - Text.Preferences.Git.SSLVerify
 - Text.Repository.CustomActions
 - Text.Repository.FilterCommits
@@ -75,8 +74,6 @@
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
 - Text.Repository.HistoriesLayout.Vertical
-- Text.Repository.HistoriesOptions
-- Text.Repository.HistoriesOptions.ShowTagsInGraph
 - Text.Repository.HistoriesOrder
 - Text.Repository.HistoriesOrder.ByDate
 - Text.Repository.HistoriesOrder.Topo
@@ -101,18 +98,17 @@
 
 </details>
 
-### it_IT.axaml: 99.73%
+### it_IT.axaml: 99.87%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.Repository.HistoriesOptions
-- Text.Repository.HistoriesOptions.ShowTagsInGraph
+- Text.Preferences.General.ShowTagsInGraph
 
 </details>
 
-### pt_BR.axaml: 90.99%
+### pt_BR.axaml: 91.12%
 
 
 <details>
@@ -159,13 +155,12 @@
 - Text.Preferences.Appearance.EditorTabWidth
 - Text.Preferences.General.DateFormat
 - Text.Preferences.General.ShowChildren
+- Text.Preferences.General.ShowTagsInGraph
 - Text.Preferences.Git.SSLVerify
 - Text.Repository.FilterCommits
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
 - Text.Repository.HistoriesLayout.Vertical
-- Text.Repository.HistoriesOptions
-- Text.Repository.HistoriesOptions.ShowTagsInGraph
 - Text.Repository.HistoriesOrder
 - Text.Repository.Notifications.Clear
 - Text.Repository.OnlyHighlightCurrentBranchInHistories

From 891e1b2ec8fc6a00882186e390c06a365ea05d46 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Mar 2025 19:55:50 +0800
Subject: [PATCH 291/364] ux: show name of stash instead of SHA which is
 useless to user

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

diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index 028764ca..6b087eb8 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -92,7 +92,7 @@
             <Border BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="0,0,0,1" Padding="4" Background="Transparent" ContextRequested="OnStashContextRequested">
               <Grid RowDefinitions="Auto,*" >
                 <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
-                  <TextBlock Grid.Column="0" Classes="primary" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" TextDecorations="Underline" Cursor="Hand"/>
+                  <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"/>
                 </Grid>
 

From 65dbfd336d4fe33e05ce6864fdf589e95c96b3c7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Mar 2025 20:53:30 +0800
Subject: [PATCH 292/364] refactor: it's not necessary to store untracked file
 list for selected stash

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Stash.cs           |  1 -
 src/ViewModels/StashesPage.cs | 25 ++++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs
index 8dca3bdb..257b6d33 100644
--- a/src/Models/Stash.cs
+++ b/src/Models/Stash.cs
@@ -10,7 +10,6 @@ namespace SourceGit.Models
         public List<string> Parents { get; set; } = [];
         public ulong Time { get; set; } = 0;
         public string Message { get; set; } = "";
-        public bool HasUntracked => Parents.Count == 3;
 
         public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
     }
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index ec7cc84a..d8443c91 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -59,24 +59,16 @@ namespace SourceGit.ViewModels
                         Task.Run(() =>
                         {
                             var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
-                            var untracked = new HashSet<string>();
-                            if (value.HasUntracked)
+                            if (value.Parents.Count == 3)
                             {
-                                var untrackedChanges = new Commands.CompareRevisions(_repo.FullPath, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", value.Parents[2]).Result();
-                                foreach (var c in untrackedChanges)
-                                {
-                                    untracked.Add(c.Path);
+                                var untracked = new Commands.CompareRevisions(_repo.FullPath, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", value.Parents[2]).Result();
+                                foreach (var c in untracked)
                                     changes.Add(c);
-                                }
+
+                                changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
                             }
 
-                            changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
-
-                            Dispatcher.UIThread.Invoke(() =>
-                            {
-                                Changes = changes;
-                                _untrackedChanges = untracked;
-                            });
+                            Dispatcher.UIThread.Invoke(() => Changes = changes);
                         });
                     }
                 }
@@ -102,7 +94,7 @@ namespace SourceGit.ViewModels
                 {
                     if (value == null)
                         DiffContext = null;
-                    else if (_untrackedChanges.Contains(value.Path))
+                    else if (value.Index == Models.ChangeState.Added && _selectedStash.Parents.Count == 3)
                         DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption("4b825dc642cb6eb9a060e54bf8d69288fbee4904", _selectedStash.Parents[2], value), _diffContext);
                     else
                         DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, value), _diffContext);
@@ -178,7 +170,7 @@ namespace SourceGit.ViewModels
                     var opts = new List<Models.DiffOption>();
                     foreach (var c in _changes)
                     {
-                        if (_untrackedChanges.Contains(c.Path))
+                        if (c.Index == Models.ChangeState.Added && _selectedStash.Parents.Count == 3)
                             opts.Add(new Models.DiffOption("4b825dc642cb6eb9a060e54bf8d69288fbee4904", _selectedStash.Parents[2], c));
                         else
                             opts.Add(new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, c));
@@ -303,7 +295,6 @@ namespace SourceGit.ViewModels
         private List<Models.Stash> _visibleStashes = new List<Models.Stash>();
         private string _searchFilter = string.Empty;
         private Models.Stash _selectedStash = null;
-        private HashSet<string> _untrackedChanges = new HashSet<string>();
         private List<Models.Change> _changes = null;
         private Models.Change _selectedChange = null;
         private DiffContext _diffContext = null;

From 38d87fa1a1b443ede1cab537af489fd46431be21 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Mar 2025 21:12:08 +0800
Subject: [PATCH 293/364] feature: use `git stash show -u --name-status
 <stash_name>` command to query changes in selected stash if git >= 2.32.0

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryStashChanges.cs | 68 +++++++++++++++++++++++++++++++
 src/Models/GitVersions.cs         | 13 ++++--
 src/ViewModels/StashChanges.cs    |  4 +-
 src/ViewModels/StashesPage.cs     | 26 ++++++++----
 4 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 src/Commands/QueryStashChanges.cs

diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs
new file mode 100644
index 00000000..7fc27ea3
--- /dev/null
+++ b/src/Commands/QueryStashChanges.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace SourceGit.Commands
+{
+    /// <summary>
+    /// Query stash changes. Requires git >= 2.32.0
+    /// </summary>
+    public partial class QueryStashChanges : Command
+    {
+        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        private static partial Regex REG_FORMAT();
+
+        public QueryStashChanges(string repo, string stash) 
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Args = $"stash show -u --name-status \"{stash}\"";
+        }
+
+        public List<Models.Change> Result()
+        {
+            var rs = ReadToEnd();
+            if (!rs.IsSuccess)
+                return [];
+
+            var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+            var outs = new List<Models.Change>();
+            foreach (var line in lines)
+            {
+                var match = REG_FORMAT().Match(line);
+                if (!match.Success)
+                    continue;
+
+                var change = new Models.Change() { Path = match.Groups[2].Value };
+                var status = match.Groups[1].Value;
+
+                switch (status[0])
+                {
+                    case 'M':
+                        change.Set(Models.ChangeState.Modified);
+                        outs.Add(change);
+                        break;
+                    case 'A':
+                        change.Set(Models.ChangeState.Added);
+                        outs.Add(change);
+                        break;
+                    case 'D':
+                        change.Set(Models.ChangeState.Deleted);
+                        outs.Add(change);
+                        break;
+                    case 'R':
+                        change.Set(Models.ChangeState.Renamed);
+                        outs.Add(change);
+                        break;
+                    case 'C':
+                        change.Set(Models.ChangeState.Copied);
+                        outs.Add(change);
+                        break;
+                }
+            }
+
+            outs.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
+            return outs;
+        }
+    }
+}
diff --git a/src/Models/GitVersions.cs b/src/Models/GitVersions.cs
index 394a9518..92fd8c59 100644
--- a/src/Models/GitVersions.cs
+++ b/src/Models/GitVersions.cs
@@ -13,13 +13,18 @@
         public static readonly System.Version ADD_WITH_PATHSPECFILE = new System.Version(2, 25, 0);
 
         /// <summary>
-        ///     The minimal version of Git that supports the `stash` command with the `--pathspec-from-file` option.
+        ///     The minimal version of Git that supports the `stash push` command with the `--pathspec-from-file` option.
         /// </summary>
-        public static readonly System.Version STASH_WITH_PATHSPECFILE = new System.Version(2, 26, 0);
+        public static readonly System.Version STASH_PUSH_WITH_PATHSPECFILE = new System.Version(2, 26, 0);
 
         /// <summary>
-        ///     The minimal version of Git that supports the `stash` command with the `--staged` option.
+        ///     The minimal version of Git that supports the `stash push` command with the `--staged` option.
         /// </summary>
-        public static readonly System.Version STASH_ONLY_STAGED = new System.Version(2, 35, 0);
+        public static readonly System.Version STASH_PUSH_ONLY_STAGED = new System.Version(2, 35, 0);
+
+        /// <summary>
+        ///     The minimal version of Git that supports the `stash show` command with the `-u` option.
+        /// </summary>
+        public static readonly System.Version STASH_SHOW_WITH_UNTRACKED = new System.Version(2, 32, 0);
     }
 }
diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs
index 33ebb1f3..e35aaad0 100644
--- a/src/ViewModels/StashChanges.cs
+++ b/src/ViewModels/StashChanges.cs
@@ -64,7 +64,7 @@ namespace SourceGit.ViewModels
                 {
                     if (OnlyStaged)
                     {
-                        if (Native.OS.GitVersion >= Models.GitVersions.STASH_ONLY_STAGED)
+                        if (Native.OS.GitVersion >= Models.GitVersions.STASH_PUSH_ONLY_STAGED)
                         {
                             succ = new Commands.Stash(_repo.FullPath).PushOnlyStaged(Message, KeepIndex);
                         }
@@ -109,7 +109,7 @@ namespace SourceGit.ViewModels
                 return true;
 
             var succ = false;
-            if (Native.OS.GitVersion >= Models.GitVersions.STASH_WITH_PATHSPECFILE)
+            if (Native.OS.GitVersion >= Models.GitVersions.STASH_PUSH_WITH_PATHSPECFILE)
             {
                 var paths = new List<string>();
                 foreach (var c in changes)
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index d8443c91..77ed5551 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -58,14 +58,26 @@ namespace SourceGit.ViewModels
                     {
                         Task.Run(() =>
                         {
-                            var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
-                            if (value.Parents.Count == 3)
-                            {
-                                var untracked = new Commands.CompareRevisions(_repo.FullPath, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", value.Parents[2]).Result();
-                                foreach (var c in untracked)
-                                    changes.Add(c);
+                            var changes = null as List<Models.Change>;
 
-                                changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
+                            if (Native.OS.GitVersion >= Models.GitVersions.STASH_SHOW_WITH_UNTRACKED)
+                            {
+                                changes = new Commands.QueryStashChanges(_repo.FullPath, value.Name).Result();
+                            }
+                            else
+                            {
+                                changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
+                                if (value.Parents.Count == 3)
+                                {
+                                    var untracked = new Commands.CompareRevisions(_repo.FullPath, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", value.Parents[2]).Result();
+                                    var needSort = changes.Count > 0;
+
+                                    foreach (var c in untracked)
+                                        changes.Add(c);
+
+                                    if (needSort)
+                                        changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
+                                }
                             }
 
                             Dispatcher.UIThread.Invoke(() => Changes = changes);

From 7cd5814410b152a1363b9cf173e9e67928dd6fe1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 20 Mar 2025 21:18:51 +0800
Subject: [PATCH 294/364] enhance: better regex for output of
 `Commands.CompareRevisions`

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

diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
index 8a6f2832..e311a88e 100644
--- a/src/Commands/CompareRevisions.cs
+++ b/src/Commands/CompareRevisions.cs
@@ -6,7 +6,7 @@ namespace SourceGit.Commands
 {
     public partial class CompareRevisions : Command
     {
-        [GeneratedRegex(@"^(\s?[\w\?]{1,4})\s+(.+)$")]
+        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
 
         public CompareRevisions(string repo, string start, string end)

From 5467703a6e085853fbb10762d0d93abc223b004c Mon Sep 17 00:00:00 2001
From: Ilian Delagrange <62717259+ilianoKokoro@users.noreply.github.com>
Date: Thu, 20 Mar 2025 21:30:57 -0400
Subject: [PATCH 295/364] localization: add missing french translations (#1113)

Co-authored-by: Ilian Delagrange <ilian@MacBook-Air-de-Ilian.local>
---
 src/Resources/Locales/fr_FR.axaml | 64 +++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index f3a71390..19c0859c 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -684,4 +684,68 @@
   <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Verrouiller</x:String>
   <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Supprimer</x:String>
   <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Déverrouiller</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GÉNÉRER</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLIQUER COMME MESSAGE DE COMMIT</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Appliquer le Stash</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Supprimer après l'application</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Rétablir les modifications de l'index</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
+  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Action personnalisée</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Branche en amont invalide!</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Initialiser et mettre à jour les sous-modules</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Branche</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Attendre la fin de l'action</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Les espaces seront remplacés par des tirets.</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Chemin:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Tous les enfants seront retirés de la liste.</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">Cela le supprimera uniquement de la liste, pas du disque !</x:String>
+  <x:String x:Key="Text.Diff.First" xml:space="preserve">Première différence</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Dernière différence</x:String>
+  <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Traitement du commit</x:String>
+  <x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">Fusionnement</x:String>
+  <x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">Arrêté à</x:String>
+  <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Annulation du commit</x:String>
+  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Source:</x:String>
+  <x:String x:Key="Text.MergeMultiple" xml:space="preserve">Fusionner (Plusieurs)</x:String>
+  <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Commit tous les changement</x:String>
+  <x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">Stratégie:</x:String>
+  <x:String x:Key="Text.MergeMultiple.Targets" xml:space="preserve">Cibles:</x:String>
+  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Activer le streaming</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Largeur de tab dans l'éditeur</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Taille de police</x:String>
+  <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.General.DateFormat" xml:space="preserve">Format de date</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Afficher les enfants dans les détails du commit</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Afficher les tags dans le graphique des commits</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Activer la vérification HTTP SSL</x:String>
+  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Actions personnalisées</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Visibilité dans le graphique</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Réinitialiser</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Cacher dans le graphique des commits</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filtrer dans le graphique des commits</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">DISPOSITION</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">ORDRE DES COMMITS</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Date du commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologiquement</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">EFFACER LES NOTIFICATIONS</x:String>
+  <x:String x:Key="Text.Repository.Skip" xml:space="preserve">PASSER</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">Par date de créateur</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">Par nom (Croissant)</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">Par nom (Décroissant)</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Trier</x:String>
+  <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Utiliser le temps relatif dans les historiques</x:String>
+  <x:String x:Key="Text.ScanRepositories" xml:space="preserve">Analyser les repositories</x:String>
+  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Définir la branche suivie</x:String>
+  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branche:</x:String>
+  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Retirer la branche amont</x:String>
+  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">En amont:</x:String>
+  <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Aller sur</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Restauration automatique après le stashing</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Vos fichiers de travail restent inchangés, mais une sauvegarde est enregistrée.</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Sauvegarder en tant que patch...</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Modifier)</x:String>
+  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">SignOff</x:String>
 </ResourceDictionary>

From 56253e95c337210215d85546b1378e9f7b119ce3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 01:31:07 +0000
Subject: [PATCH 296/364] doc: Update translation status and missing keys

---
 README.md      |  2 +-
 TRANSLATION.md | 67 ++------------------------------------------------
 2 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/README.md b/README.md
index 5b3dbc20..2f13fce6 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.92%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-91.39%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.92%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
 
 > [!NOTE]
 > You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
diff --git a/TRANSLATION.md b/TRANSLATION.md
index b7f87cdf..aa8da630 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -25,76 +25,13 @@
 
 </details>
 
-### fr_FR.axaml: 91.39%
+### fr_FR.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.AIAssistant.Regen
-- Text.AIAssistant.Use
-- Text.ApplyStash
-- Text.ApplyStash.DropAfterApply
-- Text.ApplyStash.RestoreIndex
-- Text.ApplyStash.Stash
-- Text.BranchCM.CustomAction
-- Text.BranchUpstreamInvalid
-- Text.Clone.RecurseSubmodules
-- Text.Configure.CustomAction.Scope.Branch
-- Text.Configure.CustomAction.WaitForExit
-- Text.CreateBranch.Name.WarnSpace
-- Text.DeleteRepositoryNode.Path
-- Text.DeleteRepositoryNode.TipForGroup
-- Text.DeleteRepositoryNode.TipForRepository
-- Text.Diff.First
-- Text.Diff.Last
-- Text.InProgress.CherryPick.Head
-- Text.InProgress.Merge.Operating
-- Text.InProgress.Rebase.StoppedAt
-- Text.InProgress.Revert.Head
-- Text.Merge.Source
-- Text.MergeMultiple
-- Text.MergeMultiple.CommitChanges
-- Text.MergeMultiple.Strategy
-- Text.MergeMultiple.Targets
-- Text.Preferences.AI.Streaming
-- Text.Preferences.Appearance.EditorTabWidth
-- Text.Preferences.Appearance.FontSize
-- Text.Preferences.Appearance.FontSize.Default
-- Text.Preferences.Appearance.FontSize.Editor
-- Text.Preferences.General.DateFormat
-- Text.Preferences.General.ShowChildren
-- Text.Preferences.General.ShowTagsInGraph
-- Text.Preferences.Git.SSLVerify
-- Text.Repository.CustomActions
-- Text.Repository.FilterCommits
-- Text.Repository.FilterCommits.Default
-- Text.Repository.FilterCommits.Exclude
-- Text.Repository.FilterCommits.Include
-- Text.Repository.HistoriesLayout
-- Text.Repository.HistoriesLayout.Horizontal
-- Text.Repository.HistoriesLayout.Vertical
-- Text.Repository.HistoriesOrder
-- Text.Repository.HistoriesOrder.ByDate
-- Text.Repository.HistoriesOrder.Topo
-- Text.Repository.Notifications.Clear
-- Text.Repository.Skip
-- Text.Repository.Tags.OrderByCreatorDate
-- Text.Repository.Tags.OrderByNameAsc
-- Text.Repository.Tags.OrderByNameDes
-- Text.Repository.Tags.Sort
-- Text.Repository.UseRelativeTimeInHistories
-- Text.ScanRepositories
-- Text.SetUpstream
-- Text.SetUpstream.Local
-- Text.SetUpstream.Unset
-- Text.SetUpstream.Upstream
-- Text.SHALinkCM.NavigateTo
-- Text.Stash.AutoRestore
-- Text.Stash.AutoRestore.Tip
-- Text.StashCM.SaveAsPatch
-- Text.WorkingCopy.CommitToEdit
-- Text.WorkingCopy.SignOff
+
 
 </details>
 

From 8c1e1a3e6a0cb4ea41ed8a6361bc2a894a492617 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Mar 2025 09:45:42 +0800
Subject: [PATCH 297/364] fix: text diff view scrolling issue introduced by
 AvaloniaEdit `11.2.0` (commit 7caa03a09b)

- `SyncScrollOffset` does not update in `side-by-side` mode while scrolling
- Highlighted chunk is not cleared when scroll by drag scrollbar

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/TextDiffView.axaml.cs | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 925c7622..0d20a990 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -565,7 +565,6 @@ namespace SourceGit.Views
                     ScrollToLine(prev.Start);
                 }
             }
-            // NOTE: Not implemented (button hidden) for non-block navigation.
         }
 
         public void GotoPrevChange()
@@ -678,7 +677,6 @@ namespace SourceGit.Views
                     ScrollToLine(next.Start);
                 }
             }
-            // NOTE: Not implemented (button hidden) for non-block navigation.
         }
 
         public override void Render(DrawingContext context)
@@ -1229,7 +1227,7 @@ namespace SourceGit.Views
             if (scroller != null)
             {
                 scroller.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
-                scroller.GotFocus += OnTextViewScrollGotFocus;
+                scroller.ScrollChanged += OnTextViewScrollChanged;
             }
         }
 
@@ -1237,7 +1235,7 @@ namespace SourceGit.Views
         {
             var scroller = this.FindDescendantOfType<ScrollViewer>();
             if (scroller != null)
-                scroller.GotFocus -= OnTextViewScrollGotFocus;
+                scroller.ScrollChanged -= OnTextViewScrollChanged;
 
             base.OnUnloaded(e);
         }
@@ -1274,9 +1272,9 @@ namespace SourceGit.Views
             GC.Collect();
         }
 
-        private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
+        private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
         {
-            if (EnableChunkSelection && !TextArea.IsPointerOver)
+            if (sender is ScrollViewer { IsExpanded: true, IsPointerOver: true } scroller)
                 TrySetChunk(null);
         }
     }
@@ -1446,12 +1444,9 @@ namespace SourceGit.Views
             _scrollViewer = this.FindDescendantOfType<ScrollViewer>();
             if (_scrollViewer != null)
             {
-                _scrollViewer.GotFocus += OnTextViewScrollGotFocus;
                 _scrollViewer.ScrollChanged += OnTextViewScrollChanged;
                 _scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("SyncScrollOffset", BindingMode.OneWay));
             }
-
-            TextArea.PointerWheelChanged += OnTextAreaPointerWheelChanged;
         }
 
         protected override void OnUnloaded(RoutedEventArgs e)
@@ -1459,12 +1454,9 @@ namespace SourceGit.Views
             if (_scrollViewer != null)
             {
                 _scrollViewer.ScrollChanged -= OnTextViewScrollChanged;
-                _scrollViewer.GotFocus -= OnTextViewScrollGotFocus;
                 _scrollViewer = null;
             }
 
-            TextArea.PointerWheelChanged -= OnTextAreaPointerWheelChanged;
-
             base.OnUnloaded(e);
             GC.Collect();
         }
@@ -1499,22 +1491,15 @@ namespace SourceGit.Views
             }
         }
 
-        private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
-        {
-            if (EnableChunkSelection && !TextArea.IsPointerOver)
-                TrySetChunk(null);
-        }
-
         private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
         {
-            if (TextArea.IsFocused && DataContext is ViewModels.TwoSideTextDiff diff)
+            if (IsPointerOver && DataContext is ViewModels.TwoSideTextDiff diff)
+            {
                 diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
-        }
 
-        private void OnTextAreaPointerWheelChanged(object sender, PointerWheelEventArgs e)
-        {
-            if (!TextArea.IsFocused)
-                Focus();
+                if (sender is ScrollViewer { IsExpanded: true, IsPointerOver: true } scroller )
+                    TrySetChunk(null);
+            }
         }
 
         private ScrollViewer _scrollViewer = null;

From cdc0fbb753e9e2326765ef193eea0ca4e1812227 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Mar 2025 10:23:52 +0800
Subject: [PATCH 298/364] doc: update README.md

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

diff --git a/README.md b/README.md
index 2f13fce6..00779cc7 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 * GIT commands with GUI
   * Clone/Fetch/Pull/Push...
   * Merge/Rebase/Reset/Revert/Amend/Cherry-pick...
-  * Amend/Reword
+  * Amend/Reword/Squash
   * Interactive rebase
   * Branches
   * Remotes
@@ -40,6 +40,7 @@
 * Git LFS
 * Issue Link
 * Workspace
+* Custom Action
 * Using AI to generate commit message (C# port of [anjerodev/commitollama](https://github.com/anjerodev/commitollama))
 
 > [!WARNING]

From 39f4cd173287a3d531e6e3225009b5527f77e193 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Mar 2025 10:54:47 +0800
Subject: [PATCH 299/364] ci: move all translation status to `TRANSLATION.md`
 and do not modify `README.md ` while checking localization

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md                           |  7 +--
 TRANSLATION.md                      | 66 +++++++++--------------------
 build/scripts/localization-check.js | 45 ++++++++------------
 3 files changed, 38 insertions(+), 80 deletions(-)

diff --git a/README.md b/README.md
index 00779cc7..d63886ed 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 * Supports SSH access with each remote
 * GIT commands with GUI
   * Clone/Fetch/Pull/Push...
-  * Merge/Rebase/Reset/Revert/Amend/Cherry-pick...
+  * Merge/Rebase/Reset/Revert/Cherry-pick...
   * Amend/Reword/Squash
   * Interactive rebase
   * Branches
@@ -48,10 +48,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.92%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)](TRANSLATION.md)
-
-> [!NOTE]
-> You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
+You can find the current translation status in [TRANSLATION.md](TRANSLATION.md)
 
 ## How to Use
 
diff --git a/TRANSLATION.md b/TRANSLATION.md
index aa8da630..a96f0fc6 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,8 +1,15 @@
-### de_DE.axaml: 98.92%
+# Translation Status
 
+This document shows the translation status of each locale file in the repository.
+
+## Details
+
+### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
+
+### ![de__DE](https://img.shields.io/badge/de__DE-98.92%25-yellow)
 
 <details>
-<summary>Missing Keys</summary>
+<summary>Missing keys in de_DE.axaml</summary>
 
 - Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.WaitForExit
@@ -15,41 +22,30 @@
 
 </details>
 
-### es_ES.axaml: 99.87%
-
+### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
 
 <details>
-<summary>Missing Keys</summary>
+<summary>Missing keys in es_ES.axaml</summary>
 
 - Text.Preferences.General.ShowTagsInGraph
 
 </details>
 
-### fr_FR.axaml: 100.00%
+### ![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)
 
+### ![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)
 
 <details>
-<summary>Missing Keys</summary>
-
-
-
-</details>
-
-### it_IT.axaml: 99.87%
-
-
-<details>
-<summary>Missing Keys</summary>
+<summary>Missing keys in it_IT.axaml</summary>
 
 - Text.Preferences.General.ShowTagsInGraph
 
 </details>
 
-### pt_BR.axaml: 91.12%
-
+### ![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)
 
 <details>
-<summary>Missing Keys</summary>
+<summary>Missing keys in pt_BR.axaml</summary>
 
 - Text.AIAssistant.Regen
 - Text.AIAssistant.Use
@@ -120,32 +116,8 @@
 
 </details>
 
-### ru_RU.axaml: 100.00%
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing Keys</summary>
-
-
-
-</details>
-
-### zh_CN.axaml: 100.00%
-
-
-<details>
-<summary>Missing Keys</summary>
-
-
-
-</details>
-
-### zh_TW.axaml: 100.00%
-
-
-<details>
-<summary>Missing Keys</summary>
-
-
-
-</details>
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file
diff --git a/build/scripts/localization-check.js b/build/scripts/localization-check.js
index ed89a5e8..1e8f1f0d 100644
--- a/build/scripts/localization-check.js
+++ b/build/scripts/localization-check.js
@@ -6,7 +6,6 @@ const repoRoot = path.join(__dirname, '../../');
 const localesDir = path.join(repoRoot, 'src/Resources/Locales');
 const enUSFile = path.join(localesDir, 'en_US.axaml');
 const outputFile = path.join(repoRoot, 'TRANSLATION.md');
-const readmeFile = path.join(repoRoot, 'README.md');
 
 const parser = new xml2js.Parser();
 
@@ -18,46 +17,36 @@ async function parseXml(filePath) {
 async function calculateTranslationRate() {
     const enUSData = await parseXml(enUSFile);
     const enUSKeys = new Set(enUSData.ResourceDictionary['x:String'].map(item => item.$['x:Key']));
-
-    const translationRates = [];
-    const badges = [];
-
     const files = (await fs.readdir(localesDir)).filter(file => file !== 'en_US.axaml' && file.endsWith('.axaml'));
 
-    // Add en_US badge first
-    badges.push(`[![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)](TRANSLATION.md)`);
+    const lines = [];
+
+    lines.push('# Translation Status');
+    lines.push('This document shows the translation status of each locale file in the repository.');
+    lines.push(`## Details`);
+    lines.push(`### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)`);
 
     for (const file of files) {
+        const locale = file.replace('.axaml', '').replace('_', '__');
         const filePath = path.join(localesDir, file);
         const localeData = await parseXml(filePath);
         const localeKeys = new Set(localeData.ResourceDictionary['x:String'].map(item => item.$['x:Key']));
-
         const missingKeys = [...enUSKeys].filter(key => !localeKeys.has(key));
-        const translationRate = ((enUSKeys.size - missingKeys.length) / enUSKeys.size) * 100;
 
-        translationRates.push(`### ${file}: ${translationRate.toFixed(2)}%\n`);
-        translationRates.push(`<details>\n<summary>Missing Keys</summary>\n\n${missingKeys.map(key => `- ${key}`).join('\n')}\n\n</details>`);
+        if (missingKeys.length > 0) {
+            const progress = ((enUSKeys.size - missingKeys.length) / enUSKeys.size) * 100;
+            const badgeColor = progress >= 75 ? 'yellow' : 'red';
 
-        // Add badges
-        const locale = file.replace('.axaml', '').replace('_', '__');
-        if (translationRate === 100) {
-            badges.push(`[![${locale}](https://img.shields.io/badge/${locale}-%E2%88%9A-brightgreen)](TRANSLATION.md)`);
+            lines.push(`### ![${locale}](https://img.shields.io/badge/${locale}-${progress.toFixed(2)}%25-${badgeColor})`);
+            lines.push(`<details>\n<summary>Missing keys in ${file}</summary>\n\n${missingKeys.map(key => `- ${key}`).join('\n')}\n\n</details>`)
         } else {
-            const badgeColor = translationRate >= 75 ? 'yellow' : 'red';
-            badges.push(`[![${locale}](https://img.shields.io/badge/${locale}-${translationRate.toFixed(2)}%25-${badgeColor})](TRANSLATION.md)`);
-        }        
+            lines.push(`### ![${locale}](https://img.shields.io/badge/${locale}-%E2%88%9A-brightgreen)`);
+        }    
     }
 
-    console.log(translationRates.join('\n\n'));
-
-    await fs.writeFile(outputFile, translationRates.join('\n\n') + '\n', 'utf8');
-
-    // Update README.md
-    let readmeContent = await fs.readFile(readmeFile, 'utf8');
-    const badgeSection = `## Translation Status\n\n${badges.join(' ')}`;
-    console.log(badgeSection);
-    readmeContent = readmeContent.replace(/## Translation Status\n\n.*\n\n/, badgeSection + '\n\n');
-    await fs.writeFile(readmeFile, readmeContent, 'utf8');
+    const content = lines.join('\n\n');
+    console.log(content);
+    await fs.writeFile(outputFile, content, 'utf8');
 }
 
 calculateTranslationRate().catch(err => console.error(err));

From 03f49ccff01a2c3d4aad95a0bebb49b67faf1cb3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Mar 2025 17:35:59 +0800
Subject: [PATCH 300/364] refactor: text diff view block navigation

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/DiffView.axaml        |   7 +-
 src/Views/DiffView.axaml.cs     |  18 +++--
 src/Views/TextDiffView.axaml.cs | 138 +++++++++++++++-----------------
 3 files changed, 77 insertions(+), 86 deletions(-)

diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 12cfa451..c4da158d 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -285,10 +285,9 @@
 
           <!-- Text Diff -->
           <DataTemplate DataType="m:TextDiff">
-            <v:TextDiffView
-              UseSideBySideDiff="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"
-              UseBlockNavigation="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseBlockNavigationInDiffView, Mode=OneWay}"
-              BlockNavigationIndicator="{Binding #BlockNavigationIndicator.Text, Mode=OneWayToSource}"/>
+            <v:TextDiffView UseSideBySideDiff="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"
+                            UseBlockNavigation="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseBlockNavigationInDiffView, Mode=OneWay}"
+                            BlockNavigationChanged="OnBlockNavigationChanged"/>
           </DataTemplate>
 
           <!-- Empty or only EOL changes -->
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index 889f0df7..f0824307 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -13,30 +13,32 @@ namespace SourceGit.Views
 
         private void OnGotoFirstChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<TextDiffView>();
-            textDiff?.GotoFirstChange();
+            this.FindDescendantOfType<TextDiffView>()?.GotoFirstChange();
             e.Handled = true;
         }
 
         private void OnGotoPrevChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<TextDiffView>();
-            textDiff?.GotoPrevChange();
+            this.FindDescendantOfType<TextDiffView>()?.GotoPrevChange();
             e.Handled = true;
         }
 
         private void OnGotoNextChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<TextDiffView>();
-            textDiff?.GotoNextChange();
+            this.FindDescendantOfType<TextDiffView>()?.GotoNextChange();
             e.Handled = true;
         }
 
         private void OnGotoLastChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<TextDiffView>();
-            textDiff?.GotoLastChange();
+            this.FindDescendantOfType<TextDiffView>()?.GotoLastChange();
             e.Handled = true;
         }
+
+        private void OnBlockNavigationChanged(object sender, RoutedEventArgs e)
+        {
+            if (sender is TextDiffView { UseBlockNavigation: true } textDiff)
+                BlockNavigationIndicator.Text = textDiff.BlockNavigation?.Indicator ?? string.Empty;
+        }
     }
 }
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 0d20a990..7b461e57 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -553,7 +553,7 @@ namespace SourceGit.Views
         {
         }
 
-        public void GotoFirstChange()
+        public virtual void GotoFirstChange()
         {
             var blockNavigation = BlockNavigation;
             if (blockNavigation != null)
@@ -567,7 +567,7 @@ namespace SourceGit.Views
             }
         }
 
-        public void GotoPrevChange()
+        public virtual void GotoPrevChange()
         {
             var blockNavigation = BlockNavigation;
             if (blockNavigation != null)
@@ -623,7 +623,7 @@ namespace SourceGit.Views
             }
         }
 
-        public void GotoNextChange()
+        public virtual void GotoNextChange()
         {
             var blockNavigation = BlockNavigation;
             if (blockNavigation != null)
@@ -665,7 +665,7 @@ namespace SourceGit.Views
             }
         }
 
-        public void GotoLastChange()
+        public virtual void GotoLastChange()
         {
             var blockNavigation = BlockNavigation;
             if (blockNavigation != null)
@@ -766,15 +766,13 @@ namespace SourceGit.Views
             {
                 var oldValue = change.OldValue as ViewModels.BlockNavigation;
                 if (oldValue != null)
-                {
                     oldValue.PropertyChanged -= OnBlockNavigationPropertyChanged;
-                    if (oldValue.Current != -1)
-                        TextArea?.TextView?.Redraw();
-                }
 
                 var newValue = change.NewValue as ViewModels.BlockNavigation;
                 if (newValue != null)
                     newValue.PropertyChanged += OnBlockNavigationPropertyChanged;
+
+                TextArea?.TextView?.Redraw();
             }
         }
 
@@ -793,9 +791,10 @@ namespace SourceGit.Views
                 base.OnKeyDown(e);
         }
 
-        private void OnBlockNavigationPropertyChanged(object _1, PropertyChangedEventArgs _2)
+        private void OnBlockNavigationPropertyChanged(object _1, PropertyChangedEventArgs e)
         {
-            TextArea?.TextView?.Redraw();
+            if (e.PropertyName == "Current")
+                TextArea?.TextView?.Redraw();
         }
 
         private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
@@ -1223,19 +1222,18 @@ namespace SourceGit.Views
         {
             base.OnLoaded(e);
 
-            var scroller = this.FindDescendantOfType<ScrollViewer>();
-            if (scroller != null)
+            _scrollViewer = this.FindDescendantOfType<ScrollViewer>();
+            if (_scrollViewer != null)
             {
-                scroller.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
-                scroller.ScrollChanged += OnTextViewScrollChanged;
+                _scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
+                _scrollViewer.ScrollChanged += OnTextViewScrollChanged;
             }
         }
 
         protected override void OnUnloaded(RoutedEventArgs e)
         {
-            var scroller = this.FindDescendantOfType<ScrollViewer>();
-            if (scroller != null)
-                scroller.ScrollChanged -= OnTextViewScrollChanged;
+            if (_scrollViewer != null)
+                _scrollViewer.ScrollChanged -= OnTextViewScrollChanged;
 
             base.OnUnloaded(e);
         }
@@ -1274,9 +1272,11 @@ namespace SourceGit.Views
 
         private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
         {
-            if (sender is ScrollViewer { IsExpanded: true, IsPointerOver: true } scroller)
+            if (_scrollViewer is { IsExpanded: true, IsPointerOver: true })
                 TrySetChunk(null);
         }
+
+        private ScrollViewer _scrollViewer = null;
     }
 
     public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter
@@ -1288,14 +1288,6 @@ namespace SourceGit.Views
             TextArea.LeftMargins.Add(new LineModifyTypeMargin());
         }
 
-        public void ForceSyncScrollOffset()
-        {
-            if (_scrollViewer == null)
-                return;
-            if (DataContext is ViewModels.TwoSideTextDiff diff)
-                diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
-        }
-
         public override List<Models.TextDiffLine> GetLines()
         {
             if (DataContext is ViewModels.TwoSideTextDiff diff)
@@ -1310,6 +1302,30 @@ namespace SourceGit.Views
             return 0;
         }
 
+        public override void GotoFirstChange()
+        {
+            base.GotoFirstChange();
+            DirectSyncScrollOffset();
+        }
+
+        public override void GotoPrevChange()
+        {
+            base.GotoPrevChange();
+            DirectSyncScrollOffset();
+        }
+
+        public override void GotoNextChange()
+        {
+            base.GotoNextChange();
+            DirectSyncScrollOffset();
+        }
+
+        public override void GotoLastChange()
+        {
+            base.GotoLastChange();
+            DirectSyncScrollOffset();
+        }
+
         public override void UpdateSelectedChunk(double y)
         {
             var diff = DataContext as ViewModels.TwoSideTextDiff;
@@ -1497,11 +1513,17 @@ namespace SourceGit.Views
             {
                 diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
 
-                if (sender is ScrollViewer { IsExpanded: true, IsPointerOver: true } scroller )
+                if (_scrollViewer is { IsExpanded: true, IsPointerOver: true } )
                     TrySetChunk(null);
             }
         }
 
+        private void DirectSyncScrollOffset()
+        {
+            if (_scrollViewer is { } && DataContext is ViewModels.TwoSideTextDiff diff)
+                diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
+        }
+
         private ScrollViewer _scrollViewer = null;
     }
 
@@ -1679,13 +1701,13 @@ namespace SourceGit.Views
             set => SetValue(BlockNavigationProperty, value);
         }
 
-        public static readonly StyledProperty<string> BlockNavigationIndicatorProperty =
-            AvaloniaProperty.Register<TextDiffView, string>(nameof(BlockNavigationIndicator));
+        public static readonly RoutedEvent<RoutedEventArgs> BlockNavigationChangedEvent =
+            RoutedEvent.Register<TextDiffView, RoutedEventArgs>(nameof(BlockNavigationChanged), RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
 
-        public string BlockNavigationIndicator
+        public event EventHandler<RoutedEventArgs> BlockNavigationChanged
         {
-            get => GetValue(BlockNavigationIndicatorProperty);
-            set => SetValue(BlockNavigationIndicatorProperty, value);
+            add { AddHandler(BlockNavigationChangedEvent, value); }
+            remove { RemoveHandler(BlockNavigationChangedEvent, value); }
         }
 
         static TextDiffView()
@@ -1723,54 +1745,26 @@ namespace SourceGit.Views
 
         public void GotoFirstChange()
         {
-            var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (presenter == null)
-                return;
-
-            presenter.GotoFirstChange();
-            if (presenter is SingleSideTextDiffPresenter singleSide)
-                singleSide.ForceSyncScrollOffset();
-
-            BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
+            this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoFirstChange();
+            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
         }
 
         public void GotoPrevChange()
         {
-            var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (presenter == null)
-                return;
-
-            presenter.GotoPrevChange();
-            if (presenter is SingleSideTextDiffPresenter singleSide)
-                singleSide.ForceSyncScrollOffset();
-
-            BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
+            this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoPrevChange();
+            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
         }
 
         public void GotoNextChange()
         {
-            var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (presenter == null)
-                return;
-
-            presenter.GotoNextChange();
-            if (presenter is SingleSideTextDiffPresenter singleSide)
-                singleSide.ForceSyncScrollOffset();
-
-            BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
+            this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoNextChange();
+            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
         }
 
         public void GotoLastChange()
         {
-            var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (presenter == null)
-                return;
-
-            presenter.GotoLastChange();
-            if (presenter is SingleSideTextDiffPresenter singleSide)
-                singleSide.ForceSyncScrollOffset();
-
-            BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
+            this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoLastChange();
+            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
         }
 
         protected override void OnDataContextChanged(EventArgs e)
@@ -1820,15 +1814,11 @@ namespace SourceGit.Views
         private void RefreshBlockNavigation()
         {
             if (UseBlockNavigation)
-            {
                 BlockNavigation = new ViewModels.BlockNavigation(Editor.Content);
-                BlockNavigationIndicator = BlockNavigation.Indicator;
-            }
             else
-            {
                 BlockNavigation = null;
-                BlockNavigationIndicator = "-/-";
-            }
+
+            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
         }
 
         private void OnStageChunk(object _1, RoutedEventArgs _2)

From 9590f96a449124187b1a6ad4e06cbe42f58e26ca Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Mar 2025 17:46:11 +0800
Subject: [PATCH 301/364] enhance: clear highlight chunk while scrolling out of
 `TextArea.TextView`

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

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 7b461e57..c55719de 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1272,7 +1272,7 @@ namespace SourceGit.Views
 
         private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
         {
-            if (_scrollViewer is { IsExpanded: true, IsPointerOver: true })
+            if (!TextArea.TextView.IsPointerOver)
                 TrySetChunk(null);
         }
 
@@ -1513,7 +1513,7 @@ namespace SourceGit.Views
             {
                 diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
 
-                if (_scrollViewer is { IsExpanded: true, IsPointerOver: true } )
+                if (!TextArea.TextView.IsPointerOver)
                     TrySetChunk(null);
             }
         }

From d335cac167e817c2581921259ca40569f605d855 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 21 Mar 2025 18:00:46 +0800
Subject: [PATCH 302/364] enhance: only raise `BlockNavigationChangedEvent`
 when `UseBlockNavigation` enabled

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/DiffView.axaml.cs     |  2 +-
 src/Views/TextDiffView.axaml.cs | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index f0824307..9dd27f24 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -37,7 +37,7 @@ namespace SourceGit.Views
 
         private void OnBlockNavigationChanged(object sender, RoutedEventArgs e)
         {
-            if (sender is TextDiffView { UseBlockNavigation: true } textDiff)
+            if (sender is TextDiffView textDiff)
                 BlockNavigationIndicator.Text = textDiff.BlockNavigation?.Indicator ?? string.Empty;
         }
     }
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index c55719de..7ce9f288 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1746,25 +1746,25 @@ namespace SourceGit.Views
         public void GotoFirstChange()
         {
             this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoFirstChange();
-            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
+            TryRaiseBlockNavigationChanged();
         }
 
         public void GotoPrevChange()
         {
             this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoPrevChange();
-            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
+            TryRaiseBlockNavigationChanged();
         }
 
         public void GotoNextChange()
         {
             this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoNextChange();
-            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
+            TryRaiseBlockNavigationChanged();
         }
 
         public void GotoLastChange()
         {
             this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoLastChange();
-            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
+            TryRaiseBlockNavigationChanged();
         }
 
         protected override void OnDataContextChanged(EventArgs e)
@@ -1818,7 +1818,7 @@ namespace SourceGit.Views
             else
                 BlockNavigation = null;
 
-            RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
+            TryRaiseBlockNavigationChanged();
         }
 
         private void OnStageChunk(object _1, RoutedEventArgs _2)
@@ -1990,5 +1990,11 @@ namespace SourceGit.Views
             repo.MarkWorkingCopyDirtyManually();
             repo.SetWatcherEnabled(true);
         }
+
+        private void TryRaiseBlockNavigationChanged()
+        {
+            if (UseBlockNavigation)
+                RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
+        }
     }
 }

From 88bb603dc9686ff54a738219678590091db0b929 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Mar 2025 09:44:41 +0800
Subject: [PATCH 303/364] version: Release 2025.10

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

diff --git a/VERSION b/VERSION
index 23993bfb..e78345d1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.09
\ No newline at end of file
+2025.10
\ No newline at end of file

From 0a877c6730ecc44ca16e32b670dd4bcf348c42d3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Mar 2025 10:03:27 +0800
Subject: [PATCH 304/364] project: upgrade `OpenAI` and `Azure.AI.OpenAI` to
 `2.2.0-beta.4`

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

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 3578d59f..2a4b3c91 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -48,10 +48,10 @@
     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.5" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.2.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.2.0" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.2" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.4" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc5.4" />
-    <PackageReference Include="OpenAI" Version="2.2.0-beta.2" />
+    <PackageReference Include="OpenAI" Version="2.2.0-beta.4" />
     <PackageReference Include="TextMateSharp" Version="1.0.66" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.66" />
   </ItemGroup>

From fc85dd3269bb3c122b36d8b43f7612dd8e242d03 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Mar 2025 19:28:16 +0800
Subject: [PATCH 305/364] enhance: improve `Repository.Open()` performance
 (#1121)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Launcher.cs | 47 +++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 06479394..9ae99b33 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -275,22 +275,16 @@ namespace SourceGit.ViewModels
 
             if (!Path.Exists(node.Id))
             {
-                var ctx = page == null ? ActivePage.Node.Id : page.Node.Id;
-                App.RaiseException(ctx, "Repository does NOT exists any more. Please remove it.");
+                App.RaiseException(node.Id, "Repository does NOT exists any more. Please remove it.");
                 return;
             }
 
             var isBare = new Commands.IsBareRepository(node.Id).Result();
-            var gitDir = node.Id;
-            if (!isBare)
+            var gitDir = isBare ? node.Id : GetRepositoryGitDir(node.Id);
+            if (string.IsNullOrEmpty(gitDir))
             {
-                gitDir = new Commands.QueryGitDir(node.Id).Result();
-                if (string.IsNullOrEmpty(gitDir))
-                {
-                    var ctx = page == null ? ActivePage.Node.Id : page.Node.Id;
-                    App.RaiseException(ctx, "Given path is not a valid git repository!");
-                    return;
-                }
+                App.RaiseException(node.Id, "Given path is not a valid git repository!");
+                return;
             }
 
             var repo = new Repository(isBare, node.Id, gitDir);
@@ -469,6 +463,37 @@ namespace SourceGit.ViewModels
             return menu;
         }
 
+        private string GetRepositoryGitDir(string repo)
+        {
+            var fullpath = Path.Combine(repo, ".git");
+            if (Directory.Exists(fullpath))
+            {
+                if (Directory.Exists(Path.Combine(fullpath, "refs")) &&
+                    Directory.Exists(Path.Combine(fullpath, "objects")) &&
+                    File.Exists(Path.Combine(fullpath, "HEAD")))
+                    return fullpath;
+
+                return null;
+            }
+
+            if (File.Exists(fullpath))
+            {
+                var redirect = File.ReadAllText(fullpath).Trim();
+                if (redirect.StartsWith("gitdir: ", StringComparison.Ordinal))
+                    redirect = redirect.Substring(8);
+
+                if (!Path.IsPathRooted(redirect))
+                    redirect = Path.GetFullPath(Path.Combine(repo, redirect));
+
+                if (Directory.Exists(redirect))
+                    return redirect;
+
+                return null;
+            }
+
+            return new Commands.QueryGitDir(repo).Result();
+        }
+
         private void SwitchWorkspace(Workspace to)
         {
             foreach (var one in Pages)

From 380e6713b5418ee9f27a7b9bb5dd7e6c4556de82 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, 24 Mar 2025 19:51:22 -0600
Subject: [PATCH 306/364] localization: update spanish translations (#1124)

---
 src/Resources/Locales/es_ES.axaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index e7e953e5..2f4a7230 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -475,6 +475,7 @@
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commits en el historial</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostrar hora del autor en lugar de la hora del commit en el gráfico</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Mostrar hijos en los detalles de commit</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Mostrar etiquetas en el gráfico de commit</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Longitud de la guía del asunto</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">Habilitar Auto CRLF</x:String>
@@ -604,7 +605,7 @@
   <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">Por Fecha de Creación</x:String>
   <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">Por Nombre (Ascendiente)</x:String>
   <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">Por Nombre (Descendiente)</x:String>
-  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Sort</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Ordenar</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Abrir en Terminal</x:String>
   <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Usar tiempo relativo en las historias</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREES</x:String>

From 467089aec55005918bd42ba1294234bb06ee8bd0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 01:51:33 +0000
Subject: [PATCH 307/364] doc: Update translation status and missing keys

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

diff --git a/TRANSLATION.md b/TRANSLATION.md
index a96f0fc6..30a2a679 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -22,14 +22,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
-
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.Preferences.General.ShowTagsInGraph
-
-</details>
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
 ### ![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)
 

From f37ac904b9b2babddbba5b970f45de583e30fc33 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 25 Mar 2025 10:33:39 +0800
Subject: [PATCH 308/364] =?UTF-8?q?enhance:=20do=20not=20create=20crash=20?=
 =?UTF-8?q?log=20for=20unobserved=20task=20exceptions=20(#1121=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.axaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index af5e6177..86c5200c 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -37,7 +37,6 @@ namespace SourceGit
 
             TaskScheduler.UnobservedTaskException += (_, e) =>
             {
-                LogException(e.Exception);
                 e.SetObserved();
             };
 

From ca0fb7ae1090068de4a7a42de113d0c9c4e203ff Mon Sep 17 00:00:00 2001
From: Iacopo Sbalchiero <iacoposb@gmail.com>
Date: Wed, 26 Mar 2025 02:27:10 +0100
Subject: [PATCH 309/364] Adding template for Azure DevOps workitems (#1128)

* feat: add Azure DevOps issue tracker integration

* localization: add Azure DevOps sample rule to issue tracker in multiple languages
---
 src/Resources/Locales/en_US.axaml     | 1 +
 src/Resources/Locales/es_ES.axaml     | 1 +
 src/Resources/Locales/fr_FR.axaml     | 1 +
 src/Resources/Locales/it_IT.axaml     | 1 +
 src/Resources/Locales/pt_BR.axaml     | 1 +
 src/Resources/Locales/ru_RU.axaml     | 1 +
 src/ViewModels/RepositoryConfigure.cs | 5 +++++
 src/Views/RepositoryConfigure.axaml   | 1 +
 8 files changed, 12 insertions(+)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index f24d6c65..75d312ea 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -160,6 +160,7 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Add Sample GitLab Issue Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Add Sample GitLab Merge Request Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Add Sample Jira Rule</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Add Sample Azure DevOps Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">New Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Issue Regex Expression:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Rule Name:</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 2f4a7230..e1eccaa7 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -161,6 +161,7 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Añadir Regla de Ejemplo para Pull Requests de Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Añadir Regla de Ejemplo para Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Añadir Regla de Ejemplo para Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Añadir Regla de Ejemplo para Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Añadir Regla de Ejemplo para Incidencias de GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Añadir Regla de Ejemplo para Merge Requests de GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nueva Regla</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 19c0859c..1c3d7d34 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -151,6 +151,7 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Ajouter une règle d'exemple pour Pull Request Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Ajouter une règle d'exemple Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Ajouter une règle d'exemple Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Ajouter une règle d'exemple Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Ajouter une règle d'exemple pour Incidents GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Ajouter une règle d'exemple pour Merge Request GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nouvelle règle</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index d002dfef..da7d18d1 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -161,6 +161,7 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Aggiungi una regola di esempio per un Pull Request Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Aggiungi una regola di esempio per GitHub</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi una regola di esempio per Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Aggiungi una regola di esempio per Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Aggiungi una regola di esempio per Issue GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Aggiungi una regola di esempio per una Merge Request GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nuova Regola</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index e811cf3e..e799741c 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -168,6 +168,7 @@
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">RASTREADOR DE PROBLEMAS</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Adicionar Regra de Exemplo do Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Adicionar Regra de Exemplo do Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Adicionar Regra de Exemplo do Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Adicionar Regra de Exemplo do GitLab </x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Adicionar regra de exemplo de Merge Request do GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nova Regra</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 707c9ed9..53f04a5b 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -161,6 +161,7 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Добавить пример правила запроса скачивания из Gitea</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Добавить пример правила для Git</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Добавить пример правила Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Добавить пример правила Azure DevOps</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</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Новое правило</x:String>
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index cf23b6d8..3f590758 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -203,6 +203,11 @@ namespace SourceGit.ViewModels
             SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Jira Tracker", "PROJ-(\\d+)", "https://jira.yourcompany.com/browse/PROJ-$1");
         }
 
+        public void AddSampleAzureWorkItemTracker()
+        {
+            SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Azure DevOps Tracker", "#(\\d+)", "https://dev.azure.com/yourcompany/workspace/_workitems/edit/$1");
+        }
+
         public void AddSampleGitLabIssueTracker()
         {
             var link = "https://gitlab.com/username/repository/-/issues/$1";
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index de777800..e41375b9 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -283,6 +283,7 @@
                       <MenuItem Header="-"/>
                       <MenuItem Header="{DynamicResource Text.Configure.IssueTracker.AddSampleGithub}" Command="{Binding AddSampleGithubIssueTracker}"/>
                       <MenuItem Header="{DynamicResource Text.Configure.IssueTracker.AddSampleJira}" Command="{Binding AddSampleJiraIssueTracker}"/>
+                      <MenuItem Header="{DynamicResource Text.Configure.IssueTracker.AddSampleAzure}" Command="{Binding AddSampleAzureWorkItemTracker}"/>
                       <MenuItem Header="{DynamicResource Text.Configure.IssueTracker.AddSampleGitLabIssue}" Command="{Binding AddSampleGitLabIssueTracker}"/>
                       <MenuItem Header="{DynamicResource Text.Configure.IssueTracker.AddSampleGitLabMergeRequest}" Command="{Binding AddSampleGitLabMergeRequestTracker}"/>
                       <MenuItem Header="{DynamicResource Text.Configure.IssueTracker.AddSampleGiteeIssue}" Command="{Binding AddSampleGiteeIssueTracker}"/>

From dccf53e51823a8da0eceaa3059d408d6f35c15d3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 01:27:21 +0000
Subject: [PATCH 310/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 30a2a679..b6ba3ed3 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,13 +6,14 @@ 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-98.92%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-98.79%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
 - Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.WaitForExit
+- Text.Configure.IssueTracker.AddSampleAzure
 - Text.Diff.First
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
@@ -35,7 +36,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-91.13%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -111,6 +112,20 @@ This document shows the translation status of each locale file in the repository
 
 ### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-99.87%25-yellow)
 
-### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file
+<details>
+<summary>Missing keys in zh_CN.axaml</summary>
+
+- Text.Configure.IssueTracker.AddSampleAzure
+
+</details>
+
+### ![zh__TW](https://img.shields.io/badge/zh__TW-99.87%25-yellow)
+
+<details>
+<summary>Missing keys in zh_TW.axaml</summary>
+
+- Text.Configure.IssueTracker.AddSampleAzure
+
+</details>
\ No newline at end of file

From 4fb853d1fd91d13e852f64556808705cd345be45 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 26 Mar 2025 09:30:41 +0800
Subject: [PATCH 311/364] localization: add translation
 `Text.Configure.IssueTracker.AddSampleAzure` for Chinese (#1128)

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

diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 93d08bd0..ad9b4179 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -157,6 +157,7 @@
   <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.IssueTracker" xml:space="preserve">ISSUE追踪</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">新增匹配Azure DevOps规则</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合并请求规则</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">新增匹配Github Issue规则</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index d5a7a77c..173ad099 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -157,6 +157,7 @@
   <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.IssueTracker" xml:space="preserve">Issue 追蹤</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">新增符合 Azure DevOps 規則</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 合併請求規則</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">新增符合 GitHub Issue 規則</x:String>

From fc3767754621a0f50b833f7e2259e41b7cd8caad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 01:30:58 +0000
Subject: [PATCH 312/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index b6ba3ed3..183e77e6 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -112,20 +112,6 @@ This document shows the translation status of each locale file in the repository
 
 ### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.87%25-yellow)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in zh_CN.axaml</summary>
-
-- Text.Configure.IssueTracker.AddSampleAzure
-
-</details>
-
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.87%25-yellow)
-
-<details>
-<summary>Missing keys in zh_TW.axaml</summary>
-
-- Text.Configure.IssueTracker.AddSampleAzure
-
-</details>
\ No newline at end of file
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file

From 4153eec1a8594e67f7b70f81812042886af50dec Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Wed, 26 Mar 2025 12:15:15 +0800
Subject: [PATCH 313/364] chore: Update DEB package configuration with
 installed size (#1130)

---
 build/resources/deb/DEBIAN/control |  3 ++-
 build/scripts/package.linux.sh     | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/build/resources/deb/DEBIAN/control b/build/resources/deb/DEBIAN/control
index f553db8b..71786b43 100755
--- a/build/resources/deb/DEBIAN/control
+++ b/build/resources/deb/DEBIAN/control
@@ -1,7 +1,8 @@
 Package: sourcegit
-Version: 8.23
+Version: 2025.10
 Priority: optional
 Depends: libx11-6, libice6, libsm6, libicu | libicu76 | libicu74 | libicu72 | libicu71 | libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu63 | libicu60 | libicu57 | libicu55 | libicu52, xdg-utils
 Architecture: amd64
+Installed-Size: 60440
 Maintainer: longshuang@msn.cn
 Description: Open-source & Free Git GUI Client
diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 5abb058b..1b4adbdc 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -56,8 +56,15 @@ cp -f SourceGit/* resources/deb/opt/sourcegit
 ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
 cp -r resources/_common/applications resources/deb/usr/share
 cp -r resources/_common/icons resources/deb/usr/share
-sed -i -e "s/^Version:.*/Version: $VERSION/" -e "s/^Architecture:.*/Architecture: $arch/" resources/deb/DEBIAN/control
-dpkg-deb --root-owner-group --build resources/deb "sourcegit_$VERSION-1_$arch.deb"
+# Calculate installed size in KB
+installed_size=$(du -sk resources/deb | cut -f1)
+# Update the control file
+sed -i -e "s/^Version:.*/Version: $VERSION/" \
+    -e "s/^Architecture:.*/Architecture: $arch/" \
+    -e "s/^Installed-Size:.*/Installed-Size: $installed_size/" \
+    resources/deb/DEBIAN/control
+# Build deb package with gzip compression
+dpkg-deb -Zgzip --root-owner-group --build resources/deb "sourcegit_$VERSION-1_$arch.deb"
 
 rpmbuild -bb --target="$target" resources/rpm/SPECS/build.spec --define "_topdir $(pwd)/resources/rpm" --define "_version $VERSION"
 mv "resources/rpm/RPMS/$target/sourcegit-$VERSION-1.$target.rpm" ./

From 1575ae977eb1ba1923e2d02e0521a90064aa7b95 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Thu, 27 Mar 2025 20:22:46 +0800
Subject: [PATCH 314/364] fix: improve font family name handling by collapsing
 multiple spaces (#1131)

---
 src/App.axaml.cs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 86c5200c..0448a247 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -559,8 +559,22 @@ namespace SourceGit
             foreach (var part in parts)
             {
                 var t = part.Trim();
-                if (!string.IsNullOrEmpty(t))
-                    trimmed.Add(t);
+                if (string.IsNullOrEmpty(t))
+                    continue;
+
+                // Collapse multiple spaces into single space
+                var prevChar = '\0';
+                var sb = new StringBuilder();
+
+                foreach (var c in t)
+                {
+                    if (c == ' ' && prevChar == ' ')
+                        continue;
+                    sb.Append(c);
+                    prevChar = c;
+                }
+
+                trimmed.Add(sb.ToString());
             }
 
             return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;

From 56ebc182f2fa244276c2c1014c978ef7cb72c32f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Mar 2025 12:20:36 +0800
Subject: [PATCH 315/364] enhance: try to reinstate not onl the working tree's
 change, but also the index's ones (#1135)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Stash.cs             | 2 +-
 src/Resources/Locales/de_DE.axaml | 1 -
 src/Resources/Locales/en_US.axaml | 1 -
 src/Resources/Locales/es_ES.axaml | 1 -
 src/Resources/Locales/fr_FR.axaml | 1 -
 src/Resources/Locales/it_IT.axaml | 1 -
 src/Resources/Locales/pt_BR.axaml | 1 -
 src/Resources/Locales/ru_RU.axaml | 1 -
 src/Resources/Locales/zh_CN.axaml | 1 -
 src/Resources/Locales/zh_TW.axaml | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index 7acfdf38..7d1a269b 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -82,7 +82,7 @@ namespace SourceGit.Commands
 
         public bool Pop(string name)
         {
-            Args = $"stash pop -q \"{name}\"";
+            Args = $"stash pop -q --index \"{name}\"";
             return Exec();
         }
 
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 7144ef43..ba6592e9 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -650,7 +650,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Lokale Änderungen stashen</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Anwenden</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Entfernen</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Anwenden und entfernen</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Stash entfernen</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Entfernen:</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 75d312ea..5c400979 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -655,7 +655,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stash Local Changes</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Apply</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Drop</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
   <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Save as Patch...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Drop Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Drop:</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index e1eccaa7..54cb588d 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -659,7 +659,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stash Cambios Locales</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Aplicar</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Eliminar</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
   <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Guardar como Parche...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Eliminar Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Eliminar:</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 1c3d7d34..2dcd52ab 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -600,7 +600,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stash les changements locaux</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Appliquer</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Effacer</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Extraire</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Effacer le Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Effacer :</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index da7d18d1..e973a99c 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -659,7 +659,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stasha Modifiche Locali</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Applica</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Elimina</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Estrai</x:String>
   <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Salva come Patch...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Elimina Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Elimina:</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index e799741c..8ff00158 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -620,7 +620,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Guardar Alterações Locais</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Aplicar</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Descartar Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Descartar:</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 53f04a5b..ede88a10 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -660,7 +660,6 @@
   <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.Drop" xml:space="preserve">Отбросить</x:String>
-  <x:String x:Key="Text.StashCM.Pop" 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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index ad9b4179..783e5696 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -659,7 +659,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">贮藏本地变更</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">应用(apply)</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">删除(drop)</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">应用并删除(pop)</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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 173ad099..c10d195f 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -658,7 +658,6 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">擱置本機變更</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">套用 (apply)</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">刪除 (drop)</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">套用並刪除 (pop)</x:String>
   <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">另存為修補檔 (patch)...</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>

From b26c8a64ad7ebf62e450ca6b121bd0ab3fc14860 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Mar 2025 04:20:55 +0000
Subject: [PATCH 316/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 183e77e6..b51fa09b 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -36,7 +36,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-91.13%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>

From 276d000bcf66c8e5f686cc3eba0f98d486ee0cf9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 28 Mar 2025 18:01:15 +0800
Subject: [PATCH 317/364] refactor: change `Copy File Name` to `Copy Full Path`
 for selected file or change (#1132)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/OS.cs                  |  9 +++++++++
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/en_US.axaml |  2 +-
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/fr_FR.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/pt_BR.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  2 +-
 src/Resources/Locales/zh_TW.axaml |  2 +-
 src/ViewModels/BranchCompare.cs   | 12 ++++++------
 src/ViewModels/CommitDetail.cs    | 24 ++++++++++++------------
 src/ViewModels/RevisionCompare.cs | 12 ++++++------
 src/ViewModels/StashesPage.cs     | 12 ++++++------
 src/ViewModels/WorkingCopy.cs     | 24 ++++++++++++------------
 15 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/Native/OS.cs b/src/Native/OS.cs
index f11d1e7f..320b5208 100644
--- a/src/Native/OS.cs
+++ b/src/Native/OS.cs
@@ -162,6 +162,15 @@ namespace SourceGit.Native
             _backend.OpenWithDefaultEditor(file);
         }
 
+        public static string GetAbsPath(string root, string sub)
+        {
+            var fullpath = Path.Combine(root, sub);
+            if (OperatingSystem.IsWindows())
+                return fullpath.Replace('/', '\\');
+
+            return fullpath;
+        }
+
         private static void UpdateGitVersion()
         {
             if (string.IsNullOrEmpty(_gitExecutable) || !File.Exists(_gitExecutable))
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index ba6592e9..bbfe4545 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -186,7 +186,6 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Kopieren</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Kopiere gesamten Text</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Pfad kopieren</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Dateinamen kopieren</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Branch erstellen...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basierend auf:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Erstellten Branch auschecken</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5c400979..5ff1e3a4 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -186,7 +186,7 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copy</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copy All Text</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copy Path</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copy File Name</x:String>
+  <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copy Full Path</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Create Branch...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Based On:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Check out the created branch</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 54cb588d..d8018097 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -189,7 +189,6 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar Todo el Texto</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Ruta</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copiar Nombre del Archivo</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Crear Rama...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basado En:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 2dcd52ab..70d0af22 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -178,7 +178,6 @@
   <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Type de Changement :</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Copier</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copier tout le texte</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copier le nom de fichier</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copier le chemin</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Créer une branche...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basé sur :</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index e973a99c..85038d9e 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -189,7 +189,6 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copia</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copia Tutto il Testo</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copia Percorso</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copia Nome File</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Crea Branch...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basato Su:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout del Branch Creato</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 8ff00158..4ee6cdbc 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -196,7 +196,6 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar todo o texto</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Caminho</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copiar Nome do Arquivo</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Criar Branch...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Baseado Em:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checar o branch criado</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index ede88a10..2d48d127 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -190,7 +190,6 @@
   <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.CopyPath" xml:space="preserve">Копировать путь</x:String>
-  <x:String x:Key="Text.CopyFileName" 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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 783e5696..8d2b4f1e 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -189,7 +189,7 @@
   <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.CopyPath" xml:space="preserve">复制路径</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">复制文件名</x:String>
+  <x:String x:Key="Text.CopyFullPath" 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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index c10d195f..8e823f68 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -189,7 +189,7 @@
   <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.CopyPath" xml:space="preserve">複製路徑</x:String>
-  <x:String x:Key="Text.CopyFileName" xml:space="preserve">複製檔案名稱</x:String>
+  <x:String x:Key="Text.CopyFullPath" 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>
diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs
index b3c0009c..4edb978c 100644
--- a/src/ViewModels/BranchCompare.cs
+++ b/src/ViewModels/BranchCompare.cs
@@ -163,15 +163,15 @@ namespace SourceGit.ViewModels
             };
             menu.Items.Add(copyPath);
 
-            var copyFileName = new MenuItem();
-            copyFileName.Header = App.Text("CopyFileName");
-            copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-            copyFileName.Click += (_, e) =>
+            var copyFullPath = new MenuItem();
+            copyFullPath.Header = App.Text("CopyFullPath");
+            copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFullPath.Click += (_, e) =>
             {
-                App.CopyText(Path.GetFileName(change.Path));
+                App.CopyText(Native.OS.GetAbsPath(_repo, change.Path));
                 e.Handled = true;
             };
-            menu.Items.Add(copyFileName);
+            menu.Items.Add(copyFullPath);
 
             return menu;
         }
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 34ac8308..d04e674b 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -425,17 +425,17 @@ namespace SourceGit.ViewModels
                 ev.Handled = true;
             };
 
-            var copyFileName = new MenuItem();
-            copyFileName.Header = App.Text("CopyFileName");
-            copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-            copyFileName.Click += (_, e) =>
+            var copyFullPath = new MenuItem();
+            copyFullPath.Header = App.Text("CopyFullPath");
+            copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFullPath.Click += (_, e) =>
             {
-                App.CopyText(Path.GetFileName(change.Path));
+                App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
                 e.Handled = true;
             };
 
             menu.Items.Add(copyPath);
-            menu.Items.Add(copyFileName);
+            menu.Items.Add(copyFullPath);
             return menu;
         }
 
@@ -562,17 +562,17 @@ namespace SourceGit.ViewModels
                 ev.Handled = true;
             };
 
-            var copyFileName = new MenuItem();
-            copyFileName.Header = App.Text("CopyFileName");
-            copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-            copyFileName.Click += (_, e) =>
+            var copyFullPath = new MenuItem();
+            copyFullPath.Header = App.Text("CopyFullPath");
+            copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFullPath.Click += (_, e) =>
             {
-                App.CopyText(Path.GetFileName(file.Path));
+                App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, file.Path));
                 e.Handled = true;
             };
 
             menu.Items.Add(copyPath);
-            menu.Items.Add(copyFileName);
+            menu.Items.Add(copyFullPath);
             return menu;
         }
 
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
index 77a408e0..3b5717a6 100644
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@@ -183,15 +183,15 @@ namespace SourceGit.ViewModels
             };
             menu.Items.Add(copyPath);
 
-            var copyFileName = new MenuItem();
-            copyFileName.Header = App.Text("CopyFileName");
-            copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-            copyFileName.Click += (_, e) =>
+            var copyFullPath = new MenuItem();
+            copyFullPath.Header = App.Text("CopyFullPath");
+            copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFullPath.Click += (_, e) =>
             {
-                App.CopyText(Path.GetFileName(change.Path));
+                App.CopyText(Native.OS.GetAbsPath(_repo, change.Path));
                 e.Handled = true;
             };
-            menu.Items.Add(copyFileName);
+            menu.Items.Add(copyFullPath);
 
             return menu;
         }
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 77ed5551..e69d9bb5 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -251,12 +251,12 @@ namespace SourceGit.ViewModels
                 ev.Handled = true;
             };
 
-            var copyFileName = new MenuItem();
-            copyFileName.Header = App.Text("CopyFileName");
-            copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-            copyFileName.Click += (_, e) =>
+            var copyFullPath = new MenuItem();
+            copyFullPath.Header = App.Text("CopyFullPath");
+            copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFullPath.Click += (_, e) =>
             {
-                App.CopyText(Path.GetFileName(change.Path));
+                App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
                 e.Handled = true;
             };
 
@@ -267,7 +267,7 @@ namespace SourceGit.ViewModels
             menu.Items.Add(resetToThisRevision);
             menu.Items.Add(new MenuItem { Header = "-" });
             menu.Items.Add(copyPath);
-            menu.Items.Add(copyFileName);
+            menu.Items.Add(copyFullPath);
 
             return menu;
         }
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index f9ddb288..40b4c50c 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -903,15 +903,15 @@ namespace SourceGit.ViewModels
                 };
                 menu.Items.Add(copy);
 
-                var copyFileName = new MenuItem();
-                copyFileName.Header = App.Text("CopyFileName");
-                copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyFileName.Click += (_, e) =>
+                var copyFullPath = new MenuItem();
+                copyFullPath.Header = App.Text("CopyFullPath");
+                copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                copyFullPath.Click += (_, e) =>
                 {
-                    App.CopyText(Path.GetFileName(change.Path));
+                    App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
                     e.Handled = true;
                 };
-                menu.Items.Add(copyFileName);
+                menu.Items.Add(copyFullPath);
             }
             else
             {
@@ -1270,17 +1270,17 @@ namespace SourceGit.ViewModels
                     e.Handled = true;
                 };
 
-                var copyFileName = new MenuItem();
-                copyFileName.Header = App.Text("CopyFileName");
-                copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyFileName.Click += (_, e) =>
+                var copyFullPath = new MenuItem();
+                copyFullPath.Header = App.Text("CopyFullPath");
+                copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                copyFullPath.Click += (_, e) =>
                 {
-                    App.CopyText(Path.GetFileName(change.Path));
+                    App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
                     e.Handled = true;
                 };
 
                 menu.Items.Add(copyPath);
-                menu.Items.Add(copyFileName);
+                menu.Items.Add(copyFullPath);
             }
             else
             {

From ce7196490a5d7143f7502ea8b4aad89a3c719ab8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Mar 2025 10:02:16 +0000
Subject: [PATCH 318/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index b51fa09b..c79847be 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-98.79%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-98.65%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -14,6 +14,7 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.IssueTracker.AddSampleAzure
+- Text.CopyFullPath
 - Text.Diff.First
 - Text.Diff.Last
 - Text.Preferences.AI.Streaming
@@ -23,20 +24,35 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)
+<details>
+<summary>Missing keys in es_ES.axaml</summary>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-99.87%25-yellow)
+- Text.CopyFullPath
+
+</details>
+
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.87%25-yellow)
+
+<details>
+<summary>Missing keys in fr_FR.axaml</summary>
+
+- Text.CopyFullPath
+
+</details>
+
+### ![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
+- Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-91.12%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-90.98%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -59,6 +75,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
+- Text.CopyFullPath
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
@@ -110,7 +127,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.87%25-yellow)
+
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.CopyFullPath
+
+</details>
 
 ### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 

From 1482a005bb616d5f16926ec77d469e324ce1095a Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Mon, 31 Mar 2025 04:20:54 +0300
Subject: [PATCH 319/364] localization: update and fix translation russian
 (#1136)

---
 src/Resources/Locales/ru_RU.axaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 2d48d127..2ea274d1 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -190,6 +190,7 @@
   <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.CopyPath" xml:space="preserve">Копировать путь</x:String>
+  <x:String x:Key="Text.CopyFullPath" 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>
@@ -212,7 +213,7 @@
   <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.CtrlClickTip" xml:space="preserve">Удерживайте Ctrl, чтобы сразу начать</x:String>
   <x:String x:Key="Text.Cut" 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>
@@ -330,7 +331,7 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Добавить шаблон отслеживания в LFS Git</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Извлечь</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Извлечь объекты LFS</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Запустить «git lfs fetch», чтобы загрузить объекты LFS Git. При этом рабочая копия не обновляется.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Запустить (git lfs fetch), чтобы загрузить объекты LFS Git. При этом рабочая копия не обновляется.</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Установить перехват LFS Git</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>
@@ -340,10 +341,10 @@
   <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">Запустить «git lfs prune», чтобы удалить старые файлы LFS из локального хранилища</x:String>
+  <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Запустить (git lfs prune), чтобы удалить старые файлы LFS из локального хранилища</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Забрать</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Забрать объекты LFS</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Запустить «git lfs pull», чтобы загрузить все файлы LFS Git для текущей ссылки и проверить</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Запустить (git lfs pull), чтобы загрузить все файлы LFS Git для текущей ссылки и проверить</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Выложить</x:String>
   <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Выложить объекты LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Отправляйте большие файлы, помещенные в очередь, в конечную точку LFS Git</x:String>
@@ -557,7 +558,7 @@
   <x:String x:Key="Text.Repository.Abort" xml:space="preserve">Отказ</x:String>
   <x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">Автоматическое извлечение изменений с внешних репозиторий...</x:String>
   <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Очистить (Сбор мусора и удаление) </x:String>
-  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">Запустить команду «git gc» для данного репозитория.</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.Configure" xml:space="preserve">Настройка репозитория</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">ПРОДОЛЖИТЬ</x:String>

From 9ee3a00fbae017de54c33f56ff0d0d3d1b53e29c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Mar 2025 01:21:15 +0000
Subject: [PATCH 320/364] doc: Update translation status and missing keys

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

diff --git a/TRANSLATION.md b/TRANSLATION.md
index c79847be..341fdce0 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -127,14 +127,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.87%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.CopyFullPath
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 

From 07d99f5fd28cae320cf20b229438ead47ca68e79 Mon Sep 17 00:00:00 2001
From: qiufengshe <sunqiusheng827@126.com>
Date: Mon, 31 Mar 2025 09:21:38 +0800
Subject: [PATCH 321/364] enhance: get email hash code opimization (#1137)

(cherry picked from commit 839b92a284d6b103894f6a8a39e5ce1f99bb12fa)
---
 src/Models/AvatarManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Models/AvatarManager.cs b/src/Models/AvatarManager.cs
index 9f0bceaf..a506d886 100644
--- a/src/Models/AvatarManager.cs
+++ b/src/Models/AvatarManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -196,8 +196,8 @@ namespace SourceGit.Models
         private string GetEmailHash(string email)
         {
             var lowered = email.ToLower(CultureInfo.CurrentCulture).Trim();
-            var hash = MD5.Create().ComputeHash(Encoding.Default.GetBytes(lowered));
-            var builder = new StringBuilder();
+            var hash = MD5.HashData(Encoding.Default.GetBytes(lowered).AsSpan());
+            var builder = new StringBuilder(hash.Length * 2);
             foreach (var c in hash)
                 builder.Append(c.ToString("x2"));
             return builder.ToString();

From 0045e06d7888ea1463e6f2291bfe8b76d927b563 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 31 Mar 2025 09:29:07 +0800
Subject: [PATCH 322/364] project: upgrade `AvaloniaUI` to `11.2.6`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/SourceGit.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 2a4b3c91..852c9e34 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -41,11 +41,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.5" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.5" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia" Version="11.2.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.6" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.6" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.6" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.2.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.2.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.4" />

From ae5fa6a793801fa6171257ef3aa9f94a6f7ba3be Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 31 Mar 2025 09:29:56 +0800
Subject: [PATCH 323/364] version: Release 2025.11

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

diff --git a/VERSION b/VERSION
index e78345d1..75c26f38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.10
\ No newline at end of file
+2025.11
\ No newline at end of file

From 8e55ba1b47168f9fa193d33c1af4dacd04316da4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 31 Mar 2025 19:06:10 +0800
Subject: [PATCH 324/364] enhance: avoid unhandled exceptions in timer

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs | 51 ++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 6ea41e04..6b1e439e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -2513,30 +2513,37 @@ namespace SourceGit.ViewModels
 
         private void AutoFetchImpl(object sender)
         {
-            if (!_settings.EnableAutoFetch || _isAutoFetching)
-                return;
-
-            var lockFile = Path.Combine(_gitDir, "index.lock");
-            if (File.Exists(lockFile))
-                return;
-
-            var now = DateTime.Now;
-            var desire = _lastFetchTime.AddMinutes(_settings.AutoFetchInterval);
-            if (desire > now)
-                return;
-
-            var remotes = new List<string>();
-            lock (_lockRemotes)
+            try
             {
-                foreach (var remote in _remotes)
-                    remotes.Add(remote.Name);
-            }
+                if (!_settings.EnableAutoFetch || _isAutoFetching)
+                    return;
 
-            Dispatcher.UIThread.Invoke(() => IsAutoFetching = true);
-            foreach (var remote in remotes)
-                new Commands.Fetch(_fullpath, remote, false, false, null) { RaiseError = false }.Exec();
-            _lastFetchTime = DateTime.Now;
-            Dispatcher.UIThread.Invoke(() => IsAutoFetching = false);
+                var lockFile = Path.Combine(_gitDir, "index.lock");
+                if (File.Exists(lockFile))
+                    return;
+
+                var now = DateTime.Now;
+                var desire = _lastFetchTime.AddMinutes(_settings.AutoFetchInterval);
+                if (desire > now)
+                    return;
+
+                var remotes = new List<string>();
+                lock (_lockRemotes)
+                {
+                    foreach (var remote in _remotes)
+                        remotes.Add(remote.Name);
+                }
+
+                Dispatcher.UIThread.Invoke(() => IsAutoFetching = true);
+                foreach (var remote in remotes)
+                    new Commands.Fetch(_fullpath, remote, false, false, null) { RaiseError = false }.Exec();
+                _lastFetchTime = DateTime.Now;
+                Dispatcher.UIThread.Invoke(() => IsAutoFetching = false);
+            }
+            catch
+            {
+                // DO nothing, but prevent `System.AggregateException`
+            }
         }
 
         private string _fullpath = string.Empty;

From 2deb79f8cea6580ba89fb24cc7fea537f723ec17 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: Wed, 2 Apr 2025 03:20:33 -0600
Subject: [PATCH 325/364] localization: update spanish translations (#1142)

add literal translation for 'CopyFullPath' string
---
 src/Resources/Locales/es_ES.axaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index d8018097..8b4c350f 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -189,6 +189,7 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar Todo el Texto</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Ruta</x:String>
+  <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copiar Ruta Completa</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Crear Rama...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basado En:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>

From 7ef4cca1f548e408984a553bfbbe2e09ed4731ba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 09:20:43 +0000
Subject: [PATCH 326/364] doc: Update translation status and missing keys

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

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 341fdce0..011671ea 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -24,14 +24,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
-
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.CopyFullPath
-
-</details>
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
 ### ![fr__FR](https://img.shields.io/badge/fr__FR-99.87%25-yellow)
 

From 904432a8f1d63472f913071ad1e52f5a8e5fa582 Mon Sep 17 00:00:00 2001
From: UchiTesting <56003633+UchiTesting@users.noreply.github.com>
Date: Mon, 7 Apr 2025 03:45:02 +0200
Subject: [PATCH 327/364] style(locale): Add a few translations to the French
 locale (#1158)

---
 src/Resources/Locales/fr_FR.axaml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 70d0af22..bf238aa2 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -16,13 +16,19 @@
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Suivre la branche :</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Suivi de la branche distante</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assistant IA</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GÉNERER</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Utiliser l'IA pour générer un message de commit</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLIQUER COMME MESSAGE DE COMMIT</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Appliquer</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Fichier de patch :</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Selectionner le fichier .patch à appliquer</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignorer les changements d'espaces blancs</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Appliquer le patch</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Espaces blancs :</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Appliquer le Stash</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Supprimer après application</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Rétablir les changements de l'index</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
   <x:String x:Key="Text.Archive" xml:space="preserve">Archiver...</x:String>
   <x:String x:Key="Text.Archive.File" xml:space="preserve">Enregistrer l'archive sous :</x:String>
   <x:String x:Key="Text.Archive.File.Placeholder" xml:space="preserve">Sélectionnez le chemin du fichier d'archive</x:String>
@@ -39,6 +45,7 @@
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copier le nom de la branche</x:String>
+  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Action personnalisée</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Supprimer ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Supprimer {0} branches sélectionnées</x:String>
   <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Rejeter tous les changements</x:String>
@@ -54,6 +61,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Renommer ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Définir la branche de suivi...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Comparer les branches</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Branche amont invalide !</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Octets</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ANNULER</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Réinitialiser à la révision parente</x:String>
@@ -92,6 +100,7 @@
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Récupérer ce commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick ce commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick ...</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copier les informations</x:String>
@@ -150,10 +159,10 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Ajouter une règle d'exemple Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Ajouter une règle d'exemple pour Pull Request Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Ajouter une règle d'exemple Github</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Ajouter une règle d'exemple Jira</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Ajouter une règle d'exemple Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Ajouter une règle d'exemple pour Incidents GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Ajouter une règle d'exemple pour Merge Request GitLab</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Ajouter une règle d'exemple Jira</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Ajouter une règle d'exemple Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nouvelle règle</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Issue Regex Expression:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nom de règle :</x:String>
@@ -179,6 +188,7 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copier</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copier tout le texte</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copier le chemin</x:String>
+  <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copier le chemin complet</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Créer une branche...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basé sur :</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Récupérer la branche créée</x:String>
@@ -187,6 +197,7 @@
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nom de la nouvelle branche :</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Entrez le nom de la branche.</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Les espaces seront remplacés par des tirets.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Créer une branche locale</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">Créer un tag...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">Nouveau tag à :</x:String>
@@ -583,13 +594,20 @@
   <x:String x:Key="Text.SelfUpdate.IgnoreThisVersion" xml:space="preserve">Passer cette version</x:String>
   <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Mise à jour du logiciel</x:String>
   <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">Il n'y a pas de mise à jour pour le moment.</x:String>
+  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Définir la branche de suivi</x:String>
+  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branche :</x:String>
+  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Escamoter la branche amont</x:String>
+  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">Branche amont:</x:String>
   <x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">Copier le SHA</x:String>
-  <x:String x:Key="Text.Squash" xml:space="preserve">Squash Commits</x:String>
+  <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Aller à</x:String>
+  <x:String x:Key="Text.Squash" xml:space="preserve">Squash les commits</x:String>
   <x:String x:Key="Text.Squash.Into" xml:space="preserve">Dans :</x:String>
   <x:String x:Key="Text.SSHKey" xml:space="preserve">Clé privée SSH :</x:String>
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Chemin du magasin de clés privées SSH</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Auto-restauration après le stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Vos fichiers de travail sont inchangés, mais un stash a été sauvegardé.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Inclure les fichiers non-suivis</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Garder les fichiers indexés</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Message :</x:String>
@@ -599,6 +617,7 @@
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stash les changements locaux</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Appliquer</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Effacer</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Sauver comme Patch...</x:String>
   <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Effacer le Stash</x:String>
   <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Effacer :</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>

From cbc7079e59f1078e219bd4942ab59fd879a8f484 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 01:45:21 +0000
Subject: [PATCH 328/364] doc: Update translation status and missing keys

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

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 011671ea..711564ef 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -26,14 +26,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.87%25-yellow)
-
-<details>
-<summary>Missing keys in fr_FR.axaml</summary>
-
-- Text.CopyFullPath
-
-</details>
+### ![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)
 
 ### ![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)
 

From ef106e6909e73355ee22cd06ce0d0fef73a3ce02 Mon Sep 17 00:00:00 2001
From: Sousi Omine <110832262+SousiOmine@users.noreply.github.com>
Date: Mon, 7 Apr 2025 10:53:20 +0900
Subject: [PATCH 329/364] Add Japanese localization (#1157)

* Initial Japanese translation

Only a small part was translated

* Unspecified words will be in English

When new words are added, they will be displayed in English even if Japanese support is delayed.

* Expanded translation scope

* Expanded translation scope

* Proceed with translation with a focus on overall settings

* Re-translated the outdated settings screen

* Add items that only exist in the latest en_US and remove items that do not exist in en_US

* A lot of translation work done

* A lot more translation work has been done

* ja_JP.axaml has been translated into Japanese

* Fixed three incomplete parts of the Japanese translation
---
 src/App.axaml                     |   1 +
 src/Models/Locales.cs             |   1 +
 src/Resources/Locales/ja_JP.axaml | 747 ++++++++++++++++++++++++++++++
 3 files changed, 749 insertions(+)
 create mode 100644 src/Resources/Locales/ja_JP.axaml

diff --git a/src/App.axaml b/src/App.axaml
index 76d4baa8..fdfa8e07 100644
--- a/src/App.axaml
+++ b/src/App.axaml
@@ -20,6 +20,7 @@
       <ResourceInclude x:Key="zh_CN" Source="/Resources/Locales/zh_CN.axaml"/>
       <ResourceInclude x:Key="zh_TW" Source="/Resources/Locales/zh_TW.axaml"/>
       <ResourceInclude x:Key="es_ES" Source="/Resources/Locales/es_ES.axaml"/>
+      <ResourceInclude x:Key="ja_JP" Source="/Resources/Locales/ja_JP.axaml"/>
     </ResourceDictionary>
   </Application.Resources>
 
diff --git a/src/Models/Locales.cs b/src/Models/Locales.cs
index d5e1534c..802e88ef 100644
--- a/src/Models/Locales.cs
+++ b/src/Models/Locales.cs
@@ -17,6 +17,7 @@ namespace SourceGit.Models
             new Locale("Русский", "ru_RU"),
             new Locale("简体中文", "zh_CN"),
             new Locale("繁體中文", "zh_TW"),
+            new Locale("日本語", "ja_JP"),
         };
 
         public Locale(string name, string key)
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
new file mode 100644
index 00000000..21255221
--- /dev/null
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -0,0 +1,747 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
+  </ResourceDictionary.MergedDictionaries>
+  <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.SubTitle" xml:space="preserve">オープンソース &amp; フリーなGit GUIクライアント</x:String>
+  <x:String x:Key="Text.AddWorktree" xml:space="preserve">ワークツリーを追加</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">チェックアウトする内容:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">既存のブランチ</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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.AIAssistant" xml:space="preserve">OpenAI アシスタント</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">再生成</x:String>
+  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">OpenAIを使用してコミットメッセージを生成</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" 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.AssumeUnchanged" xml:space="preserve">変更されていないとみなされるファイル</x:String>
+  <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">変更されていないとみなされるファイルはありません</x:String>
+  <x:String x:Key="Text.AssumeUnchanged.Remove" 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.BranchCM.Checkout" xml:space="preserve">${0}$ をチェックアウトする...</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">HEADと比較</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.DiscardAll" xml:space="preserve">すべての変更を破棄</x:String>
+  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">${0}$ へ早送りする</x:String>
+  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">${0}$ から ${1}$ へフェッチする</x:String>
+  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Finish ${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}$ をプルする</x:String>
+  <x:String x:Key="Text.BranchCM.PullInto" xml:space="preserve">${0}$ を ${1}$ にプルする...</x:String>
+  <x:String x:Key="Text.BranchCM.Push" xml:space="preserve">${0}$ をプッシュする</x:String>
+  <x:String x:Key="Text.BranchCM.Rebase" xml:space="preserve">${0}$ を ${1}$ でリベースする...</x:String>
+  <x:String x:Key="Text.BranchCM.Rename" 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.BranchUpstreamInvalid" xml:space="preserve">無効な上流ブランチ!</x:String>
+  <x:String x:Key="Text.Bytes" xml:space="preserve">バイト</x:String>
+  <x:String x:Key="Text.Cancel" xml:space="preserve">キャンセル</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">このリビジョンにリセット</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" 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.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.Warning" xml:space="preserve">警告: コミットをチェックアウトするとHEADが切断されます</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">コミット:</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">ブランチ:</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">スタッシュして再適用</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">通常、マージをチェリーピックすることはできません。どちらのマージ元をメインラインとして扱うべきかが分からないためです。このオプションを使用すると、指定した親に対して変更を再適用する形でチェリーピックを実行できます。</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">サブモジュールを初期化して更新</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.CherryPick" xml:space="preserve">このコミットをチェリーピック</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">チェリーピック...</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" 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.CopyInfo" xml:space="preserve">情報をコピー</x:String>
+  <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHAをコピー</x:String>
+  <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">カスタムアクション</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">${0}$ ブランチをここにインタラクティブリベース</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.Rebase" xml:space="preserve">${0}$ をここにリベース</x:String>
+  <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">${0}$ ブランチをここにリセット</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.CommitCM.SquashCommitsSinceThis" xml:space="preserve">子コミットをここにスカッシュ</x:String>
+  <x:String x:Key="Text.CommitDetail.Changes" 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.Changed" 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">このコミットを含む参照を確認</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">コミットが含まれるか確認</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">最初の100件の変更のみが表示されています。すべての変更は'変更'タブで確認できます。</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">参照</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">ブラウザで開く</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">コミットのタイトルを入力</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">テンプレート名:</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" 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} - リポジトリのパス; ${BRANCH} - 選択中のブランチ; ${SHA} - 選択中のコミットのSHA</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Executable" 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.Repository" 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">Eメールアドレス</x:String>
+  <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Eメールアドレス</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">自動的にリモートからフェッチ 間隔:</x:String>
+  <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分(s)</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">リモートの初期値</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUEトラッカー</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">サンプルのGitee Issueルールを追加</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">サンプルのGiteeプルリクエストルールを追加</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 Issueルールを追加</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">サンプルのGitLabマージリクエストルールを追加</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">サンプルのJiraルールを追加</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">サンプルのAzure DevOpsルールを追加</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">Issueの正規表現:</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">ルール名:</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はこのリポジトリでのみそれを使用します。そうでない場合で複数サービスが利用できる場合は、そのうちの1つを選択するためのコンテキストメニューが表示されます。</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.ConfigureWorkspace" xml:space="preserve">ワークスペース</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">色</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Restore" 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">破壊的変更:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">閉じたIssue:</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.CopyPath" xml:space="preserve">パスをコピー</x:String>
+  <x:String x:Key="Text.CopyFullPath" 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">スタッシュして再適用</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.Name.WarnSpace" xml:space="preserve">スペースはダッシュに置き換えられます。</x:String>
+  <x:String x:Key="Text.CreateBranch.Title" 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.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.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.TitleForGroup" xml:space="preserve">グループを削除</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" 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.Binary.New" xml:space="preserve">NEW</x:String>
+  <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">OLD</x:String>
+  <x:String x:Key="Text.Diff.Copy" 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.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.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.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.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.UseBlockNavigation" 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.DiffWithMerger" 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.Total" xml:space="preserve">{0}個の変更を破棄します。</x:String>
+  <x:String x:Key="Text.Discard.Warning" xml:space="preserve">この操作を元に戻すことはできません!!!</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" xml:space="preserve">カスタムアクションを実行</x:String>
+  <x:String x:Key="Text.ExecuteCustomAction.Name" xml:space="preserve">アクション名:</x:String>
+  <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">(チェックアウトせずに)ブランチを早送りする</x:String>
+  <x:String x:Key="Text.Fetch" xml:space="preserve">フェッチ</x:String>
+  <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">すべてのリモートをフェッチ</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">ローカル参照を強制的に上書き</x:String>
+  <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">タグなしでフェッチ</x:String>
+  <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">リモート:</x:String>
+  <x:String x:Key="Text.Fetch.Title" xml:space="preserve">リモートの変更をフェッチ</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.DiscardSelectedLines" xml:space="preserve">選択された行の変更を破棄</x:String>
+  <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">外部マージツールで開く</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.StageSelectedLines" xml:space="preserve">選択された行の変更をステージ</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.UnstageSelectedLines" xml:space="preserve">選択された行の変更をアンステージ</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">相手の変更を使用 (checkout --theirs)</x:String>
+  <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">自分の変更を使用 (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileHistory" xml:space="preserve">ファイルの履歴</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">コンテンツ</x:String>
+  <x:String x:Key="Text.FileHistory.FileChange" 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 - Finish Feature</x:String>
+  <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW - Finish Hotfix</x:String>
+  <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Finish Release</x:String>
+  <x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">対象:</x:String>
+  <x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">Hotfix:</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">Release:</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">Start Feature...</x:String>
+  <x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">FLOW - Start Feature</x:String>
+  <x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">Start Hotfix...</x:String>
+  <x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">FLOW - Start 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">Start Release...</x:String>
+  <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW - Start Release</x:String>
+  <x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">Versionタグ プレフィックス:</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">フェッチ</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">LFSオブジェクトをフェッチ</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">`git lfs fetch`を実行して、Git LFSオブジェクトをダウンロードします。ワーキングコピーは更新されません。</x:String>
+  <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Git LFSフックをインストール</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">`git lfs prune`を実行して、ローカルの保存領域から古いLFSファイルを削除します。</x:String>
+  <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">プル</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">LFSオブジェクトをプル</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">`git lfs pull`を実行して、現在の参照とチェックアウトのすべてのGit LFSファイルをダウンロードします。</x:String>
+  <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">プッシュ</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">LFSオブジェクトをプッシュ</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">キュー内の大容量ファイルをGit 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">TIPS:</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.CancelPopup" 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.GotoPrevTab" 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.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.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.CreateBranchOnCommit" xml:space="preserve">選択中のコミットから新たなブランチを作成</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">選択した変更を破棄</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">直接フェッチを実行</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">ダッシュボードモード (初期値)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">直接プルを実行</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.StageOrUnstageSelected" 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.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.Search" 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.Hunk.Discard" 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">チェリーピックが進行中です。'中止'を押すと元のHEADが復元されます。</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">マージリクエストが進行中です。'中止'を押すと元のHEADが復元されます。</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">リベースが進行中です。'中止'を押すと元のHEADが復元されます。</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">元に戻す処理が進行中です。'中止'を押すと元のHEADが復元されます。</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.Target" xml:space="preserve">対象のブランチ:</x:String>
+  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">ブラウザで開く</x:String>
+  <x:String x:Key="Text.IssueLinkCM.CopyLink" 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.Merge" xml:space="preserve">ブランチのマージ</x:String>
+  <x:String x:Key="Text.Merge.Into" xml:space="preserve">宛先:</x:String>
+  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">マージオプション:</x:String>
+  <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.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.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.JustNow" xml:space="preserve">たった今</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" 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.Yesterday" xml:space="preserve">昨日</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} 日前</x:String>
+  <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">先月</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} ヶ月前</x:String>
+  <x:String x:Key="Text.Period.LastYear" xml:space="preserve">昨年</x:String>
+  <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} 年前</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">差分分析プロンプト</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.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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">差分/マージ ツールのパスを入力</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.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.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.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">ユーザー Eメールアドレス</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">グローバルgitのEメールアドレス</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">フェッチ時に--pruneを有効化</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.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.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) はこのアプリで必要です</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.TagEnabled" 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.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.Type" xml:space="preserve">シェル/ターミナル</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" 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_DIR/worktrees` の作業ツリー情報を削除</x:String>
+  <x:String x:Key="Text.Pull" xml:space="preserve">プル</x:String>
+  <x:String x:Key="Text.Pull.Branch" xml:space="preserve">ブランチ:</x:String>
+  <x:String x:Key="Text.Pull.FetchAllBranches" 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">スタッシュして再適用</x:String>
+  <x:String x:Key="Text.Pull.NoTags" 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">プル (フェッチ &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.Remote" 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">ローカルの変更をスタッシュして再適用</x:String>
+  <x:String x:Key="Text.Rebase.On" xml:space="preserve">On:</x:String>
+  <x:String x:Key="Text.Rebase.Target" xml:space="preserve">リベース:</x:String>
+  <x:String x:Key="Text.RefetchAvatar" 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.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">フェッチ</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">リモートから変更を自動取得中...</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.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.EnableReflog" xml:space="preserve">`--reflog` オプションを有効化</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.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.FirstParentFilterToggle" xml:space="preserve">`--first-parent` オプションを有効化</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.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.OnlyHighlightCurrentBranchInHistories" 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.Refresh" 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.ByFile" 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.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.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.OrderByNameAsc" xml:space="preserve">名前 (昇順)</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDesc" 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.UseRelativeTimeInHistories" xml:space="preserve">履歴に相対時間を使用</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.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.Reword.Tip" xml:space="preserve">改行には'Shift+Enter'キーを使用します。 'Enter"はOKボタンのホットキーとして機能します。</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.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.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">Go to</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.AutoRestore" xml:space="preserve">スタッシュ後に自動で復元</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">作業ファイルは変更されず、スタッシュが保存されます。</x:String>
+  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">追跡されていないファイルを含める</x:String>
+  <x:String x:Key="Text.Stash.KeepIndex" 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.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.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.CommitAmount" xml:space="preserve">コミット</x:String>
+  <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">コミット: </x:String>
+  <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">著者: </x:String>
+  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">相対パスをコピー</x:String>
+  <x:String x:Key="Text.Submodule.FetchNested" 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.Sure" xml:space="preserve">OK</x:String>
+  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">タグ名をコピー</x:String>
+  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">タグメッセージをコピー</x:String>
+  <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">URL:</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.UseRemote" xml:space="preserve">--remoteオプションを使用</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">ドラッグ &amp; ドロップでフォルダを追加できます. グループを作成したり、変更したりできます。</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.Welcome.Sort" 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 Ignore</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.InSameFolder" 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">Amend</x:String>
+  <x:String x:Key="Text.WorkingCopy.CanStageTip" 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>
+  <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">クリックイベントをトリガー</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">コミット (Edit)</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">すべての変更をステージしてコミット</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">空のコミットが検出されました。続行しますか？ (--allow-empty)</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">競合が検出されました</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" 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.SignOff" xml:space="preserve">サインオフ</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.ViewAssumeUnchaged" xml:space="preserve">変更されていないとみなしたものを表示</x:String>
+  <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">テンプレート: ${0}$</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">選択したファイルを右クリックし、競合を解決する操作を選択してください。</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.Remove" xml:space="preserve">削除</x:String>
+  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">ロック解除</x:String>
+</ResourceDictionary>

From 17d285d9bf410a76b2ea32dcaccabd235b82367b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 01:53:35 +0000
Subject: [PATCH 330/364] doc: Update translation status and missing keys

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

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 711564ef..b344e6a3 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -38,6 +38,16 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.73%25-yellow)
+
+<details>
+<summary>Missing keys in ja_JP.axaml</summary>
+
+- Text.Repository.FilterCommits
+- Text.Repository.Tags.OrderByNameDes
+
+</details>
+
 ### ![pt__BR](https://img.shields.io/badge/pt__BR-90.98%25-yellow)
 
 <details>

From c615d04038cdbc1fda6f3a085070feb750803e15 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 09:54:35 +0800
Subject: [PATCH 331/364] doc: update README.md for Japanese support

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 d63886ed..aacf222e 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文
+* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文/日本語
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph

From 8c9cf05c1d393bcfe1381b1358d3e4f33404cae9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 10:14:02 +0800
Subject: [PATCH 332/364] fix: renamed files are missing in commit changes and
 stash changes (#1151)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/CompareRevisions.cs  | 18 +++++++++++++-----
 src/Commands/QueryStashChanges.cs | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
index e311a88e..c3206767 100644
--- a/src/Commands/CompareRevisions.cs
+++ b/src/Commands/CompareRevisions.cs
@@ -6,8 +6,10 @@ namespace SourceGit.Commands
 {
     public partial class CompareRevisions : Command
     {
-        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
+        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
+        private static partial Regex REG_RENAME_FORMAT();
 
         public CompareRevisions(string repo, string start, string end)
         {
@@ -38,7 +40,17 @@ namespace SourceGit.Commands
         {
             var match = REG_FORMAT().Match(line);
             if (!match.Success)
+            {
+                match = REG_RENAME_FORMAT().Match(line);
+                if (match.Success)
+                {
+                    var renamed = new Models.Change() { Path = match.Groups[1].Value };
+                    renamed.Set(Models.ChangeState.Renamed);
+                    _changes.Add(renamed);
+                }
+
                 return;
+            }
 
             var change = new Models.Change() { Path = match.Groups[2].Value };
             var status = match.Groups[1].Value;
@@ -57,10 +69,6 @@ namespace SourceGit.Commands
                     change.Set(Models.ChangeState.Deleted);
                     _changes.Add(change);
                     break;
-                case 'R':
-                    change.Set(Models.ChangeState.Renamed);
-                    _changes.Add(change);
-                    break;
                 case 'C':
                     change.Set(Models.ChangeState.Copied);
                     _changes.Add(change);
diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs
index 7fc27ea3..92240569 100644
--- a/src/Commands/QueryStashChanges.cs
+++ b/src/Commands/QueryStashChanges.cs
@@ -9,8 +9,10 @@ namespace SourceGit.Commands
     /// </summary>
     public partial class QueryStashChanges : Command
     {
-        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
+        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
+        private static partial Regex REG_RENAME_FORMAT();
 
         public QueryStashChanges(string repo, string stash) 
         {
@@ -31,7 +33,17 @@ namespace SourceGit.Commands
             {
                 var match = REG_FORMAT().Match(line);
                 if (!match.Success)
+                {
+                    match = REG_RENAME_FORMAT().Match(line);
+                    if (match.Success)
+                    {
+                        var renamed = new Models.Change() { Path = match.Groups[1].Value };
+                        renamed.Set(Models.ChangeState.Renamed);
+                        outs.Add(renamed);
+                    }
+
                     continue;
+                }
 
                 var change = new Models.Change() { Path = match.Groups[2].Value };
                 var status = match.Groups[1].Value;
@@ -50,10 +62,6 @@ namespace SourceGit.Commands
                         change.Set(Models.ChangeState.Deleted);
                         outs.Add(change);
                         break;
-                    case 'R':
-                        change.Set(Models.ChangeState.Renamed);
-                        outs.Add(change);
-                        break;
                     case 'C':
                         change.Set(Models.ChangeState.Copied);
                         outs.Add(change);

From ac7b02590ba846905b5492900e02a82b5852d01b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 10:23:37 +0800
Subject: [PATCH 333/364] enhance: add comma between date and time (#1150)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/DateTimeFormat.cs | 22 +++++++++++-----------
 src/Views/Histories.axaml    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Models/DateTimeFormat.cs b/src/Models/DateTimeFormat.cs
index 4e71a74f..4e8aa550 100644
--- a/src/Models/DateTimeFormat.cs
+++ b/src/Models/DateTimeFormat.cs
@@ -32,17 +32,17 @@ namespace SourceGit.Models
 
         public static readonly List<DateTimeFormat> Supported = new List<DateTimeFormat>
         {
-            new DateTimeFormat("yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss"),
-            new DateTimeFormat("yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss"),
-            new DateTimeFormat("yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss"),
-            new DateTimeFormat("MM/dd/yyyy", "MM/dd/yyyy HH:mm:ss"),
-            new DateTimeFormat("MM.dd.yyyy", "MM.dd.yyyy HH:mm:ss"),
-            new DateTimeFormat("MM-dd-yyyy", "MM-dd-yyyy HH:mm:ss"),
-            new DateTimeFormat("dd/MM/yyyy", "dd/MM/yyyy HH:mm:ss"),
-            new DateTimeFormat("dd.MM.yyyy", "dd.MM.yyyy HH:mm:ss"),
-            new DateTimeFormat("dd-MM-yyyy", "dd-MM-yyyy HH:mm:ss"),
-            new DateTimeFormat("MMM d yyyy", "MMM d yyyy HH:mm:ss"),
-            new DateTimeFormat("d MMM yyyy", "d MMM yyyy HH:mm:ss"),
+            new DateTimeFormat("yyyy/MM/dd", "yyyy/MM/dd, HH:mm:ss"),
+            new DateTimeFormat("yyyy.MM.dd", "yyyy.MM.dd, HH:mm:ss"),
+            new DateTimeFormat("yyyy-MM-dd", "yyyy-MM-dd, HH:mm:ss"),
+            new DateTimeFormat("MM/dd/yyyy", "MM/dd/yyyy, HH:mm:ss"),
+            new DateTimeFormat("MM.dd.yyyy", "MM.dd.yyyy, HH:mm:ss"),
+            new DateTimeFormat("MM-dd-yyyy", "MM-dd-yyyy, HH:mm:ss"),
+            new DateTimeFormat("dd/MM/yyyy", "dd/MM/yyyy, HH:mm:ss"),
+            new DateTimeFormat("dd.MM.yyyy", "dd.MM.yyyy, HH:mm:ss"),
+            new DateTimeFormat("dd-MM-yyyy", "dd-MM-yyyy, HH:mm:ss"),
+            new DateTimeFormat("MMM d yyyy", "MMM d yyyy, HH:mm:ss"),
+            new DateTimeFormat("d MMM yyyy", "d MMM yyyy, HH:mm:ss"),
         };
 
         private static readonly DateTime _example = new DateTime(2025, 1, 31, 8, 0, 0, DateTimeKind.Local);
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 4fd8909d..96340d1e 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -195,7 +195,7 @@
                   </Border>
 
                   <!-- TIME -->
-                  <Border Grid.Column="3" Padding="4,0" ClipToBounds="True" IsHitTestVisible="False">
+                  <Border Grid.Column="3" Padding="4,0,8,0" ClipToBounds="True" IsHitTestVisible="False">
                     <v:CommitTimeTextBlock Classes="primary"
                                            HorizontalAlignment="Center"
                                            FontWeight="{Binding FontWeight}"

From a37c6b29ec41fd6d5c7bea08cb5b127abb4b1a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20W?= <44604769+goran-w@users.noreply.github.com>
Date: Mon, 7 Apr 2025 04:37:58 +0200
Subject: [PATCH 334/364] In Local Changes, added filter-box in Staged area, to
 match Unstaged area (#1153)

Also added minimal handling (RaiseException) if trying to commit with active filter (might commit more changes than visible, so disallow).
Minor unification in unstageChanges() to make it more similar to StageChanges().
---
 src/ViewModels/WorkingCopy.cs | 70 ++++++++++++++++++++++++++++-------
 src/Views/WorkingCopy.axaml   | 39 +++++++++++++++++--
 2 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 40b4c50c..3e6f6fbd 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -109,12 +109,28 @@ namespace SourceGit.ViewModels
                     if (_isLoadingData)
                         return;
 
-                    VisibleUnstaged = GetVisibleUnstagedChanges(_unstaged);
+                    VisibleUnstaged = GetVisibleChanges(_unstaged, _unstagedFilter);
                     SelectedUnstaged = [];
                 }
             }
         }
 
+        public string StagedFilter
+        {
+            get => _stagedFilter;
+            set
+            {
+                if (SetProperty(ref _stagedFilter, value))
+                {
+                    if (_isLoadingData)
+                        return;
+
+                    VisibleStaged = GetVisibleChanges(_staged, _stagedFilter);
+                    SelectedStaged = [];
+                }
+            }
+        }
+
         public List<Models.Change> Unstaged
         {
             get => _unstaged;
@@ -133,6 +149,12 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _staged, value);
         }
 
+        public List<Models.Change> VisibleStaged
+        {
+            get => _visibleStaged;
+            private set => SetProperty(ref _visibleStaged, value);
+        }
+
         public List<Models.Change> SelectedUnstaged
         {
             get => _selectedUnstaged;
@@ -216,6 +238,9 @@ namespace SourceGit.ViewModels
             _visibleUnstaged.Clear();
             OnPropertyChanged(nameof(VisibleUnstaged));
 
+            _visibleStaged.Clear();
+            OnPropertyChanged(nameof(VisibleStaged));
+
             _unstaged.Clear();
             OnPropertyChanged(nameof(Unstaged));
 
@@ -269,7 +294,7 @@ namespace SourceGit.ViewModels
                 }
             }
 
-            var visibleUnstaged = GetVisibleUnstagedChanges(unstaged);
+            var visibleUnstaged = GetVisibleChanges(unstaged, _unstagedFilter);
             var selectedUnstaged = new List<Models.Change>();
             foreach (var c in visibleUnstaged)
             {
@@ -278,8 +303,10 @@ namespace SourceGit.ViewModels
             }
 
             var staged = GetStagedChanges();
+
+            var visibleStaged = GetVisibleChanges(staged, _stagedFilter);
             var selectedStaged = new List<Models.Change>();
-            foreach (var c in staged)
+            foreach (var c in visibleStaged)
             {
                 if (lastSelectedStaged.Contains(c.Path))
                     selectedStaged.Add(c);
@@ -290,6 +317,7 @@ namespace SourceGit.ViewModels
                 _isLoadingData = true;
                 HasUnsolvedConflicts = hasConflict;
                 VisibleUnstaged = visibleUnstaged;
+                VisibleStaged = visibleStaged;
                 Unstaged = unstaged;
                 Staged = staged;
                 SelectedUnstaged = selectedUnstaged;
@@ -337,7 +365,7 @@ namespace SourceGit.ViewModels
 
         public void UnstageAll()
         {
-            UnstageChanges(_staged, null);
+            UnstageChanges(_visibleStaged, null);
         }
 
         public void Discard(List<Models.Change> changes)
@@ -350,6 +378,11 @@ namespace SourceGit.ViewModels
         {
             UnstagedFilter = string.Empty;
         }
+ 
+        public void ClearStagedFilter()
+        {
+            StagedFilter = string.Empty;
+        }
 
         public async void UseTheirs(List<Models.Change> changes)
         {
@@ -1472,16 +1505,16 @@ namespace SourceGit.ViewModels
             return menu;
         }
 
-        private List<Models.Change> GetVisibleUnstagedChanges(List<Models.Change> unstaged)
+        private List<Models.Change> GetVisibleChanges(List<Models.Change> changes, string filter)
         {
-            if (string.IsNullOrEmpty(_unstagedFilter))
-                return unstaged;
+            if (string.IsNullOrEmpty(filter))
+                return changes;
 
             var visible = new List<Models.Change>();
 
-            foreach (var c in unstaged)
+            foreach (var c in changes)
             {
-                if (c.Path.Contains(_unstagedFilter, StringComparison.OrdinalIgnoreCase))
+                if (c.Path.Contains(filter, StringComparison.OrdinalIgnoreCase))
                     visible.Add(c);
             }
 
@@ -1599,7 +1632,8 @@ namespace SourceGit.ViewModels
 
         private async void UnstageChanges(List<Models.Change> changes, Models.Change next)
         {
-            if (changes.Count == 0)
+            var count = changes.Count;
+            if (count == 0)
                 return;
 
             // Use `_selectedStaged` instead of `SelectedStaged` to avoid UI refresh.
@@ -1611,16 +1645,15 @@ namespace SourceGit.ViewModels
             {
                 await Task.Run(() => new Commands.UnstageChangesForAmend(_repo.FullPath, changes).Exec());
             }
-            else if (changes.Count == _staged.Count)
+            else if (count == _staged.Count)
             {
                 await Task.Run(() => new Commands.Reset(_repo.FullPath).Exec());
             }
             else
             {
-                for (int i = 0; i < changes.Count; i += 10)
+                for (int i = 0; i < count; i += 10)
                 {
-                    var count = Math.Min(10, changes.Count - i);
-                    var step = changes.GetRange(i, count);
+                    var step = changes.GetRange(i, Math.Min(10, count - i));
                     await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec());
                 }
             }
@@ -1650,6 +1683,13 @@ namespace SourceGit.ViewModels
                 return;
             }
 
+            if (!string.IsNullOrEmpty(_stagedFilter))
+            {
+                // FIXME - make this a proper warning message-box "Staged-area filter will not be applied to commit. Continue?" Yes/No
+                App.RaiseException(_repo.FullPath, "Committing with staged-area filter applied is NOT allowed!");
+                return;
+            }
+
             if (string.IsNullOrWhiteSpace(_commitMessage))
             {
                 App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!");
@@ -1729,11 +1769,13 @@ namespace SourceGit.ViewModels
         private List<Models.Change> _unstaged = [];
         private List<Models.Change> _visibleUnstaged = [];
         private List<Models.Change> _staged = [];
+        private List<Models.Change> _visibleStaged = [];
         private List<Models.Change> _selectedUnstaged = [];
         private List<Models.Change> _selectedStaged = [];
         private int _count = 0;
         private object _detailContext = null;
         private string _unstagedFilter = string.Empty;
+        private string _stagedFilter = string.Empty;
         private string _commitMessage = string.Empty;
 
         private bool _hasUnsolvedConflicts = false;
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 4d79135d..6af2b448 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -129,7 +129,7 @@
                     Background="{DynamicResource Brush.Border0}"/>
 
       <!-- Staged -->
-      <Grid Grid.Row="2" RowDefinitions="28,*">
+      <Grid Grid.Row="2" RowDefinitions="28,36,*">
         <!-- Staged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
           <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
@@ -156,14 +156,47 @@
           </Grid>
         </Border>
 
+        <!-- Staged Filter -->
+        <Border Grid.Row="1" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
+          <TextBox Height="24"
+                   Margin="4,0"
+                   BorderThickness="1"
+                   CornerRadius="12"
+                   Text="{Binding StagedFilter, Mode=TwoWay}"
+                   BorderBrush="{DynamicResource Brush.Border2}"
+                   VerticalContentAlignment="Center">
+            <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 ClearStagedFilter}"
+                      IsVisible="{Binding StagedFilter, 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>
+        </Border>
+        
         <!-- Staged Changes -->
-        <v:ChangeCollectionView Grid.Row="1"
+        <v:ChangeCollectionView Grid.Row="2"
                                 x:Name="StagedChangesView"
                                 Focusable="True"
+                                IsUnstagedChange="False"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode}"
-                                Changes="{Binding Staged}"
+                                Changes="{Binding VisibleStaged}"
                                 SelectedChanges="{Binding SelectedStaged, Mode=TwoWay}"
                                 ContextRequested="OnStagedContextRequested"
                                 ChangeDoubleTapped="OnStagedChangeDoubleTapped"

From fa02c65da538eba40d846e0eab4de3238e9a7662 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 11:45:14 +0800
Subject: [PATCH 335/364] code_review: PR #1153

- use a single filter for both unstage and staged files
- show confirm dialog if staged files are displayed partially

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/ConfirmCommit.cs               |  26 +++++
 src/ViewModels/ConfirmCommitWithoutFiles.cs   |  19 ----
 src/ViewModels/WorkingCopy.cs                 |  75 +++++-------
 ...WithoutFiles.axaml => ConfirmCommit.axaml} |   6 +-
 ...tFiles.axaml.cs => ConfirmCommit.axaml.cs} |  10 +-
 src/Views/WorkingCopy.axaml                   | 107 +++++++-----------
 9 files changed, 103 insertions(+), 143 deletions(-)
 create mode 100644 src/ViewModels/ConfirmCommit.cs
 delete mode 100644 src/ViewModels/ConfirmCommitWithoutFiles.cs
 rename src/Views/{ConfirmCommitWithoutFiles.axaml => ConfirmCommit.axaml} (92%)
 rename src/Views/{ConfirmCommitWithoutFiles.axaml.cs => ConfirmCommit.axaml.cs} (57%)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5ff1e3a4..61140173 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -719,6 +719,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Edit)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter">You have staged {0} file(s) but only {1} file(s) displayed ({2} files are filtered out). Do you want to continue?</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 8d2b4f1e..fec5c780 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -723,6 +723,7 @@
   <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.ConfirmCommitWithFilter">当前有 {0} 个文件在暂存区中，但仅显示了 {1} 个文件（{2} 个文件被过滤掉了），是否继续提交？</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">文件冲突已解决</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 8e823f68..66bcc33a 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -722,6 +722,7 @@
   <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.ConfirmCommitWithFilter">您已暫存 {0} 檔案，但只顯示 {1} 檔案 ({2} 檔案被篩選器隱藏)。您要繼續嗎？</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">檔案衝突已解決</x:String>
diff --git a/src/ViewModels/ConfirmCommit.cs b/src/ViewModels/ConfirmCommit.cs
new file mode 100644
index 00000000..cea56948
--- /dev/null
+++ b/src/ViewModels/ConfirmCommit.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace SourceGit.ViewModels
+{
+    public class ConfirmCommit
+    {
+        public string Message
+        {
+            get;
+            private set;
+        }
+
+        public ConfirmCommit(string message, Action onSure)
+        {
+            Message = message;
+            _onSure = onSure;
+        }
+
+        public void Continue()
+        {
+            _onSure?.Invoke();
+        }
+
+        private Action _onSure;
+    }
+}
diff --git a/src/ViewModels/ConfirmCommitWithoutFiles.cs b/src/ViewModels/ConfirmCommitWithoutFiles.cs
deleted file mode 100644
index 3249fba8..00000000
--- a/src/ViewModels/ConfirmCommitWithoutFiles.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace SourceGit.ViewModels
-{
-    public class ConfirmCommitWithoutFiles
-    {
-        public ConfirmCommitWithoutFiles(WorkingCopy wc, bool autoPush)
-        {
-            _wc = wc;
-            _autoPush = autoPush;
-        }
-
-        public void Continue()
-        {
-            _wc.CommitWithoutFiles(_autoPush);
-        }
-
-        private readonly WorkingCopy _wc;
-        private bool _autoPush;
-    }
-}
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 3e6f6fbd..a0933ea3 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -99,38 +99,23 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public string UnstagedFilter
+        public string Filter
         {
-            get => _unstagedFilter;
+            get => _filter;
             set
             {
-                if (SetProperty(ref _unstagedFilter, value))
+                if (SetProperty(ref _filter, value))
                 {
                     if (_isLoadingData)
                         return;
 
-                    VisibleUnstaged = GetVisibleChanges(_unstaged, _unstagedFilter);
+                    VisibleUnstaged = GetVisibleChanges(_unstaged);
+                    VisibleStaged = GetVisibleChanges(_staged);
                     SelectedUnstaged = [];
                 }
             }
         }
 
-        public string StagedFilter
-        {
-            get => _stagedFilter;
-            set
-            {
-                if (SetProperty(ref _stagedFilter, value))
-                {
-                    if (_isLoadingData)
-                        return;
-
-                    VisibleStaged = GetVisibleChanges(_staged, _stagedFilter);
-                    SelectedStaged = [];
-                }
-            }
-        }
-
         public List<Models.Change> Unstaged
         {
             get => _unstaged;
@@ -294,7 +279,7 @@ namespace SourceGit.ViewModels
                 }
             }
 
-            var visibleUnstaged = GetVisibleChanges(unstaged, _unstagedFilter);
+            var visibleUnstaged = GetVisibleChanges(unstaged);
             var selectedUnstaged = new List<Models.Change>();
             foreach (var c in visibleUnstaged)
             {
@@ -304,7 +289,7 @@ namespace SourceGit.ViewModels
 
             var staged = GetStagedChanges();
 
-            var visibleStaged = GetVisibleChanges(staged, _stagedFilter);
+            var visibleStaged = GetVisibleChanges(staged);
             var selectedStaged = new List<Models.Change>();
             foreach (var c in visibleStaged)
             {
@@ -374,14 +359,9 @@ namespace SourceGit.ViewModels
                 _repo.ShowPopup(new Discard(_repo, changes));
         }
 
-        public void ClearUnstagedFilter()
+        public void ClearFilter()
         {
-            UnstagedFilter = string.Empty;
-        }
- 
-        public void ClearStagedFilter()
-        {
-            StagedFilter = string.Empty;
+            Filter = string.Empty;
         }
 
         public async void UseTheirs(List<Models.Change> changes)
@@ -571,11 +551,6 @@ namespace SourceGit.ViewModels
             DoCommit(false, true, false);
         }
 
-        public void CommitWithoutFiles(bool autoPush)
-        {
-            DoCommit(false, autoPush, true);
-        }
-
         public ContextMenu CreateContextMenuForUnstagedChanges()
         {
             if (_selectedUnstaged == null || _selectedUnstaged.Count == 0)
@@ -1505,16 +1480,16 @@ namespace SourceGit.ViewModels
             return menu;
         }
 
-        private List<Models.Change> GetVisibleChanges(List<Models.Change> changes, string filter)
+        private List<Models.Change> GetVisibleChanges(List<Models.Change> changes)
         {
-            if (string.IsNullOrEmpty(filter))
+            if (string.IsNullOrEmpty(_filter))
                 return changes;
 
             var visible = new List<Models.Change>();
 
             foreach (var c in changes)
             {
-                if (c.Path.Contains(filter, StringComparison.OrdinalIgnoreCase))
+                if (c.Path.Contains(_filter, StringComparison.OrdinalIgnoreCase))
                     visible.Add(c);
             }
 
@@ -1675,7 +1650,7 @@ namespace SourceGit.ViewModels
                 DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);
         }
 
-        private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty)
+        private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty = false, bool confirmWithFilter = false)
         {
             if (!_repo.CanCreatePopup())
             {
@@ -1683,10 +1658,17 @@ namespace SourceGit.ViewModels
                 return;
             }
 
-            if (!string.IsNullOrEmpty(_stagedFilter))
+            if (!string.IsNullOrEmpty(_filter) && _staged.Count > _visibleStaged.Count && !confirmWithFilter)
             {
-                // FIXME - make this a proper warning message-box "Staged-area filter will not be applied to commit. Continue?" Yes/No
-                App.RaiseException(_repo.FullPath, "Committing with staged-area filter applied is NOT allowed!");
+                var confirmMessage = App.Text("WorkingCopy.ConfirmCommitWithFilter", _staged.Count, _visibleStaged.Count, _staged.Count - _visibleStaged.Count);
+                App.OpenDialog(new Views.ConfirmCommit()
+                {
+                    DataContext = new ConfirmCommit(confirmMessage, () =>
+                    {
+                        DoCommit(autoStage, autoPush, allowEmpty, true);
+                    })
+                });
+
                 return;
             }
 
@@ -1700,9 +1682,13 @@ namespace SourceGit.ViewModels
             {
                 if ((autoStage && _count == 0) || (!autoStage && _staged.Count == 0))
                 {
-                    App.OpenDialog(new Views.ConfirmCommitWithoutFiles()
+                    var confirmMessage = App.Text("WorkingCopy.ConfirmCommitWithoutFiles");
+                    App.OpenDialog(new Views.ConfirmCommit()
                     {
-                        DataContext = new ConfirmCommitWithoutFiles(this, autoPush)
+                        DataContext = new ConfirmCommit(confirmMessage, () =>
+                        {
+                            DoCommit(autoStage, autoPush, true, confirmWithFilter);
+                        })
                     });
 
                     return;
@@ -1774,8 +1760,7 @@ namespace SourceGit.ViewModels
         private List<Models.Change> _selectedStaged = [];
         private int _count = 0;
         private object _detailContext = null;
-        private string _unstagedFilter = string.Empty;
-        private string _stagedFilter = string.Empty;
+        private string _filter = string.Empty;
         private string _commitMessage = string.Empty;
 
         private bool _hasUnsolvedConflicts = false;
diff --git a/src/Views/ConfirmCommitWithoutFiles.axaml b/src/Views/ConfirmCommit.axaml
similarity index 92%
rename from src/Views/ConfirmCommitWithoutFiles.axaml
rename to src/Views/ConfirmCommit.axaml
index 4c9fd1c8..77bbdb30 100644
--- a/src/Views/ConfirmCommitWithoutFiles.axaml
+++ b/src/Views/ConfirmCommit.axaml
@@ -5,8 +5,8 @@
                     xmlns:v="using:SourceGit.Views"
                     xmlns:vm="using:SourceGit.ViewModels"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                    x:Class="SourceGit.Views.ConfirmCommitWithoutFiles"
-                    x:DataType="vm:ConfirmCommitWithoutFiles"
+                    x:Class="SourceGit.Views.ConfirmCommit"
+                    x:DataType="vm:ConfirmCommit"
                     x:Name="ThisControl"
                     Icon="/App.ico"
                     Title="{DynamicResource Text.Warn}"
@@ -38,7 +38,7 @@
 
     <!-- Body -->
     <Border Grid.Row="1" Margin="16">
-      <TextBlock Text="{DynamicResource Text.WorkingCopy.ConfirmCommitWithoutFiles}"/>
+      <TextBlock Text="{Binding Message}" MaxWidth="400" TextWrapping="Wrap"/>
     </Border>
 
     <!-- Buttons -->
diff --git a/src/Views/ConfirmCommitWithoutFiles.axaml.cs b/src/Views/ConfirmCommit.axaml.cs
similarity index 57%
rename from src/Views/ConfirmCommitWithoutFiles.axaml.cs
rename to src/Views/ConfirmCommit.axaml.cs
index 342600fc..1cf770cb 100644
--- a/src/Views/ConfirmCommitWithoutFiles.axaml.cs
+++ b/src/Views/ConfirmCommit.axaml.cs
@@ -2,20 +2,16 @@ using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
-    public partial class ConfirmCommitWithoutFiles : ChromelessWindow
+    public partial class ConfirmCommit : ChromelessWindow
     {
-        public ConfirmCommitWithoutFiles()
+        public ConfirmCommit()
         {
             InitializeComponent();
         }
 
         private void Sure(object _1, RoutedEventArgs _2)
         {
-            if (DataContext is ViewModels.ConfirmCommitWithoutFiles vm)
-            {
-                vm.Continue();
-            }
-
+            (DataContext as ViewModels.ConfirmCommit)?.Continue();
             Close();
         }
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 6af2b448..94dd0c30 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -19,13 +19,46 @@
     <!-- Left -->
     <Grid Grid.Column="0">
       <Grid.RowDefinitions>
+        <RowDefinition Height="36"/>
         <RowDefinition Height="*" MinHeight="100"/>
         <RowDefinition Height="1"/>
         <RowDefinition Height="*" MinHeight="100"/>
       </Grid.RowDefinitions>
 
+      <!-- Search Filter -->
+      <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
+        <TextBox Height="24"
+                 Margin="4,0"
+                 BorderThickness="1"
+                 CornerRadius="12"
+                 Text="{Binding Filter, Mode=TwoWay}"
+                 BorderBrush="{DynamicResource Brush.Border2}"
+                 VerticalContentAlignment="Center">
+          <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 Filter, 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>
+      </Border>
+
       <!-- Unstaged -->
-      <Grid Grid.Row="0" RowDefinitions="28,36,*">
+      <Grid Grid.Row="1" RowDefinitions="28,*">
         <!-- Unstaged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
           <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto">
@@ -75,40 +108,8 @@
           </Grid>
         </Border>
 
-        <!-- Unstaged Filter -->
-        <Border Grid.Row="1" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
-          <TextBox Height="24"
-                   Margin="4,0"
-                   BorderThickness="1"
-                   CornerRadius="12"
-                   Text="{Binding UnstagedFilter, Mode=TwoWay}"
-                   BorderBrush="{DynamicResource Brush.Border2}"
-                   VerticalContentAlignment="Center">
-            <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 ClearUnstagedFilter}"
-                      IsVisible="{Binding UnstagedFilter, 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>
-        </Border>
-
         <!-- Unstaged Changes -->
-        <v:ChangeCollectionView Grid.Row="2"
+        <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="UnstagedChangesView"
                                 Focusable="True"
                                 IsUnstagedChange="True"
@@ -123,13 +124,13 @@
       </Grid>
 
       <!-- Splitter -->
-      <GridSplitter Grid.Row="1"
+      <GridSplitter Grid.Row="2"
                     MinHeight="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                     Background="{DynamicResource Brush.Border0}"/>
 
       <!-- Staged -->
-      <Grid Grid.Row="2" RowDefinitions="28,36,*">
+      <Grid Grid.Row="3" RowDefinitions="28,*">
         <!-- Staged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
           <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
@@ -155,41 +156,9 @@
                                       ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/>
           </Grid>
         </Border>
-
-        <!-- Staged Filter -->
-        <Border Grid.Row="1" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
-          <TextBox Height="24"
-                   Margin="4,0"
-                   BorderThickness="1"
-                   CornerRadius="12"
-                   Text="{Binding StagedFilter, Mode=TwoWay}"
-                   BorderBrush="{DynamicResource Brush.Border2}"
-                   VerticalContentAlignment="Center">
-            <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 ClearStagedFilter}"
-                      IsVisible="{Binding StagedFilter, 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>
-        </Border>
         
         <!-- Staged Changes -->
-        <v:ChangeCollectionView Grid.Row="2"
+        <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="StagedChangesView"
                                 Focusable="True"
                                 IsUnstagedChange="False"

From 48f8b6116a658dbe0c3a13fb83b5948ce0983dbd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 03:48:59 +0000
Subject: [PATCH 336/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index b344e6a3..6ebb72c1 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-98.65%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-98.52%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -21,34 +21,51 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.Appearance.EditorTabWidth
 - Text.Preferences.General.ShowTagsInGraph
 - Text.StashCM.SaveAsPatch
+- Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)
+<details>
+<summary>Missing keys in es_ES.axaml</summary>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)
+- Text.WorkingCopy.ConfirmCommitWithFilter
+
+</details>
+
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.87%25-yellow)
+
+<details>
+<summary>Missing keys in fr_FR.axaml</summary>
+
+- Text.WorkingCopy.ConfirmCommitWithFilter
+
+</details>
+
+### ![it__IT](https://img.shields.io/badge/it__IT-99.60%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
+- Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.73%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.60%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
+- Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-90.98%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-90.86%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -119,11 +136,19 @@ This document shows the translation status of each locale file in the repository
 - Text.Stash.AutoRestore.Tip
 - Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.CommitToEdit
+- Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.87%25-yellow)
+
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.WorkingCopy.ConfirmCommitWithFilter
+
+</details>
 
 ### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 

From b65c697e5b6e9af4c3f82a252fbf97a6f4582c68 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 12:00:45 +0800
Subject: [PATCH 337/364] version: Release 2025.12

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

diff --git a/VERSION b/VERSION
index 75c26f38..8283ecf3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.11
\ No newline at end of file
+2025.12
\ No newline at end of file

From 39f7f119dd7784f10c9b462d1cc284c22b981423 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 12:06:06 +0800
Subject: [PATCH 338/364] doc: always show current translation status in
 `develop` branch

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 aacf222e..75af9d2c 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@
 
 ## Translation Status
 
-You can find the current translation status in [TRANSLATION.md](TRANSLATION.md)
+You can find the current translation status in [TRANSLATION.md](https://github.com/sourcegit-scm/sourcegit/blob/develop/TRANSLATION.md)
 
 ## How to Use
 

From ad9021e8920815198d655faa76abbcfdc1ca5f6c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 14:07:58 +0800
Subject: [PATCH 339/364] enhance: allow using `+` character in branch name
 (#1152)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/CreateBranch.cs | 2 +-
 src/ViewModels/RenameBranch.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index 37db0065..6d7fe27a 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -6,7 +6,7 @@ namespace SourceGit.ViewModels
     public class CreateBranch : Popup
     {
         [Required(ErrorMessage = "Branch name is required!")]
-        [RegularExpression(@"^[\w \-/\.#]+$", ErrorMessage = "Bad branch name format!")]
+        [RegularExpression(@"^[\w \-/\.#\+]+$", ErrorMessage = "Bad branch name format!")]
         [CustomValidation(typeof(CreateBranch), nameof(ValidateBranchName))]
         public string Name
         {
diff --git a/src/ViewModels/RenameBranch.cs b/src/ViewModels/RenameBranch.cs
index 0679a5b5..f78eb46b 100644
--- a/src/ViewModels/RenameBranch.cs
+++ b/src/ViewModels/RenameBranch.cs
@@ -12,7 +12,7 @@ namespace SourceGit.ViewModels
         }
 
         [Required(ErrorMessage = "Branch name is required!!!")]
-        [RegularExpression(@"^[\w \-/\.#]+$", ErrorMessage = "Bad branch name format!")]
+        [RegularExpression(@"^[\w \-/\.#\+]+$", ErrorMessage = "Bad branch name format!")]
         [CustomValidation(typeof(RenameBranch), nameof(ValidateBranchName))]
         public string Name
         {

From 3049730dd5c0acee68af771a9d3fa44a874a1ee9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 14:42:46 +0800
Subject: [PATCH 340/364] feature: add `Preferred Merge Mode` in repository
 configure (#1156)

Signed-off-by: leo <longshuang@msn.cn>
---
 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 +
 src/ViewModels/Merge.cs               |  9 +++--
 src/ViewModels/RepositoryConfigure.cs | 13 +++++++
 src/Views/RepositoryConfigure.axaml   | 52 ++++++++++++++++++++++-----
 7 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 76a7f160..1d326a5e 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -224,6 +224,12 @@ namespace SourceGit.Models
             set;
         } = [];
 
+        public int PreferredMergeMode
+        {
+            get;
+            set;
+        } = 0;
+
         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 61140173..d1e32e84 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -153,6 +153,7 @@
   <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.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>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Add Sample Gitee Issue Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Add Sample Gitee Pull Request Rule</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index fec5c780..932f1237 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -156,6 +156,7 @@
   <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.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>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">新增匹配Azure DevOps规则</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">新增匹配Gitee议题规则</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 66bcc33a..88b0ab64 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -156,6 +156,7 @@
   <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">Issue 追蹤</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">新增符合 Azure DevOps 規則</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">新增符合 Gitee 議題規則</x:String>
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index be938867..faadaf57 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -69,9 +69,14 @@ namespace SourceGit.ViewModels
 
         private Models.MergeMode AutoSelectMergeMode()
         {
+            var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode;
+            if (preferredMergeModeIdx < 0 || preferredMergeModeIdx > Models.MergeMode.Supported.Length)
+                preferredMergeModeIdx = 0;
+
+            var defaultMergeMode = Models.MergeMode.Supported[preferredMergeModeIdx];
             var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
             if (string.IsNullOrEmpty(config))
-                return Models.MergeMode.Supported[0];
+                return defaultMergeMode;
             if (config.Equals("--ff-only", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[1];
             if (config.Equals("--no-ff", StringComparison.Ordinal))
@@ -81,7 +86,7 @@ namespace SourceGit.ViewModels
             if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[4];
 
-            return Models.MergeMode.Supported[0];
+            return defaultMergeMode;
         }
 
         private readonly Repository _repo = null;
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index 3f590758..9a3bc9c4 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -36,6 +36,19 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public int PreferredMergeMode
+        {
+            get => _repo.Settings.PreferredMergeMode;
+            set
+            {
+                if (_repo.Settings.PreferredMergeMode != value)
+                {
+                    _repo.Settings.PreferredMergeMode = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool GPGCommitSigningEnabled
         {
             get;
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index e41375b9..ee1d6fa8 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" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="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"
@@ -86,10 +86,46 @@
           </ComboBox>
 
           <TextBlock Grid.Row="3" Grid.Column="0"
+                     HorizontalAlignment="Right" VerticalAlignment="Center"
+                     Margin="0,0,8,0"
+                     Text="{DynamicResource Text.Configure.Git.PreferredMergeMode}"/>
+          <ComboBox Grid.Row="3" Grid.Column="1"
+                    Height="28" Padding="8,0"
+                    VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                    ItemsSource="{Binding Source={x:Static m:MergeMode.Supported}}"
+                    SelectedIndex="{Binding PreferredMergeMode, Mode=TwoWay}"
+                    Grid.IsSharedSizeScope="True">
+            <ComboBox.ItemTemplate>
+              <DataTemplate DataType="m:MergeMode">
+                <Grid Height="20">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeNameColumn"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeDescriptionColumn"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeOptionColumn"/>
+                  </Grid.ColumnDefinitions>
+
+                  <TextBlock Grid.Column="0" Text="{Binding Name}"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Desc}" Margin="8,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                  <TextBlock Grid.Column="2" Text="{Binding Arg}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                </Grid>
+              </DataTemplate>
+            </ComboBox.ItemTemplate>
+
+            <ComboBox.SelectionBoxItemTemplate>
+              <DataTemplate DataType="m:MergeMode">
+                <Grid ColumnDefinitions="Auto,*">
+                  <TextBlock Grid.Column="0" Text="{Binding Name}" Margin="0,0,8,0"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Desc}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                </Grid>
+              </DataTemplate>
+            </ComboBox.SelectionBoxItemTemplate>
+          </ComboBox>
+
+          <TextBlock Grid.Row="4" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
                      Text="{DynamicResource Text.Configure.Proxy}"/>
-          <TextBox Grid.Row="3" Grid.Column="1"
+          <TextBox Grid.Row="4" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Configure.Proxy.Placeholder}"
@@ -101,29 +137,29 @@
             </TextBox.InnerRightContent>
           </TextBox>
 
-          <TextBlock Grid.Row="4" Grid.Column="0"
+          <TextBlock Grid.Row="5" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
                      Text="{DynamicResource Text.Preferences.GPG.UserKey}"/>
-          <TextBox Grid.Row="4" Grid.Column="1"
+          <TextBox Grid.Row="5" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"
                    Text="{Binding GPGUserSigningKey, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="5" Grid.Column="1"
+          <CheckBox Grid.Row="6" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
                     IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="6" Grid.Column="1"
+          <CheckBox Grid.Row="7" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="7" Grid.Column="1"
+          <CheckBox Grid.Row="8" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
                     IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"/>
 
-          <StackPanel Grid.Row="8" Grid.Column="1" Orientation="Horizontal">
+          <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal">
             <CheckBox x:Name="AutoFetchCheckBox"
                       Content="{DynamicResource Text.Configure.Git.AutoFetch}"
                       IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>

From 67fb0b300f90e6582a5343888fb0a719ab7fd197 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 06:43:08 +0000
Subject: [PATCH 341/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 6ebb72c1..0f44cbcf 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,13 +6,14 @@ 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-98.52%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-98.39%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
 - Text.BranchUpstreamInvalid
 - Text.Configure.CustomAction.WaitForExit
+- Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleAzure
 - Text.CopyFullPath
 - Text.Diff.First
@@ -25,47 +26,51 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.73%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
+- Text.Configure.Git.PreferredMergeMode
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.87%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.73%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
+- Text.Configure.Git.PreferredMergeMode
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-99.60%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-99.46%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
+- Text.Configure.Git.PreferredMergeMode
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.60%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.46%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
+- Text.Configure.Git.PreferredMergeMode
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-90.86%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-90.74%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -86,6 +91,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitDetail.Info.Children
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
+- Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
 - Text.CopyFullPath
@@ -141,11 +147,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.87%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
+- Text.Configure.Git.PreferredMergeMode
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>

From 3275dd07d226c6c6dc4c6a75b1f83d53108fdcbb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 16:03:49 +0800
Subject: [PATCH 342/364] enhance: auto stash and re-apply local changes before
 squashing (#1141)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Histories.cs | 12 ------------
 src/ViewModels/Squash.cs    | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 01114dd3..b0bbff3c 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -419,12 +419,6 @@ namespace SourceGit.ViewModels
                         squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
                         squash.Click += (_, e) =>
                         {
-                            if (_repo.LocalChangesCount > 0)
-                            {
-                                App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
-                                return;
-                            }
-
                             if (_repo.CanCreatePopup())
                                 _repo.ShowPopup(new Squash(_repo, commit, commit.SHA));
 
@@ -458,12 +452,6 @@ namespace SourceGit.ViewModels
                     squash.IsEnabled = commit.Parents.Count == 1;
                     squash.Click += (_, e) =>
                     {
-                        if (_repo.LocalChangesCount > 0)
-                        {
-                            App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
-                            return;
-                        }
-
                         if (commit.Parents.Count == 1)
                         {
                             var parent = _commits.Find(x => x.SHA == commit.Parents[0]);
diff --git a/src/ViewModels/Squash.cs b/src/ViewModels/Squash.cs
index 198dbe9a..eceb8339 100644
--- a/src/ViewModels/Squash.cs
+++ b/src/ViewModels/Squash.cs
@@ -33,9 +33,28 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                var succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Exec();
+                var autoStashed = false;
+                var succ = false;
+
+                if (_repo.LocalChangesCount > 0)
+                {
+                    succ = new Commands.Stash(_repo.FullPath).Push("SQUASH_AUTO_STASH");
+                    if (!succ)
+                    {
+                        CallUIThread(() => _repo.SetWatcherEnabled(true));
+                        return false;
+                    }
+
+                    autoStashed = true;
+                }
+
+                succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Exec();
                 if (succ)
                     succ = new Commands.Commit(_repo.FullPath, _message, true, _repo.Settings.EnableSignOffForCommit).Run();
+
+                if (succ && autoStashed)
+                    new Commands.Stash(_repo.FullPath).Pop("stash@{0}");
+
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return succ;
             });

From f5c213060eb842a302713ba27178c0f0a0c6e37b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 20:05:24 +0800
Subject: [PATCH 343/364] localization: keep all keys in order and remove
 duplicated keys in fr_FR (#1161)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml |  69 +++++------
 src/Resources/Locales/en_US.axaml |   2 +-
 src/Resources/Locales/es_ES.axaml |  71 +++++------
 src/Resources/Locales/fr_FR.axaml | 188 ++++++++++++++----------------
 src/Resources/Locales/it_IT.axaml |  73 ++++++------
 src/Resources/Locales/ja_JP.axaml |  69 +++++------
 src/Resources/Locales/pt_BR.axaml |  90 ++++++--------
 src/Resources/Locales/ru_RU.axaml |  92 +++++++--------
 src/Resources/Locales/zh_CN.axaml |  70 +++++------
 src/Resources/Locales/zh_TW.axaml |  70 +++++------
 10 files changed, 377 insertions(+), 417 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index bbfe4545..276f44e8 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <x:String x:Key="Text.About" xml:space="preserve">Info</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Über SourceGit</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Open Source &amp; freier Git GUI Client</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Worktree hinzufügen</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Was auschecken:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Existierender Branch</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Neuen Branch erstellen</x:String>
   <x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Ordner:</x:String>
   <x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">Pfad für diesen Worktree. Relativer Pfad wird unterstützt.</x:String>
   <x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">Branch Name:</x:String>
   <x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Optional. Standard ist der Zielordnername.</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Branch verfolgen:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Remote-Branch verfolgen</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Was auschecken:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Neuen Branch erstellen</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Existierender Branch</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">OpenAI Assistent</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">Neu generieren</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Verwende OpenAI, um Commit-Nachrichten zu generieren</x:String>
@@ -63,8 +64,8 @@
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Branch Vergleich</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ABBRECHEN</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Auf diese Revision zurücksetzen</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Auf Vorgänger-Revision zurücksetzen</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Auf diese Revision zurücksetzen</x:String>
   <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generiere Commit-Nachricht</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">ANZEIGE MODUS ÄNDERN</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Zeige als Datei- und Ordnerliste</x:String>
@@ -72,12 +73,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Zeige als Dateisystembaum</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Branch auschecken</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">Commit auschecken</x:String>
-  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Warnung: Beim Auschecken eines Commits wird dein HEAD losgelöst (detached) sein!</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Warnung: Beim Auschecken eines Commits wird dein HEAD losgelöst (detached) sein!</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Quelle an Commit-Nachricht anhängen</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
@@ -96,9 +97,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Repository URL:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">SCHLIESSEN</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Commit auschecken</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Diesen Commit cherry-picken</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Mehrere cherry-picken</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Commit auschecken</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Mit HEAD vergleichen</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Mit Worktree vergleichen</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Info kopieren</x:String>
@@ -133,12 +134,12 @@
   <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.WebLinks" xml:space="preserve">Im Browser öffnen</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Commit-Nachricht</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Details</x:String>
+  <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.Name" xml:space="preserve">Template Name:</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>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argumente:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Repository Pfad; ${SHA} - SHA-Wert des selektierten Commits</x:String>
@@ -158,9 +159,9 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Beispiel für Gitee Issue Regel einfügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Beispiel für Gitee Pull Request Regel einfügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Beispiel für Github-Regel hinzufügen</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Beispiel für Jira-Regel hinzufügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Beispiel für Gitlab Issue Regel einfügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Beispiel für Gitlab Merge Request einfügen</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Beispiel für Jira-Regel hinzufügen</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Neue Regel</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Ticketnummer Regex-Ausdruck:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Name:</x:String>
@@ -220,9 +221,9 @@
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Pfad:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Ziel:</x:String>
-  <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Bestätige löschen von Gruppe</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Alle Nachfolger werden aus der Liste entfernt.</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">Dadurch wird es nur aus der Liste entfernt, nicht von der Festplatte!</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Bestätige löschen von Gruppe</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Bestätige löschen von Repository</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Lösche Submodul</x:String>
   <x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">Submodul Pfad:</x:String>
@@ -289,11 +290,11 @@
   <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">Unstage</x:String>
   <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">{0} Dateien unstagen</x:String>
   <x:String x:Key="Text.FileCM.UnstageSelectedLines" xml:space="preserve">Änderungen in ausgewählten Zeilen unstagen</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">"Ihre" verwenden (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">"Meine" verwenden (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">"Ihre" verwenden (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Datei Historie</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">INHALT</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">ÄNDERUNGEN</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">INHALT</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">Development-Branch:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
@@ -323,8 +324,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">Eigenes Muster:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Verfolgungsmuster zu Git LFS hinzufügen</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Fetch</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">LFS Objekte fetchen</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Führt `git lfs fetch` aus um Git LFS Objekte herunterzuladen. Das aktualisiert nicht die Arbeitskopie.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">LFS Objekte fetchen</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Installiere Git LFS Hooks</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Sperren anzeigen</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Keine gesperrten Dateien</x:String>
@@ -336,11 +337,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Prune</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Führt `git lfs prune` aus um alte LFS Dateien von lokalem Speicher zu löschen</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Pull</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">LFS Objekte pullen</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Führt `git lfs pull` aus um alle Git LFS Dasteien für aktuellen Ref &amp; Checkout herunterzuladen</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">LFS Objekte pullen</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Push</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">LFS Objekte pushen</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Pushe große Dateien in der Warteschlange zum Git LFS Endpunkt</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">LFS Objekte pushen</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Verfolge alle '{0}' Dateien</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Verfolge alle *{0} Dateien</x:String>
@@ -359,8 +360,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Aktuelles Popup schließen</x:String>
   <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Klone neues Repository</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Aktuellen Tab schließen</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Zum vorherigen Tab wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Zum nächsten Tab wechseln</x:String>
+  <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.Repo" xml:space="preserve">REPOSITORY</x:String>
@@ -371,11 +372,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Ausgewählte Änderungen verwerfen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Dashboard Modus (Standard)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Commit-Suchmodus</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Push, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Erzwinge Neuladen des Repositorys</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Ausgewählte Änderungen stagen/unstagen</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Commit-Suchmodus</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Wechsle zu 'Änderungen'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Wechsle zu 'Verlauf'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Wechsle zu 'Stashes'</x:String>
@@ -384,9 +385,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Suche nächste Übereinstimmung</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Suche vorherige Übereinstimmung</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Öffne Suchpanel</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Verwerfen</x:String>
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stagen</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstagen</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Verwerfen</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Initialisiere Repository</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Pfad:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick wird durchgeführt.</x:String>
@@ -398,10 +399,10 @@
   <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert wird durchgeführt.</x:String>
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Reverte commit</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interaktiver Rebase</x:String>
-  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ziel Branch:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Auf:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">In Browser öffnen</x:String>
+  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ziel Branch:</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Link kopieren</x:String>
+  <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.Merge" xml:space="preserve">Branch mergen</x:String>
@@ -427,24 +428,24 @@
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Kopiere Repository-Pfad</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Repositories</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Einfügen</x:String>
-  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Gerade eben</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Vor {0} Minuten</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Vor {0} Tagen</x:String>
   <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">Vor 1 Stunde</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">Vor {0} Stunden</x:String>
-  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Gestern</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Vor {0} Tagen</x:String>
+  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Gerade eben</x:String>
   <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">Letzter Monat</x:String>
-  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Vor {0} Monaten</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Leztes Jahr</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Vor {0} Minuten</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Vor {0} Monaten</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Vor {0} Jahren</x:String>
+  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Gestern</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Einstellungen</x:String>
   <x:String x:Key="Text.Preferences.AI" xml:space="preserve">OPEN AI</x:String>
   <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analysierung des Diff Befehl</x:String>
   <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API Schlüssel</x:String>
   <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">Generiere Nachricht Befehl</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modell</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Name</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
-  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modell</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
@@ -474,24 +475,24 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Benutzer Email</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Aktivere --prune beim fetchen</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Diese App setzt Git (&gt;= 2.23.0) voraus</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Installationspfad</x:String>
   <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Aktiviere HTTP SSL Verifizierung</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Globaler Git Benutzername</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git Version</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Diese App setzt Git (>= 2.23.0) voraus</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG SIGNIERUNG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit-Signierung</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Tag-Signierung</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">GPG Format</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">GPG Installationspfad</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Installationspfad zum GPG Programm</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Tag-Signierung</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Benutzer Signierungsschlüssel</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">GPG Benutzer Signierungsschlüssel</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">EINBINDUNGEN</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Pfad</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Remote löschen</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Ziel:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Worktrees löschen</x:String>
@@ -657,11 +658,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">Statistiken</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMITS</x:String>
   <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">COMMITTER</x:String>
+  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">ÜBERSICHT</x:String>
   <x:String x:Key="Text.Statistics.ThisMonth" xml:space="preserve">MONAT</x:String>
   <x:String x:Key="Text.Statistics.ThisWeek" xml:space="preserve">WOCHE</x:String>
-  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">AUTOREN: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">ÜBERSICHT</x:String>
+  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Submodule" xml:space="preserve">SUBMODULE</x:String>
   <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Submodul hinzufügen</x:String>
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Relativen Pfad kopieren</x:String>
@@ -676,13 +677,13 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Lösche ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ in ${1}$ hinein...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Pushe ${0}$...</x:String>
-  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Submodule aktualisieren</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Alle Submodule</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Initialisiere wenn nötig</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Rekursiv</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submodul:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Verwende `--remote` Option</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Warnung</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Willkommensseite</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Erstelle Gruppe</x:String>
@@ -718,6 +719,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">NICHT-VERFOLGTE DATEIEN INKLUDIEREN</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">KEINE BISHERIGEN COMMIT-NACHRICHTEN</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">KEINE COMMIT TEMPLATES</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Rechtsklick auf selektierte Dateien und wähle die Konfliktlösungen aus.</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">GESTAGED</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGEN</x:String>
@@ -727,7 +729,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">ALLES STAGEN</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">ALS UNVERÄNDERT ANGENOMMENE ANZEIGEN</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Template: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Rechtsklick auf selektierte Dateien und wähle die Konfliktlösungen aus.</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">ARBEITSPLATZ: </x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Arbeitsplätze konfigurieren...</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d1e32e84..97b2a832 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -486,7 +486,7 @@
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">User Name</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git version</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) is required by this app</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) is required by this app</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG SIGNING</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit GPG signing</x:String>
   <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Tag GPG signing</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 8b4c350f..e6968560 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <x:String x:Key="Text.About" xml:space="preserve">Acerca de</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Acerca de SourceGit</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Cliente Git GUI de código abierto y gratuito</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Agregar Worktree</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Qué Checkout:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Rama Existente</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Crear Nueva Rama</x:String>
   <x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Ubicación:</x:String>
   <x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">Ruta para este worktree. Se admite ruta relativa.</x:String>
   <x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">Nombre de la Rama:</x:String>
   <x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Opcional. Por defecto es el nombre de la carpeta de destino.</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Rama de Seguimiento:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Seguimiento de rama remota</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Qué Checkout:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Crear Nueva Rama</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Rama Existente</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Asistente OpenAI</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GENERAR</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usar OpenAI para generar mensaje de commit</x:String>
@@ -64,8 +65,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">¡Upstream inválido!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">CANCELAR</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Resetear a Esta Revisión</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Resetear a Revisión Padre</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Resetear a Esta Revisión</x:String>
   <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generar mensaje de commit</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">CAMBIAR MODO DE VISUALIZACIÓN</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Mostrar como Lista de Archivos y Directorios</x:String>
@@ -73,12 +74,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Mostrar como Árbol de Sistema de Archivos</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Rama</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">Checkout Commit</x:String>
-  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Advertencia: Al hacer un checkout de commit, tu Head se separará</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Rama:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Advertencia: Al hacer un checkout de commit, tu Head se separará</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Rama:</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Añadir fuente al mensaje de commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
@@ -97,9 +98,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL del Repositorio:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">CERRAR</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick Este Commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick ...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparar con HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Comparar con Worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copiar Información</x:String>
@@ -134,12 +135,12 @@
   <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.WebLinks" xml:space="preserve">Abrir en Navegador</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Introducir asunto del commit</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Descripción</x:String>
+  <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.Name" xml:space="preserve">Nombre de la Plantilla:</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>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argumentos:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Ruta del repositorio; ${SHA} - SHA del commit seleccionado</x:String>
@@ -157,13 +158,13 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto por Defecto</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SEGUIMIENTO DE INCIDENCIAS</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Añadir Regla de Ejemplo para Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Añadir Regla de Ejemplo para Incidencias de Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Añadir Regla de Ejemplo para Pull Requests de Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Añadir Regla de Ejemplo para Github</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Añadir Regla de Ejemplo para Jira</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Añadir Regla de Ejemplo para Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Añadir Regla de Ejemplo para Incidencias de GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Añadir Regla de Ejemplo para Merge Requests de GitLab</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Añadir Regla de Ejemplo para Jira</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nueva Regla</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Expresión Regex para Incidencias:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nombre de la Regla:</x:String>
@@ -188,8 +189,8 @@
   <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Tipo de Cambio:</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar Todo el Texto</x:String>
-  <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Ruta</x:String>
   <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copiar Ruta Completa</x:String>
+  <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Ruta</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Crear Rama...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basado En:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>
@@ -225,8 +226,8 @@
   <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Ruta:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Destino:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Todos los hijos serán removidos de la lista.</x:String>
-  <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Confirmar Eliminación de Grupo</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">¡Esto solo lo removera de la lista, no del disco!</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Confirmar Eliminación de Grupo</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Confirmar Eliminación de Repositorio</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Eliminar Submódulo</x:String>
   <x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">Ruta del Submódulo:</x:String>
@@ -295,11 +296,11 @@
   <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">Unstage</x:String>
   <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">Unstage {0} archivos</x:String>
   <x:String x:Key="Text.FileCM.UnstageSelectedLines" xml:space="preserve">Unstage Cambios en Línea(s) Seleccionada(s)</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usar Suyos (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">Usar Míos (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usar Suyos (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Historial de Archivos</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENIDO</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">CAMBIO</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENIDO</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">Rama de Desarrollo:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
@@ -329,8 +330,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">Patrón Personalizado:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Añadir Patrón de Seguimiento a Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Fetch</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Fetch Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Ejecuta `git lfs fetch` para descargar objetos Git LFS. Esto no actualiza la copia de trabajo.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Fetch Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Instalar hooks de Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Mostrar Bloqueos</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">No hay archivos bloqueados</x:String>
@@ -342,11 +343,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Prune</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Ejecuta `git lfs prune` para eliminar archivos LFS antiguos del almacenamiento local</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Pull</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Pull Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Ejecuta `git lfs pull` para descargar todos los archivos Git LFS para la referencia actual y hacer checkout</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Pull Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Push</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Push Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Push archivos grandes en cola al endpoint de Git LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Push Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Seguir archivos llamados '{0}'</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Seguir todos los archivos *{0}</x:String>
@@ -365,8 +366,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Cancelar popup actual</x:String>
   <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Clonar repositorio nuevo</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Cerrar página actual</x:String>
-  <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.GotoNextTab" xml:space="preserve">Ir a la siguiente página</x:String>
+  <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.Repo" xml:space="preserve">REPOSITORIO</x:String>
@@ -377,11 +378,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Descartar cambios seleccionados</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch, empieza directamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Modo Dashboard (Por Defecto)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modo de búsqueda de commits</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull, empieza directamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Push, empieza directamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Forzar a recargar este repositorio</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Stage/Unstage cambios seleccionados</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modo de búsqueda de commits</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Cambiar a 'Cambios'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Cambiar a 'Historias'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Cambiar a 'Stashes'</x:String>
@@ -390,9 +391,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Buscar siguiente coincidencia</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Buscar coincidencia anterior</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Abrir panel de búsqueda</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stage</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstage</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Inicializar Repositorio</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Ruta:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick en progreso.</x:String>
@@ -404,10 +405,10 @@
   <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert en progreso.</x:String>
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Haciendo revert del commit</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Rebase Interactivo</x:String>
-  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Rama Objetivo:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">En:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Abrir en el Navegador</x:String>
+  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Rama Objetivo:</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copiar Enlace</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Abrir en el Navegador</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">AVISO</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Merge Rama</x:String>
@@ -433,16 +434,16 @@
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Copiar Ruta del Repositorio</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Repositorios</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Pegar</x:String>
-  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Justo ahora</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Hace {0} minutos</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Hace {0} días</x:String>
   <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">Hace 1 hora</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">Hace {0} horas</x:String>
-  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ayer</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Hace {0} días</x:String>
+  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Justo ahora</x:String>
   <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">Último mes</x:String>
-  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Hace {0} meses</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Último año</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Hace {0} minutos</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Hace {0} meses</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Hace {0} años</x:String>
+  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ayer</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferencias</x:String>
   <x:String x:Key="Text.Preferences.Advanced" xml:space="preserve">Opciones Avanzadas</x:String>
   <x:String x:Key="Text.Preferences.AI" xml:space="preserve">OPEN AI</x:String>
@@ -484,24 +485,24 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email de usuario</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global del usuario git</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Habilitar --prune para fetch</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Se requiere Git (&gt;= 2.23.0) para esta aplicación</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Ruta de instalación</x:String>
   <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Habilitar verificación HTTP SSL</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nombre de usuario</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nombre global del usuario git</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versión de Git</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Se requiere Git (>= 2.23.0) para esta aplicación</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">FIRMA GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Firma GPG en commit</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG en etiqueta</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Formato GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Ruta de instalación del programa</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Introducir ruta para el programa gpg instalado</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG en etiqueta</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Clave de firma del usuario</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Clave de firma gpg del usuario</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRACIÓN</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Ruta</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Podar Remoto</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destino:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Podar Worktrees</x:String>
@@ -668,11 +669,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">Estadísticas</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMITS</x:String>
   <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">COMMITTER</x:String>
+  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">GENERAL</x:String>
   <x:String x:Key="Text.Statistics.ThisMonth" xml:space="preserve">MES</x:String>
   <x:String x:Key="Text.Statistics.ThisWeek" xml:space="preserve">SEMANA</x:String>
-  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">AUTORES: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">GENERAL</x:String>
+  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Submodule" xml:space="preserve">SUBMÓDULOS</x:String>
   <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Añadir Submódulo</x:String>
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Copiar Ruta Relativa</x:String>
@@ -687,13 +688,13 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Eliminar ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ en ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
-  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Actualizar Submódulos</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Todos los submódulos</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Inicializar según sea necesario</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Recursivamente</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submódulo:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Usar opción --remote</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Advertencia</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Página de Bienvenida</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Crear Grupo</x:String>
@@ -729,6 +730,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARCHIVOS NO RASTREADOS</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO HAY MENSAJES DE ENTRADA RECIENTES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO HAY PLANTILLAS DE COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Haz clic derecho en el(los) archivo(s) seleccionado(s) y elige tu opción para resolver conflictos.</x:String>
   <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">Firmar</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGE</x:String>
@@ -738,7 +740,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">STAGE TODO</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VER ASSUME UNCHANGED</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Plantilla: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Haz clic derecho en el(los) archivo(s) seleccionado(s) y elige tu opción para resolver conflictos.</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">ESPACIO DE TRABAJO: </x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configura Espacios de Trabajo...</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index bf238aa2..f3cf80eb 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -2,21 +2,22 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <x:String x:Key="Text.About" xml:space="preserve">À propos</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">À propos de SourceGit</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Client Git Open Source et Gratuit</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Ajouter un Worktree</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Que récupérer :</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Créer une nouvelle branche</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branche existante</x:String>
   <x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Emplacement :</x:String>
   <x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">Chemin vers ce worktree. Relatif supporté.</x:String>
   <x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">Nom de branche:</x:String>
   <x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Optionnel. Nom du dossier de destination par défaut.</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Suivre la branche :</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Suivi de la branche distante</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Que récupérer :</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Créer une nouvelle branche</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branche existante</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assistant IA</x:String>
-  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GÉNERER</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GÉNÉRER</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Utiliser l'IA pour générer un message de commit</x:String>
   <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLIQUER COMME MESSAGE DE COMMIT</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Appliquer</x:String>
@@ -61,7 +62,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Renommer ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Définir la branche de suivi...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Comparer les branches</x:String>
-  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Branche amont invalide !</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Branche en amont invalide!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Octets</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ANNULER</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Réinitialiser à la révision parente</x:String>
@@ -75,10 +76,10 @@
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">Récupérer ce commit</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit :</x:String>
   <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Avertissement: une récupération vers un commit aboutiera vers un HEAD détaché</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Annuler</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Mettre en stash et réappliquer</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick de ce commit</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Ajouter la source au message de commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit :</x:String>
@@ -94,13 +95,13 @@
   <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">Nom local :</x:String>
   <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">Nom de dépôt. Optionnel.</x:String>
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Dossier parent :</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Initialiser et mettre à jour les sous-modules</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL du dépôt :</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">FERMER</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Éditeur</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Récupérer ce commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick ce commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick ...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copier les informations</x:String>
@@ -135,20 +136,22 @@
   <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.WebLinks" xml:space="preserve">Ouvrir dans le navigateur</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Entrez le message du commit</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Description</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Entrez le message du commit</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Configurer le dépôt</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">MODÈLE DE COMMIT</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nom de modèle:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Contenu de modèle:</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nom de modèle:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ACTION PERSONNALISÉE</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments :</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Chemin du repository; ${SHA} - SHA du commit sélectionné</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">Fichier exécutable :</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Name" xml:space="preserve">Nom :</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">Portée :</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Branche</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">Commit</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">Repository</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Attendre la fin de l'action</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Adresse e-mail</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Adresse e-mail</x:String>
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
@@ -156,13 +159,13 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">minute(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Dépôt par défaut</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">SUIVI DES PROBLÈMES</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Ajouter une règle d'exemple Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Ajouter une règle d'exemple Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Ajouter une règle d'exemple pour Pull Request Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Ajouter une règle d'exemple Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Ajouter une règle d'exemple pour Incidents GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Ajouter une règle d'exemple pour Merge Request GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Ajouter une règle d'exemple Jira</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Ajouter une règle d'exemple Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nouvelle règle</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Issue Regex Expression:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nom de règle :</x:String>
@@ -187,8 +190,8 @@
   <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Type de Changement :</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Copier</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copier tout le texte</x:String>
-  <x:String x:Key="Text.CopyPath" xml:space="preserve">Copier le chemin</x:String>
   <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copier le chemin complet</x:String>
+  <x:String x:Key="Text.CopyPath" xml:space="preserve">Copier le chemin</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Créer une branche...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basé sur :</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Récupérer la branche créée</x:String>
@@ -221,7 +224,10 @@
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Vous essayez de supprimer plusieurs branches à la fois. Assurez-vous de revérifier avant de procéder !</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Supprimer Remote</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remote :</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Chemin:</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Cible :</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Tous les enfants seront retirés de la liste.</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">Cela le supprimera uniquement de la liste, pas du disque !</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Confirmer la suppression du groupe</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Confirmer la suppression du dépôt</x:String>
   <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Supprimer le sous-module</x:String>
@@ -234,7 +240,9 @@
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">ANCIEN</x:String>
   <x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copier</x:String>
   <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Mode de fichier changé</x:String>
+  <x:String x:Key="Text.Diff.First" xml:space="preserve">Première différence</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorer les changements d'espaces</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Dernière différence</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">CHANGEMENT D'OBJET LFS</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Différence suivante</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">PAS DE CHANGEMENT OU SEULEMENT EN FIN DE LIGNE</x:String>
@@ -247,8 +255,8 @@
   <x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">Permuter</x:String>
   <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Coloration syntaxique</x:String>
   <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Retour à la ligne</x:String>
-  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Ouvrir dans l'outil de fusion</x:String>
   <x:String x:Key="Text.Diff.UseBlockNavigation" xml:space="preserve">Activer la navigation par blocs</x:String>
+  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Ouvrir dans l'outil de fusion</x:String>
   <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Voir toutes les lignes</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Réduit le nombre de ligne visibles</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Augmente le nombre de ligne visibles</x:String>
@@ -292,8 +300,8 @@
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">Utiliser les miennes (checkout --ours)</x:String>
   <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Utiliser les leurs (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Historique du fichier</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENU</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">MODIFICATION</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENU</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">Branche de développement :</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
@@ -323,8 +331,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">Pattern personnalisé :</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Ajouter un pattern de suivi à Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Fetch</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Fetch les objets LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Lancer `git lfs fetch` pour télécharger les objets Git LFS. Cela ne met pas à jour la copie de travail.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Fetch les objets LFS</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Installer les hooks Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Afficher les verrous</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Pas de fichiers verrouillés</x:String>
@@ -336,11 +344,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Elaguer</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Lancer `git lfs prune` pour supprimer les anciens fichier LFS du stockage local</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Pull</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Pull les objets LFS</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Lancer `git lfs pull` pour télécharger tous les fichier Git LFS de la référence actuelle &amp; récupérer</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Pull les objets LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Pousser</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Pousser les objets LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Transférer les fichiers volumineux en file d'attente vers le point de terminaison Git LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Pousser les objets LFS</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Dépôt :</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Suivre les fichiers appelés '{0}'</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Suivre tous les fichiers *{0}</x:String>
@@ -359,8 +367,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Annuler le popup en cours</x:String>
   <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Cloner un nouveau dépôt</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Fermer la page en cours</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Aller à la page précédente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Aller à la page suivante</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Aller à la page précédente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Créer une nouvelle page</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Ouvrir le dialogue des préférences</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">DÉPÔT</x:String>
@@ -371,11 +379,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Rejeter les changements sélectionnés</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch, démarre directement</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Mode tableau de bord (Défaut)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Recherche de commit</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull, démarre directement</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Push, démarre directement</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Forcer le rechargement du dépôt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Ajouter/Retirer les changements sélectionnés de l'index</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Recherche de commit</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Basculer vers 'Changements'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Basculer vers 'Historique'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Basculer vers 'Stashes'</x:String>
@@ -384,25 +392,34 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Trouver la prochaine correspondance</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Trouver la correspondance précédente</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Ouvrir le panneau de recherche</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Rejeter</x:String>
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Indexer</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Retirer de l'index</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Rejeter</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Initialiser le repository</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Chemin :</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick en cours.</x:String>
+  <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Traitement du commit</x:String>
   <x:String x:Key="Text.InProgress.Merge" xml:space="preserve">Merge request en cours.</x:String>
+  <x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">Fusionnement</x:String>
   <x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">Rebase en cours.</x:String>
+  <x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">Arrêté à</x:String>
   <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Annulation en cours.</x:String>
+  <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Annulation du commit</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Rebase interactif</x:String>
-  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Branche cible :</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Sur :</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Ouvrir dans le navigateur</x:String>
+  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Branche cible :</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copier le lien</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Ouvrir dans le navigateur</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERREUR</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Merger la branche </x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">Dans :</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Option de merge:</x:String>
+  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Source:</x:String>
+  <x:String x:Key="Text.MergeMultiple" xml:space="preserve">Fusionner (Plusieurs)</x:String>
+  <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Commit tous les changement</x:String>
+  <x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">Stratégie:</x:String>
+  <x:String x:Key="Text.MergeMultiple.Targets" xml:space="preserve">Cibles:</x:String>
   <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Déplacer le noeud du repository</x:String>
   <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Sélectionnier le noeud parent pour :</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">Nom :</x:String>
@@ -418,16 +435,16 @@
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Copier le chemin vers le dépôt</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Dépôts</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Coller</x:String>
-  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">A l'instant</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">il y a {0} minutes</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">il y a {0} jours</x:String>
   <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">il y a 1 heure</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">il y a {0} heures</x:String>
-  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Hier</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">il y a {0} jours</x:String>
+  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">A l'instant</x:String>
   <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">Le mois dernier</x:String>
-  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">il y a {0} mois</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'an dernier</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">il y a {0} minutes</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">il y a {0} mois</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">il y a {0} ans</x:String>
+  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Hier</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Préférences</x:String>
   <x:String x:Key="Text.Preferences.AI" xml:space="preserve">IA</x:String>
   <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Analyser Diff Prompt</x:String>
@@ -436,10 +453,15 @@
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modèle</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Nom</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Serveur</x:String>
+  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Activer le streaming</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPARENCE</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Police par défaut</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFontSize" xml:space="preserve">Taille de police par défaut</x:String>
   <x:String x:Key="Text.Preferences.Appearance.EditorFontSize" xml:space="preserve">Taille de police de l'éditeur</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Largeur de tab dans l'éditeur</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Taille de police</x:String>
+  <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>
@@ -452,9 +474,12 @@
   <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Outil</x:String>
   <x:String x:Key="Text.Preferences.General" xml:space="preserve">GÉNÉRAL</x:String>
   <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Vérifier les mises à jour au démarrage</x:String>
+  <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Format de date</x:String>
   <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Language</x:String>
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Historique de commits</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Afficher l'heure de l'auteur au lieu de l'heure de validation dans le graphique</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Afficher les enfants dans les détails du commit</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Afficher les tags dans le graphique des commits</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Guide de longueur du sujet</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">Activer auto CRLF</x:String>
@@ -462,24 +487,24 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">E-mail utilsateur</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">E-mail utilsateur global</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Activer --prune pour fetch</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Cette application requière Git (&gt;= 2.23.0)</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Chemin d'installation</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Activer la vérification HTTP SSL</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nom d'utilisateur</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nom d'utilisateur global</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Version de Git</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Cette application requière Git (>= 2.23.0)</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">SIGNATURE GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Signature GPG de commit</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Signature GPG de tag</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Format GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Chemin d'installation du programme</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Saisir le chemin d'installation vers le programme GPG</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Signature GPG de tag</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Clé de signature de l'utilisateur</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Clé de signature GPG de l'utilisateur</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRATION</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Chemin</x:String>
-  <x:String x:Key="Text.PruneRemote" xml:space="preserve">Élaguer une branche distant</x:String> <!-- If it is indeed about a branch -->
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Cible :</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Élaguer les Worktrees</x:String>
   <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve"> Élaguer les information de worktree dans `$GIT_COMMON_DIR/worktrees`</x:String>
@@ -539,14 +564,26 @@
   <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Tout effacer</x:String>
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configurer ce repository</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUER</x:String>
+  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Actions personnalisées</x:String>
   <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Pas d'actions personnalisées</x:String>
   <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Activer l'option '--reflog'</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Ouvrir dans l'explorateur de fichiers</x:String>
   <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Rechercher Branches/Tags/Submodules</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Visibilité dans le graphique</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Réinitialiser</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Cacher dans le graphique des commits</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filtrer dans le graphique des commits</x:String>
   <x:String x:Key="Text.Repository.FirstParentFilterToggle" xml:space="preserve">Activer l'option '--first-parent'</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">DISPOSITION</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">ORDRE DES COMMITS</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Date du commit</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologiquement</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCHES LOCALES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Naviguer vers le HEAD</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Créer une branche</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">EFFACER LES NOTIFICATIONS</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" xml:space="preserve">Mettre la branche courante en surbrillance dans le graph</x:String>
   <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">Ouvrir dans {0}</x:String>
   <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Ouvrir dans un outil externe</x:String>
@@ -561,13 +598,19 @@
   <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">Branche actuelle</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Voir les Tags en tant qu'arbre</x:String>
+  <x:String x:Key="Text.Repository.Skip" xml:space="preserve">PASSER</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistiques</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULES</x:String>
   <x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">AJOUTER SUBMODULE</x:String>
   <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">METTRE A JOUR SUBMODULE</x:String>
   <x:String x:Key="Text.Repository.Tags" xml:space="preserve">TAGS</x:String>
   <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">NOUVEAU TAG</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">Par date de créateur</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">Par nom (Croissant)</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">Par nom (Décroissant)</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Trier</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Ouvrir dans un terminal</x:String>
+  <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Utiliser le temps relatif dans les historiques</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREES</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">AJOUTER WORKTREE</x:String>
   <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">ELAGUER</x:String>
@@ -586,6 +629,7 @@
   <x:String x:Key="Text.Save" xml:space="preserve">SAUVEGARDER</x:String>
   <x:String x:Key="Text.SaveAs" xml:space="preserve">Sauvegarder en tant que...</x:String>
   <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">Le patch a été sauvegardé !</x:String>
+  <x:String x:Key="Text.ScanRepositories" xml:space="preserve">Analyser les repositories</x:String>
   <x:String x:Key="Text.ScanRepositories.RootDir" xml:space="preserve">Dossier racine :</x:String>
   <x:String x:Key="Text.SelfUpdate" xml:space="preserve">Rechercher des mises à jour...</x:String>
   <x:String x:Key="Text.SelfUpdate.Available" xml:space="preserve">Une nouvelle version du logiciel est disponible :</x:String>
@@ -594,10 +638,10 @@
   <x:String x:Key="Text.SelfUpdate.IgnoreThisVersion" xml:space="preserve">Passer cette version</x:String>
   <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Mise à jour du logiciel</x:String>
   <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">Il n'y a pas de mise à jour pour le moment.</x:String>
-  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Définir la branche de suivi</x:String>
-  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branche :</x:String>
-  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Escamoter la branche amont</x:String>
-  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">Branche amont:</x:String>
+  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Définir la branche suivie</x:String>
+  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branche:</x:String>
+  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Retirer la branche amont</x:String>
+  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">En amont:</x:String>
   <x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">Copier le SHA</x:String>
   <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Aller à</x:String>
   <x:String x:Key="Text.Squash" xml:space="preserve">Squash les commits</x:String>
@@ -607,7 +651,7 @@
   <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
   <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Auto-restauration après le stash</x:String>
-  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Vos fichiers de travail sont inchangés, mais un stash a été sauvegardé.</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Vos fichiers de travail restent inchangés, mais une sauvegarde est enregistrée.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Inclure les fichiers non-suivis</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Garder les fichiers indexés</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Message :</x:String>
@@ -626,11 +670,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">Statistiques</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMITS</x:String>
   <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">COMMITTER</x:String>
+  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">APERCU</x:String>
   <x:String x:Key="Text.Statistics.ThisMonth" xml:space="preserve">MOIS</x:String>
   <x:String x:Key="Text.Statistics.ThisWeek" xml:space="preserve">SEMAINE</x:String>
-  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">AUTEURS : </x:String>
-  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">APERCU</x:String>
+  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Submodule" xml:space="preserve">SOUS-MODULES</x:String>
   <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Ajouter un sous-module</x:String>
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Copier le chemin relatif</x:String>
@@ -645,13 +689,13 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Supprimer ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Fusionner ${0}$ dans ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Pousser ${0}$...</x:String>
-  <x:String x:Key="Text.URL" xml:space="preserve">URL :</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Actualiser les sous-modules</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tous les sous-modules</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Initialiser au besoin</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Récursivement</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Sous-module :</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Utiliser l'option --remote</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL :</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Avertissement</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Page d'accueil</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Créer un groupe</x:String>
@@ -679,6 +723,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; POUSSER</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Modèles/Historiques</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Modifier)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Indexer tous les changements et commit</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Un commit vide a été détecté ! Voulez-vous continuer (--allow-empty) ?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLITS DÉTECTÉS</x:String>
@@ -686,6 +731,8 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLURE LES FICHIERS NON-SUIVIS</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">PAS DE MESSAGE D'ENTRÉE RÉCENT</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">PAS DE MODÈLES DE COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Faites un clique droit sur les fichiers sélectionnés et faites vos choix pour la résoluion des conflits.</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">INDEXÉ</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">RETIRER DE L'INDEX</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">RETIRER TOUT DE L'INDEX</x:String>
@@ -694,7 +741,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">INDEXER TOUT</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VOIR LES FICHIERS PRÉSUMÉS INCHANGÉS</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Modèle: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Faites un clique droit sur les fichiers sélectionnés et faites vos choix pour la résoluion des conflits.</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">ESPACE DE TRAVAIL : </x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configurer les espaces de travail...</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
@@ -702,68 +748,4 @@
   <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Verrouiller</x:String>
   <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Supprimer</x:String>
   <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Déverrouiller</x:String>
-  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RE-GÉNÉRER</x:String>
-  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">APPLIQUER COMME MESSAGE DE COMMIT</x:String>
-  <x:String x:Key="Text.ApplyStash" xml:space="preserve">Appliquer le Stash</x:String>
-  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">Supprimer après l'application</x:String>
-  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">Rétablir les modifications de l'index</x:String>
-  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">Stash:</x:String>
-  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Action personnalisée</x:String>
-  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Branche en amont invalide!</x:String>
-  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">Initialiser et mettre à jour les sous-modules</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">Branche</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">Attendre la fin de l'action</x:String>
-  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Les espaces seront remplacés par des tirets.</x:String>
-  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Chemin:</x:String>
-  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">Tous les enfants seront retirés de la liste.</x:String>
-  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">Cela le supprimera uniquement de la liste, pas du disque !</x:String>
-  <x:String x:Key="Text.Diff.First" xml:space="preserve">Première différence</x:String>
-  <x:String x:Key="Text.Diff.Last" xml:space="preserve">Dernière différence</x:String>
-  <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Traitement du commit</x:String>
-  <x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">Fusionnement</x:String>
-  <x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">Arrêté à</x:String>
-  <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Annulation du commit</x:String>
-  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Source:</x:String>
-  <x:String x:Key="Text.MergeMultiple" xml:space="preserve">Fusionner (Plusieurs)</x:String>
-  <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Commit tous les changement</x:String>
-  <x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">Stratégie:</x:String>
-  <x:String x:Key="Text.MergeMultiple.Targets" xml:space="preserve">Cibles:</x:String>
-  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">Activer le streaming</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Largeur de tab dans l'éditeur</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Taille de police</x:String>
-  <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.General.DateFormat" xml:space="preserve">Format de date</x:String>
-  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Afficher les enfants dans les détails du commit</x:String>
-  <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Afficher les tags dans le graphique des commits</x:String>
-  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Activer la vérification HTTP SSL</x:String>
-  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Actions personnalisées</x:String>
-  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Visibilité dans le graphique</x:String>
-  <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Réinitialiser</x:String>
-  <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Cacher dans le graphique des commits</x:String>
-  <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filtrer dans le graphique des commits</x:String>
-  <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">DISPOSITION</x:String>
-  <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
-  <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">ORDRE DES COMMITS</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">Date du commit</x:String>
-  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">Topologiquement</x:String>
-  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">EFFACER LES NOTIFICATIONS</x:String>
-  <x:String x:Key="Text.Repository.Skip" xml:space="preserve">PASSER</x:String>
-  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">Par date de créateur</x:String>
-  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">Par nom (Croissant)</x:String>
-  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">Par nom (Décroissant)</x:String>
-  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Trier</x:String>
-  <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Utiliser le temps relatif dans les historiques</x:String>
-  <x:String x:Key="Text.ScanRepositories" xml:space="preserve">Analyser les repositories</x:String>
-  <x:String x:Key="Text.SetUpstream" xml:space="preserve">Définir la branche suivie</x:String>
-  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">Branche:</x:String>
-  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">Retirer la branche amont</x:String>
-  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">En amont:</x:String>
-  <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Aller sur</x:String>
-  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Restauration automatique après le stashing</x:String>
-  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Vos fichiers de travail restent inchangés, mais une sauvegarde est enregistrée.</x:String>
-  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Sauvegarder en tant que patch...</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Modifier)</x:String>
-  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">SignOff</x:String>
 </ResourceDictionary>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 85038d9e..95647101 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <x:String x:Key="Text.About" xml:space="preserve">Informazioni</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Informazioni su SourceGit</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Client GUI Git open source e gratuito</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Aggiungi Worktree</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Di cosa fare il checkout:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branch esistente</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Crea nuovo branch</x:String>
   <x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Posizione:</x:String>
   <x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">Percorso per questo worktree. Supportato il percorso relativo.</x:String>
   <x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">Nome Branch:</x:String>
   <x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Facoltativo. Predefinito è il nome della cartella di destinazione.</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Traccia Branch:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Traccia branch remoto</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Di cosa fare il checkout:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Crea nuovo branch</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branch esistente</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assistente AI</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">RIGENERA</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Usa AI per generare il messaggio di commit</x:String>
@@ -64,8 +65,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Upstream non valido</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Byte</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ANNULLA</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Ripristina Questa Revisione</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Ripristina la Revisione Padre</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Ripristina Questa Revisione</x:String>
   <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Genera messaggio di commit</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">CAMBIA MODALITÀ DI VISUALIZZAZIONE</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Mostra come elenco di file e cartelle</x:String>
@@ -73,12 +74,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Mostra come albero del filesystem</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">Checkout Commit</x:String>
-  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Avviso: Effettuando un checkout del commit, la tua HEAD sarà separata</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Avviso: Effettuando un checkout del commit, la tua HEAD sarà separata</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Aggiungi sorgente al messaggio di commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
@@ -97,9 +98,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL del Repository:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">CHIUDI</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick Questo Commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Confronta con HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Confronta con Worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copia Info</x:String>
@@ -134,12 +135,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">RIFERIMENTI</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Apri nel Browser</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Inserisci l'oggetto del commit</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Descrizione</x:String>
+  <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.Name" xml:space="preserve">Nome Template:</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>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argomenti:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Percorso del repository; ${SHA} - SHA del commit selezionato</x:String>
@@ -157,13 +158,13 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto/i</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto Predefinito</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TRACCIAMENTO ISSUE</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Aggiungi una regola di esempio per Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Aggiungi una regola di esempio per un Issue Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Aggiungi una regola di esempio per un Pull Request Gitee</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Aggiungi una regola di esempio per GitHub</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi una regola di esempio per Jira</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Aggiungi una regola di esempio per Azure DevOps</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Aggiungi una regola di esempio per Issue GitLab</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Aggiungi una regola di esempio per una Merge Request GitLab</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Aggiungi una regola di esempio per Jira</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nuova Regola</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Espressione Regex Issue:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nome Regola:</x:String>
@@ -244,7 +245,6 @@
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Differenza Successiva</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">NESSUNA MODIFICA O SOLO CAMBIAMENTI DI FINE LINEA</x:String>
   <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Differenza Precedente</x:String>
-  <x:String x:Key="Text.Diff.UseBlockNavigation" xml:space="preserve">Abilita la navigazione a blocchi</x:String>
   <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Salva come Patch</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Mostra Simboli Nascosti</x:String>
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Diff Affiancato</x:String>
@@ -253,6 +253,7 @@
   <x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">Scambia</x:String>
   <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Evidenziazione Sintassi</x:String>
   <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Avvolgimento delle Parole</x:String>
+  <x:String x:Key="Text.Diff.UseBlockNavigation" xml:space="preserve">Abilita la navigazione a blocchi</x:String>
   <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Apri nello Strumento di Merge</x:String>
   <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Mostra Tutte le Righe</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Diminuisci Numero di Righe Visibili</x:String>
@@ -294,11 +295,11 @@
   <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">Rimuovi da Stage</x:String>
   <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">Rimuovi da Stage {0} file</x:String>
   <x:String x:Key="Text.FileCM.UnstageSelectedLines" xml:space="preserve">Rimuovi le Righe Selezionate da Stage</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usa Il Loro (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">Usa Il Mio (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usa Il Loro (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Cronologia File</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENUTO</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">MODIFICA</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENUTO</x:String>
   <x:String x:Key="Text.Filter" xml:space="preserve">FILTRO</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">Branch di Sviluppo:</x:String>
@@ -329,8 +330,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">Modello Personalizzato:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Aggiungi Modello di Tracciamento a Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Recupera</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Recupera Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Esegui `git lfs fetch` per scaricare gli oggetti Git LFS. Questo non aggiorna la copia di lavoro.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Recupera Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Installa hook di Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Mostra Blocchi</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Nessun File Bloccato</x:String>
@@ -342,11 +343,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Elimina</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Esegui `git lfs prune` per eliminare vecchi file LFS dallo storage locale</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Scarica</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Scarica Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Esegui `git lfs pull` per scaricare tutti i file LFS per il ref corrente e fare il checkout</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Scarica Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Invia</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Invia Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Invia grandi file in coda al punto finale di Git LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Invia Oggetti LFS</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Traccia file con nome '{0}'</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Traccia tutti i file *{0}</x:String>
@@ -365,8 +366,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Annulla il popup corrente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Clona una nuova repository</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Chiudi la pagina corrente</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Vai alla pagina precedente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Vai alla pagina successiva</x:String>
+  <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.Repo" xml:space="preserve">REPOSITORY</x:String>
@@ -377,11 +378,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Scarta le modifiche selezionate</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Recupera, avvia direttamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Modalità Dashboard (Predefinita)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modalità ricerca commit</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Scarica, avvia direttamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Invia, avvia direttamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Forza l'aggiornamento di questo repository</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Aggiungi/Rimuovi da stage le modifiche selezionate</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modalità ricerca commit</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Passa a 'Modifiche'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Passa a 'Storico'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Passa a 'Stashes'</x:String>
@@ -390,9 +391,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Trova il prossimo risultato</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Trova il risultato precedente</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Apri il pannello di ricerca</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Aggiungi in stage</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Rimuovi</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Inizializza Repository</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Percorso:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick in corso.</x:String>
@@ -404,10 +405,10 @@
   <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Ripristino in corso.</x:String>
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Ripristinando il commit</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Riallinea Interattivamente</x:String>
-  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Branch di destinazione:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Su:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Apri nel Browser</x:String>
+  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Branch di destinazione:</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copia il Link</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Apri nel Browser</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERRORE</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">AVVISO</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Unisci Branch</x:String>
@@ -433,16 +434,16 @@
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Copia Percorso Repository</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Repository</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Incolla</x:String>
-  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Proprio ora</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minuti fa</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} giorni fa</x:String>
   <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 ora fa</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} ore fa</x:String>
-  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ieri</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} giorni fa</x:String>
+  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Proprio ora</x:String>
   <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">Il mese scorso</x:String>
-  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} mesi fa</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'anno scorso</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minuti fa</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} mesi fa</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} anni fa</x:String>
+  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ieri</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferenze</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">Analizza il Prompt Differenza</x:String>
@@ -482,24 +483,24 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email Utente</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email utente Git globale</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Abilita --prune durante il fetch</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Questa applicazione richiede Git (&gt;= 2.23.0)</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Percorso Installazione</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Abilita la verifica HTTP SSL</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome Utente</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome utente Git globale</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versione di Git</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Questa applicazione richiede Git (&gt;= 2.23.0)</x:String>
-  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Abilita la verifica HTTP SSL</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">FIRMA GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Firma GPG per commit</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG per tag</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Formato GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Percorso Programma Installato</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Inserisci il percorso per il programma GPG installato</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Firma GPG per tag</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Chiave Firma Utente</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Chiave GPG dell'utente per la firma</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRAZIONE</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINALE</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminale</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Percorso</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminale</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Potatura Remota</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Destinazione:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Potatura Worktrees</x:String>
@@ -667,11 +668,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">Statistiche</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMIT</x:String>
   <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">COMMITTER</x:String>
+  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">PANORAMICA</x:String>
   <x:String x:Key="Text.Statistics.ThisMonth" xml:space="preserve">MESE</x:String>
   <x:String x:Key="Text.Statistics.ThisWeek" xml:space="preserve">SETTIMANA</x:String>
-  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMIT:</x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">AUTORI:</x:String>
-  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">PANORAMICA</x:String>
+  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMIT:</x:String>
   <x:String x:Key="Text.Submodule" xml:space="preserve">SOTTOMODULI</x:String>
   <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Aggiungi Sottomodulo</x:String>
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Copia Percorso Relativo</x:String>
@@ -686,13 +687,13 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Elimina ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Unisci ${0}$ in ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Invia ${0}$...</x:String>
-  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Aggiorna Sottomoduli</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tutti i sottomoduli</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Inizializza se necessario</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Ricorsivamente</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Sottomodulo:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Usa opzione --remote</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Avviso</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Pagina di Benvenuto</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Crea Gruppo</x:String>
@@ -728,6 +729,8 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDI FILE NON TRACCIATI</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NESSUN MESSAGGIO RECENTE INSERITO</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NESSUN TEMPLATE DI COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Clicca con il tasto destro sul(i) file selezionato, quindi scegli come risolvere i conflitti.</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">IN STAGE</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">RIMUOVI DA STAGE</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">RIMUOVI TUTTO DA STAGE</x:String>
@@ -736,8 +739,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">FAI LO STAGE DI TUTTO</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VISUALIZZA COME NON MODIFICATO</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Template: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Clicca con il tasto destro sul(i) file selezionato, quindi scegli come risolvere i conflitti.</x:String>
-  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">SignOff</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">WORKSPACE:</x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configura Workspaces...</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 21255221..91cefbac 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <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.SubTitle" xml:space="preserve">オープンソース &amp; フリーなGit GUIクライアント</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">ワークツリーを追加</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">チェックアウトする内容:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">既存のブランチ</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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">OpenAI アシスタント</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">再生成</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">OpenAIを使用してコミットメッセージを生成</x:String>
@@ -64,8 +65,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">無効な上流ブランチ!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">バイト</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">キャンセル</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" 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>
@@ -73,12 +74,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">ファイルシステムのツリーを表示</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.Warning" xml:space="preserve">警告: コミットをチェックアウトするとHEADが切断されます</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">コミット:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">ブランチ:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">警告: コミットをチェックアウトするとHEADが切断されます</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">スタッシュして再適用</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">ブランチ:</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>
@@ -97,9 +98,9 @@
   <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.Checkout" 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.CopyInfo" xml:space="preserve">情報をコピー</x:String>
@@ -134,12 +135,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">参照</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">ブラウザで開く</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">コミットのタイトルを入力</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">テンプレート名:</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} - リポジトリのパス; ${BRANCH} - 選択中のブランチ; ${SHA} - 選択中のコミットのSHA</x:String>
@@ -157,13 +158,13 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">リモートの初期値</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUEトラッカー</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">サンプルのAzure DevOpsルールを追加</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">サンプルのGitee Issueルールを追加</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">サンプルのGiteeプルリクエストルールを追加</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 Issueルールを追加</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">サンプルのGitLabマージリクエストルールを追加</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">サンプルのJiraルールを追加</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">サンプルのAzure DevOpsルールを追加</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">Issueの正規表現:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">ルール名:</x:String>
@@ -188,8 +189,8 @@
   <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.CopyPath" 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>
@@ -225,8 +226,8 @@
   <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.TitleForGroup" 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>
@@ -295,11 +296,11 @@
   <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.UnstageSelectedLines" xml:space="preserve">選択された行の変更をアンステージ</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">相手の変更を使用 (checkout --theirs)</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.FileContent" 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>
@@ -329,8 +330,8 @@
   <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">フェッチ</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">LFSオブジェクトをフェッチ</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">`git lfs fetch`を実行して、Git LFSオブジェクトをダウンロードします。ワーキングコピーは更新されません。</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">LFSオブジェクトをフェッチ</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Git LFSフックをインストール</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>
@@ -342,11 +343,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">削除</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">`git lfs prune`を実行して、ローカルの保存領域から古いLFSファイルを削除します。</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">プル</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">LFSオブジェクトをプル</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">`git lfs pull`を実行して、現在の参照とチェックアウトのすべてのGit LFSファイルをダウンロードします。</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">LFSオブジェクトをプル</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">プッシュ</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">LFSオブジェクトをプッシュ</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>
@@ -365,8 +366,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" 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.GotoPrevTab" 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.Repo" xml:space="preserve">リポジトリ</x:String>
@@ -377,11 +378,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">選択した変更を破棄</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">直接フェッチを実行</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">直接プルを実行</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.StageOrUnstageSelected" 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.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>
@@ -390,9 +391,9 @@
   <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.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.Hunk.Discard" 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">チェリーピックが進行中です。'中止'を押すと元のHEADが復元されます。</x:String>
@@ -404,10 +405,10 @@
   <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">元に戻す処理が進行中です。'中止'を押すと元のHEADが復元されます。</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.Target" xml:space="preserve">対象のブランチ:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" 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.Merge" xml:space="preserve">ブランチのマージ</x:String>
@@ -433,16 +434,16 @@
   <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.JustNow" xml:space="preserve">たった今</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} 分前</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.Yesterday" xml:space="preserve">昨日</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" 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.MonthsAgo" xml:space="preserve">{0} ヶ月前</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">差分分析プロンプト</x:String>
@@ -483,24 +484,24 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">ユーザー Eメールアドレス</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">グローバルgitのEメールアドレス</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">フェッチ時に--pruneを有効化</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) はこのアプリで必要です</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.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.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) はこのアプリで必要です</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.TagEnabled" 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.Type" 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>
@@ -666,11 +667,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">統計</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">コミット</x:String>
   <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">コミット: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">著者: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">相対パスをコピー</x:String>
@@ -685,13 +686,13 @@
   <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">URL:</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.UseRemote" xml:space="preserve">--remoteオプションを使用</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL:</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>
@@ -727,6 +728,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.ResolveTip" 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>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">ステージを取り消し</x:String>
@@ -736,7 +738,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">すべてステージへ移動</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">変更されていないとみなしたものを表示</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">テンプレート: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">選択したファイルを右クリックし、競合を解決する操作を選択してください。</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>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 4ee6cdbc..09b78c31 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -3,43 +3,19 @@
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
 
-  <!--
-  Untranslated words for better usability, as those are common git concepts
-  Termos mantidos em Inglês para uma melhor usabilidade. Todos estao abertos para discussao.
-  - Branch
-  - Breaking Change     (contexto de Conventional Commit / Versioning)
-  - Checkout
-  - Cherry-pich
-  - Conventional Commit (Contexto: https://www.conventionalcommits.org/en)  
-  - Fast-Forward
-  - Link                (contexto de URL)
-  - Mainline
-  - Patch               (contexto de um Arquivo Patch para ser aplicado)
-  - Rebase
-  - Upstream
-  - Stashes
-  - submodules
-  - Tag
-  - Workspaces
-
-  Desambiguation (Aberto a discussoes)
-  - Bloquear/Desbloquear ao inves de   Travar/Destravar
-  - Exibir               ao inves de   Mostrar
-  -->
-  
   <x:String x:Key="Text.About" xml:space="preserve">Sobre</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">Sobre o SourceGit</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">Cliente Git GUI Livre e de Código Aberto</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Adicionar Worktree</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">O que Checar:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branch Existente</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Criar Novo Branch</x:String>
   <x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Localização:</x:String>
   <x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">Caminho para este worktree. Caminho relativo é suportado.</x:String>
   <x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">Nome do Branch:</x:String>
   <x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Opcional. O padrão é o nome da pasta de destino.</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Rastrear Branch:</x:String>
   <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">Rastreando branch remoto</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">O que Checar:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">Criar Novo Branch</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branch Existente</x:String>
   <x:String x:Key="Text.AIAssistant" xml:space="preserve">Assietente IA</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Utilizar IA para gerar mensagem de commit</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
@@ -80,8 +56,8 @@
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Comparação de Branches</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">CANCELAR</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Resetar para Esta Revisão</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Resetar para Revisão Pai</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Resetar para Esta Revisão</x:String>
   <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Gerar mensagem de commit</x:String>
   <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">ALTERAR MODO DE EXIBIÇÃO</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Exibir como Lista de Arquivos e Diretórios</x:String>
@@ -89,12 +65,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Exibir como Árvore de Sistema de Arquivos</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">Checkout Commit</x:String>
-  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Aviso: Ao fazer o checkout de um commit, seu Head ficará desanexado</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Aviso: Ao fazer o checkout de um commit, seu Head ficará desanexado</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Adicionar origem à mensagem de commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
@@ -112,9 +88,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL do Repositório:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">FECHAR</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checar Commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick este commit</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick ...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checar Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparar com HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Comparar com Worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Copiar Informações</x:String>
@@ -145,12 +121,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">REFERÊNCIAS</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Abrir no navegador</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Insira o assunto do commit</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Descrição</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Insira o assunto do commit</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Configurar Repositório</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">TEMPLATE DE COMMIT</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nome do Template:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Conteúdo do Template:</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nome do Template:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AÇÃO CUSTOMIZADA</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argumentos:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">${REPO} - Caminho do repositório; ${SHA} - SHA do commit selecionado</x:String>
@@ -166,11 +142,11 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minuto(s)</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Remoto padrão</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">RASTREADOR DE PROBLEMAS</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Adicionar Regra de Exemplo do Github</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Adicionar Regra de Exemplo do Jira</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Adicionar Regra de Exemplo do Azure DevOps</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Adicionar Regra de Exemplo do Github</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Adicionar Regra de Exemplo do GitLab </x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Adicionar regra de exemplo de Merge Request do GitLab</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Adicionar Regra de Exemplo do Jira</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nova Regra</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Expressão Regex de Issue:</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nome da Regra:</x:String>
@@ -292,11 +268,11 @@
   <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">Desfazer Preparação</x:String>
   <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">Desfazer Preparação de {0} arquivos</x:String>
   <x:String x:Key="Text.FileCM.UnstageSelectedLines" xml:space="preserve">Desfazer Preparação nas Linhas Selecionadas</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usar Deles (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">Usar Meu (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Usar Deles (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Histórico de Arquivos</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTEUDO</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">MUDANÇA</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTEUDO</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">Branch de Desenvolvimento:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
@@ -326,8 +302,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">Padrão Personalizado:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Adicionar Padrão de Rastreamento ao Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Buscar</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Buscar Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Execute `git lfs fetch` para baixar objetos Git LFS. Isso não atualiza a cópia de trabalho.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Buscar Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Instalar hooks do Git LFS</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Exibir bloqueios</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Sem Arquivos Bloqueados</x:String>
@@ -339,11 +315,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Prune</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Execute `git lfs prune` para excluir arquivos LFS antigos do armazenamento local</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Puxar</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Puxar Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Execute `git lfs pull` para baixar todos os arquivos Git LFS para a referência atual e checkout</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Puxar Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Enviar</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Enviar Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Envie arquivos grandes enfileirados para o endpoint Git LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Enviar Objetos LFS</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Rastrear arquivos nomeados '{0}'</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Rastrear todos os arquivos *{0}</x:String>
@@ -361,8 +337,8 @@
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Cancelar popup atual</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Fechar página atual</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Ir para a página anterior</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Ir para a próxima página</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Ir para a página anterior</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Criar nova página</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Abrir diálogo de preferências</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITÓRIO</x:String>
@@ -373,11 +349,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Descartar mudanças selecionadas</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Buscar, imediatamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Modo de Dashboard (Padrão)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modo de busca de commits</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Puxar, imediatamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Enviar, imediatamente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Forçar recarregamento deste repositório</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Preparar/Despreparar mudanças selecionadas</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Modo de busca de commits</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Alternar para 'Mudanças'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Alternar para 'Históricos'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Alternar para 'Stashes'</x:String>
@@ -386,9 +362,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Encontrar próxima correspondência</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Encontrar correspondência anterior</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Abrir painel de busca</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Preparar</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Despreparar</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Inicializar Repositório</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Caminho:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick em andamento.</x:String>
@@ -396,10 +372,10 @@
   <x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">Rebase em andamento.</x:String>
   <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert em andamento.</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Rebase Interativo</x:String>
-  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ramo Alvo:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Em:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Abrir no navegador</x:String>
+  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ramo Alvo:</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copiar link</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Abrir no navegador</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERRO</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">AVISO</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Mesclar Ramo</x:String>
@@ -420,16 +396,16 @@
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Copiar Caminho do Repositório</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Repositórios</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Colar</x:String>
-  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Agora mesmo</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutos atrás</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} dias atrás</x:String>
   <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 hora atrás</x:String>
   <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} horas atrás</x:String>
-  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ontem</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} dias atrás</x:String>
+  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">Agora mesmo</x:String>
   <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">Mês passado</x:String>
-  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} meses atrás</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Ano passado</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutos atrás</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} meses atrás</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} anos atrás</x:String>
+  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ontem</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferências</x:String>
   <x:String x:Key="Text.Preferences.AI" xml:space="preserve">INTELIGÊNCIA ARTIFICIAL</x:String>
   <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Prompt para Analisar Diff</x:String>
@@ -465,23 +441,23 @@
   <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email do Usuário</x:String>
   <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global do usuário git</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Habilita --prune ao buscar</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) é necessário para este aplicativo</x:String>
   <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Caminho de Instalação</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome do Usuário</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome global do usuário git</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Versão do Git</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (>= 2.23.0) é necessário para este aplicativo</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">ASSINATURA GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Assinatura GPG de commit</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Assinatura GPG de tag</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">Formato GPG</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">Caminho de Instalação do Programa</x:String>
   <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">Insira o caminho para o programa gpg instalado</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">Assinatura GPG de tag</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">Chave de Assinatura do Usuário</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Chave de assinatura gpg do usuário</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRAÇÃO</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Caminho</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Prunar Remoto</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Alvo:</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Podar Worktrees</x:String>
@@ -627,11 +603,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">Estatísticas</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMITS</x:String>
   <x:String x:Key="Text.Statistics.Committer" xml:space="preserve">COMMITTER</x:String>
+  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">VISÃO GERAL</x:String>
   <x:String x:Key="Text.Statistics.ThisMonth" xml:space="preserve">MÊS</x:String>
   <x:String x:Key="Text.Statistics.ThisWeek" xml:space="preserve">SEMANA</x:String>
-  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">AUTORES: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">VISÃO GERAL</x:String>
+  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
   <x:String x:Key="Text.Submodule" xml:space="preserve">SUBMÓDULOS</x:String>
   <x:String x:Key="Text.Submodule.Add" xml:space="preserve">Adicionar Submódulo</x:String>
   <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Copiar Caminho Relativo</x:String>
@@ -646,13 +622,13 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Excluir ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Mesclar ${0}$ em ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Enviar ${0}$...</x:String>
-  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Atualizar Submódulos</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Todos os submódulos</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Inicializar conforme necessário</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Recursivamente</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submódulo:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Usar opção --remote</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Aviso</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Página de Boas-vindas</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Criar Grupo Raíz</x:String>
@@ -687,6 +663,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARQUIVOS NÃO RASTREADOS</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">SEM MENSAGENS DE ENTRADA RECENTES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">SEM MODELOS DE COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Clique com o botão direito nos arquivos selecionados e escolha como resolver conflitos.</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGE</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">UNSTAGE TODOS</x:String>
@@ -695,7 +672,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">STAGE TODOS</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VER SUPOR NÃO ALTERADO</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Template: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Clique com o botão direito nos arquivos selecionados e escolha como resolver conflitos.</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">Workspaces: </x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configurar workspaces...</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 2ea274d1..7da65b5e 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <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.SubTitle" xml:space="preserve">Бесплатный графический клиент Git с исходным кодом</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">Добавить рабочий каталог</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">Переключиться на:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">ветку из списка</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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">Помощник OpenAI</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">ПЕРЕСОЗДАТЬ</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Использовать OpenAI для создания сообщения о ревизии</x:String>
@@ -42,7 +43,6 @@
   <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.CompareWithHead" xml:space="preserve">Сравнить с ГОЛОВОЙ (HEAD)</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>
@@ -64,8 +64,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Недопустимая основная ветка!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Байты</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">ОТМЕНА</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" 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>
@@ -73,12 +73,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Показывать в виде дерева файловой системы</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.Warning" xml:space="preserve">Предупреждение: После переключения ревизии ваша Голова (HEAD) будет отсоединена</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Ревизия:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Ветка:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Предупреждение: После переключения ревизии ваша Голова (HEAD) будет отсоединена</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">Отложить и примненить повторно</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Ветка:</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>
@@ -97,9 +97,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Адрес репозитория:</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">Применить эту ревизию (cherry-pick)</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Применить несколько ревизий ...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Переключиться на эту ревизию</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Сравнить c ГОЛОВОЙ (HEAD)</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Сравнить с рабочим каталогом</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">Копировать информацию</x:String>
@@ -134,12 +134,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">ССЫЛКИ</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Открыть в браузере</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Введите тему ревизии</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">Название:</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">${REPO} - Путь к репозиторию; ${SHA} - SHA ревизий</x:String>
@@ -157,13 +157,13 @@
   <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.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.AddSampleGiteeIssue" xml:space="preserve">Добавить пример правила для тем в Gitea</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Добавить пример правила запроса скачивания из Gitea</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Добавить пример правила для Git</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Добавить пример правила Jira</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Добавить пример правила Azure DevOps</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</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>
@@ -177,8 +177,8 @@
   <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.ConfigureWorkspace" xml:space="preserve">Рабочие пространства</x:String>
-  <x:String x:Key="Text.ConfigureWorkspace.Name" 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.ConventionalCommit" xml:space="preserve">Общепринятый помощник по ревизии</x:String>
   <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Кардинальные изменения:</x:String>
@@ -189,8 +189,8 @@
   <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.CopyPath" 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>
@@ -226,8 +226,8 @@
   <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.TitleForGroup" 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>
@@ -242,12 +242,12 @@
   <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.Last" xml:space="preserve">Последнее различие</x:String>
-  <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Показывать скрытые символы</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">ИЗМЕНЕНИЕ ОБЪЕКТА LFS</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.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.New" xml:space="preserve">НОВЫЙ</x:String>
@@ -296,11 +296,11 @@
   <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.UnstageSelectedLines" xml:space="preserve">Неподготовленные изменения в выбранной(ых) строке(ах)</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">Использовать их (checkout --theirs)</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.FileContent" 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-поток</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">Ветка разработчика:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Свойство:</x:String>
@@ -330,8 +330,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">Изменить шаблон:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Добавить шаблон отслеживания в LFS Git</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Извлечь</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Извлечь объекты LFS</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Запустить (git lfs fetch), чтобы загрузить объекты LFS Git. При этом рабочая копия не обновляется.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Извлечь объекты LFS</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Установить перехват LFS Git</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>
@@ -343,11 +343,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">Обрезать</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">Запустить (git lfs prune), чтобы удалить старые файлы LFS из локального хранилища</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Забрать</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Забрать объекты LFS</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">Запустить (git lfs pull), чтобы загрузить все файлы LFS Git для текущей ссылки и проверить</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">Забрать объекты LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">Выложить</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">Выложить объекты LFS</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">Отправляйте большие файлы, помещенные в очередь, в конечную точку LFS Git</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>
@@ -366,8 +366,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" 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.GotoPrevTab" 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.Repo" xml:space="preserve">РЕПОЗИТОРИЙ</x:String>
@@ -378,11 +378,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Отклонить выбранные изменения</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Извлечение, запускается сразу</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" 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.OpenSearchCommits" xml:space="preserve">Режим поиска ревизий</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Забрать, запускается сразу</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.StageOrUnstageSelected" 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.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>
@@ -391,9 +391,9 @@
   <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.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.Hunk.Discard" 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">Выполняется частичный перенос ревизий (cherry-pick).</x:String>
@@ -405,11 +405,10 @@
   <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.Target" xml:space="preserve">Целевая ветка:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">На:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" 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.Launcher.Error" xml:space="preserve">ОШИБКА</x:String>  
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Открыть в браузере</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">УВЕДОМЛЕНИЕ</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Влить ветку</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
@@ -434,20 +433,20 @@
   <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.JustNow" xml:space="preserve">Сейчас</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} минут назад</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.Yesterday" xml:space="preserve">Вчера</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" 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.MonthsAgo" xml:space="preserve">{0} месяцев назад</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">ОТКРЫТЬ ИИ</x:String>
-  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">Ключ API</x:String>
   <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Запрос на анализ различий</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>
@@ -455,9 +454,9 @@
   <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.EditorTabWidth" 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>
@@ -484,24 +483,24 @@
   <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">Разрешить (--prune) при скачивании</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Для работы программы требуется версия Git (&gt;= 2.23.0)</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.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.Git.Invalid" xml:space="preserve">Для работы программы требуется версия Git (>= 2.23.0)</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.TagEnabled" 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.Type" 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>
@@ -630,8 +629,6 @@
   <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.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.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>
@@ -643,12 +640,12 @@
   <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.Stash.OnlyStagedChanges" xml:space="preserve">Только подготовленные изменения</x:String>
-  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Подготовленные так и неподготовленные изменения выбранных файлов будут сохранены!!!</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.AutoRestore" xml:space="preserve">Автоматически восстанавливать после откладывания</x:String>
@@ -657,6 +654,8 @@
   <x:String x:Key="Text.Stash.KeepIndex" 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.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.Drop" xml:space="preserve">Отбросить</x:String>
@@ -669,11 +668,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">Статистика</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">РЕВИЗИИ</x:String>
   <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">РЕВИЗИИ: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">АВТОРЫ: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">Копировать относительный путь</x:String>
@@ -688,13 +687,13 @@
   <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">Сетевой адрес:</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.UseRemote" xml:space="preserve">Использовать опцию (--remote)</x:String>
+  <x:String x:Key="Text.URL" 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>
@@ -707,7 +706,6 @@
   <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.Welcome.Sort" xml:space="preserve">Сортировка</x:String>
   <x:String x:Key="Text.WorkingCopy" xml:space="preserve">Изменения</x:String>
@@ -730,6 +728,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.ResolveTip" 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>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">СНЯТЬ ПОДГОТОВЛЕННЫЙ</x:String>
@@ -739,7 +738,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">ВСЕ ПОДГОТОВИТЬ</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">ОТКРЫТЬ СПИСОК НЕОТСЛЕЖИВАЕМЫХ ФАЙЛОВ</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Шаблон: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Щёлкните правой кнопкой мыши выбранный файл(ы) и разрешите конфликты.</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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 932f1237..281d6a4d 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <x:String x:Key="Text.About" xml:space="preserve">关于软件</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">关于本软件</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">开源免费的Git客户端</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">新增工作树</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">检出分支方式 ：</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">已有分支</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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>
@@ -64,8 +65,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">跟踪的上游分支不存在或已删除！</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">字节</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取    消</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" 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>
@@ -73,12 +74,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">文件目录树形结构模式</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">检出(checkout)分支</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">检出(checkout)提交</x:String>
-  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">注意：执行该操作后，当前HEAD会变为游离(detached)状态!</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">提交 ：</x:String>
-  <x:String x:Key="Text.Checkout.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">贮藏并自动恢复</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目标分支 ：</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>
@@ -97,9 +98,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">远程仓库 ：</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">挑选(cherry-pick)此提交</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">挑选(cherry-pick)...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" 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.CopyInfo" xml:space="preserve">复制简要信息</x:String>
@@ -134,12 +135,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">相关引用</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">提交指纹</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">浏览器中查看</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填写提交信息主题</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">模板名 ：</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}代替仓库路径，${BRANCH}代替选中的分支，${SHA}代替提交哈希</x:String>
@@ -189,8 +190,8 @@
   <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.CopyPath" 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>
@@ -226,8 +227,8 @@
   <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.TitleForGroup" 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>
@@ -296,11 +297,11 @@
   <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.UnstageSelectedLines" xml:space="preserve">从暂存中移除选中的更改</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">使用 THEIRS (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">使用 MINE (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">使用 THEIRS (checkout --theirs)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">文件历史</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" 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工作流</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">开发分支 ：</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">特性分支 ：</x:String>
@@ -330,8 +331,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">规则 ：</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">添加LFS追踪文件规则</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">拉取LFS对象 (fetch)</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">拉取LFS对象</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">执行`git lfs prune`命令，下载远程LFS对象，但不会更新工作副本。</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">拉取LFS对象</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">启用Git LFS支持</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">显示LFS对象锁</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">没有锁定的LFS文件</x:String>
@@ -343,11 +344,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">精简本地LFS对象存储</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">运行`git lfs prune`命令，从本地存储中精简当前版本不需要的LFS对象</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">拉回LFS对象 (pull)</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">拉回LFS对象</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">运行`git lfs pull`命令，下载远程LFS对象并更新工作副本。</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">拉回LFS对象</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">推送</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">推送LFS对象</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>
@@ -366,8 +367,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" 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.GotoPrevTab" 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.Repo" xml:space="preserve">仓库页面快捷键</x:String>
@@ -378,11 +379,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" 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.StageOrUnstageSelected" 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.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>
@@ -391,9 +392,9 @@
   <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.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.Hunk.Discard" 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">挑选（Cherry-Pick）操作进行中。</x:String>
@@ -405,10 +406,10 @@
   <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.Target" xml:space="preserve">目标分支 ：</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交 ：</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" 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.Merge" xml:space="preserve">合并分支</x:String>
@@ -434,16 +435,16 @@
   <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.JustNow" xml:space="preserve">刚刚</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0}分钟前</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.Yesterday" xml:space="preserve">昨天</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" 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.MonthsAgo" xml:space="preserve">{0}个月前</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">Analyze Diff Prompt</x:String>
@@ -455,11 +456,11 @@
   <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.EditorFontSize" 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.EditorFontSize" 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>
@@ -485,24 +486,24 @@
   <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">拉取更新时启用修剪（--prune）</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.23.0</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.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.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.23.0</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">启用提交签名</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">启用标签签名</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">签名格式</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">签名程序所在路径</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">启用标签签名</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">用户签名KEY</x:String>
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">输入签名提交所使用的KEY</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">第三方工具集成</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">终端/SHELL</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">终端/SHELL</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">终端/SHELL</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>
@@ -669,11 +670,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">提交统计</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">提交次数</x:String>
   <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">提交次数: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">贡献者人数: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">复制路径</x:String>
@@ -688,13 +689,13 @@
   <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">仓库地址 ：</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">启用 '--init'</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">启用 '--recursive'</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">子模块 ：</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">启用 '--remote'</x:String>
+  <x:String x:Key="Text.URL" 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>
@@ -724,13 +725,13 @@
   <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.ConfirmCommitWithFilter">当前有 {0} 个文件在暂存区中，但仅显示了 {1} 个文件（{2} 个文件被过滤掉了），是否继续提交？</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" 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.ResolveTip" 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>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">从暂存区移除选中</x:String>
@@ -740,7 +741,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">暂存所有</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">查看忽略变更文件</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">模板：${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">请选中冲突文件，打开右键菜单，选择合适的解决方式</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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 88b0ab64..e090fe2a 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -2,19 +2,20 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
   </ResourceDictionary.MergedDictionaries>
+
   <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.SubTitle" xml:space="preserve">開源免費的 Git 客戶端</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">新增工作區</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">簽出分支方式:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">已有分支</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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>
@@ -64,8 +65,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">追蹤上游分支不存在或已刪除！</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">位元組</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取  消</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" 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>
@@ -73,12 +74,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">檔案目錄樹狀結構模式</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">簽出 (checkout) 分支</x:String>
   <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">簽出 (checkout) 提交</x:String>
-  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">注意: 執行該操作後，目前 HEAD 會變為分離 (detached) 狀態!</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">提交:</x:String>
-  <x:String x:Key="Text.Checkout.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">擱置變更並自動復原</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目標分支:</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>
@@ -97,9 +98,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">遠端存放庫:</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">簽出 (checkout) 此提交</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">揀選 (cherry-pick) 此提交</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">揀選 (cherry-pick)...</x:String>
-  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">簽出 (checkout) 此提交</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.CopyInfo" xml:space="preserve">複製摘要資訊</x:String>
@@ -134,12 +135,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">相關參照</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">提交編號</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">在瀏覽器中檢視</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填寫提交訊息標題</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">範本名稱:</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} 表示存放庫路徑、${BRANCH} 表示所選的分支、${SHA} 表示所選的提交編號</x:String>
@@ -189,8 +190,8 @@
   <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.CopyPath" 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>
@@ -226,8 +227,8 @@
   <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.TitleForGroup" 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>
@@ -296,11 +297,11 @@
   <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.UnstageSelectedLines" xml:space="preserve">取消暫存選取的變更</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">使用對方版本 (checkout --theirs)</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.FileContent" 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 工作流</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">開發分支:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">功能分支:</x:String>
@@ -330,8 +331,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">規則:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">加入 LFS 追蹤檔案規則</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">提取 (fetch)</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">提取 LFS 物件</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">執行 `git lfs fetch` 以下載遠端 LFS 物件，但不會更新工作副本。</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">提取 LFS 物件</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">啟用 Git LFS 支援</x:String>
   <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">顯示 LFS 物件鎖</x:String>
   <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">沒有鎖定的 LFS 物件</x:String>
@@ -343,11 +344,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">清理 (prune)</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">執行 `git lfs prune` 以從本機中清理目前版本不需要的 LFS 物件</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">拉取 (pull)</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">拉取 LFS 物件</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">執行 `git lfs pull` 以下載遠端 LFS 物件並更新工作副本。</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">拉取 LFS 物件</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">推送 (push)</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">推送 LFS 物件</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>
@@ -366,8 +367,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">取消彈出面板</x:String>
   <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">複製 (clone) 遠端存放庫</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" 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.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.Repo" xml:space="preserve">存放庫頁面快速鍵</x:String>
@@ -378,11 +379,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" 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">推送 (push) 本機變更到遠端存放庫</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">強制重新載入存放庫</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" 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.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>
@@ -391,9 +392,9 @@
   <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.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.Hunk.Discard" 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">揀選 (cherry-pick) 操作進行中。</x:String>
@@ -405,10 +406,10 @@
   <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.Target" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" 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.Merge" xml:space="preserve">合併分支</x:String>
@@ -434,16 +435,16 @@
   <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.JustNow" xml:space="preserve">剛剛</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} 分鐘前</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.Yesterday" xml:space="preserve">昨天</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" 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.MonthsAgo" xml:space="preserve">{0} 個月前</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">分析變更差異提示詞</x:String>
@@ -484,24 +485,24 @@
   <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">拉取變更時進行清理 (--prune)</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.23.0</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.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.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.23.0</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">啟用提交簽章</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">啟用標籤簽章</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.exe 所在路徑</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">啟用標籤簽章</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">填寫簽章提交所使用的金鑰</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">第三方工具整合</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">終端機/Shell</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">終端機/Shell</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">終端機/Shell</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>
@@ -668,11 +669,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">提交統計</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">提交次數</x:String>
   <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">提交次數:</x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">貢獻者人數:</x:String>
-  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">複製路徑</x:String>
@@ -687,13 +688,13 @@
   <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">存放庫網址:</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">啟用 [--init] 選項</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">啟用 [--recursive] 選項</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">子模組:</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">啟用 [--remote] 選項</x:String>
+  <x:String x:Key="Text.URL" 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>
@@ -706,8 +707,8 @@
   <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.Search" xml:space="preserve">快速搜尋存放庫...</x:String>
   <x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">重新掃描預設複製 (clone) 目錄下的存放庫</x:String>
+  <x:String x:Key="Text.Welcome.Search" xml:space="preserve">快速搜尋存放庫...</x:String>
   <x:String x:Key="Text.Welcome.Sort" 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">加入至 .gitignore 忽略清單</x:String>
@@ -723,13 +724,13 @@
   <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.ConfirmCommitWithFilter">您已暫存 {0} 檔案，但只顯示 {1} 檔案 ({2} 檔案被篩選器隱藏)。您要繼續嗎？</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" 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.ResolveTip" 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>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">取消暫存選取的檔案</x:String>
@@ -739,7 +740,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">暫存所有檔案</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">檢視不追蹤變更的檔案</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">範本: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">請選擇發生衝突的檔案，開啟右鍵選單，選擇合適的解決方式</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>

From f29402ceec9f2c6fcf796c2a5248c656a2c46cb8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 12:05:43 +0000
Subject: [PATCH 344/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0f44cbcf..2fd8672b 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -36,12 +36,13 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.73%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.60%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
+- Text.PruneRemote
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
@@ -147,16 +148,33 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.33%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
+- Text.BranchCM.CompareWithHead
 - Text.Configure.Git.PreferredMergeMode
+- Text.Launcher.Error
+- Text.Welcome.ScanDefaultCloneDir
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-99.87%25-yellow)
 
-### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file
+<details>
+<summary>Missing keys in zh_CN.axaml</summary>
+
+- Text.WorkingCopy.ConfirmCommitWithFilter
+
+</details>
+
+### ![zh__TW](https://img.shields.io/badge/zh__TW-99.87%25-yellow)
+
+<details>
+<summary>Missing keys in zh_TW.axaml</summary>
+
+- Text.WorkingCopy.ConfirmCommitWithFilter
+
+</details>
\ No newline at end of file

From 2c5ee4fa99b00e25c49e144f8a105a910b5af62b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 20:19:00 +0800
Subject: [PATCH 345/364] localization: add keys deleted by sorter tools back

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/fr_FR.axaml | 1 +
 src/Resources/Locales/ru_RU.axaml | 3 +++
 src/Resources/Locales/zh_CN.axaml | 1 +
 src/Resources/Locales/zh_TW.axaml | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index f3cf80eb..ac2ed8b8 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -505,6 +505,7 @@
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Chemin</x:String>
   <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
+  <x:String x:Key="Text.PruneRemote" xml:space="preserve">Élaguer une branche distant</x:String>
   <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">Cible :</x:String>
   <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">Élaguer les Worktrees</x:String>
   <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve"> Élaguer les information de worktree dans `$GIT_COMMON_DIR/worktrees`</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 7da65b5e..e778af86 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -43,6 +43,7 @@
   <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.CompareWithHead" xml:space="preserve">Сравнить с ГОЛОВОЙ (HEAD)</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>
@@ -409,6 +410,7 @@
   <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.Merge" xml:space="preserve">Влить ветку</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
@@ -706,6 +708,7 @@
   <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.Welcome.Sort" xml:space="preserve">Сортировка</x:String>
   <x:String x:Key="Text.WorkingCopy" xml:space="preserve">Изменения</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 281d6a4d..c1cbcc77 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -725,6 +725,7 @@
   <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.ConfirmCommitWithFilter" xml:space="preserve">当前有 {0} 个文件在暂存区中，但仅显示了 {1} 个文件（{2} 个文件被过滤掉了），是否继续提交？</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">文件冲突已解决</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index e090fe2a..34dac155 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -724,6 +724,7 @@
   <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.ConfirmCommitWithFilter" xml:space="preserve">您已暫存 {0} 檔案，但只顯示 {1} 檔案 ({2} 檔案被篩選器隱藏)。您要繼續嗎？</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">檔案衝突已解決</x:String>

From 7fedef396f2f964a392cf9b422818eaf663d840d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 12:19:19 +0000
Subject: [PATCH 346/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 2fd8672b..0f44cbcf 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -36,13 +36,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.60%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.73%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.PruneRemote
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
@@ -148,33 +147,16 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.33%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
-- Text.BranchCM.CompareWithHead
 - Text.Configure.Git.PreferredMergeMode
-- Text.Launcher.Error
-- Text.Welcome.ScanDefaultCloneDir
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.87%25-yellow)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in zh_CN.axaml</summary>
-
-- Text.WorkingCopy.ConfirmCommitWithFilter
-
-</details>
-
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.87%25-yellow)
-
-<details>
-<summary>Missing keys in zh_TW.axaml</summary>
-
-- Text.WorkingCopy.ConfirmCommitWithFilter
-
-</details>
\ No newline at end of file
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file

From 1555abd027cbf2d9eafdba88edb8ff76995305db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20W?= <44604769+goran-w@users.noreply.github.com>
Date: Mon, 7 Apr 2025 14:22:53 +0200
Subject: [PATCH 347/364] Added new ExternalMerger - Plastic SCM (#1162)

Motivation:
https://m-pixel.com/how-to-use-plastic-scms-merge-tool-with-p4v/
---
 src/Models/ExternalMerger.cs                     |   1 +
 .../Images/ExternalToolIcons/plastic_merge.png   | Bin 0 -> 6369 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 src/Resources/Images/ExternalToolIcons/plastic_merge.png

diff --git a/src/Models/ExternalMerger.cs b/src/Models/ExternalMerger.cs
index 49d31df5..d97d3933 100644
--- a/src/Models/ExternalMerger.cs
+++ b/src/Models/ExternalMerger.cs
@@ -42,6 +42,7 @@ namespace SourceGit.Models
                     new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "\"$MERGED\"", "-u -e -sw \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(8, "codium", "VSCodium", "VSCodium.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(9, "p4merge", "P4Merge", "p4merge.exe", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger(10, "plastic_merge", "Plastic SCM", "mergetool.exe", "-s=\"$REMOTE\" -b=\"$BASE\" -d=\"$LOCAL\" -r=\"$MERGED\" --automatic", "-s=\"$LOCAL\" -d=\"$REMOTE\""),
                 };
             }
             else if (OperatingSystem.IsMacOS())
diff --git a/src/Resources/Images/ExternalToolIcons/plastic_merge.png b/src/Resources/Images/ExternalToolIcons/plastic_merge.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d82fc86f7f266a9be39ed16757d02f609febcc3
GIT binary patch
literal 6369
zcmeH~c{G&m|Ho&{WQ(#!Lemt9W*^K<j9r!nSu&Pz&&-X<ESi}tl`Sn)Pg*P$Lg7i4
zs7Qo)+9dU;r<7I_si;sPT7LIvdFuSW=lo9R{J#G+=iGB&_jP@)*Y)|lKcDM5_nq$L
zv0PPIPZ<V-sk*v2dP8?x*`+8C{U775eFWX4>wTFLZy**GEfR)vc_2y>9}S|wIBqx$
z7I%;D6{K+<rTAe$%X*WXsbMQQrquG;$PRmA&2t*IBS8IG!T3x=gzj95cANP?Vb2xq
zT$+XoU!-Cczp1HsWbd|<$p_K3oFdL^o6!+1{LNeLIt$|013@!8Lv7!y+mpz~dY@j|
zcWzOvR9jtm_q2VLcU5TDdgg){K&_oNhQT&8SwCO4xoe5HmoaNz@+F2X!{AWxDZ&dX
z(Xp4+usdl34Ho(+H$Z)V*2x$c48ED`;Na!z;P5RLD1y9%J=QMgZS^mP-gI*>qjcF_
zSm3bk#E$K0K4mQRrI~g1<+F@)674h{_V)Ig)X&lXz^tIvQwCr3m@00Xk9xIf-{BpZ
z6D`Hp(U(%6B%W;?uiv1cSV{A_W-I4q-hR1sFRQ2?Eg!0GtG3`OdMUxjb70Qsuzu+H
z@W?yt-zU#@e56ih?QMe<xa5U30P4pzJ%xd^frMU@ayR7>>PWqv&Z5M=hN01U1KZEb
zb?nr8Kcv4llUeb$`oZ~%HAgS_Tp&1gnuMCvS42PRt++j}LhSkJoQrGF-)r-qDta>=
z_2#DSzG17nj+u7z*d7+zeadzA=jtaNyWNfbRd?#Y=}J~^8%h2A*K5JG(Z0>OTCQ>l
zxVn!7Wn^qh%+0!%41QyR+(bc&S><4NB%D-GY}pt%q^R2^kF9Dvcvd0!70ki2f#b5P
z@6RQf?b4~a2|nt&XJ?!%7YOqc^60Sm7i*r&Qz*zwrkPDoM_zdeg`W>Se>;vikSD5p
z(N}B<)m#i0sx2mC1&uA_V*!qk1!Cj)(NNLBU{*G9(EvLNl%QB(1Xo~<e%;uDMsYdT
zXn%7Co)PT;Msi)&i$I_C9=`1LQEVy)Z9`YKiladQJ}3cDaeSUYOpCKdPjhKdTh@(3
zqoz$HQPyZC!wcmg6oDu*mW;(?oZ`4KL^NF)WhLT-)4Uy>zapR~YjmVU5>3P5Vq;^m
zu_UZe6oDg9sZ<=Eh$9j)kOf8@FOUFn7=d`94Dp5G2#VPvZnT6e6rf~GfF)cfu|}hz
zanv{e_|Xi;cf3ISRRu^7TpSRMBVh43J|Fkv46(#127-Kb=s(U7`$Ah3=M9R5>qKnO
zDFzfs7XFA>?#l4`PLPEZ!R1F!2L*}u(_$R<cf06yBHpwOhm8YyARmH?A^!+J*-N<L
z|BCgKZ?ci;aDH?ITJAglC+lyqPa8v43<k|n$X+K~)YZ`%E%TSg5wf`)+H{jm1v!>P
za}vgq%)(>HR4RaBS+L0%B7s0AQwac`g$I5>xeCM*K)?oNC<u<_LL4e&NF-Q*&>Rj4
zL*}sY7#5L8#aKXj=71D}C51@(0pTg)LRAUye)LL);y@@$I7lLr03wD(0*M$h3!q{E
z8I%J8<ZzC8I2%u5PordcpxJr3TBC_r{J%Y3JU|jI6!D=_=L$H&Sn<C@zFa=&BLQTx
z5iH4MJi)?(f~Qzg$X}hCCawZSVyNU~R01ALB2Q1}uxZW^6M#yG%LgJrT(lr!dO(&K
z8WavBEg-8@h&<g7MMHBCfq+CP@)Zhs)@T_UB}0B6W<VQ?14sZzKmtOm;fdxnJeh{K
z^d%5v4HCr+Po&|0uorT;;qm{MwQT#KtiB}Og)4^EkDu=PvZs8&wO^jTJo32Hn+b)Q
z-WD`~{Uro35Cd|i{e)OwhS-sSAOeKWkFN#$t)KfJiUG7Bg@+RXHipEeLiNP5AYlLy
zPr$IvscfnR5f2bqUo!ZeE*6GMVgV6o7Xj%AX$2MNv{opSuQ^=uvp2Dkpe#X<WEead
z^IbAB9*z4NEKYV}e2dl!_rLV8nl||1h=JyP>4T0g=p@8_KMKF<1^N2l{C&;Ce{%^G
z>h~hQr0;LJe#`Ys3jC7s@9O$3*DopXOUA#e>;FwI<$ph>Kmqgy6bpSS1*vGfgg&$6
zS?<dnq5A?DDM^2<8EPp-y99_~u$h{&3l2M&rwer|NL(3C3eS-WN=TD-sYx#krnuYH
z(atyS-pkyio!b7|tv2JTjn%>;DfZ~~RX$@`ZV$n<x{^qq@{x4zt-uMy<C;aQFm^~^
zW+Kzfro!f)T&0&0`rYg+<jp3vFOsg^l2f{W*qA;iszwuCo2h5Zbn8AR=nnb3ACZ71
zi3gezrouXNd2(<5widT^Z}|Jn_#yG~mHnj#&hQ;62a+)vV(Cd~c>mhEgHKlaA?S!L
zy-`wHA;Er#TrGdivvcON&w6sFQV~3P0i&y5J1l*4Sl%3d@9~@-LXQ|cHi4<Ok3UO0
zs(5|Y9e7mAafJCt-#Z8^r3yd8fhw-tg$^B9H{z1+g=O&2Px)|Xy*^L)?4tJpMo%1$
zZ8}LuI4M+j!ak{n(XSu168IRNcJ<1`wK&xhq^q<H?g5v~+3<S+dRTFIMrve8pM^=r
z#?4jaYJH|svFc=^YK5<1Qllv{a+`YZz>ef1`H_5Lm!;+lLmcNCDJ=w<h#q<T@|b#|
zfg!B9K-v*1pKY3v)4s98x2IKl3pw)GuD^zFt8{%<EFvg5JoQ;F@yRkXt<b0GPCG5r
z4CUvTW$2i>CCAjyo!G+*Wh6Gk;}%`%*deiyyV=+B^2(D_c63Y)5Wi`nT7g+&6*8y;
zc}l5vzWoM}U)^!JqGgZQ0J_k_Fg6``+{bW0^`lTNYJZe&$Ber+7hd=haFfJghp>vr
zPDyGuLeDT)<NU=bomZZeAsb3vH`YHy>6QCzF{#SBn+JM*$i6zU3z^#F&T8%3Tov!K
zF+No8;hT$SdYIZrZM=WHB-g?|W3F@noDoS(xigD#53sC0jT}xJ3VB%_w2XXlG8(_t
zc&<<Ig9AoghcP`vi+$f*1{xMRw_%mAtt!&Nlx@jIPKhCcL5;zH<5rIdXU82hDq3_G
z-ac$KYg?eS>`mG2q&&ur&Lii-KN|KE7Q-iS@a0CVJ9D!uv`1qp&Q%_qUE5z#q9~<S
zPhsPm15@SxIprLfEDU-n&4)b?ytaQbWKD&1V`i%%V%YP_fh0GoUD@Wssfaf1A<LZ+
zr4t{Gdc0;ANBU#uXKaV(WK_KuTpWy8>d~~1rlt_G>_M?X417wZ2Y1;JuxC1EM`$`e
zwcmMYiIo1b+I`srEw<_guTws_%w6?6>*|VchDGE|GE^pNS<NRkc`J;~GU~d_?>;#@
z8o3Wu-&!cPh-O|=d-SMP>?Ccc&nifVwS-uZxv2%7{)Q*_4qe%v7RQLcDpxwM*FleY
z#K3S@SASlaBfV#PU#c+ZkN1Y1;gr0kUWS;Gp>~I~xRvpzU^5*fe1ocNv=2shW}#5G
zW_wCXx8_rF4mU<$++O4QVPo#|%jE_Zm%HN->h~AXc@4d-MYana;#&w4Tk95p8u(Y<
zg;!(Es>*MYi#OD0wP)%OUBv&ei(-2B8HpZ+mKy9r%qz>1j)h!W%cI&}sZIWjdKH}0
z`z|RUzDEf$v2@tfj*oiSnsW!f+|jto+71z~XS!QZ$?>T67dytkb%wR9UZ%hM>h(Ve
zYXq>EHQNyPlx+G;GD6l&<;a&K;pv)7?iFcMn36Hie@fvBCAfa%>2f>UXN9}+YqAeD
zGM%4R%IjX#kgr#r8#y!XG;DFV$BhHqZoF$!Io=uGa~}6+KxeI+ZChm{?6Xx)?^QJh
zyUBR<&24Fc@DO*u`^iC4ZO60alpAG7%WsfxMQts4=LZj|Md`+0e!WuPCU?`;a)oA7
zyWv3Ll25JoKPw$Qx6C56r1_3K{6H|EV8?%5qS4TVT;V6++zwDR)w$fKtUx+*j=X8j
z>k-`>Po!4;M8+9?m4}E9qZtpZOxU)@{?RGvNbp@RTNrYP;ft*TJ_fk$exx6~>@T#&
zsFc=SSBL1%Y|SvUyiL3w;H*~MlkJq2r>}+7QeUgj^uYd=PHgvAGPPOhny~}<d=$Pm
zC2@v+cb#$8egB9vK@n6WkHpz%VPbjeY?UbhKQcwV>p4~TE;h{1*ne14u0t)ee#MM?
zXOlxUN2ZRtF{KIG)e`~I1>JRq@Ay%1D#MRy?MINEfab(QTX&VX<PGjdg^L}-j|qcj
zn%UYLT$k5>#~=KpHaxC*OY45x@g+}_8#CK^{UY+#t5ZEq8ceNA&DiSsWvXLb&&fK!
zoHlI>zvQ$UsZTRM0nv5iR<M_?*>%>lSPf=LaN-{67CK_j_`b1L_2E-jZTFY(-tx<}
zO|whaEGQ0{A0slZe{mw@%+^6t0Ntd9?Ge0U`y$jnGs#3<?Uo*T5;ND{3uzr#(m9$V
zUDMw?FZs`uPU-11Tql1e)}Yj{@DG%=fzAhG75wn5uo}_bT<L>>_KFNr8hu{)LkD{c
z6P=U;kW(`z;NYs@E4;-i3R&$Pny{9AJ$r8%C`l57&hT*DxmWv??<>7}#LLXjE@O=H
zqxK1d`iJH<^jT}J=vkLNxGp>2wh{ip>Be2H8T1is$LY#+R=DdJG9qPLO67sz1+VYl
zo}ZH8q-1HXL!W)h%(8BBLtBS`+T1@i_fMJjA2f3@;)@gRAM}U@o-b6o(2cG)sa2bZ
z+*wkFe0s>JUOBeO?k!GZSz>{fPutYSB#~RuEd;ThJvsPxE%MpYSeI2MZQ%3Qg?CF2
zEx}NO#_U>8SGpHmTzYtZ`b)f=BzrCKN#)j84}%-9ud~Ogj20jFX8uETYSZZ!WLg0Z
zvC3%p%|LS2m426`OQAIn4hn-vi|7vmP2uaYbGB1Y3_Xf`HoAS{{md-gSf?Es&H3Ji
zbL0loKT%G+HXUBPH-WrPZvuO;vSc#8Q_<wa);&%mMVD-oT~~YVDTrOQz5)@LIL045
zFY0;EJAnK!E7Io`YATwzInA@ZZk@Ni+$ZIwe%OxLZ@Z59>BJdIPUaCk=Y7~nxE`!J
z>~}Jmej6VsQYNL$sY#x-sk|mPE2{ZnK--vb<7C-wJt?sOdR>9JI(ax&*@tcVAGdk&
A_y7O^

literal 0
HcmV?d00001


From 7cda7211f1035a63bf444c57051a308cebbe8d48 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 7 Apr 2025 21:20:59 +0800
Subject: [PATCH 348/364] refactor: statistics dialog

- use `%aN+%aE` instead of `%aN` to get commit author
- show user avatar in statistics dialog

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Statistics.cs |  2 +-
 src/Models/Statistics.cs   | 16 +++++++++-------
 src/Views/Statistics.axaml | 16 ++++++++++------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Commands/Statistics.cs b/src/Commands/Statistics.cs
index 1439cedd..41b3889e 100644
--- a/src/Commands/Statistics.cs
+++ b/src/Commands/Statistics.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --date-order --branches --remotes -{max} --format=%ct$%aN";
+            Args = $"log --date-order --branches --remotes -{max} --format=%ct$%aN±%aE";
         }
 
         public Models.Statistics Result()
diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs
index 969d3945..87a6eabd 100644
--- a/src/Models/Statistics.cs
+++ b/src/Models/Statistics.cs
@@ -18,9 +18,9 @@ namespace SourceGit.Models
         ThisWeek,
     }
 
-    public class StaticsticsAuthor(string name, int count)
+    public class StaticsticsAuthor(User user, int count)
     {
-        public string Name { get; set; } = name;
+        public User User { get; set; } = user;
         public int Count { get; set; } = count;
     }
 
@@ -73,7 +73,7 @@ namespace SourceGit.Models
             }
         }
 
-        public void AddCommit(DateTime time, string author)
+        public void AddCommit(DateTime time, User author)
         {
             Total++;
 
@@ -126,7 +126,7 @@ namespace SourceGit.Models
         }
 
         private StaticsticsMode _mode = StaticsticsMode.All;
-        private Dictionary<string, int> _mapUsers = new Dictionary<string, int>();
+        private Dictionary<User, int> _mapUsers = new Dictionary<User, int>();
         private Dictionary<DateTime, int> _mapSamples = new Dictionary<DateTime, int>();
     }
 
@@ -150,14 +150,16 @@ namespace SourceGit.Models
 
         public void AddCommit(string author, double timestamp)
         {
+            var user = User.FindOrAdd(author);
+
             var time = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
             if (time >= _thisWeekStart)
-                Week.AddCommit(time, author);
+                Week.AddCommit(time, user);
 
             if (time >= _thisMonthStart)
-                Month.AddCommit(time, author);
+                Month.AddCommit(time, user);
 
-            All.AddCommit(time, author);
+            All.AddCommit(time, user);
         }
 
         public void Complete()
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 0c002407..3bbdafbe 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -136,7 +136,7 @@
         <DataTemplate DataType="m:StatisticsReport">
           <Grid ColumnDefinitions="256,*">
             <Grid Grid.Column="0" RowDefinitions="*,16">
-              <!-- Table By Committer -->
+              <!-- Table By Autor -->
               <ListBox Grid.Column="0"
                        ItemsSource="{Binding Authors}"
                        SelectionMode="Single"
@@ -162,11 +162,15 @@
                 <ListBox.ItemTemplate>
                   <DataTemplate DataType="m:StaticsticsAuthor">
                     <Border BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}">
-                      <Grid ColumnDefinitions="*,100">
-                        <Border Grid.Column="0" Padding="8,0" ClipToBounds="True">
-                          <TextBlock Text="{Binding Name}" HorizontalAlignment="Left"/>
+                      <Grid ColumnDefinitions="26,*,100">
+                        <v:Avatar Grid.Column="0"
+                                  Width="16" Height="16"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center"
+                                  User="{Binding User}"/>
+                        <Border Grid.Column="1" Padding="4,0,8,0" ClipToBounds="True">
+                          <TextBlock Text="{Binding User.Name}" HorizontalAlignment="Left"/>
                         </Border>
-                        <Border Grid.Column="1" Padding="8,0" ClipToBounds="True">
+                        <Border Grid.Column="2" Padding="8,0" ClipToBounds="True">
                           <TextBlock Text="{Binding Count}" HorizontalAlignment="Right"/>
                         </Border>
                       </Grid>
@@ -177,7 +181,7 @@
 
               <!-- Summary -->
               <Grid Grid.Row="1" ColumnDefinitions="*,*">
-                <!-- Total Committers -->
+                <!-- 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"/>

From da38b72ee5b3f653bfd197975a73b66ef430b571 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 8 Apr 2025 18:03:40 +0800
Subject: [PATCH 349/364] ux: disable commit button when commit message is
 empty

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Converters/StringConverters.cs |  3 +++
 src/ViewModels/WorkingCopy.cs      |  9 +++------
 src/Views/WorkingCopy.axaml        | 30 +++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index 5e4608c5..bcadfae9 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -81,5 +81,8 @@ namespace SourceGit.Converters
 
         public static readonly FuncValueConverter<string, bool> ContainsSpaces =
             new FuncValueConverter<string, bool>(v => v != null && v.Contains(' '));
+
+        public static readonly FuncValueConverter<string, bool> IsNotNullOrWhitespace =
+            new FuncValueConverter<string, bool>(v => v != null && v.Trim().Length > 0);
     }
 }
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index a0933ea3..784328cc 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -1652,6 +1652,9 @@ namespace SourceGit.ViewModels
 
         private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty = false, bool confirmWithFilter = false)
         {
+            if (string.IsNullOrWhiteSpace(_commitMessage))
+                return;
+
             if (!_repo.CanCreatePopup())
             {
                 App.RaiseException(_repo.FullPath, "Repository has unfinished job! Please wait!");
@@ -1672,12 +1675,6 @@ namespace SourceGit.ViewModels
                 return;
             }
 
-            if (string.IsNullOrWhiteSpace(_commitMessage))
-            {
-                App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!");
-                return;
-            }
-
             if (!_useAmend && !allowEmpty)
             {
                 if ((autoStage && _count == 0) || (!autoStage && _staged.Count == 0))
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 94dd0c30..4ca854fa 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -295,7 +295,9 @@
           </SplitButton.IsEnabled>
           <SplitButton.Flyout>
             <MenuFlyout>
-              <MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}" Command="{Binding Commit}"/>
+              <MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}"
+                        Command="{Binding Commit}"
+                        IsEnabled="{Binding CommitMessage, Converter={x:Static c:StringConverters.IsNotNullOrWhitespace}}"/>
             </MenuFlyout>
           </SplitButton.Flyout>
         </SplitButton>
@@ -309,7 +311,6 @@
                 Command="{Binding Commit}"
                 HotKey="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"
                 IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNull}}"
-                IsEnabled="{Binding !IsCommitting}"
                 ToolTip.Placement="Top"
                 ToolTip.VerticalOffset="0">
           <ToolTip.Tip>
@@ -324,6 +325,13 @@
               </TextBlock>
             </StackPanel>
           </ToolTip.Tip>
+
+          <Button.IsEnabled>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="IsCommitting" Converter="{x:Static BoolConverters.Not}"/>
+              <Binding Path="CommitMessage" Converter="{x:Static c:StringConverters.IsNotNullOrWhitespace}"/>
+            </MultiBinding>
+          </Button.IsEnabled>
         </Button>
 
         <!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage -->
@@ -331,8 +339,14 @@
                 Width="0" Height="0"
                 Background="Transparent"
                 Command="{Binding CommitWithAutoStage}"
-                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"
-                IsEnabled="{Binding !IsCommitting}"/>
+                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}">
+          <Button.IsEnabled>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="IsCommitting" Converter="{x:Static BoolConverters.Not}"/>
+              <Binding Path="CommitMessage" Converter="{x:Static c:StringConverters.IsNotNullOrWhitespace}"/>
+            </MultiBinding>
+          </Button.IsEnabled>
+        </Button>
 
         <Button Grid.Column="8"
                 Classes="flat"
@@ -342,10 +356,16 @@
                 Padding="8,0"
                 Command="{Binding CommitWithPush}"
                 HotKey="Alt+Enter"
-                IsEnabled="{Binding !IsCommitting}"
                 ToolTip.Tip="{OnPlatform Alt+Enter, macOS=⌥+Enter}"
                 ToolTip.Placement="Top"
                 ToolTip.VerticalOffset="0">
+          <Button.IsEnabled>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="IsCommitting" Converter="{x:Static BoolConverters.Not}"/>
+              <Binding Path="CommitMessage" Converter="{x:Static c:StringConverters.IsNotNullOrWhitespace}"/>
+            </MultiBinding>
+          </Button.IsEnabled>
+          
           <Button.IsVisible>
             <MultiBinding Converter="{x:Static BoolConverters.And}">
               <Binding Path="HasRemotes"/>

From 898a8bc69aa91e325477fa6c40160273552cff95 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 8 Apr 2025 18:05:53 +0800
Subject: [PATCH 350/364] ux: resize confirm commit dialog

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

diff --git a/src/Views/ConfirmCommit.axaml b/src/Views/ConfirmCommit.axaml
index 77bbdb30..a835f0b6 100644
--- a/src/Views/ConfirmCommit.axaml
+++ b/src/Views/ConfirmCommit.axaml
@@ -38,7 +38,7 @@
 
     <!-- Body -->
     <Border Grid.Row="1" Margin="16">
-      <TextBlock Text="{Binding Message}" MaxWidth="400" TextWrapping="Wrap"/>
+      <TextBlock Text="{Binding Message}" MaxWidth="520" TextWrapping="Wrap"/>
     </Border>
 
     <!-- Buttons -->

From 506af959633d94f1fa054188e9b1cc85323f677a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 8 Apr 2025 20:00:42 +0800
Subject: [PATCH 351/364] enhance: new confirm empty commit dialog (#1143)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml     |  1 -
 src/Resources/Locales/en_US.axaml     |  4 +-
 src/Resources/Locales/es_ES.axaml     |  1 -
 src/Resources/Locales/fr_FR.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/zh_CN.axaml     |  4 +-
 src/Resources/Locales/zh_TW.axaml     |  4 +-
 src/ViewModels/ConfirmEmptyCommit.cs  | 31 ++++++++++++
 src/ViewModels/WorkingCopy.cs         |  7 ++-
 src/Views/ConfirmEmptyCommit.axaml    | 72 +++++++++++++++++++++++++++
 src/Views/ConfirmEmptyCommit.axaml.cs | 29 +++++++++++
 14 files changed, 144 insertions(+), 14 deletions(-)
 create mode 100644 src/ViewModels/ConfirmEmptyCommit.cs
 create mode 100644 src/Views/ConfirmEmptyCommit.axaml
 create mode 100644 src/Views/ConfirmEmptyCommit.axaml.cs

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 276f44e8..25b54c60 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -713,7 +713,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Klick-Ereignis auslösen</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Bearbeitung)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Alle Änderungen stagen und committen</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Leerer Commit erkannt! Fortfahren (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">KONFLIKTE ERKANNT</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">DATEI KONFLIKTE GELÖST</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">NICHT-VERFOLGTE DATEIEN INKLUDIEREN</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 97b2a832..8645cd96 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -177,6 +177,9 @@
   <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>
   <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Restore tabs on startup</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Message" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">CONTINUE</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">STAGE ALL &amp; COMMIT</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</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">Closed Issue:</x:String>
@@ -721,7 +724,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Edit)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter">You have staged {0} file(s) but only {1} file(s) displayed ({2} files are filtered out). Do you want to continue?</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index e6968560..e2af0860 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -724,7 +724,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Activar evento de clic</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Editar)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stagear todos los cambios y commit</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">¡Commit vacío detectado! ¿Quieres continuar (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTOS DETECTADOS</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">LOS CONFLICTOS DE ARCHIVOS ESTÁN RESUELTOS</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARCHIVOS NO RASTREADOS</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index ac2ed8b8..83d590f5 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -726,7 +726,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Modifier)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Indexer tous les changements et commit</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Un commit vide a été détecté ! Voulez-vous continuer (--allow-empty) ?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLITS DÉTECTÉS</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">LES CONFLITS DE FICHIER SONT RÉSOLUS</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLURE LES FICHIERS NON-SUIVIS</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 95647101..59bf3028 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -723,7 +723,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Attiva evento click</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Modifica)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage di tutte le modifiche e fai il commit</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Trovato un commit vuoto! Vuoi continuare (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLITTI RILEVATI</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">CONFLITTI NEI FILE RISOLTI</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDI FILE NON TRACCIATI</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 91cefbac..fe643b5e 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -722,7 +722,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">クリックイベントをトリガー</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">コミット (Edit)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">すべての変更をステージしてコミット</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">空のコミットが検出されました。続行しますか？ (--allow-empty)</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">競合が検出されました</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">ファイルの競合は解決されました</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">追跡されていないファイルを含める</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 09b78c31..3caac3cc 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -657,7 +657,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Modelo/Históricos</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Acionar evento de clique</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Preparar todas as mudanças e commitar</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Commit vazio detectado! Deseja continuar (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLITOS DETECTADOS</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">CONFLITOS DE ARQUIVO RESOLVIDOS</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARQUIVOS NÃO RASTREADOS</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index e778af86..b26532ae 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -725,7 +725,6 @@
   <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.ConfirmCommitWithoutFiles" xml:space="preserve">Обнаружена пустая ревизия! Вы хотите продолжить (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">ОБНАРУЖЕНЫ КОНФЛИКТЫ</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">КОНФЛИКТЫ ФАЙЛОВ РАЗРЕШЕНЫ</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">ВКЛЮЧИТЬ НЕОТСЛЕЖИВАЕМЫЕ ФАЙЛЫ</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c1cbcc77..a2bde6f8 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -181,6 +181,9 @@
   <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.Restore" xml:space="preserve">启动时恢复打开的仓库</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Message" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)或是自动暂存所有变更并提交？</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">确认继续</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自动暂存并提交</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">规范化提交信息生成</x:String>
   <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破坏性更新：</x:String>
   <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">关闭的ISSUE：</x:String>
@@ -726,7 +729,6 @@
   <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.ConfirmCommitWithFilter" xml:space="preserve">当前有 {0} 个文件在暂存区中，但仅显示了 {1} 个文件（{2} 个文件被过滤掉了），是否继续提交？</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">文件冲突已解决</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">显示未跟踪文件</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 34dac155..571f9376 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -181,6 +181,9 @@
   <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.Restore" xml:space="preserve">啟動時還原上次開啟的存放庫</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Message" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)或者自動暫存全部變更並提交?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">确认继续</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自动暂存并提交</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>
   <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破壞性變更:</x:String>
   <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">關閉的 Issue:</x:String>
@@ -725,7 +728,6 @@
   <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.ConfirmCommitWithFilter" xml:space="preserve">您已暫存 {0} 檔案，但只顯示 {1} 檔案 ({2} 檔案被篩選器隱藏)。您要繼續嗎？</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">檔案衝突已解決</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">顯示未追蹤檔案</x:String>
diff --git a/src/ViewModels/ConfirmEmptyCommit.cs b/src/ViewModels/ConfirmEmptyCommit.cs
new file mode 100644
index 00000000..71d1f00c
--- /dev/null
+++ b/src/ViewModels/ConfirmEmptyCommit.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace SourceGit.ViewModels
+{
+    public class ConfirmEmptyCommit
+    {
+        public bool HasLocalChanges
+        {
+            get;
+            private set;
+        }
+
+        public ConfirmEmptyCommit(bool hasLocalChanges, Action<bool> onSure)
+        {
+            HasLocalChanges = hasLocalChanges;
+            _onSure = onSure;
+        }
+
+        public void StageAllThenCommit()
+        {
+            _onSure?.Invoke(true);
+        }
+
+        public void Continue()
+        {
+            _onSure?.Invoke(false);
+        }
+
+        private Action<bool> _onSure;
+    }
+}
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 784328cc..83813f39 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -1679,12 +1679,11 @@ namespace SourceGit.ViewModels
             {
                 if ((autoStage && _count == 0) || (!autoStage && _staged.Count == 0))
                 {
-                    var confirmMessage = App.Text("WorkingCopy.ConfirmCommitWithoutFiles");
-                    App.OpenDialog(new Views.ConfirmCommit()
+                    App.OpenDialog(new Views.ConfirmEmptyCommit()
                     {
-                        DataContext = new ConfirmCommit(confirmMessage, () =>
+                        DataContext = new ConfirmEmptyCommit(_count > 0, stageAll =>
                         {
-                            DoCommit(autoStage, autoPush, true, confirmWithFilter);
+                            DoCommit(stageAll, autoPush, true, confirmWithFilter);
                         })
                     });
 
diff --git a/src/Views/ConfirmEmptyCommit.axaml b/src/Views/ConfirmEmptyCommit.axaml
new file mode 100644
index 00000000..ba51212b
--- /dev/null
+++ b/src/Views/ConfirmEmptyCommit.axaml
@@ -0,0 +1,72 @@
+<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"
+                    xmlns:vm="using:SourceGit.ViewModels"
+                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+                    x:Class="SourceGit.Views.ConfirmEmptyCommit"
+                    x:DataType="vm:ConfirmEmptyCommit"
+                    x:Name="ThisControl"
+                    Icon="/App.ico"
+                    Title="{DynamicResource Text.Warn}"
+                    SizeToContent="WidthAndHeight"
+                    CanResize="False"
+                    WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,Auto,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.Error}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
+
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.Warn}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+
+      <v:CaptionButtons HorizontalAlignment="Right"
+                        IsCloseButtonOnly="True"
+                        IsVisible="{OnPlatform True, macOS=False}"/>
+    </Grid>
+
+    <!-- Body -->
+    <Border Grid.Row="1" Margin="16">
+      <TextBlock Text="{DynamicResource Text.ConfirmEmptyCommit.Message}" MaxWidth="520" TextWrapping="Wrap"/>
+    </Border>
+
+    <!-- Buttons -->
+    <StackPanel Grid.Row="2" Margin="0,0,0,16" Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Classes="flat"
+              Height="30"
+              Margin="4,0"
+              IsVisible="{Binding HasLocalChanges}"
+              Click="StageAllThenCommit"
+              Content="{DynamicResource Text.ConfirmEmptyCommit.StageAllThenCommit}"
+              HorizontalContentAlignment="Center"
+              VerticalContentAlignment="Center"/>
+
+      <Button Classes="flat"
+              Height="30"
+              Margin="4,0"
+              Click="Continue"
+              Content="{DynamicResource Text.ConfirmEmptyCommit.Continue}"
+              HorizontalContentAlignment="Center"
+              VerticalContentAlignment="Center"/>
+
+      <Button Classes="flat primary"
+              Height="30"
+              Margin="4,0"
+              Click="CloseWindow"
+              Content="{DynamicResource Text.Cancel}"
+              HorizontalContentAlignment="Center"
+              VerticalContentAlignment="Center"/>
+    </StackPanel>
+  </Grid>
+</v:ChromelessWindow>
diff --git a/src/Views/ConfirmEmptyCommit.axaml.cs b/src/Views/ConfirmEmptyCommit.axaml.cs
new file mode 100644
index 00000000..6668ee2c
--- /dev/null
+++ b/src/Views/ConfirmEmptyCommit.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia.Interactivity;
+
+namespace SourceGit.Views
+{
+    public partial class ConfirmEmptyCommit : ChromelessWindow
+    {
+        public ConfirmEmptyCommit()
+        {
+            InitializeComponent();
+        }
+
+        private void StageAllThenCommit(object _1, RoutedEventArgs _2)
+        {
+            (DataContext as ViewModels.ConfirmEmptyCommit)?.StageAllThenCommit();
+            Close();
+        }
+
+        private void Continue(object _1, RoutedEventArgs _2)
+        {
+            (DataContext as ViewModels.ConfirmEmptyCommit)?.Continue();
+            Close();
+        }
+
+        private void CloseWindow(object _1, RoutedEventArgs _2)
+        {
+            Close();
+        }
+    }
+}

From 8b5f491e34466be7804fadd731330ff5bac05bc1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 12:01:06 +0000
Subject: [PATCH 352/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0f44cbcf..135b2c49 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-98.39%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-97.99%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -15,6 +15,9 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleAzure
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.CopyFullPath
 - Text.Diff.First
 - Text.Diff.Last
@@ -26,51 +29,63 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.73%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.Configure.Git.PreferredMergeMode
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.73%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.33%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-99.46%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-99.06%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.46%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.06%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-90.74%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-90.36%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -94,6 +109,9 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.CopyFullPath
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
@@ -147,12 +165,15 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.73%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.33%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
+- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>

From 768b324356b5b907559a62f203b30a15896aea34 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 8 Apr 2025 20:05:44 +0800
Subject: [PATCH 353/364] ux: if there are no local changes, show different
 confirm message (#1143)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml    | 3 ++-
 src/Resources/Locales/zh_CN.axaml    | 3 ++-
 src/Resources/Locales/zh_TW.axaml    | 3 ++-
 src/ViewModels/ConfirmEmptyCommit.cs | 7 +++++++
 src/Views/ConfirmEmptyCommit.axaml   | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 8645cd96..b25e4f77 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -177,7 +177,8 @@
   <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>
   <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Restore tabs on startup</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.Message" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">CONTINUE</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">STAGE ALL &amp; COMMIT</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index a2bde6f8..b303374f 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -181,7 +181,8 @@
   <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.Restore" xml:space="preserve">启动时恢复打开的仓库</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.Message" 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.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">确认继续</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自动暂存并提交</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">规范化提交信息生成</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 571f9376..4239667f 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -181,7 +181,8 @@
   <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.Restore" xml:space="preserve">啟動時還原上次開啟的存放庫</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.Message" 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.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">确认继续</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自动暂存并提交</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>
diff --git a/src/ViewModels/ConfirmEmptyCommit.cs b/src/ViewModels/ConfirmEmptyCommit.cs
index 71d1f00c..87178b75 100644
--- a/src/ViewModels/ConfirmEmptyCommit.cs
+++ b/src/ViewModels/ConfirmEmptyCommit.cs
@@ -10,9 +10,16 @@ namespace SourceGit.ViewModels
             private set;
         }
 
+        public string Message
+        {
+            get;
+            private set;
+        }
+
         public ConfirmEmptyCommit(bool hasLocalChanges, Action<bool> onSure)
         {
             HasLocalChanges = hasLocalChanges;
+            Message = App.Text(hasLocalChanges ? "ConfirmEmptyCommit.WithLocalChanges" : "ConfirmEmptyCommit.NoLocalChanges");
             _onSure = onSure;
         }
 
diff --git a/src/Views/ConfirmEmptyCommit.axaml b/src/Views/ConfirmEmptyCommit.axaml
index ba51212b..32a1f2cd 100644
--- a/src/Views/ConfirmEmptyCommit.axaml
+++ b/src/Views/ConfirmEmptyCommit.axaml
@@ -38,7 +38,7 @@
 
     <!-- Body -->
     <Border Grid.Row="1" Margin="16">
-      <TextBlock Text="{DynamicResource Text.ConfirmEmptyCommit.Message}" MaxWidth="520" TextWrapping="Wrap"/>
+      <TextBlock Text="{Binding Message}" MaxWidth="520" TextWrapping="Wrap"/>
     </Border>
 
     <!-- Buttons -->

From 5d90c2ed6024d84f3f0461f44e491ae739069a50 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 12:06:21 +0000
Subject: [PATCH 354/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 135b2c49..0a469262 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-97.99%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-97.86%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -15,7 +15,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleAzure
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.CopyFullPath
@@ -29,39 +30,42 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.33%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.20%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.33%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.20%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-99.06%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-98.93%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.CopyFullPath
@@ -70,13 +74,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.06%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-98.93%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.Repository.FilterCommits
@@ -85,7 +90,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-90.36%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-90.24%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -109,7 +114,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.CopyFullPath
@@ -165,13 +171,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.33%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.20%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Message
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter

From 3b18ee0b37b4fe7fc210c099b0bfdb45512a1e28 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 8 Apr 2025 20:20:20 +0800
Subject: [PATCH 355/364] code_style: remove unused code

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryStashChanges.cs |  2 +-
 src/Models/OpenAI.cs              | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs
index 92240569..1f6c5b4f 100644
--- a/src/Commands/QueryStashChanges.cs
+++ b/src/Commands/QueryStashChanges.cs
@@ -14,7 +14,7 @@ namespace SourceGit.Commands
         [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
         private static partial Regex REG_RENAME_FORMAT();
 
-        public QueryStashChanges(string repo, string stash) 
+        public QueryStashChanges(string repo, string stash)
         {
             WorkingDirectory = repo;
             Context = repo;
diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index 76daacd0..22fbcd51 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -107,15 +107,7 @@ namespace SourceGit.Models
         public string Server
         {
             get => _server;
-            set
-            {
-                // migrate old server value
-                if (!string.IsNullOrEmpty(value) && value.EndsWith("/chat/completions", StringComparison.Ordinal))
-                {
-                    value = value.Substring(0, value.Length - "/chat/completions".Length);
-                }
-                SetProperty(ref _server, value);
-            }
+            set => SetProperty(ref _server, value);
         }
 
         public string ApiKey

From 47824dc27a41ebce082fe13dfeddead09e9c0b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20W?= <44604769+goran-w@users.noreply.github.com>
Date: Fri, 11 Apr 2025 03:33:07 +0200
Subject: [PATCH 356/364] Add button for running external mergetool on ALL
 conflicts (#1173)

* Make a few non-translated strings localizable (in Conflict view)

* Add button and wiring to run mergetool on all conflicts

* Corrected spelling and wording in related code and exception msg
---
 src/Commands/MergeTool.cs         |  7 +++++--
 src/Models/Change.cs              |  2 +-
 src/Resources/Locales/en_US.axaml |  4 ++++
 src/ViewModels/WorkingCopy.cs     | 31 +++++++++++++++++++------------
 src/Views/ChangeStatusIcon.cs     |  4 ++--
 src/Views/Conflict.axaml          |  6 +++---
 src/Views/WorkingCopy.axaml       | 19 ++++++++++++++-----
 7 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs
index d3478d59..276c078b 100644
--- a/src/Commands/MergeTool.cs
+++ b/src/Commands/MergeTool.cs
@@ -13,9 +13,12 @@ namespace SourceGit.Commands
             cmd.Context = repo;
             cmd.RaiseError = true;
 
+            // NOTE: If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts.
+            var file_arg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
+
             if (toolType == 0)
             {
-                cmd.Args = $"mergetool \"{file}\"";
+                cmd.Args = $"mergetool {file_arg}";
                 return cmd.Exec();
             }
 
@@ -32,7 +35,7 @@ namespace SourceGit.Commands
                 return false;
             }
 
-            cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\"";
+            cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {file_arg}";
             return cmd.Exec();
         }
 
diff --git a/src/Models/Change.cs b/src/Models/Change.cs
index 36fe20ac..e9d07181 100644
--- a/src/Models/Change.cs
+++ b/src/Models/Change.cs
@@ -36,7 +36,7 @@ namespace SourceGit.Models
         public string OriginalPath { get; set; } = "";
         public ChangeDataForAmend DataForAmend { get; set; } = null;
 
-        public bool IsConflit
+        public bool IsConflict
         {
             get
             {
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index b25e4f77..9676d371 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -726,7 +726,11 @@
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter">You have staged {0} file(s) but only {1} file(s) displayed ({2} files are filtered out). Do you want to continue?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.OpenExternalMergeTool" xml:space="preserve">OPEN EXTERNAL MERGETOOL</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts" xml:space="preserve">OPEN ALL CONFLICTS IN EXTERNAL MERGETOOL</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseMine" xml:space="preserve">USE MINE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">USE THEIRS</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO RECENT INPUT MESSAGES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO COMMIT TEMPLATES</x:String>
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 83813f39..802c6c5d 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -243,7 +243,7 @@ namespace SourceGit.ViewModels
                 // Just force refresh selected changes.
                 Dispatcher.UIThread.Invoke(() =>
                 {
-                    HasUnsolvedConflicts = _cached.Find(x => x.IsConflit) != null;
+                    HasUnsolvedConflicts = _cached.Find(x => x.IsConflict) != null;
 
                     UpdateDetail();
                     UpdateInProgressState();
@@ -275,7 +275,7 @@ namespace SourceGit.ViewModels
                 if (c.WorkTree != Models.ChangeState.None)
                 {
                     unstaged.Add(c);
-                    hasConflict |= c.IsConflit;
+                    hasConflict |= c.IsConflict;
                 }
             }
 
@@ -314,6 +314,12 @@ namespace SourceGit.ViewModels
             });
         }
 
+        public void OpenExternalMergeToolAllConflicts()
+        {
+            // No <file> arg, mergetool runs on all files with merge conflicts!
+            UseExternalMergeTool(null);
+        }
+
         public void OpenAssumeUnchanged()
         {
             App.OpenDialog(new Views.AssumeUnchangedManager()
@@ -373,7 +379,7 @@ namespace SourceGit.ViewModels
 
             foreach (var change in changes)
             {
-                if (!change.IsConflit)
+                if (!change.IsConflict)
                     continue;
 
                 if (change.WorkTree == Models.ChangeState.Deleted)
@@ -413,7 +419,7 @@ namespace SourceGit.ViewModels
 
             foreach (var change in changes)
             {
-                if (!change.IsConflit)
+                if (!change.IsConflict)
                     continue;
 
                 if (change.Index == Models.ChangeState.Deleted)
@@ -448,7 +454,8 @@ namespace SourceGit.ViewModels
         {
             var toolType = Preferences.Instance.ExternalMergeToolType;
             var toolPath = Preferences.Instance.ExternalMergeToolPath;
-            await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
+            var file = change?.Path; // NOTE: With no <file> arg, mergetool runs on on every file with merge conflicts!
+            await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, file));
         }
 
         public void ContinueMerge()
@@ -585,7 +592,7 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(openWith);
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
-                if (change.IsConflit)
+                if (change.IsConflict)
                 {
                     var useTheirs = new MenuItem();
                     useTheirs.Icon = App.CreateMenuIcon("Icons.Incoming");
@@ -924,20 +931,20 @@ namespace SourceGit.ViewModels
             else
             {
                 var hasConflicts = false;
-                var hasNoneConflicts = false;
+                var hasNonConflicts = false;
                 foreach (var change in _selectedUnstaged)
                 {
-                    if (change.IsConflit)
+                    if (change.IsConflict)
                         hasConflicts = true;
                     else
-                        hasNoneConflicts = true;
+                        hasNonConflicts = true;
                 }
 
                 if (hasConflicts)
                 {
-                    if (hasNoneConflicts)
+                    if (hasNonConflicts)
                     {
-                        App.RaiseException(_repo.FullPath, "You have selected both non-conflict changes with conflicts!");
+                        App.RaiseException(_repo.FullPath, "Selection contains both conflict and non-conflict changes!");
                         return null;
                     }
 
@@ -1644,7 +1651,7 @@ namespace SourceGit.ViewModels
 
             if (change == null)
                 DetailContext = null;
-            else if (change.IsConflit && isUnstaged)
+            else if (change.IsConflict && isUnstaged)
                 DetailContext = new Conflict(_repo, this, change);
             else
                 DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);
diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs
index 5d34be09..7dbd0beb 100644
--- a/src/Views/ChangeStatusIcon.cs
+++ b/src/Views/ChangeStatusIcon.cs
@@ -93,7 +93,7 @@ namespace SourceGit.Views
             string indicator;
             if (IsUnstagedChange)
             {
-                if (Change.IsConflit)
+                if (Change.IsConflict)
                 {
                     background = Brushes.OrangeRed;
                     indicator = "!";
@@ -139,7 +139,7 @@ namespace SourceGit.Views
                 }
 
                 if (isUnstaged)
-                    ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);
+                    ToolTip.SetTip(this, c.IsConflict ? "Conflict" : TIPS[(int)c.WorkTree]);
                 else
                     ToolTip.SetTip(this, TIPS[(int)c.Index]);
 
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index 2dce264e..7f13f14e 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -105,9 +105,9 @@
         </Border>
 
         <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
-          <Button Classes="flat" Content="USE THEIRS" Command="{Binding UseTheirs}"/>
-          <Button Classes="flat" Margin="8,0,0,0" Content="USE MINE" Command="{Binding UseMine}"/>
-          <Button Classes="flat" Margin="8,0,0,0" Content="OPEN EXTERNAL MERGETOOL" Command="{Binding OpenExternalMergeTool}"/>
+          <Button Classes="flat" Margin="0,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" Command="{Binding UseTheirs}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" Command="{Binding UseMine}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" Command="{Binding OpenExternalMergeTool}"/>
         </StackPanel>
       </StackPanel>
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 4ca854fa..7d471142 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -61,13 +61,22 @@
       <Grid Grid.Row="1" RowDefinitions="28,*">
         <!-- Unstaged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
-          <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto">
+          <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto,Auto">
             <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Changes}"/>
             <TextBlock Grid.Column="1" Text="{DynamicResource Text.WorkingCopy.Unstaged}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0"/>
             <TextBlock Grid.Column="2" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Unstaged, Converter={x:Static c:ListConverters.ToCount}}"/>
             <v:LoadingIcon Grid.Column="3" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsStaging}"/>
 
             <Button Grid.Column="5"
+                    Classes="icon_button"
+                    Width="26" Height="14"
+                    Padding="0"
+                    IsVisible="{Binding HasUnsolvedConflicts}"
+                    ToolTip.Tip="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts}"
+                    Command="{Binding OpenExternalMergeToolAllConflicts}">
+              <Path Width="14" Height="14" Data="{StaticResource Icons.Conflict}"/>
+            </Button>
+            <Button Grid.Column="6"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -75,12 +84,12 @@
                     Command="{Binding OpenAssumeUnchanged}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.File.Ignore}"/>
             </Button>
-            <ToggleButton Grid.Column="6"
+            <ToggleButton Grid.Column="7"
                           Classes="toggle_untracked"
                           Width="26" Height="14"
                           ToolTip.Tip="{DynamicResource Text.WorkingCopy.IncludeUntracked}"
                           IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"/>
-            <Button Grid.Column="7"
+            <Button Grid.Column="8"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -93,7 +102,7 @@
               </ToolTip.Tip>
               <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
             </Button>
-            <Button Grid.Column="8"
+            <Button Grid.Column="9"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -101,7 +110,7 @@
                     Command="{Binding StageAll}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.DoubleDown}"/>
             </Button>
-            <v:ChangeViewModeSwitcher Grid.Column="9"
+            <v:ChangeViewModeSwitcher Grid.Column="10"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
                                       ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"/>

From a99ab377977776cf0c45c483fd6fa3b44fc09265 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 01:33:18 +0000
Subject: [PATCH 357/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 66 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 9 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0a469262..aee13ea5 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-97.86%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-97.34%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -27,10 +27,14 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.General.ShowTagsInGraph
 - Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.20%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-98.67%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
@@ -41,10 +45,14 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.20%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-98.67%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -55,10 +63,14 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-98.93%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-98.40%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -71,10 +83,14 @@ This document shows the translation status of each locale file in the repository
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-98.93%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-98.40%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -87,10 +103,14 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-90.24%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-89.76%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -167,11 +187,15 @@ This document shows the translation status of each locale file in the repository
 - Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.20%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-98.67%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
@@ -182,9 +206,33 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-99.47%25-yellow)
 
-### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file
+<details>
+<summary>Missing keys in zh_CN.axaml</summary>
+
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
+
+</details>
+
+### ![zh__TW](https://img.shields.io/badge/zh__TW-99.47%25-yellow)
+
+<details>
+<summary>Missing keys in zh_TW.axaml</summary>
+
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
+
+</details>
\ No newline at end of file

From 1799de4907c9b01290cd9e9700c80717b1238b41 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 11 Apr 2025 10:02:33 +0800
Subject: [PATCH 358/364] code_review: PR #1173

- rename c-style `file_arg` to `fileArg`
- add missing translations for zh_CN and zh_TW
- re-design conflict view and add tooltip for `USE THEIRS` and `USE MINE`
- re-order unstaged toolbar buttons

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/MergeTool.cs         |   6 +-
 src/Resources/Locales/zh_CN.axaml |   4 +
 src/Resources/Locales/zh_TW.axaml |   4 +
 src/Views/Conflict.axaml          | 167 ++++++++++++++++--------------
 src/Views/WorkingCopy.axaml       |  26 ++---
 5 files changed, 115 insertions(+), 92 deletions(-)

diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs
index 276c078b..f67f5e48 100644
--- a/src/Commands/MergeTool.cs
+++ b/src/Commands/MergeTool.cs
@@ -14,11 +14,11 @@ namespace SourceGit.Commands
             cmd.RaiseError = true;
 
             // NOTE: If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts.
-            var file_arg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
+            var fileArg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
 
             if (toolType == 0)
             {
-                cmd.Args = $"mergetool {file_arg}";
+                cmd.Args = $"mergetool {fileArg}";
                 return cmd.Exec();
             }
 
@@ -35,7 +35,7 @@ namespace SourceGit.Commands
                 return false;
             }
 
-            cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {file_arg}";
+            cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {fileArg}";
             return cmd.Exec();
         }
 
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index b303374f..1b878b29 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -731,7 +731,11 @@
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自动暂存所有变更并提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter" xml:space="preserve">当前有 {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">使用 MINE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">使用 THEIRS</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>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 4239667f..e090d32d 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -730,7 +730,11 @@
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自動暫存全部變更並提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter" xml:space="preserve">您已暫存 {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">使用 MINE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">使用 THEIRS</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>
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index 7f13f14e..f2d7bdec 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -12,83 +12,83 @@
   <Border Background="{DynamicResource Brush.Window}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
     <Grid VerticalAlignment="Center">
       <StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
-        <StackPanel.DataTemplates>
-          <DataTemplate DataType="vm:ConflictSourceBranch">
-            <StackPanel Orientation="Horizontal">
-              <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock Margin="4,0,0,0" Text="{Binding Name}"/>
-              <TextBlock Margin="4,0,0,0"
-                         Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                         Foreground="DarkOrange"
-                         TextDecorations="Underline"
-                         Cursor="Hand"
-                         PointerPressed="OnPressedSHA"
-                         ToolTip.Tip="{Binding Revision}"
-                         ToolTip.ShowDelay="0">
-                <TextBlock.DataTemplates>
-                  <DataTemplate DataType="m:Commit">
-                    <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"/>
-                      </Grid>
-
-                      <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                    </StackPanel>
-                  </DataTemplate>
-                </TextBlock.DataTemplates>
-              </TextBlock>
-            </StackPanel>
-          </DataTemplate>
-
-          <DataTemplate DataType="m:Commit">
-            <StackPanel Orientation="Horizontal">
-              <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="11"
-                                     VerticalAlignment="Center"
-                                     UseGraphColor="False"/>
-              <TextBlock Margin="4,0,0,0"
-                         Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                         Foreground="DarkOrange"
-                         TextDecorations="Underline"
-                         Cursor="Hand"
-                         PointerPressed="OnPressedSHA"
-                         ToolTip.Tip="{Binding}"
-                         ToolTip.ShowDelay="0">
-                <TextBlock.DataTemplates>
-                  <DataTemplate DataType="m:Commit">
-                    <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"/>
-                      </Grid>
-
-                      <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                    </StackPanel>
-                  </DataTemplate>
-                </TextBlock.DataTemplates>
-              </TextBlock>
-              <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
-            </StackPanel>
-          </DataTemplate>
-
-          <DataTemplate DataType="x:String">
-            <StackPanel Orientation="Horizontal">
-              <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
-              <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
-            </StackPanel>
-          </DataTemplate>
-        </StackPanel.DataTemplates>
-
         <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
         <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
 
         <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+          <Border.DataTemplates>
+            <DataTemplate DataType="vm:ConflictSourceBranch">
+              <StackPanel Orientation="Horizontal">
+                <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
+                <TextBlock Margin="4,0,0,0" Text="{Binding Name}"/>
+                <TextBlock Margin="4,0,0,0"
+                           Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                           Foreground="DarkOrange"
+                           TextDecorations="Underline"
+                           Cursor="Hand"
+                           PointerPressed="OnPressedSHA"
+                           ToolTip.Tip="{Binding Revision}"
+                           ToolTip.ShowDelay="0">
+                  <TextBlock.DataTemplates>
+                    <DataTemplate DataType="m:Commit">
+                      <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"/>
+                        </Grid>
+
+                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                      </StackPanel>
+                    </DataTemplate>
+                  </TextBlock.DataTemplates>
+                </TextBlock>
+              </StackPanel>
+            </DataTemplate>
+
+            <DataTemplate DataType="m:Commit">
+              <StackPanel Orientation="Horizontal">
+                <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="11"
+                                       VerticalAlignment="Center"
+                                       UseGraphColor="False"/>
+                <TextBlock Margin="4,0,0,0"
+                           Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                           Foreground="DarkOrange"
+                           TextDecorations="Underline"
+                           Cursor="Hand"
+                           PointerPressed="OnPressedSHA"
+                           ToolTip.Tip="{Binding}"
+                           ToolTip.ShowDelay="0">
+                  <TextBlock.DataTemplates>
+                    <DataTemplate DataType="m:Commit">
+                      <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"/>
+                        </Grid>
+
+                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                      </StackPanel>
+                    </DataTemplate>
+                  </TextBlock.DataTemplates>
+                </TextBlock>
+                <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
+              </StackPanel>
+            </DataTemplate>
+
+            <DataTemplate DataType="x:String">
+              <StackPanel Orientation="Horizontal">
+                <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
+                <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
+              </StackPanel>
+            </DataTemplate>
+          </Border.DataTemplates>
+          
           <Border.IsVisible>
             <MultiBinding Converter="{x:Static BoolConverters.And}">
               <Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>
@@ -105,9 +105,24 @@
         </Border>
 
         <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
-          <Button Classes="flat" Margin="0,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" Command="{Binding UseTheirs}"/>
-          <Button Classes="flat" Margin="8,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" Command="{Binding UseMine}"/>
-          <Button Classes="flat" Margin="8,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" Command="{Binding OpenExternalMergeTool}"/>
+          <Button Classes="flat" Margin="0,0,0,0" Command="{Binding UseTheirs}" ToolTip.Tip="git checkout --theirs">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Incoming}"/>
+              <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" VerticalAlignment="Center"/>
+            </StackPanel>
+          </Button>
+          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --theirs">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Local}"/>
+              <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>
+            </StackPanel>
+          </Button>
+          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding OpenExternalMergeTool}">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.OpenWith}"/>
+              <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" VerticalAlignment="Center"/>
+            </StackPanel>
+          </Button>
         </StackPanel>
       </StackPanel>
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 7d471142..41d80b04 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -68,6 +68,19 @@
             <v:LoadingIcon Grid.Column="3" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsStaging}"/>
 
             <Button Grid.Column="5"
+                    Classes="icon_button"
+                    Width="26" Height="14"
+                    Padding="0"
+                    ToolTip.Tip="{DynamicResource Text.WorkingCopy.Unstaged.ViewAssumeUnchaged}"
+                    Command="{Binding OpenAssumeUnchanged}">
+              <Path Width="14" Height="14" Data="{StaticResource Icons.File.Ignore}"/>
+            </Button>
+            <ToggleButton Grid.Column="6"
+                          Classes="toggle_untracked"
+                          Width="26" Height="14"
+                          ToolTip.Tip="{DynamicResource Text.WorkingCopy.IncludeUntracked}"
+                          IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"/>
+            <Button Grid.Column="7"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -76,19 +89,6 @@
                     Command="{Binding OpenExternalMergeToolAllConflicts}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Conflict}"/>
             </Button>
-            <Button Grid.Column="6"
-                    Classes="icon_button"
-                    Width="26" Height="14"
-                    Padding="0"
-                    ToolTip.Tip="{DynamicResource Text.WorkingCopy.Unstaged.ViewAssumeUnchaged}"
-                    Command="{Binding OpenAssumeUnchanged}">
-              <Path Width="14" Height="14" Data="{StaticResource Icons.File.Ignore}"/>
-            </Button>
-            <ToggleButton Grid.Column="7"
-                          Classes="toggle_untracked"
-                          Width="26" Height="14"
-                          ToolTip.Tip="{DynamicResource Text.WorkingCopy.IncludeUntracked}"
-                          IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"/>
             <Button Grid.Column="8"
                     Classes="icon_button"
                     Width="26" Height="14"

From cfabfb73683d89a6c3cf6fa45be1fc69e9dc0b53 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 02:02:56 +0000
Subject: [PATCH 359/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index aee13ea5..e79783ea 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -213,26 +213,6 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.47%25-yellow)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in zh_CN.axaml</summary>
-
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
-
-</details>
-
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.47%25-yellow)
-
-<details>
-<summary>Missing keys in zh_TW.axaml</summary>
-
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
-
-</details>
\ No newline at end of file
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file

From accccb5ea3120e1943068bb4d4ebad71982cc91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=AE=A4=E0=AE=AE=E0=AE=BF=E0=AE=B4=E0=AF=8D=20=E0=AE=A8?=
 =?UTF-8?q?=E0=AF=87=E0=AE=B0=E0=AE=AE=E0=AF=8D?=
 <67970539+TamilNeram@users.noreply.github.com>
Date: Fri, 11 Apr 2025 09:52:00 +0530
Subject: [PATCH 360/364] =?UTF-8?q?=E0=AE=A4=E0=AE=AE=E0=AE=BF=E0=AE=B4?=
 =?UTF-8?q?=E0=AF=8D=20(Tamil)=20translation=20file=20added=20(#1174)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Tamil file added

220

* 0

* Tamil file added

220

0

(cherry picked from commit 355db34db382d17e0b8f0bb6f05b8e2e2f2963d9)
---
 src/Resources/Locales/ta_IN.axaml | 746 ++++++++++++++++++++++++++++++
 1 file changed, 746 insertions(+)
 create mode 100644 src/Resources/Locales/ta_IN.axaml

diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
new file mode 100644
index 00000000..84df570c
--- /dev/null
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -0,0 +1,746 @@
+<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">மூலஅறிவிலி பற்றி</x:String>
+  <x:String x:Key="Text.About.SubTitle" xml:space="preserve">திறந்தமூல &amp; கட்டற்ற அறிவிலி இடைமுக வாடிக்கயாளர்</x:String>
+  <x:String x:Key="Text.AddWorktree" xml:space="preserve">பணிமரத்தைச் சேர்</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">என்ன சரிபார்க்க வேண்டும்:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">ஏற்கனவே உள்ள கிளை</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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.AIAssistant" xml:space="preserve">செநு உதவியாளர்</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">மறு-உருவாக்கு</x:String>
+  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">உறுதிமொழி செய்தியை உருவாக்க செநுவைப் பயன்படுத்து</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" 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">.ஒட்டு இடுவதற்கு கோப்பைத் தேர்ந்தெடு</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">மூலஅறிவிலி கடவுகேள்</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.AssumeUnchanged.Remove" 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.BranchCM.Checkout" xml:space="preserve">${0}$ சரிபார்...</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">தலையுடன் ஒப்பிடுக</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.DiscardAll" xml:space="preserve">எல்லா மாற்றங்களையும் நிராகரி</x:String>
+  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">${0}$ இதற்கு வேகமாக முன்னோக்கிச் செல்</x:String>
+  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">${0}$ ஐ ${1}$இல் பெறு...</x:String>
+  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">அறிவிலி ஓட்டம் - முடி ${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}$</x:String>
+  <x:String x:Key="Text.BranchCM.PullInto" xml:space="preserve">இழு ${0}$ஐ ${1}$-க்குள்...</x:String>
+  <x:String x:Key="Text.BranchCM.Push" xml:space="preserve">தள்ளு ${0}$</x:String>
+  <x:String x:Key="Text.BranchCM.Rebase" xml:space="preserve">மறுதளம் ${0}$ இதன்மேல் ${1}$...</x:String>
+  <x:String x:Key="Text.BranchCM.Rename" 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.BranchUpstreamInvalid" xml:space="preserve">தவறான மேல்ஓடை!</x:String>
+  <x:String x:Key="Text.Bytes" xml:space="preserve">எண்மங்கள்</x:String>
+  <x:String x:Key="Text.Cancel" xml:space="preserve">விடு</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">இந்த திருத்தத்திற்கு மீட்டமை</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" 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.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.Warning" xml:space="preserve">முன்னறிவிப்பு: ஒரு உறுதிமொழி சரிபார்பதன் மூலம், உங்கள் தலை பிரிக்கப்படும்</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">உறுதிமொழி:</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">கிளை:</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.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">பொதுவாக நீங்கள் ஒரு ஒன்றிணையை கனி-பறிக்க முடியாது, ஏனெனில் இணைப்பின் எந்தப் பக்கத்தை முதன்மையாகக் கருத வேண்டும் என்பது உங்களுக்குத் தெரியாது. இந்த விருப்பம் குறிப்பிட்ட பெற்றோருடன் தொடர்புடைய மாற்றத்தை மீண்டும் இயக்க கனி-பறி அனுமதிக்கிறது.</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">களஞ்சிய முகவரி:</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.CherryPick" xml:space="preserve">கனி-பறி உறுதிமொழி</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">கனி-பறி ...</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">உறுதிமொழி சரிபார்</x:String>
+  <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">தலையுடன் ஒப்பிடுக</x:String>
+  <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">பணிமரத்துடன் ஒப்பிடுக</x:String>
+  <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">தகவலை நகலெடு</x:String>
+  <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">பாகொவ-வை நகலெடு</x:String>
+  <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">தனிப்பயன் செயல்</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">இங்கே ${0}$ ஐ ஊடாடும் வகையில் மறுதளம்</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.Rebase" xml:space="preserve">இங்கே ${0}$ ஐ மறுதளம்</x:String>
+  <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">${0}$ ஐ இங்கே மீட்டமை</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.CommitCM.SquashCommitsSinceThis" xml:space="preserve">நொறுக்கு குழந்தைகள் இங்கே சேர்</x:String>
+  <x:String x:Key="Text.CommitDetail.Changes" 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">பெகோஅ கோப்பு</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.Changed" 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">இந்த உறுதிமொழிடைக் கொண்ட குறிப்புகளைச் சரிபார்</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">உறுதிமொழி இதில் உள்ளது</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">முதல் 100 மாற்றங்களை மட்டும் காட்டுகிறது மாற்றங்கள் தாவலில் அனைத்து மாற்றங்களையும் காண்க.</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">குறிகள்</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">பாகொவ</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">உலாவியில் திற</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">உறுதிமொழி பொருளை உள்ளிடவும்</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">வார்ப்புரு பெயர்:</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" 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:String x:Key="Text.Configure.CustomAction.Executable" 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.Repository" 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">அறிவிலி</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.DefaultRemote" xml:space="preserve">இயல்புநிலை தொலை</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">சிக்கல் கண்காணி</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">மாதிரி அறிவிலிஈ சிக்கலுக்கான விதியைச் சேர்</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">மாதிரி அறிவிலிஈ இழு கோரிக்கை விதியைச் சேர்</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">மாதிரி அறிவிலிமையம் விதியைச் சேர்</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">மாதிரி அறிவிலிஆய்வு சிக்கலுக்கான விதியைச் சேர்</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">மாதிரி அறிவிலிஆய்வு இணைப்பு கோரிக்கை  விதியைச் சேர்</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">மாதிரி சீரா விதியைச் சேர்</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">மாதிரி அசூர் வளர்பணிகள் விதியைச் சேர்</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.URLTemplate" xml:space="preserve">முடிவு முகவரி:</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">செநு</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">'விருப்பமான சேவை' அமைக்கப்பட்டிருந்தால், மூலஅறிவிலி இந்த களஞ்சியத்தில் மட்டுமே அதைப் பயன்படுத்தும். இல்லையெனில், ஒன்றுக்கு மேற்பட்ட சேவைகள் இருந்தால், அவற்றில் ஒன்றைத் தேர்ந்தெடுப்பதற்கான சூழல் பட்டயல் காண்பிக்கப்படும்.</x:String>
+  <x:String x:Key="Text.Configure.Proxy" xml:space="preserve">உஉபநெ பதிலாள்</x:String>
+  <x:String x:Key="Text.Configure.Proxy.Placeholder" xml:space="preserve">இந்த களஞ்சியத்தால் பயன்படுத்தப்படும் உஉபநெ பதிலாள்</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.ConfigureWorkspace" xml:space="preserve">பணியிடங்கள்</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">நிறம்</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">தாவல்களை மீட்டமை</x:String>
+  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">வழக்கமான உறுதிமொழி உதவியாளர்</x:String>
+  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">உடைக்கும் மாற்றம்:</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.CopyPath" xml:space="preserve">நகல் பாதை</x:String>
+  <x:String x:Key="Text.CopyFullPath" 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.Name.WarnSpace" xml:space="preserve">இடைவெளிகள் கோடுகளால் மாற்றப்படும்.</x:String>
+  <x:String x:Key="Text.CreateBranch.Title" 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">சீபிசீ கையொப்பமிடுதல்</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">பரிந்துரைக்கப்பட்ட வடிவம்: ப1.0.0-ஆனா</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">annotated</x:String>
+  <x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">குறைந்தஎடை</x:String>
+  <x:String x:Key="Text.CtrlClickTip" xml:space="preserve">நேரடியாகத் தொடங்க  கட்டுப்பாட்டை அழுத்திப் பிடி</x:String>
+  <x:String x:Key="Text.Cut" 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.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.TitleForGroup" xml:space="preserve">குழுவை நீக்குவதை உறுதிப்படுத்து</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" 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.Binary.New" xml:space="preserve">புதிய</x:String>
+  <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">பழைய</x:String>
+  <x:String x:Key="Text.Diff.Copy" 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.Last" xml:space="preserve">கடைசி வேறுபாடு</x:String>
+  <x:String x:Key="Text.Diff.LFS" 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">மாற்றங்கள் இல்லை அல்லது  வரிமுடிவு மாற்றங்கள் மட்டும்</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.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.UseBlockNavigation" 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.DiffWithMerger" 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.Total" xml:space="preserve">{0} மாற்றங்கள் நிராகரிக்கப்படும்</x:String>
+  <x:String x:Key="Text.Discard.Warning" xml:space="preserve">இந்தச் செயலை நீங்கள் செயல்தவிர்க்க முடியாது!!!</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" xml:space="preserve">தனிப்பயன் செயலை இயக்கு</x:String>
+  <x:String x:Key="Text.ExecuteCustomAction.Name" xml:space="preserve">செயல் பெயர்:</x:String>
+  <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">வேகமாக முன்னோக்கி (சரிபார்க்காமல்)</x:String>
+  <x:String x:Key="Text.Fetch" xml:space="preserve">பெறு</x:String>
+  <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">எல்லா தொலைகளையும் பெறு</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">உள்ளக குறிப்புகளை கட்டாயமாக மீறு</x:String>
+  <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">குறிச்சொற்கள் இல்லாமல் பெறு</x:String>
+  <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">தொலை:</x:String>
+  <x:String x:Key="Text.Fetch.Title" xml:space="preserve">தொலை மாற்றங்களைப் பெறு</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.DiscardSelectedLines" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை நிராகரி</x:String>
+  <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">வெளிப்புற இணைப்பு கருவியைத் திற</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} fகோப்புகள் நிலைபடுத்து</x:String>
+  <x:String x:Key="Text.FileCM.StageSelectedLines" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை  நிலைபடுத்து</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.UnstageSelectedLines" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை நிலைநீக்கு</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">அவர்களுடையதைப் பயன்படுத்து (சரிபார் --அவர்களது)</x:String>
+  <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">என்னுடையதைப் பயன்படுத்து (சரிபார் --நமது)</x:String>
+  <x:String x:Key="Text.FileHistory" xml:space="preserve">கோப்பு வரலாறு</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">உள்ளடக்கம்</x:String>
+  <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">மாற்றம்</x:String>
+  <x:String x:Key="Text.GitFlow" xml:space="preserve">அறிவிலி-ஓட்டம்</x:String>
+  <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">மேம்பாட்டு கிளை:</x:String>
+  <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">நற்பொருத்தம்:</x:String>
+  <x:String x:Key="Text.GitFlow.FeaturePrefix" xml:space="preserve">நற்பொருத்தம் முன்னொட்டு:</x:String>
+  <x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">ஓட்டம் - நற்பொருத்தம் முடி</x:String>
+  <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">ஓட்டம் - சூடானதிருத்தம் முடி</x:String>
+  <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">ஓட்டம் - வெளியீட்டை முடி</x:String>
+  <x:String x:Key="Text.GitFlow.FinishTarget" 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">சூடானதிருத்தம் முன்னொட்டு:</x:String>
+  <x:String x:Key="Text.GitFlow.Init" xml:space="preserve">அறிவிலி-ஓட்டம் துவக்கு</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">வெளியீடு முன்னொட்டு:</x:String>
+  <x:String x:Key="Text.GitFlow.StartFeature" xml:space="preserve">நற்பொருத்தம் தொடங்கு...</x:String>
+  <x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">ஓட்டம் - நற்பொருத்தம் தொடங்கு</x:String>
+  <x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">சூடானதிருத்தம் தொடங்கு...</x:String>
+  <x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">ஓட்டம் - சூடானதிருத்தம் தொடங்கு</x:String>
+  <x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">பெயரை உள்ளிடு</x:String>
+  <x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">வெளியீட்டைத் தொடங்கு...</x:String>
+  <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">ஓட்டம் - வெளியீட்டைத் தொடங்கு</x:String>
+  <x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">பதிப்பு குறிச்சொல் முன்னொட்டு:</x:String>
+  <x:String x:Key="Text.GitLFS" xml:space="preserve">அறிவிலி பெகோஅ</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">அறிவிலி பெகோஅ இல் கண்காணி வடிவங்களைச் சேர்</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">பெறு</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">அறிவிலி பெகோஅ பொருள்களைப் பெறு</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">அறிவிலி பெகோஅ பொருள்களைப் பதிவிறக்க `அறிவிலி பெகோஅ பெறு` ஐ இயக்கவும் இது செயல்படும் நகலை புதுப்பிக்காது.</x:String>
+  <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">அறிவிலி பெகோஅ கொக்கிகளை நிறுவு</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">பெகோஅ பூட்டுகள்</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">உள்ளக சேமிப்பகத்திலிருந்து பழைய பெகோஅ கோப்புகளை நீக்க `அறிவிலி பெகோஅ கத்தரி` ஐ இயக்கு</x:String>
+  <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">இழு</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">பெகோஅ பொருள்களை இழு</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">தற்போதைய குறிக்கு அனைத்து அறிவிலி பெகோஅ கோப்புகளையும் பதிவிறக்கி சரிபார்க்க `அறிவிலி பெகோஅ இழு`ஐ இயக்கு</x:String>
+  <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">தள்ளு</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">பெகோஅ பொருள்கள் தள்ளு</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">வரிசைப்படுத்தப்பட்ட பெரிய கோப்புகளை அறிவிலி பெகோஅ முடிவுபுள்ளிக்கு தள்ளு</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">பாகொவ</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">பல உறுதிமொழிகளைத் தேர்ந்தெடுக்க 'கட்டுப்பாடு' அல்லது 'உயர்த்து'ஐ அழுத்திப் பிடி.</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.CancelPopup" xml:space="preserve">தற்போதைய மேல்தோன்றலை Cancel </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.GotoPrevTab" 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.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.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.CreateBranchOnCommit" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட உறுதிமொழியின் அடிப்படையில் ஒரு புதிய கிளையை உருவாக்குகிறது</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட மாற்றங்களை நிராகரி</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">எடு, நேரடியாகத் தொடங்குகிறது</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">முகப்பலகை பயன்முறை (இயல்புநிலை)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">இழு, நேரடியாகத் தொடங்குகிறது</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.StageOrUnstageSelected" 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.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.Search" 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.Hunk.Discard" 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.Target" xml:space="preserve">இலக்கு கிளை:</x:String>
+  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">மேல்:</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">உலாவியில் திற</x:String>
+  <x:String x:Key="Text.IssueLinkCM.CopyLink" 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.Merge" xml:space="preserve">கிளையை ஒன்றிணை</x:String>
+  <x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
+  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">இணைப்பு விருப்பம்:</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.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">அறிவிலி உள்ளமைக்கப்படவில்லை. [விருப்பத்தேர்வுகள்]க்குச் சென்று முதலில் அதை உள்ளமை. </x:String>
+  <x:String x:Key="Text.OpenAppDataDir" 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.JustNow" xml:space="preserve">சற்றுமுன்</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" 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.Yesterday" xml:space="preserve">நேற்று</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} நாட்களுக்கு முன்பு</x:String>
+  <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">கடந்த திங்கள்</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} திங்களுக்கு முன்பு</x:String>
+  <x:String x:Key="Text.Period.LastYear" xml:space="preserve">கடந்த ஆண்டு</x:String>
+  <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} ஆண்டுகளுக்கு முன்பு</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">விருப்பத்தேர்வுகள்</x:String>
+  <x:String x:Key="Text.Preferences.AI" xml:space="preserve">செநு</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">வேறுபாடு உடனடியாக பகுப்பாய்வு செய்</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">பநிஇ திறவுகோல்</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.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.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>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">வேறு/ஒன்றிணை கருவிக்கான பாதை உள்ளிடு</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.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.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.Git" xml:space="preserve">அறிவிலி</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">இயல்புநிலை நகலி அடைவு</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">உலகளாவிய அறிவிலி பயனர் மின்னஞ்சல்</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">--prune எடுக்கும்போது இயக்கு</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">உஉபநெ பாகுஅ சரிபார்ப்பை இயக்கு</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">உலகளாவிய அறிவிலி பயனர் பெயர்</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">அறிவிலி பதிப்பு</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">அறிவிலி (>= 2.23.0) இந்த பயன்பாட்டிற்கு தேவைப்படுகிறது</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">சிபிசி கையொப்பமிடுதல்</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">சிபிசி கையொப்பமிடுதல் உறுதிமொழி</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">சிபிசி கையொப்பமிடுதலை குறிச்சொலிடு</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">சிபிசி வடிவம்</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">நிறுவப்பட்ட சிபிசி நிரலுக்கான உள்ளீட்டு பாதை</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">பயனரின்  கையொப்பமிடும் திறவுகோல்</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.Type" xml:space="preserve">ஓடு/முனையம்</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" 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/பணிமரங்கள்` இதில் பணிமரம் தகவலை கத்தரி</x:String>
+  <x:String x:Key="Text.Pull" xml:space="preserve">இழு</x:String>
+  <x:String x:Key="Text.Pull.Branch" xml:space="preserve">தொலை கிளை:</x:String>
+  <x:String x:Key="Text.Pull.FetchAllBranches" 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.NoTags" 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">இழு (எடுத்து ஒன்றிணை)</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.Remote" 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.Rebase.Target" xml:space="preserve">மறுதளம்:</x:String>
+  <x:String x:Key="Text.RefetchAvatar" 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">களஞ்சிய முகவரி:</x:String>
+  <x:String x:Key="Text.Remote.URL.Placeholder" xml:space="preserve">தொலை அறிவிலி களஞ்சிய முகவரி:</x:String>
+  <x:String x:Key="Text.RemoteCM.CopyURL" 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">பெறு</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">`--கட்டாயம்` விருப்பத்தை இயக்கு</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">தொலைகளிலிருந்து மாற்றங்களைத் தானாகப் பெறுதல்...</x:String>
+  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">சுத்தப்படுத்தல்(சீசி &amp; கத்தரித்தல்)</x:String>
+  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">இந்த களஞ்சியத்திற்கு `அறிவிலி சீசி` கட்டளையை இயக்கு.</x:String>
+  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" 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.EnableReflog" 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.FirstParentFilterToggle" xml:space="preserve">'--first-parent' விருப்பம் இயக்கு</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.NavigateToCurrentHead" xml:space="preserve">தலைக்கு செல்</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.OnlyHighlightCurrentBranchInHistories" 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.Refresh" 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.ByFile" 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.BySHA" xml:space="preserve">பாகொவ</x:String>
+  <x:String x:Key="Text.Repository.Search.InCurrentBranch" 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.OrderByNameAsc" xml:space="preserve">பெயர் (ஏறுவரிசை) மூலம்</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" 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.UseRelativeTimeInHistories" xml:space="preserve">வரலாறுகளில் உறவு நேரத்தைப் பயன்படுத்து</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">அறிவிலி களஞ்சிய முகவரி</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.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.Reword.Tip" 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.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.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">பாஓடு தனியார் திறவுகோல்:</x:String>
+  <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">தனியார் பாஓடு திறவுகோல் கடை பாதை</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.AutoRestore" xml:space="preserve">பதுக்கிவைத்த பிறகு தானியங்கி மீட்டமை</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">உங்கள் செயல்படும் கோப்புகள் மாறாமல் இருக்கும், ஆனால் ஒரு பதுக்கிவைக்கப்படும்.</x:String>
+  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">கண்காணிக்கப்படாத கோப்புகளைச் சேர்</x:String>
+  <x:String x:Key="Text.Stash.KeepIndex" 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.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.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.CommitAmount" xml:space="preserve">உறுதிமொழிகள்</x:String>
+  <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">உறுதிமொழிகள்: </x:String>
+  <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">ஆசிரியர்கள்: </x:String>
+  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">உறவு பாதையை நகலெடு</x:String>
+  <x:String x:Key="Text.Submodule.FetchNested" 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.Sure" xml:space="preserve">சரி</x:String>
+  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">குறிச்சொல் பெயரை நகலெடு</x:String>
+  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">குறிச்சொல் செய்தியை நகலெடு</x:String>
+  <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">முகவரி:</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.UseRemote" 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">கோப்புறையை இழுத்து &amp; விடு ஆதரிக்கப்படுகிறது. தனிப்பயன் குழுவாக்க ஆதரவு.</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.Welcome.Sort" 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">அறிவிலி புறக்கணி</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.InSameFolder" 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.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.ConfirmCommitWithFilter">நீங்கள் {0} கோப்புகளை நிலைப்படுத்தியுள்ளீர்கள், ஆனால் {1} கோப்புகள் மட்டுமே காட்டப்பட்டுள்ளன ({2} கோப்புகள் வடிகட்டப்பட்டுள்ளன). தொடர விரும்புகிறீர்களா?</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">காலி உறுதிமொழி கண்டறியப்பட்டது! தொடர விரும்புகிறீர்களா(--allow-empty)?</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">மோதல்கள் கண்டறியப்பட்டது</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" 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.SignOff" xml:space="preserve">கையெழுத்திடு</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.ViewAssumeUnchaged" xml:space="preserve">மாறாதது எனநினைப்பதை பார்</x:String>
+  <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">வளர்புரு: ${0}$</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட கோப்பு(களை) வலது சொடுக்கு செய்து, முரண்பாடுகளைத் தீர்க்க உங்கள் விருப்பத்தைத் தேர்ந்தெடு.</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.Remove" xml:space="preserve">நீக்கு</x:String>
+  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">திற</x:String>
+</ResourceDictionary>

From af350c2fcd11a1ddce39163590332c4db097a089 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 11 Apr 2025 12:31:09 +0800
Subject: [PATCH 361/364] code_review: PR #1174
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- keeps all keys in locale files in order
- add தமிழ் (Tamil)

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md                         |  2 +-
 src/App.axaml                     |  1 +
 src/Models/Locales.cs             |  1 +
 src/Resources/Locales/en_US.axaml |  4 +-
 src/Resources/Locales/ta_IN.axaml | 77 ++++++++++++++++---------------
 src/Resources/Locales/zh_CN.axaml |  4 +-
 src/Resources/Locales/zh_TW.axaml |  4 +-
 7 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 75af9d2c..846407f6 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文/日本語
+* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文/日本語/தமிழ் (Tamil)
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph
diff --git a/src/App.axaml b/src/App.axaml
index fdfa8e07..9d8adb89 100644
--- a/src/App.axaml
+++ b/src/App.axaml
@@ -21,6 +21,7 @@
       <ResourceInclude x:Key="zh_TW" Source="/Resources/Locales/zh_TW.axaml"/>
       <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"/>
     </ResourceDictionary>
   </Application.Resources>
 
diff --git a/src/Models/Locales.cs b/src/Models/Locales.cs
index 802e88ef..a7884e8b 100644
--- a/src/Models/Locales.cs
+++ b/src/Models/Locales.cs
@@ -18,6 +18,7 @@ namespace SourceGit.Models
             new Locale("简体中文", "zh_CN"),
             new Locale("繁體中文", "zh_TW"),
             new Locale("日本語", "ja_JP"),
+            new Locale("தமிழ் (Tamil)", "ta_IN"),
         };
 
         public Locale(string name, string key)
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 9676d371..ad71427b 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -177,10 +177,10 @@
   <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>
   <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Restore tabs on startup</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">CONTINUE</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">STAGE ALL &amp; COMMIT</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</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">Closed Issue:</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index 84df570c..946a8d9c 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -1,17 +1,21 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceInclude Source="avares://SourceGit/Resources/Locales/en_US.axaml"/>
+  </ResourceDictionary.MergedDictionaries>
+
   <x:String x:Key="Text.About" xml:space="preserve">பற்றி</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">மூலஅறிவிலி பற்றி</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">திறந்தமூல &amp; கட்டற்ற அறிவிலி இடைமுக வாடிக்கயாளர்</x:String>
   <x:String x:Key="Text.AddWorktree" xml:space="preserve">பணிமரத்தைச் சேர்</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">என்ன சரிபார்க்க வேண்டும்:</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">ஏற்கனவே உள்ள கிளை</x:String>
-  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" 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">செநு உதவியாளர்</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">மறு-உருவாக்கு</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">உறுதிமொழி செய்தியை உருவாக்க செநுவைப் பயன்படுத்து</x:String>
@@ -61,8 +65,8 @@
   <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">தவறான மேல்ஓடை!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">எண்மங்கள்</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">விடு</x:String>
-  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" 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>
@@ -70,12 +74,12 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">கோப்பு முறைமை மரமாகக் காட்டு</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.Warning" xml:space="preserve">முன்னறிவிப்பு: ஒரு உறுதிமொழி சரிபார்பதன் மூலம், உங்கள் தலை பிரிக்கப்படும்</x:String>
   <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">உறுதிமொழி:</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">கிளை:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">முன்னறிவிப்பு: ஒரு உறுதிமொழி சரிபார்பதன் மூலம், உங்கள் தலை பிரிக்கப்படும்</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.Target" xml:space="preserve">கிளை:</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>
@@ -94,9 +98,9 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">களஞ்சிய முகவரி:</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.Checkout" xml:space="preserve">உறுதிமொழி சரிபார்</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">தலையுடன் ஒப்பிடுக</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">பணிமரத்துடன் ஒப்பிடுக</x:String>
   <x:String x:Key="Text.CommitCM.CopyInfo" xml:space="preserve">தகவலை நகலெடு</x:String>
@@ -131,12 +135,12 @@
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">குறிகள்</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">பாகொவ</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">உலாவியில் திற</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">உறுதிமொழி பொருளை உள்ளிடவும்</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" 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.Name" xml:space="preserve">வார்ப்புரு பெயர்:</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>
@@ -154,13 +158,13 @@
   <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.IssueTracker" xml:space="preserve">சிக்கல் கண்காணி</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">மாதிரி அசூர் வளர்பணிகள் விதியைச் சேர்</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">மாதிரி அறிவிலிஈ சிக்கலுக்கான விதியைச் சேர்</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">மாதிரி அறிவிலிஈ இழு கோரிக்கை விதியைச் சேர்</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">மாதிரி அறிவிலிமையம் விதியைச் சேர்</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">மாதிரி அறிவிலிஆய்வு சிக்கலுக்கான விதியைச் சேர்</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">மாதிரி அறிவிலிஆய்வு இணைப்பு கோரிக்கை  விதியைச் சேர்</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">மாதிரி சீரா விதியைச் சேர்</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">மாதிரி அசூர் வளர்பணிகள் விதியைச் சேர்</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>
@@ -185,8 +189,8 @@
   <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.CopyPath" 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>
@@ -222,8 +226,8 @@
   <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.TitleForGroup" 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>
@@ -292,11 +296,11 @@
   <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.UnstageSelectedLines" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை நிலைநீக்கு</x:String>
-  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">அவர்களுடையதைப் பயன்படுத்து (சரிபார் --அவர்களது)</x:String>
   <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">என்னுடையதைப் பயன்படுத்து (சரிபார் --நமது)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">அவர்களுடையதைப் பயன்படுத்து (சரிபார் --அவர்களது)</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">கோப்பு வரலாறு</x:String>
-  <x:String x:Key="Text.FileHistory.FileContent" 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">அறிவிலி-ஓட்டம்</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">மேம்பாட்டு கிளை:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">நற்பொருத்தம்:</x:String>
@@ -326,8 +330,8 @@
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">தனிப்பயன் வடிவம்:</x:String>
   <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">அறிவிலி பெகோஅ இல் கண்காணி வடிவங்களைச் சேர்</x:String>
   <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">பெறு</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">அறிவிலி பெகோஅ பொருள்களைப் பெறு</x:String>
   <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">அறிவிலி பெகோஅ பொருள்களைப் பதிவிறக்க `அறிவிலி பெகோஅ பெறு` ஐ இயக்கவும் இது செயல்படும் நகலை புதுப்பிக்காது.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">அறிவிலி பெகோஅ பொருள்களைப் பெறு</x:String>
   <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">அறிவிலி பெகோஅ கொக்கிகளை நிறுவு</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>
@@ -339,11 +343,11 @@
   <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">கத்தரி</x:String>
   <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">உள்ளக சேமிப்பகத்திலிருந்து பழைய பெகோஅ கோப்புகளை நீக்க `அறிவிலி பெகோஅ கத்தரி` ஐ இயக்கு</x:String>
   <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">இழு</x:String>
-  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">பெகோஅ பொருள்களை இழு</x:String>
   <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">தற்போதைய குறிக்கு அனைத்து அறிவிலி பெகோஅ கோப்புகளையும் பதிவிறக்கி சரிபார்க்க `அறிவிலி பெகோஅ இழு`ஐ இயக்கு</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">பெகோஅ பொருள்களை இழு</x:String>
   <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">தள்ளு</x:String>
-  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">பெகோஅ பொருள்கள் தள்ளு</x:String>
   <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">வரிசைப்படுத்தப்பட்ட பெரிய கோப்புகளை அறிவிலி பெகோஅ முடிவுபுள்ளிக்கு தள்ளு</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">பெகோஅ பொருள்கள் தள்ளு</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>
@@ -362,8 +366,8 @@
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">தற்போதைய மேல்தோன்றலை Cancel </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.GotoPrevTab" 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.Repo" xml:space="preserve">களஞ்சியம்</x:String>
@@ -374,11 +378,11 @@
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட மாற்றங்களை நிராகரி</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">எடு, நேரடியாகத் தொடங்குகிறது</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">இழு, நேரடியாகத் தொடங்குகிறது</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.StageOrUnstageSelected" 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.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>
@@ -387,9 +391,9 @@
   <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.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.Hunk.Discard" 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>
@@ -401,10 +405,10 @@
   <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.Target" xml:space="preserve">இலக்கு கிளை:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">மேல்:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" 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.Merge" xml:space="preserve">கிளையை ஒன்றிணை</x:String>
@@ -430,16 +434,16 @@
   <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.JustNow" xml:space="preserve">சற்றுமுன்</x:String>
-  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} நிமையங்களுக்கு முன்பு</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.Yesterday" xml:space="preserve">நேற்று</x:String>
-  <x:String x:Key="Text.Period.DaysAgo" 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.MonthsAgo" xml:space="preserve">{0} திங்களுக்கு முன்பு</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">செநு</x:String>
   <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">வேறுபாடு உடனடியாக பகுப்பாய்வு செய்</x:String>
@@ -461,8 +465,8 @@
   <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>
+  <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">வேறு/ஒன்றிணை கருவி</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">வேறு/ஒன்றிணை கருவிக்கான பாதை உள்ளிடு</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>
@@ -480,24 +484,24 @@
   <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">உலகளாவிய அறிவிலி பயனர் மின்னஞ்சல்</x:String>
   <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">--prune எடுக்கும்போது இயக்கு</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">அறிவிலி (&gt;= 2.23.0) இந்த பயன்பாட்டிற்கு தேவைப்படுகிறது</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">உஉபநெ பாகுஅ சரிபார்ப்பை இயக்கு</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">உலகளாவிய அறிவிலி பயனர் பெயர்</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">அறிவிலி பதிப்பு</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">அறிவிலி (>= 2.23.0) இந்த பயன்பாட்டிற்கு தேவைப்படுகிறது</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">சிபிசி கையொப்பமிடுதல்</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">சிபிசி கையொப்பமிடுதல் உறுதிமொழி</x:String>
-  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">சிபிசி கையொப்பமிடுதலை குறிச்சொலிடு</x:String>
   <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">சிபிசி வடிவம்</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">நிறுவப்பட்ட சிபிசி நிரலுக்கான உள்ளீட்டு பாதை</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">சிபிசி கையொப்பமிடுதலை குறிச்சொலிடு</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">பயனரின்  கையொப்பமிடும் திறவுகோல்</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.Type" 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>
@@ -577,8 +581,7 @@
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">உள்ளக கிளைகள்</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">தலைக்கு செல்</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.Notifications.Clear" xml:space="preserve">அறிவிப்புகளை அழி</x:String>
   <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInHistories" 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>
@@ -665,11 +668,11 @@
   <x:String x:Key="Text.Statistics" xml:space="preserve">புள்ளிவிவரங்கள்</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">உறுதிமொழிகள்</x:String>
   <x:String x:Key="Text.Statistics.Committer" 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.TotalCommits" xml:space="preserve">உறுதிமொழிகள்: </x:String>
   <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">ஆசிரியர்கள்: </x:String>
-  <x:String x:Key="Text.Statistics.Overview" 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.CopyPath" xml:space="preserve">உறவு பாதையை நகலெடு</x:String>
@@ -684,12 +687,12 @@
   <x:String x:Key="Text.TagCM.Delete" 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.URL" xml:space="preserve">முகவரி:</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.UseRemote" xml:space="preserve">--தொலை விருப்பத்தைப் பயன்படுத்து</x:String>
+  <x:String x:Key="Text.URL" 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>
@@ -726,6 +729,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.ResolveTip" 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>
   <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">நிலைநீக்கு</x:String>
@@ -735,7 +739,6 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">அனைத்தும் நிலைபடுத்து</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">மாறாதது எனநினைப்பதை பார்</x:String>
   <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">வளர்புரு: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட கோப்பு(களை) வலது சொடுக்கு செய்து, முரண்பாடுகளைத் தீர்க்க உங்கள் விருப்பத்தைத் தேர்ந்தெடு.</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>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 1b878b29..35a97b6e 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -181,10 +181,10 @@
   <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.Restore" 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.NoLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</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">自动暂存并提交</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)或是自动暂存所有变更并提交？</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">规范化提交信息生成</x:String>
   <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破坏性更新：</x:String>
   <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">关闭的ISSUE：</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index e090d32d..d71281f7 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -181,10 +181,10 @@
   <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.Restore" 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.NoLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</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">自动暂存并提交</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)或者自動暫存全部變更並提交?</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>
   <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破壞性變更:</x:String>
   <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">關閉的 Issue:</x:String>

From 13af0a43ed368de8f2c762f694c6a28ac173bd83 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 04:31:25 +0000
Subject: [PATCH 362/364] doc: Update translation status and missing keys

---
 TRANSLATION.md | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index e79783ea..ccf003c7 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -15,10 +15,10 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleAzure
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.CopyFullPath
 - Text.Diff.First
 - Text.Diff.Last
@@ -40,10 +40,10 @@ This document shows the translation status of each locale file in the repository
 <summary>Missing keys in es_ES.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -58,10 +58,10 @@ This document shows the translation status of each locale file in the repository
 <summary>Missing keys in fr_FR.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -76,10 +76,10 @@ This document shows the translation status of each locale file in the repository
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
 - Text.WorkingCopy.ConfirmCommitWithFilter
@@ -96,10 +96,10 @@ This document shows the translation status of each locale file in the repository
 <summary>Missing keys in ja_JP.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
 - Text.WorkingCopy.ConfirmCommitWithFilter
@@ -134,10 +134,10 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
 - Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.CopyFullPath
 - Text.CreateBranch.Name.WarnSpace
 - Text.DeleteRepositoryNode.Path
@@ -201,10 +201,10 @@ This document shows the translation status of each locale file in the repository
 <summary>Missing keys in ru_RU.axaml</summary>
 
 - Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -213,6 +213,24 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
+### ![ta__IN](https://img.shields.io/badge/ta__IN-98.67%25-yellow)
+
+<details>
+<summary>Missing keys in ta_IN.axaml</summary>
+
+- Text.Configure.Git.PreferredMergeMode
+- Text.ConfirmEmptyCommit.Continue
+- Text.ConfirmEmptyCommit.NoLocalChanges
+- Text.ConfirmEmptyCommit.StageAllThenCommit
+- Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.UpdateSubmodules.Target
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
+
+</details>
+
 ### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
 ### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file

From 18888de081579ef786490472f7d7be21e7648dbc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 11 Apr 2025 15:39:51 +0800
Subject: [PATCH 363/364] refactor: rewrite histories filter to support ref
 name that contains non-ascii characters (#1175)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/RepositorySettings.cs | 101 +++++++++----------------------
 1 file changed, 27 insertions(+), 74 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 1d326a5e..c2e66894 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -309,127 +309,80 @@ namespace SourceGit.Models
 
         public string BuildHistoriesFilter()
         {
+            var includedRefs = new List<string>();
             var excludedBranches = new List<string>();
             var excludedRemotes = new List<string>();
             var excludedTags = new List<string>();
-            var includedBranches = new List<string>();
-            var includedRemotes = new List<string>();
-            var includedTags = new List<string>();
             foreach (var filter in HistoriesFilters)
             {
                 if (filter.Type == FilterType.LocalBranch)
                 {
-                    var name = filter.Pattern.Substring(11);
-                    var b = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
-
                     if (filter.Mode == FilterMode.Included)
-                        includedBranches.Add(b);
+                        includedRefs.Add(filter.Pattern);
                     else if (filter.Mode == FilterMode.Excluded)
-                        excludedBranches.Add(b);
+                        excludedBranches.Add($"--exclude=\"{filter.Pattern.Substring(11)}\" --decorate-refs-exclude=\"{filter.Pattern}\"");
                 }
                 else if (filter.Type == FilterType.LocalBranchFolder)
                 {
                     if (filter.Mode == FilterMode.Included)
-                        includedBranches.Add($"{filter.Pattern.Substring(11)}/*");
+                        includedRefs.Add($"--branches={filter.Pattern.Substring(11)}/*");
                     else if (filter.Mode == FilterMode.Excluded)
-                        excludedBranches.Add($"{filter.Pattern.Substring(11)}/*");
+                        excludedBranches.Add($"--exclude=\"{filter.Pattern.Substring(11)}/*\" --decorate-refs-exclude=\"{filter.Pattern}/*\"");
                 }
                 else if (filter.Type == FilterType.RemoteBranch)
                 {
-                    var name = filter.Pattern.Substring(13);
-                    var r = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
-
                     if (filter.Mode == FilterMode.Included)
-                        includedRemotes.Add(r);
+                        includedRefs.Add(filter.Pattern);
                     else if (filter.Mode == FilterMode.Excluded)
-                        excludedRemotes.Add(r);
+                        excludedRemotes.Add($"--exclude=\"{filter.Pattern.Substring(13)}\" --decorate-refs-exclude=\"{filter.Pattern}\"");
                 }
                 else if (filter.Type == FilterType.RemoteBranchFolder)
                 {
                     if (filter.Mode == FilterMode.Included)
-                        includedRemotes.Add($"{filter.Pattern.Substring(13)}/*");
+                        includedRefs.Add($"--remotes={filter.Pattern.Substring(13)}/*");
                     else if (filter.Mode == FilterMode.Excluded)
-                        excludedRemotes.Add($"{filter.Pattern.Substring(13)}/*");
+                        excludedRemotes.Add($"--exclude=\"{filter.Pattern.Substring(13)}/*\" --decorate-refs-exclude=\"{filter.Pattern}/*\"");
                 }
                 else if (filter.Type == FilterType.Tag)
                 {
-                    var name = filter.Pattern;
-                    var t = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
-
                     if (filter.Mode == FilterMode.Included)
-                        includedTags.Add(t);
+                        includedRefs.Add($"refs/tags/{filter.Pattern}");
                     else if (filter.Mode == FilterMode.Excluded)
-                        excludedTags.Add(t);
+                        excludedTags.Add($"--exclude=\"{filter.Pattern}\" --decorate-refs-exclude=\"refs/tags/{filter.Pattern}\"");
                 }
             }
 
-            bool hasIncluded = includedBranches.Count > 0 || includedRemotes.Count > 0 || includedTags.Count > 0;
-            bool hasExcluded = excludedBranches.Count > 0 || excludedRemotes.Count > 0 || excludedTags.Count > 0;
-
             var builder = new StringBuilder();
-            if (hasIncluded)
+            if (includedRefs.Count > 0)
             {
-                foreach (var b in includedBranches)
+                foreach (var r in includedRefs)
+                {
+                    builder.Append(r);
+                    builder.Append(' ');
+                }
+            }
+            else if (excludedBranches.Count + excludedRemotes.Count + excludedTags.Count > 0)
+            {
+                foreach (var b in excludedBranches)
                 {
-                    builder.Append("--branches=");
                     builder.Append(b);
                     builder.Append(' ');
                 }
 
-                foreach (var r in includedRemotes)
+                builder.Append("--exclude=HEA[D] --branches ");
+
+                foreach (var r in excludedRemotes)
                 {
-                    builder.Append("--remotes=");
                     builder.Append(r);
                     builder.Append(' ');
                 }
 
-                foreach (var t in includedTags)
-                {
-                    builder.Append("--tags=");
-                    builder.Append(t);
-                    builder.Append(' ');
-                }
-            }
-            else if (hasExcluded)
-            {
-                if (excludedBranches.Count > 0)
-                {
-                    foreach (var b in excludedBranches)
-                    {
-                        builder.Append("--exclude=");
-                        builder.Append(b);
-                        builder.Append(" --decorate-refs-exclude=refs/heads/");
-                        builder.Append(b);
-                        builder.Append(' ');
-                    }
-                }
-
-                builder.Append("--exclude=HEA[D] --branches ");
-
-                if (excludedRemotes.Count > 0)
-                {
-                    foreach (var r in excludedRemotes)
-                    {
-                        builder.Append("--exclude=");
-                        builder.Append(r);
-                        builder.Append(" --decorate-refs-exclude=refs/remotes/");
-                        builder.Append(r);
-                        builder.Append(' ');
-                    }
-                }
-
                 builder.Append("--exclude=origin/HEA[D] --remotes ");
 
-                if (excludedTags.Count > 0)
+                foreach (var t in excludedTags)
                 {
-                    foreach (var t in excludedTags)
-                    {
-                        builder.Append("--exclude=");
-                        builder.Append(t);
-                        builder.Append(" --decorate-refs-exclude=refs/tags/");
-                        builder.Append(t);
-                        builder.Append(' ');
-                    }
+                    builder.Append(t);
+                    builder.Append(' ');
                 }
 
                 builder.Append("--tags ");

From cd5a68219476ac8baef0efb5f23c226a2fcc1cee Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 11 Apr 2025 15:44:02 +0800
Subject: [PATCH 364/364] refactor: directly use `--exclude=HEAD` instead of
 `--exclude=HEA[D]`

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

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index c2e66894..fc5e81b4 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -369,7 +369,7 @@ namespace SourceGit.Models
                     builder.Append(' ');
                 }
 
-                builder.Append("--exclude=HEA[D] --branches ");
+                builder.Append("--exclude=HEAD --branches ");
 
                 foreach (var r in excludedRemotes)
                 {
@@ -377,7 +377,7 @@ namespace SourceGit.Models
                     builder.Append(' ');
                 }
 
-                builder.Append("--exclude=origin/HEA[D] --remotes ");
+                builder.Append("--exclude=origin/HEAD --remotes ");
 
                 foreach (var t in excludedTags)
                 {