Merge branch 'develop'

doc: Update translation status and missing keys
revert: PR #673
2024-12-26 21:17:20 -08:00 · 2024-11-11 10:29:09 +08:00 · 2024-11-11 02:26:54 +00:00 · 2024-11-11 10:26:34 +08:00 · 2024-11-11 09:56:14 +08:00 · 2024-11-11 09:55:55 +08:00
59 changed files with 879 additions and 447 deletions
--- 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-96.05%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.08%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-87.72%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-90.79%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-98.70%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-86.58%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-100.00%25-brightgreen)](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)
 ## How to Use
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@ -1,69 +1,32 @@
-### de_DE.axaml: 96.05%
+### de_DE.axaml: 98.70%
 <details>
 <summary>Missing Keys</summary>
- Text.BranchCM.FetchInto
+- Text.Diff.SaveAsPatch
- Text.ChangeCM.GenerateCommitMessage
+- Text.Diff.VisualLines.All
- Text.CommitCM.CustomAction
+- Text.Hotkeys.Repo.CreateBranchOnCommit
- Text.Configure.CustomAction
+- Text.Hotkeys.Repo.Fetch
- Text.Configure.CustomAction.Arguments
+- Text.Hotkeys.Repo.Pull
- Text.Configure.CustomAction.Arguments.Tip
+- Text.Hotkeys.Repo.Push
- Text.Configure.CustomAction.Executable
+- Text.IssueLinkCM.OpenInBrowser
- Text.Configure.CustomAction.Name
+- Text.IssueLinkCM.CopyLink
- Text.Configure.CustomAction.Scope
+- Text.Preference.Appearance.EditorFontSize
 - Text.Configure.CustomAction.Scope.Commit
 - Text.Configure.CustomAction.Scope.Repository
 - Text.Configure.Git.EnablePruneOnFetch
 - Text.Configure.Git.EnableSignOff
 - Text.Configure.IssueTracker.AddSampleGitLabIssue
 - Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
 - Text.Configure.OpenAI
 - Text.Configure.OpenAI.Prefered
 - Text.Configure.OpenAI.Prefered.Tip
 - Text.ExecuteCustomAction
 - Text.ExecuteCustomAction.Name
 - Text.Preference.AI.AnalyzeDiffPrompt
 - Text.Preference.AI.GenerateSubjectPrompt
 - Text.Preference.AI.Name
 - Text.Repository.CustomActions
 - Text.Repository.CustomActions.Empty
 - Text.Stash.KeepIndex
 - Text.WorkingCopy.ConfirmCommitWithoutFiles
 </details>
-### es_ES.axaml: 97.08%
+### es_ES.axaml: 100.00%
 <details>
 <summary>Missing Keys</summary>
- Text.ChangeCM.GenerateCommitMessage
+
 - Text.CommitCM.CustomAction
 - Text.Configure.CustomAction
 - Text.Configure.CustomAction.Arguments
 - Text.Configure.CustomAction.Arguments.Tip
 - Text.Configure.CustomAction.Executable
 - Text.Configure.CustomAction.Name
 - Text.Configure.CustomAction.Scope
 - Text.Configure.CustomAction.Scope.Commit
 - Text.Configure.CustomAction.Scope.Repository
 - Text.Configure.Git.EnablePruneOnFetch
 - Text.Configure.OpenAI
 - Text.Configure.OpenAI.Prefered
 - Text.Configure.OpenAI.Prefered.Tip
 - Text.ExecuteCustomAction
 - Text.ExecuteCustomAction.Name
 - Text.Preference.AI.Name
 - Text.Repository.CustomActions
 - Text.Repository.CustomActions.Empty
 - Text.Stash.KeepIndex
 </details>
-### fr_FR.axaml: 87.72%
+### fr_FR.axaml: 86.58%
 <details>
@ -108,6 +71,8 @@
 - Text.ConventionalCommit.ShortDescription
 - Text.ConventionalCommit.Type
 - Text.Diff.IgnoreWhitespace
 - Text.Diff.SaveAsPatch
 - Text.Diff.VisualLines.All
 - Text.Discard.IncludeIgnored
 - Text.ExecuteCustomAction
 - Text.ExecuteCustomAction.Name
@ -118,7 +83,13 @@
 - Text.Histories.Tips.MacOS
 - Text.Histories.Tips.Prefix
 - Text.Hotkeys.Repo.CommitWithAutoStage
 - Text.Hotkeys.Repo.CreateBranchOnCommit
 - Text.Hotkeys.Repo.DiscardSelected
 - Text.Hotkeys.Repo.Fetch
 - Text.Hotkeys.Repo.Pull
 - Text.Hotkeys.Repo.Push
 - Text.IssueLinkCM.OpenInBrowser
 - Text.IssueLinkCM.CopyLink
 - Text.MoveRepositoryNode
 - Text.MoveRepositoryNode.Target
 - Text.Preference.AI
@ -128,6 +99,7 @@
 - Text.Preference.AI.Model
 - Text.Preference.AI.Name
 - Text.Preference.AI.Server
 - Text.Preference.Appearance.EditorFontSize
 - Text.Preference.General.ShowAuthorTime
 - Text.Preference.Integration
 - Text.Preference.Shell
@ -156,75 +128,13 @@
 </details>
-### pt_BR.axaml: 90.79%
+### pt_BR.axaml: 100.00%
 <details>
 <summary>Missing Keys</summary>
- Text.About.Chart
+
 - Text.AIAssistant
 - Text.AIAssistant.Tip
 - Text.BranchCM.FetchInto
 - Text.ChangeCM.GenerateCommitMessage
 - Text.CherryPick.AppendSourceToMessage
 - Text.CherryPick.Mainline
 - Text.CherryPick.Mainline.Tips
 - Text.CommitCM.CherryPickMultiple
 - Text.CommitCM.CustomAction
 - Text.CommitCM.SquashCommitsSinceThis
 - Text.CommitDetail.Info.ContainsIn
 - Text.CommitDetail.Info.ContainsIn.Title
 - Text.CommitDetail.Info.WebLinks
 - Text.Configure.CustomAction
 - Text.Configure.CustomAction.Arguments
 - Text.Configure.CustomAction.Arguments.Tip
 - Text.Configure.CustomAction.Executable
 - Text.Configure.CustomAction.Name
 - Text.Configure.CustomAction.Scope
 - Text.Configure.CustomAction.Scope.Commit
 - Text.Configure.CustomAction.Scope.Repository
 - Text.Configure.Git.DefaultRemote
 - Text.Configure.Git.EnablePruneOnFetch
 - Text.Configure.Git.EnableSignOff
 - Text.Configure.IssueTracker.AddSampleGitLabIssue
 - Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
 - Text.Configure.OpenAI
 - Text.Configure.OpenAI.Prefered
 - Text.Configure.OpenAI.Prefered.Tip
 - Text.ConfigureWorkspace
 - Text.ConfigureWorkspace.Color
 - Text.ConfigureWorkspace.Restore
 - Text.ConventionalCommit
 - Text.ConventionalCommit.BreakingChanges
 - Text.ConventionalCommit.ClosedIssue
 - Text.ConventionalCommit.Detail
 - Text.ConventionalCommit.Scope
 - Text.ConventionalCommit.ShortDescription
 - Text.ConventionalCommit.Type
 - Text.CopyAllText
 - Text.Discard.IncludeIgnored
 - Text.ExecuteCustomAction
 - Text.ExecuteCustomAction.Name
 - Text.FileHistory.FileContent
 - Text.FileHistory.FileChange
 - Text.GitLFS.Locks.OnlyMine
 - Text.MoveRepositoryNode
 - Text.MoveRepositoryNode.Target
 - Text.Preference.AI.Name
 - Text.Push.CheckSubmodules
 - Text.Repository.CustomActions
 - Text.Repository.CustomActions.Empty
 - Text.Squash.Into
 - Text.Stash.KeepIndex
 - Text.Stash.OnlyStagedChanges
 - Text.Stash.TipForSelectedFiles
 - Text.Statistics.Overview
 - Text.TagCM.CopyMessage
 - Text.WorkingCopy.Staged.UnstageAll
 - Text.WorkingCopy.Unstaged
 - Text.WorkingCopy.Unstaged.Stage
 - Text.WorkingCopy.Unstaged.StageAll
 </details>
--- a/2
+++ b/2
@ -1 +1 @@
-8.37
+8.38
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@ -8,6 +8,10 @@ namespace SourceGit.Commands
    {
        [GeneratedRegex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@")]
        private static partial Regex REG_INDICATOR();
        [GeneratedRegex(@"^index\s([0-9a-f]{6,40})\.\.([0-9a-f]{6,40})(\s[1-9]{6})?")]
        private static partial Regex REG_HASH_CHANGE();
        private const string PREFIX_LFS_NEW = "+version https://git-lfs.github.com/spec/";
        private const string PREFIX_LFS_DEL = "-version https://git-lfs.github.com/spec/";
        private const string PREFIX_LFS_MODIFY = " version https://git-lfs.github.com/spec/";
@ -101,17 +105,31 @@ namespace SourceGit.Commands
            if (_result.TextDiff.Lines.Count == 0)
            {
-                var match = REG_INDICATOR().Match(line);
+                if (line.StartsWith("Binary", StringComparison.Ordinal))
                if (!match.Success)
                {
-                    if (line.StartsWith("Binary", StringComparison.Ordinal))
+                    _result.IsBinary = true;
                        _result.IsBinary = true;
                    return;
                }
-                _oldLine = int.Parse(match.Groups[1].Value);
+                if (string.IsNullOrEmpty(_result.OldHash))
-                _newLine = int.Parse(match.Groups[2].Value);
+                {
-                _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
+                    var match = REG_HASH_CHANGE().Match(line);
                    if (!match.Success)
                        return;
                    _result.OldHash = match.Groups[1].Value;
                    _result.NewHash = match.Groups[2].Value;
                }
                else
                {
                    var match = REG_INDICATOR().Match(line);
                    if (!match.Success)
                        return;
                    _oldLine = int.Parse(match.Groups[1].Value);
                    _newLine = int.Parse(match.Groups[2].Value);
                    _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
                }                
            }
            else
            {
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@ -30,6 +30,8 @@ namespace SourceGit.Commands
                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
            var proc = new Process() { StartInfo = start };
            var builder = new StringBuilder();
            proc.OutputDataReceived += (_, e) =>
            {
                if (e.Data != null)
@ -39,7 +41,10 @@ namespace SourceGit.Commands
            proc.ErrorDataReceived += (_, e) =>
            {
                if (e.Data != null)
                {
                    outputHandler?.Invoke(e.Data);
                    builder.AppendLine(e.Data);
                }                    
            };
            try
@ -57,7 +62,17 @@ namespace SourceGit.Commands
                });
            }
            var exitCode = proc.ExitCode;
            proc.Close();
            if (exitCode != 0)
            {
                var errMsg = builder.ToString();
                Dispatcher.UIThread.Invoke(() =>
                {
                    App.RaiseException(repo, errMsg);
                });
            }
        }
    }
 }
--- a/src/Commands/SaveChangesAsPatch.cs
+++ b/src/Commands/SaveChangesAsPatch.cs
@ -9,7 +9,7 @@ namespace SourceGit.Commands
 {
    public static class SaveChangesAsPatch
    {
-        public static bool Exec(string repo, List<Models.Change> changes, bool isUnstaged, string saveTo)
+        public static bool ProcessLocalChanges(string repo, List<Models.Change> changes, bool isUnstaged, string saveTo)
        {
            using (var sw = File.Create(saveTo))
            {
@ -23,6 +23,20 @@ namespace SourceGit.Commands
            return true;
        }
        public static bool ProcessRevisionCompareChanges(string repo, List<Models.Change> changes, string baseRevision, string targetRevision, string saveTo)
        {
            using (var sw = File.Create(saveTo))
            {
                foreach (var change in changes)
                {
                    if (!ProcessSingleChange(repo, new Models.DiffOption(baseRevision, targetRevision, change), sw))
                        return false;
                }
            }
            return true;
        }
        private static bool ProcessSingleChange(string repo, Models.DiffOption opt, FileStream writer)
        {
            var starter = new ProcessStartInfo();
--- a/src/Models/CustomAction.cs
+++ b/src/Models/CustomAction.cs
@ -30,7 +30,7 @@ namespace SourceGit.Models
        public string Arguments
        {
-            get => _arguments; 
+            get => _arguments;
            set => SetProperty(ref _arguments, value);
        }
--- a/src/Models/DiffResult.cs
+++ b/src/Models/DiffResult.cs
@ -63,7 +63,7 @@ namespace SourceGit.Models
    {
        public string File { get; set; } = string.Empty;
        public List<TextDiffLine> Lines { get; set; } = new List<TextDiffLine>();
-        public Vector SyncScrollOffset { get; set; } = Vector.Zero;
+        public Vector ScrollOffset { get; set; } = Vector.Zero;
        public int MaxLineNumber = 0;
        public string Repo { get; set; } = null;
@ -674,6 +674,8 @@ namespace SourceGit.Models
    {
        public bool IsBinary { get; set; } = false;
        public bool IsLFS { get; set; } = false;
        public string OldHash { get; set; } = string.Empty;
        public string NewHash { get; set; } = string.Empty;
        public string OldMode { get; set; } = string.Empty;
        public string NewMode { get; set; } = string.Empty;
        public TextDiff TextDiff { get; set; } = null;
--- a/src/Models/Notification.cs
+++ b/src/Models/Notification.cs
@ -4,10 +4,5 @@
    {
        public bool IsError { get; set; } = false;
        public string Message { get; set; } = string.Empty;
        public void CopyMessage()
        {
            App.CopyText(Message);
        }
    }
 }
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@ -325,8 +325,8 @@ namespace SourceGit.Native
            if (localMachine.OpenSubKey(@"SOFTWARE\Classes\VisualStudio.Launcher.sln\CLSID") is Microsoft.Win32.RegistryKey launcher)
            {
                // Get actual path to the executable
-                if (launcher.GetValue(string.Empty) is string CLSID && 
+                if (launcher.GetValue(string.Empty) is string CLSID &&
-                    localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv && 
+                    localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv &&
                    devenv.GetValue(string.Empty) is string localServer32)
                {
                    return localServer32!.Trim('\"');
@ -353,23 +353,26 @@ namespace SourceGit.Native
        private string GenerateCommandlineArgsForVisualStudio(string repo)
        {
-            var sln = FindVSSolutionFile(repo, 4);
+            var sln = FindVSSolutionFile(new DirectoryInfo(repo), 4);
            return string.IsNullOrEmpty(sln) ? $"\"{repo}\"" : $"\"{sln}\"";
        }
-        private string FindVSSolutionFile(string path, int leftDepth)
+        private string FindVSSolutionFile(DirectoryInfo dir, int leftDepth)
        {
-            var found = Directory.GetFiles(path, "*.sln", SearchOption.TopDirectoryOnly);
+            var files = dir.GetFiles();
-            if (found != null && found.Length > 0)
+            foreach (var f in files)
-                return Path.GetFullPath(found[0]);
+            {
                if (f.Name.EndsWith(".sln", StringComparison.OrdinalIgnoreCase))
                    return f.FullName;
            }
            if (leftDepth <= 0)
                return null;
-            var subfolders = Directory.GetDirectories(path);
+            var subDirs = dir.GetDirectories();
-            foreach (var subfolder in subfolders)
+            foreach (var subDir in subDirs)
            {
-                var first = FindVSSolutionFile(subfolder, leftDepth - 1);
+                var first = FindVSSolutionFile(subDir, leftDepth - 1);
                if (!string.IsNullOrEmpty(first))
                    return first;
            }
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
  <StreamGeometry x:Key="Icons.Action">M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.AIAssist">M951 419a255 255 0 00-22-209 258 258 0 00-278-124A259 259 0 00213 178a255 255 0 00-171 124 258 258 0 0032 303 255 255 0 0022 210 258 258 0 00278 124A255 255 0 00566 1024a258 258 0 00246-179 256 256 0 00171-124 258 258 0 00-32-302zM566 957a191 191 0 01-123-44l6-3 204-118a34 34 0 0017-29v-287l86 50a3 3 0 012 2v238a192 192 0 01-192 192zM154 781a191 191 0 01-23-129l6 4 204 118a33 33 0 0033 0l249-144v99a3 3 0 01-1 3L416 851a192 192 0 01-262-70zM100 337a191 191 0 01101-84V495a33 33 0 0017 29l248 143-86 50a3 3 0 01-3 0l-206-119A192 192 0 01100 336zm708 164-249-145L645 307a3 3 0 013 0l206 119a192 192 0 01-29 346v-242a34 34 0 00-17-28zm86-129-6-4-204-119a33 33 0 00-33 0L401 394V294a3 3 0 011-3l206-119a192 192 0 01285 199zm-539 176-86-50a3 3 0 01-2-2V259a192 192 0 01315-147l-6 3-204 118a34 34 0 00-17 29zm47-101 111-64 111 64v128l-111 64-111-64z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AIAssist">M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Archive">M296 392h64v64h-64zM296 582v160h128V582h-64v-62h-64v62zm80 48v64h-32v-64h32zM360 328h64v64h-64zM296 264h64v64h-64zM360 456h64v64h-64zM360 200h64v64h-64zM855 289 639 73c-6-6-14-9-23-9H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V311c0-9-3-17-9-23zM790 326H602V138L790 326zm2 562H232V136h64v64h64v-64h174v216c0 23 19 42 42 42h216v494z</StreamGeometry>
  <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>
@ -65,6 +65,7 @@
  <StreamGeometry x:Key="Icons.LayoutHorizontal">M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zM139 832V192c0-6 4-11 11-11h331v661H149c-6 0-11-4-11-11zm747 0c0 6-4 11-11 11H544v-661H875c6 0 11 4 11 11v640z</StreamGeometry>
  <StreamGeometry x:Key="Icons.LayoutVertical">M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zm-725 64h725c6 0 11 4 11 11v288h-747V192c0-6 4-11 11-11zm725 661H149c-6 0-11-4-11-11V544h747V832c0 6-4 11-11 11z</StreamGeometry>
  <StreamGeometry x:Key="Icons.LFS">M40 9 15 23 15 31 9 28 9 20 34 5 24 0 0 14 0 34 25 48 25 28 49 14zM26 29 26 48 49 34 49 15z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Lines.All">M416 192m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 448m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 704m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM96 320l128-192 128 192h-256zM96 640l128 192 128-192h-256zM190 320h64v320H190z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Lines.Incr">M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l132 0 0-128 64 0 0 128 132 0 0 64-132 0 0 128-64 0 0-128-132 0Z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Lines.Decr">M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l328 0 0 64-328 0Z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Link">M 968 418 l -95 94 c -59 59 -146 71 -218 37 L 874 331 a 64 64 0 0 0 0 -90 L 783 150 a 64 64 0 0 0 -90 0 L 475 368 c -34 -71 -22 -159 37 -218 l 94 -94 c 75 -75 196 -75 271 0 l 90 90 c 75 75 75 196 0 271 z M 332 693 a 64 64 0 0 1 0 -90 l 271 -271 c 25 -25 65 -25 90 0 s 25 65 0 90 L 422 693 a 64 64 0 0 1 -90 0 z M 151 783 l 90 90 a 64 64 0 0 0 90 0 l 218 -218 c 34 71 22 159 -37 218 l -86 94 a 192 192 0 0 1 -271 0 l -98 -98 a 192 192 0 0 1 0 -271 l 94 -86 c 59 -59 146 -71 218 -37 L 151 693 a 64 64 0 0 0 0 90 z</StreamGeometry>
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@ -58,6 +58,7 @@
  <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>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward zu ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetche ${0}$ nach ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Abschließen ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.Merge" xml:space="preserve">Merge ${0}$ in ${1}$ hinein...</x:String>
  <x:String x:Key="Text.BranchCM.Pull" xml:space="preserve">Pull ${0}$</x:String>
@ -72,6 +73,7 @@
  <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.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>
  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Zeige als Pfadliste</x:String>
@ -109,6 +111,7 @@
  <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>
  <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHA kopieren</x:String>
  <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Interactives Rebase von ${0}$ auf diesen Commit</x:String>
  <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase von ${0}$ auf diesen Commit</x:String>
  <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Reset ${0}$ auf diesen Commit</x:String>
@ -140,20 +143,35 @@
  <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.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>
  <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.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>
  <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Email Adresse</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">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.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.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 eine Gitlab Issue Regel einfügen</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Beispiel für einen Gitlab Merge Request einfü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>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">Ergebnis-URL:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Verwende bitte $1, $2 um auf Regex-Gruppenwerte zuzugreifen.</x:String>
  <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">OPEN AI</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered" xml:space="preserve">Bevorzugter Service:</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Wenn der 'Bevorzugte Service' aktiviert ist, wird SourceGit nur dieses Repository nutzen. Ansonsten wird, wenn mehrere Services verfügbar sind, eine Kontextmenü zur Auswahl angezeigt.</x:String>
  <x:String x:Key="Text.Configure.Proxy" xml:space="preserve">HTTP Proxy</x:String>
  <x:String x:Key="Text.Configure.Proxy.Placeholder" xml:space="preserve">HTTP Proxy für dieses Repository</x:String>
  <x:String x:Key="Text.Configure.User" xml:space="preserve">Benutzername</x:String>
@ -162,15 +180,14 @@
  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Farbe</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Zuletzt geöffnete Tabs beim Starten wiederherstellen</x:String>
  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Konventionelle Commit-Hilfe</x:String>
-  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Inkompatible Änderung:</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">Geschlossenes Ticket:</x:String>
  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">Änderungen im Detail:</x:String>
-  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">Geltungsbereich:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">Gültigkeitsbereich:</x:String>
  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">Kurzbeschreibung:</x:String>
-  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Art der Änderung:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Typ der Änderung:</x:String>
  <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.CopyMessage" xml:space="preserve">COMMIT-NACHRICHT KOPIEREN</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>
@ -246,6 +263,8 @@
  <x:String x:Key="Text.EditRepositoryNode.Target" xml:space="preserve">Ziel:</x:String>
  <x:String x:Key="Text.EditRepositoryNode.TitleForGroup" xml:space="preserve">Ausgewählte Gruppe bearbeiten</x:String>
  <x:String x:Key="Text.EditRepositoryNode.TitleForRepository" xml:space="preserve">Ausgewähltes Repository bearbeiten</x:String>
  <x:String x:Key="Text.ExecuteCustomAction" xml:space="preserve">Führe benutzerte Aktion aus</x:String>
  <x:String x:Key="Text.ExecuteCustomAction.Name" xml:space="preserve">Name der Aktion:</x:String>
  <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (ohne Auschecken)</x:String>
  <x:String x:Key="Text.Fetch" xml:space="preserve">Fetch</x:String>
  <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Alle Remotes fetchen</x:String>
@ -402,8 +421,11 @@
  <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.Server" xml:space="preserve">Server</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>
@ -507,7 +529,9 @@
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Alles löschen</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Repository Einstellungen</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">WEITER</x:String>
-  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Option '--reflog' einschalten</x:String>
+  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Benutzerdefinierte Aktionen</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Keine benutzerdefinierten Aktionen</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Aktiviere '--reflog' Option</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Öffne im Datei-Browser</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Suche Branches/Tags/Submodule</x:String>
  <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">GEFILTERT:</x:String>
@ -569,6 +593,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.IncludeUntracked" xml:space="preserve">Inklusive nicht-verfolgter Dateien</x:String>
  <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Behalte Dateien des Stages</x:String>
  <x:String x:Key="Text.Stash.Message" xml:space="preserve">Name:</x:String>
  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Optional. Name dieses Stashes</x:String>
  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">Nur gestagte Änderungen</x:String>
@ -602,6 +627,7 @@
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Tag-Namen kopieren</x:String>
  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Tag-Nachricht kopieren</x:String>
  <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>
@ -638,6 +664,7 @@
  <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/Historie</x:String>
  <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Klick-Ereignis auslösen</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>
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@ -18,8 +18,8 @@
  <x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Optional. Default is the destination folder name.</x:String>
  <x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Track Branch:</x:String>
  <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">OpenAI Assistant</x:String>
+  <x:String x:Key="Text.AIAssistant" xml:space="preserve">AI Assistant</x:String>
-  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Use OpenAI to generate commit message</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.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>
@ -166,7 +166,7 @@
  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Rule Name:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">Result URL:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Please use $1, $2 to access regex groups values.</x:String>
-  <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">OPEN AI</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">Prefered Service:</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">If the 'Prefered Service' is set, SourceGit will only use it in this repository. Otherwise, if there is more than one service available, a context menu to choose one of them will be shown.</x:String>
  <x:String x:Key="Text.Configure.Proxy" xml:space="preserve">HTTP Proxy</x:String>
@ -185,7 +185,6 @@
  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Type of Change:</x:String>
  <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.CopyMessage" xml:space="preserve">COPY MESSAGE</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.CreateBranch" xml:space="preserve">Create Branch...</x:String>
@ -238,6 +237,7 @@
  <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.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>
  <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SUBMODULE</x:String>
@ -246,6 +246,7 @@
  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Syntax Highlighting</x:String>
  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Line Word Wrap</x:String>
  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Open in Merge Tool</x:String>
  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Show All Lines</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Decrease Number of Visible Lines</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Increase Number of Visible Lines</x:String>
  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">SELECT FILE TO VIEW CHANGES</x:String>
@ -274,7 +275,7 @@
  <x:String x:Key="Text.FileCM.DiscardMulti" xml:space="preserve">Discard {0} files...</x:String>
  <x:String x:Key="Text.FileCM.DiscardSelectedLines" xml:space="preserve">Discard Changes in Selected Line(s)</x:String>
  <x:String x:Key="Text.FileCM.OpenWithExternalMerger" xml:space="preserve">Open External Merge Tool</x:String>
-  <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">Save As Patch...</x:String>
+  <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">Save as Patch...</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} files</x:String>
  <x:String x:Key="Text.FileCM.StageSelectedLines" xml:space="preserve">Stage Changes in Selected Line(s)</x:String>
@ -362,8 +363,12 @@
  <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>
  <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.CreateBranchOnCommit" xml:space="preserve">Creates a new branch based on selected commit</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Discard selected changes</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch, starts directly</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Dashboard mode (Default)</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull, starts directly</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Push, starts directly</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Force to reload this repository</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Stage/Unstage selected changes</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Commit search mode</x:String>
@ -387,6 +392,8 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</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">Open in Browser</x:String>
  <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copy Link</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
@ -398,7 +405,7 @@
  <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.OpenAppDataDir" xml:space="preserve">Open App Data Dir</x:String>
-  <x:String x:Key="Text.OpenWith" xml:space="preserve">Open With...</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>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Create New Page</x:String>
  <x:String x:Key="Text.PageTabBar.Tab.Bookmark" xml:space="preserve">Bookmark</x:String>
@ -418,7 +425,7 @@
  <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">OPEN AI</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>
@ -428,6 +435,7 @@
  <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.DefaultFontSize" xml:space="preserve">Default Font Size</x:String>
  <x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Editor Font Size</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>
@ -530,15 +538,15 @@
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Custom Actions</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">No Custom Actions</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Enable '--reflog' Option</x:String>
-  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Open In File Browser</x:String>
+  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Open in File Browser</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Search Branches/Tags/Submodules</x:String>
  <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">FILTERED BY:</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.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.OpenIn" xml:space="preserve">Open In {0}</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>
+  <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Open in External Tools</x:String>
  <x:String x:Key="Text.Repository.Refresh" xml:space="preserve">Refresh</x:String>
  <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>
@ -556,7 +564,7 @@
  <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">UPDATE 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">NEW TAG</x:String>
-  <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Open In Terminal</x:String>
+  <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Open in 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">ADD WORKTREE</x:String>
  <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">PRUNE</x:String>
@ -625,6 +633,7 @@
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copy Tag Name</x:String>
  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Copy Tag Message</x:String>
  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Delete ${0}$...</x:String>
  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ into ${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">Update Submodules</x:String>
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@ -73,6 +73,7 @@
  <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.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>
  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Mostrar como Lista de Rutas</x:String>
@ -110,7 +111,10 @@
  <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>
  <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">Copiar SHA</x:String>
  <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Acción personalizada</x:String>
  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Rebase Interactivo ${0}$ hasta Aquí</x:String>
  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Abrir en el Navegador</x:String>
  <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copiar Enlace</x:String>
  <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase ${0}$ hasta Aquí</x:String>
  <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>
@ -141,12 +145,21 @@
  <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.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>
  <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.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.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>
  <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.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.AddSampleGithub" xml:space="preserve">Añadir Regla de Ejemplo para Github</x:String>
@ -158,6 +171,9 @@
  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nombre de la Regla:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">URL Resultante:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Por favor, use $1, $2 para acceder a los valores de los grupos regex.</x:String>
  <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">OPEN AI</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered" xml:space="preserve">Servicio Preferido:</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Si el 'Servicio Preferido' está establecido, SourceGit sólo lo usará en este repositorio. De lo contrario, si hay más de un servicio disponible, se mostrará un menú de contexto para elegir 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 utilizado por este repositorio</x:String>
  <x:String x:Key="Text.Configure.User" xml:space="preserve">Nombre de Usuario</x:String>
@ -174,7 +190,6 @@
  <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.CopyMessage" xml:space="preserve">COPIAR MENSAJE</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>
@ -227,6 +242,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.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>
@ -235,6 +251,7 @@
  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Resaltado de Sintaxis</x:String>
  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Ajuste de Línea</x:String>
  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Abrir en Herramienta de Merge</x:String>
  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Mostrar Todas las Líneas</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Disminuir Número de Líneas Visibles</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Aumentar Número de Líneas Visibles</x:String>
  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">SELECCIONA ARCHIVO PARA VER CAMBIOS</x:String>
@ -250,6 +267,8 @@
  <x:String x:Key="Text.EditRepositoryNode.Target" xml:space="preserve">Destino:</x:String>
  <x:String x:Key="Text.EditRepositoryNode.TitleForGroup" xml:space="preserve">Editar Grupo Seleccionado</x:String>
  <x:String x:Key="Text.EditRepositoryNode.TitleForRepository" xml:space="preserve">Editar Repositorio Seleccionado</x:String>
  <x:String x:Key="Text.ExecuteCustomAction" xml:space="preserve">Ejecutar Acción Personalizada</x:String>
  <x:String x:Key="Text.ExecuteCustomAction.Name" xml:space="preserve">Nombre de la Acción:</x:String>
  <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (sin 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 todos los remotos</x:String>
@ -349,8 +368,12 @@
  <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>
  <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Stage todos los cambios y commit</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.CreateBranchOnCommit" xml:space="preserve">Crea una nueva rama basada en el commit seleccionado</x:String>
  <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.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>
@ -411,10 +434,12 @@
  <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.DefaultFontSize" xml:space="preserve">Tamaño de fuente por defecto</x:String>
  <x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Tamaño de fuente del 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>
@ -514,6 +539,8 @@
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Limpiar todo</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configurar este repositorio</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUAR</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Acciones Personalizadas</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">No hay ninguna Acción Personalizada</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Habilitar Opción '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Abrir en el Explorador</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Buscar Ramas/Etiquetas/Submódulos</x:String>
@ -576,6 +603,7 @@
  <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.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>
  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Opcional. Nombre de este stash</x:String>
  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">Solo cambios staged</x:String>
@ -609,6 +637,7 @@
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copiar Nombre de la Etiqueta</x:String>
  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Copiar Mensaje de la Etiqueta</x:String>
  <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>
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@ -152,7 +152,6 @@
  <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.CopyMessage" xml:space="preserve">COPIER LE MESSAGE</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>
@ -552,6 +551,7 @@
  <x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copy Tag Name</x:String>
  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Delete ${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">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">Actualiser les sous-modules</x:String>
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@ -2,7 +2,32 @@
  <ResourceDictionary.MergedDictionaries>
    <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.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>
@ -20,6 +45,8 @@
  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">Branch Existente</x:String>
  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">O que Checar:</x:String>
  <x:String x:Key="Text.AddWorktree" xml:space="preserve">Adicionar Worktree</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.Error.Desc" xml:space="preserve">Erros levantados e se recusa a aplicar o patch</x:String>
  <x:String x:Key="Text.Apply.Error" xml:space="preserve">Erro</x:String>
  <x:String x:Key="Text.Apply.ErrorAll.Desc" xml:space="preserve">Semelhante a 'erro', mas mostra mais</x:String>
@ -55,6 +82,7 @@
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Excluir {0} branches selecionados</x:String>
  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Descartar todas as alterações</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward para ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Buscar ${0}$ em ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Finalizar ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.Merge" xml:space="preserve">Mesclar ${0}$ em ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Pull" xml:space="preserve">Puxar ${0}$</x:String>
@ -69,9 +97,10 @@
  <x:String x:Key="Text.Cancel" xml:space="preserve">CANCELAR</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.ChangeDisplayMode.Grid" xml:space="preserve">Mostrar como Lista de Arquivos e Diretórios</x:String>
+  <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Gerar mensagem de commit</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Mostrar como Lista de Caminhos</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Exibir como Lista de Arquivos e Diretórios</x:String>
-  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Mostrar como Árvore de Sistema de Arquivos</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Exibir como Lista de Caminhos</x:String>
  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Exibir como Árvore de Sistema de Arquivos</x:String>
  <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">ALTERAR MODO DE EXIBIÇÃO</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">Aviso: Ao fazer o checkout de um commit, seu Head ficará desanexado</x:String>
@ -82,8 +111,11 @@
  <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
  <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</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>
  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commitar todas as alterações</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">Geralmente você não pode fazer cherry-pick de um merge commit porque você não sabe qual lado do merge deve ser considerado na mainline. Esta opção permite ao cherry-pick reaplicar a mudança relativa ao parent especificado.</x:String>
  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Você está tentando limpar todas as stashes. Tem certeza que deseja continuar?</x:String>
  <x:String x:Key="Text.ClearStashes" xml:space="preserve">Limpar Stashes</x:String>
@ -97,11 +129,13 @@
  <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.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.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>
  <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">Copiar SHA</x:String>
  <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Ação customizada</x:String>
  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">Rebase Interativo ${0}$ até Aqui</x:String>
  <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase ${0}$ até Aqui</x:String>
  <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Resetar ${0}$ até Aqui</x:String>
@ -109,6 +143,7 @@
  <x:String x:Key="Text.CommitCM.Reword" xml:space="preserve">Modificar Mensagem</x:String>
  <x:String x:Key="Text.CommitCM.SaveAsPatch" xml:space="preserve">Salvar como Patch...</x:String>
  <x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">Mesclar ao Commit Pai</x:String>
  <x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">Mesclar commits filhos para este</x:String>
  <x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">Buscar Alterações...</x:String>
  <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">ALTERAÇÕES</x:String>
  <x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">Arquivo LFS</x:String>
@ -117,38 +152,68 @@
  <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">AUTOR</x:String>
  <x:String x:Key="Text.CommitDetail.Info.Changed" xml:space="preserve">ALTERADO</x:String>
  <x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">COMMITTER</x:String>
  <x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Verificar referências que contenham este commit</x:String>
  <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT EXISTE EM</x:String>
  <x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Mostra apenas as primeiras 100 alterações. Veja todas as alterações na aba ALTERAÇÕES.</x:String>
  <x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">MENSAGEM</x:String>
  <x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">PAIS</x:String>
  <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" xml:space="preserve">INFORMAÇÃO</x:String>
  <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Abrir no navegador</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.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.CommitMessageTemplate" xml:space="preserve">TEMPLATE DE COMMIT</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>
  <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">Caminho do executável:</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">Escopo:</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">Repositório</x:String>
  <x:String x:Key="Text.Configure.Email" xml:space="preserve">Endereço de email</x:String>
  <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Endereço de email</x:String>
  <x:String x:Key="Text.Configure.Email" xml:space="preserve">Endereço de Email</x:String>
  <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.Git.EnableSignOff" xml:space="preserve">Habilita --signoff para commits</x:String>
  <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</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.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>
  <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>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Por favor, use $1, $2 para acessar os valores de grupos do regex.</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">URL de Resultado:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">RASTREADOR DE PROBLEMAS</x:String>
  <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">IA</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered" xml:space="preserve">Serviço desejado:</x:String>
  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Se o 'Serviço desejado' for definido, SourceGit usará ele neste Repositório. Senão, caso haja mais de um serviço disponível, será exibido um menu para seleção.</x:String>
  <x:String x:Key="Text.Configure.Proxy.Placeholder" xml:space="preserve">Proxy HTTP usado por este repositório</x:String>
  <x:String x:Key="Text.Configure.Proxy" xml:space="preserve">Proxy HTTP</x:String>
  <x:String x:Key="Text.Configure.User.Placeholder" xml:space="preserve">Nome de usuário para este repositório</x:String>
  <x:String x:Key="Text.Configure.User" xml:space="preserve">Nome de Usuário</x:String>
  <x:String x:Key="Text.Configure" xml:space="preserve">Configurar Repositório</x:String>
  <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Workspaces</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Cor</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Restaurar abas ao inicializar</x:String>
  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Assistente de Conventional Commit</x:String>
  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Breaking Change:</x:String>
  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">Ticket encerrado:</x:String>
  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">Detalhes:</x:String>
  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">Escopo:</x:String>
  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">Breve resumo:</x:String>
  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Tipo de mudança:</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 o texto</x:String>
  <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copiar Nome do Arquivo</x:String>
  <x:String x:Key="Text.CopyMessage" xml:space="preserve">COPIAR MENSAGEM</x:String>
  <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Caminho</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>
@ -200,7 +265,8 @@
  <x:String x:Key="Text.Diff.Next" xml:space="preserve">Próxima Diferença</x:String>
  <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">SEM MUDANÇAS OU APENAS MUDANÇAS DE EOL</x:String>
  <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Diferença Anterior</x:String>
-  <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Mostrar símbolos ocultos</x:String>
+  <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Salvar como um Patch</x:String>
  <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Exibir símbolos ocultos</x:String>
  <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Diferença Lado a Lado</x:String>
  <x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">NOVO</x:String>
  <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SUBMÓDULO</x:String>
@ -208,12 +274,14 @@
  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Realce de Sintaxe</x:String>
  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Quebra de Linha</x:String>
  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Abrir na Ferramenta de Mesclagem</x:String>
  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Exibir todas as linhas</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Diminuir Número de Linhas Visíveis</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Aumentar Número de Linhas Visíveis</x:String>
  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">SELECIONE O ARQUIVO PARA VISUALIZAR AS MUDANÇAS</x:String>
  <x:String x:Key="Text.DiffWithMerger" xml:space="preserve">Abrir na Ferramenta de Mesclagem</x:String>
  <x:String x:Key="Text.Discard.All" xml:space="preserve">Todas as alterações locais na cópia de trabalho.</x:String>
  <x:String x:Key="Text.Discard.Changes" xml:space="preserve">Alterações:</x:String>
  <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">Incluir arquivos ignorados</x:String>
  <x:String x:Key="Text.Discard.Total" xml:space="preserve">Um total de {0} alterações será descartado</x:String>
  <x:String x:Key="Text.Discard.Warning" xml:space="preserve">Você não pode desfazer esta ação!!!</x:String>
  <x:String x:Key="Text.Discard" xml:space="preserve">Descartar Alterações</x:String>
@ -222,6 +290,8 @@
  <x:String x:Key="Text.EditRepositoryNode.Target" xml:space="preserve">Alvo:</x:String>
  <x:String x:Key="Text.EditRepositoryNode.TitleForGroup" xml:space="preserve">Editar Grupo Selecionado</x:String>
  <x:String x:Key="Text.EditRepositoryNode.TitleForRepository" xml:space="preserve">Editar Repositório Selecionado</x:String>
  <x:String x:Key="Text.ExecuteCustomAction" xml:space="preserve">Executar ação customizada</x:String>
  <x:String x:Key="Text.ExecuteCustomAction.Name" xml:space="preserve">Nome da ação:</x:String>
  <x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (sem checkout)</x:String>
  <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Buscar todos os remotos</x:String>
  <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Buscar sem tags</x:String>
@ -245,6 +315,8 @@
  <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.Filter" xml:space="preserve">FILTRO</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>
@ -279,10 +351,11 @@
  <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Instalar hooks do Git LFS</x:String>
  <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Sem Arquivos Bloqueados</x:String>
  <x:String x:Key="Text.GitLFS.Locks.Lock" xml:space="preserve">Bloquear</x:String>
-  <x:String x:Key="Text.GitLFS.Locks.Title" xml:space="preserve">Locks LFS</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.OnlyMine" xml:space="preserve">Exibir apenas meus bloqueios</x:String>
  <x:String x:Key="Text.GitLFS.Locks.Title" xml:space="preserve">Bloqueios LFS</x:String>
  <x:String x:Key="Text.GitLFS.Locks.Unlock" xml:space="preserve">Desbloquear</x:String>
  <x:String x:Key="Text.GitLFS.Locks.UnlockForce" xml:space="preserve">Forçar Desbloqueio</x:String>
-  <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Mostrar Locks</x:String>
+  <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Exibir bloqueios</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.Prune" xml:space="preserve">Prune</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>
@ -316,9 +389,13 @@
  <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>
  <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Preparar todas as mudanças e commitar</x:String>
  <x:String x:Key="Text.Hotkeys.Repo.CreateBranchOnCommit" xml:space="preserve">Cria um novo branch partindo do commit selecionado</x:String>
  <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.ViewChanges" xml:space="preserve">Alternar para 'Mudanças'</x:String>
@ -343,11 +420,15 @@
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Em:</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ramo Alvo:</x:String>
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Rebase Interativo</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.Into" xml:space="preserve">Para:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opção de Mesclagem:</x:String>
  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Ramo de Origem:</x:String>
  <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Mover nó do repositório</x:String>
  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Selecionar nó pai para:</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Mesclar Ramo</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">Nome:</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">O Git NÃO foi configurado. Por favor, vá para [Preferências] e configure primeiro.</x:String>
@ -375,10 +456,12 @@
  <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.AI" xml:space="preserve">INTELIGÊNCIA ARTIFICIAL</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.DefaultFontSize" xml:space="preserve">Tamanho da Fonte Padrão</x:String>
+  <x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Tamanho da fonte padrão</x:String>
  <x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Tamanho da fonte do 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>
@ -393,7 +476,7 @@
  <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">Mostrar data do autor em vez da data do commit no gráfico</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.General" xml:space="preserve">GERAL</x:String>
  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Habilitar Auto CRLF</x:String>
@ -435,6 +518,7 @@
  <x:String x:Key="Text.Pull.Title" xml:space="preserve">Puxar (Buscar &amp; Mesclar)</x:String>
  <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Usar rebase em vez de merge</x:String>
  <x:String x:Key="Text.Pull" xml:space="preserve">Puxar</x:String>
  <x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">Certifica de que submodules foram enviadas</x:String>
  <x:String x:Key="Text.Push.Force" xml:space="preserve">Forçar push</x:String>
  <x:String x:Key="Text.Push.Local" xml:space="preserve">Branch Local:</x:String>
  <x:String x:Key="Text.Push.Remote" xml:space="preserve">Remoto:</x:String>
@ -479,6 +563,8 @@
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Limpar tudo</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configurar este repositório</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUAR</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Ações customizada</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Nenhuma ação customizada</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Habilitar opção '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Abrir no Navegador de Arquivos</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Pesquisar Branches/Tags/Submódulos</x:String>
@ -499,7 +585,7 @@
  <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.Search" xml:space="preserve">Pesquisar Commit</x:String>
-  <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Mostrar Tags como Árvore</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>
  <x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">ADICIONAR SUBMÓDULO</x:String>
  <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">ATUALIZAR SUBMÓDULO</x:String>
@ -535,12 +621,16 @@
  <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">Não há atualizações disponíveis no momento.</x:String>
  <x:String x:Key="Text.SelfUpdate" xml:space="preserve">Verificar atualizações...</x:String>
  <x:String x:Key="Text.Squash" xml:space="preserve">Squash Commits</x:String>
  <x:String x:Key="Text.Squash.Into" xml:space="preserve">Squash commits em:</x:String>
  <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Caminho para a chave SSH privada</x:String>
  <x:String x:Key="Text.SSHKey" xml:space="preserve">Chave SSH Privada:</x:String>
  <x:String x:Key="Text.Start" xml:space="preserve">INICIAR</x:String>
  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Incluir arquivos não rastreados</x:String>
  <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Manter arquivos em stage</x:String>
  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Opcional. Nome deste stash</x:String>
  <x:String x:Key="Text.Stash.Message" xml:space="preserve">Mensagem:</x:String>
  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">Apenas mudanças em stage</x:String>
  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Tanto mudanças em stage e fora de stage dos arquivos selecionados serão enviadas para stash!!!</x:String>
  <x:String x:Key="Text.Stash.Title" xml:space="preserve">Guardar Alterações Locais</x:String>
  <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
  <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Aplicar</x:String>
@ -553,6 +643,7 @@
  <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</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.TotalAuthors" xml:space="preserve">AUTORES: </x:String>
@ -568,7 +659,9 @@
  <x:String x:Key="Text.Submodule" xml:space="preserve">SUBMÓDULOS</x:String>
  <x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copiar Nome da Tag</x:String>
  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Copiar mensage da Tag</x:String>
  <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.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>
@ -611,16 +704,20 @@
  <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.Unstage" xml:space="preserve">DESSTAGEAR</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>
  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
  <x:String x:Key="Text.WorkingCopy.Unstaged" xml:space="preserve">UNSTAGED</x:String>
  <x:String x:Key="Text.WorkingCopy.Unstaged.Stage" xml:space="preserve">STAGE</x:String>
  <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" xml:space="preserve">Alterações</x:String>
-  <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configurar Espaços de Trabalho...</x:String>
+  <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Configurar workspaces...</x:String>
-  <x:String x:Key="Text.Workspace" xml:space="preserve">ESPAÇO DE TRABALHO: </x:String>
+  <x:String x:Key="Text.Workspace" xml:space="preserve">Workspaces: </x:String>
  <x:String x:Key="Text.Worktree.CopyPath" xml:space="preserve">Copiar Caminho</x:String>
-  <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Travar</x:String>
+  <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Bloquear</x:String>
  <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Remover</x:String>
-  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Destravar</x:String>
+  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Desbloquear</x:String>
  <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
 </ResourceDictionary>
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@ -189,7 +189,6 @@
  <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.CopyMessage" 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>
@ -243,6 +242,7 @@
  <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.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>
@ -250,6 +250,7 @@
  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Подсветка синтаксиса </x:String>
  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Перенос слов в строке</x:String>
  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Открыть в инструменте слияния </x:String>
  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Показывать все линии</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Уменьшить количество видимых линий</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Увеличить количество видимых линий</x:String>
  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">ВЫБРАТЬ ФАЙЛ ДЛЯ ПРОСМОТРА ИЗМЕНЕНИЙ</x:String>
@ -366,9 +367,13 @@
  <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.Refresh" 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.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>
@ -391,7 +396,9 @@
  <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.Launcher.Error" 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">В:</x:String>
@ -432,6 +439,7 @@
  <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.DefaultFontSize" 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>
@ -629,6 +637,7 @@
  <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>
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@ -21,8 +21,8 @@
  <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">AI助手</x:String>
-  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">使用OpenAI助手生成提交信息</x:String>
+  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">使用AI助手生成提交信息</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>
@ -169,9 +169,9 @@
  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">规则名 ：</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">为ISSUE生成的URL链接 ：</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">可在URL中使用$1，$2等变量填入正则表达式匹配的内容</x:String>
-  <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">OPEN AI</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">启用特定服务 ：</x:String>
-  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">当【启用特定服务】被设置时，SourceGit将在本仓库中仅使用该服务。否则将弹出可用的OpenAI服务列表供用户选择。</x:String>
+  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">当【启用特定服务】被设置时，SourceGit将在本仓库中仅使用该服务。否则将弹出可用的AI服务列表供用户选择。</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>
@ -188,7 +188,6 @@
  <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.CopyMessage" 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>
@ -241,6 +240,7 @@
  <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>
@ -249,6 +249,7 @@
  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">语法高亮</x:String>
  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">自动换行</x:String>
  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">使用外部合并工具查看</x:String>
  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">显示完整文件</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">减少可见的行数</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">增加可见的行数</x:String>
  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">请选择需要对比的文件</x:String>
@ -365,8 +366,12 @@
  <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">拉取 (fetch) 远程变更</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">拉回 (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>
@ -390,6 +395,8 @@
  <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>
@ -421,7 +428,7 @@
  <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">OPEN AI</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>
@ -431,6 +438,7 @@
  <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.DefaultFontSize" 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>
@ -628,6 +636,7 @@
  <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>
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@ -21,8 +21,8 @@
  <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">AI 助理</x:String>
-  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">使用 OpenAI 產生提交訊息</x:String>
+  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">使用 AI 產生提交訊息</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>
@ -169,9 +169,9 @@
  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">規則名稱:</x:String>
  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">為 Issue 產生的網址連結:</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">OpenAI</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">偏好服務:</x:String>
-  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">設定 [偏好服務] 後，SourceGit 將於此存放庫中使用該服務，否則會顯示 OpenAI 服務列表供使用者選擇。</x:String>
+  <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">設定 [偏好服務] 後，SourceGit 將於此存放庫中使用該服務，否則會顯示 AI 服務列表供使用者選擇。</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>
@ -188,7 +188,6 @@
  <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.CopyMessage" 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>
@ -241,6 +240,7 @@
  <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>
@ -249,6 +249,7 @@
  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">語法上色</x:String>
  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">自動換行</x:String>
  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">使用外部合併工具檢視</x:String>
  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">顯示檔案的全部內容</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">減少可見的行數</x:String>
  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">增加可見的行數</x:String>
  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">請選擇需要對比的檔案</x:String>
@ -365,8 +366,12 @@
  <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">提取 (fetch) 遠端的變更</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">拉取 (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>
@ -390,6 +395,8 @@
  <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>
@ -421,7 +428,7 @@
  <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">OpenAI</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>
@ -431,6 +438,7 @@
  <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.DefaultFontSize" 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>
@ -628,6 +636,7 @@
  <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>
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@ -24,7 +24,6 @@
    <PublishAot>true</PublishAot>
    <PublishTrimmed>true</PublishTrimmed>
    <TrimMode>link</TrimMode>
    <OptimizationPreference>Speed</OptimizationPreference>
  </PropertyGroup>
  <ItemGroup>
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@ -115,14 +115,24 @@ namespace SourceGit.ViewModels
            {
                if (remote.TryGetVisitURL(out var url))
                {
                    var trimmedUrl = url;
                    if (url.EndsWith(".git"))
                        trimmedUrl = url.Substring(0, url.Length - 4);
                    if (url.StartsWith("https://github.com/", StringComparison.Ordinal))
-                        WebLinks.Add(new Models.CommitLink() { Name = "Github", URLPrefix = $"{url}/commit/" });
+                        WebLinks.Add(new Models.CommitLink() { Name = $"Github ({trimmedUrl.Substring(19)})", URLPrefix = $"{url}/commit/" });
-                    else if (url.StartsWith("https://gitlab.com/", StringComparison.Ordinal))
+                    else if (url.StartsWith("https://gitlab.", StringComparison.Ordinal))
-                        WebLinks.Add(new Models.CommitLink() { Name = "GitLab", URLPrefix = $"{url}/-/commit/" });
+                        WebLinks.Add(new Models.CommitLink() { Name = $"GitLab ({trimmedUrl.Substring(trimmedUrl.Substring(15).IndexOf('/') + 16)})", URLPrefix = $"{url}/-/commit/" });
                    else if (url.StartsWith("https://gitee.com/", StringComparison.Ordinal))
-                        WebLinks.Add(new Models.CommitLink() { Name = "Gitee", URLPrefix = $"{url}/commit/" });
+                        WebLinks.Add(new Models.CommitLink() { Name = $"Gitee ({trimmedUrl.Substring(18)})", URLPrefix = $"{url}/commit/" });
                    else if (url.StartsWith("https://bitbucket.org/", StringComparison.Ordinal))
-                        WebLinks.Add(new Models.CommitLink() { Name = "Bitbucket", URLPrefix = $"{url}/commits/" });
+                        WebLinks.Add(new Models.CommitLink() { Name = $"BitBucket ({trimmedUrl.Substring(22)})", URLPrefix = $"{url}/commits/" });
                    else if (url.StartsWith("https://codeberg.org/", StringComparison.Ordinal))
                        WebLinks.Add(new Models.CommitLink() { Name = $"Codeberg ({trimmedUrl.Substring(21)})", URLPrefix = $"{url}/commit/" });
                    else if (url.StartsWith("https://gitea.org/", StringComparison.Ordinal))
                        WebLinks.Add(new Models.CommitLink() { Name = $"Gitea ({trimmedUrl.Substring(18)})", URLPrefix = $"{url}/commit/" });
                    else if (url.StartsWith("https://git.sr.ht/", StringComparison.Ordinal))
                        WebLinks.Add(new Models.CommitLink() { Name = $"sourcehut ({trimmedUrl.Substring(18)})", URLPrefix = $"{url}/commit/" });
                }
            }
        }
@ -186,7 +196,7 @@ namespace SourceGit.ViewModels
                                var stream = Commands.QueryFileContent.Run(_repo.FullPath, _commit.SHA, file.Path);
                                var fileSize = stream.Length;
                                var bitmap = fileSize > 0 ? new Bitmap(stream) : null;
-                                var imageType = Path.GetExtension(file.Path).TrimStart('.').ToUpper(CultureInfo.CurrentCulture);
+                                var imageType = ext!.Substring(1).ToUpper(CultureInfo.CurrentCulture);
                                var image = new Models.RevisionImageFile() { Image = bitmap, FileSize = fileSize, ImageType = imageType };
                                Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = image);
                            }
@ -368,6 +378,16 @@ namespace SourceGit.ViewModels
                ev.Handled = true;
            };
            var openWith = new MenuItem();
            openWith.Header = App.Text("OpenWith");
            openWith.Icon = App.CreateMenuIcon("Icons.OpenWith");
            openWith.IsEnabled = File.Exists(fullPath);
            openWith.Click += (_, ev) =>
            {
                Native.OS.OpenWithDefaultEditor(fullPath);
                ev.Handled = true;
            };
            var saveAs = new MenuItem();
            saveAs.Header = App.Text("SaveAs");
            saveAs.Icon = App.CreateMenuIcon("Icons.Save");
@ -397,6 +417,7 @@ namespace SourceGit.ViewModels
            };
            menu.Items.Add(explore);
            menu.Items.Add(openWith);
            menu.Items.Add(saveAs);
            menu.Items.Add(new MenuItem() { Header = "-" });
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@ -33,12 +33,6 @@ namespace SourceGit.ViewModels
            private set => SetProperty(ref _fileModeChange, value);
        }
        public bool IsLoading
        {
            get => _isLoading;
            private set => SetProperty(ref _isLoading, value);
        }
        public bool IsTextDiff
        {
            get => _isTextDiff;
@ -68,6 +62,7 @@ namespace SourceGit.ViewModels
                _content = previous._content;
                _unifiedLines = previous._unifiedLines;
                _ignoreWhitespace = previous._ignoreWhitespace;
                _info = previous._info;
            }
            if (string.IsNullOrEmpty(_option.OrgPath) || _option.OrgPath == "/dev/null")
@ -78,6 +73,12 @@ namespace SourceGit.ViewModels
            LoadDiffContent();
        }
        public void ToggleFullTextDiff()
        {
            Preference.Instance.UseFullTextDiff = !Preference.Instance.UseFullTextDiff;
            LoadDiffContent();
        }
        public void IncrUnified()
        {
            UnifiedLines = _unifiedLines + 1;
@ -103,15 +104,23 @@ namespace SourceGit.ViewModels
            {
                Content = null;
                IsTextDiff = false;
                IsLoading = false;
                return;
            }
            Task.Run(() =>
            {
-                var latest = new Commands.Diff(_repo, _option, _unifiedLines, _ignoreWhitespace).Result();
+                // NOTE: Here we override the UnifiedLines value (if UseFullTextDiff is on).
-                var rs = null as object;
+                // 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 latest = new Commands.Diff(_repo, _option, numLines, _ignoreWhitespace).Result();
                var info = new Info(_option, numLines, _ignoreWhitespace, latest);
                if (_info != null && info.IsSame(_info))
                    return;
                _info = info;
                var rs = null as object;
                if (latest.TextDiff != null)
                {
                    var count = latest.TextDiff.Lines.Count;
@ -203,12 +212,11 @@ namespace SourceGit.ViewModels
                Dispatcher.UIThread.Post(() =>
                {
                    if (_content is Models.TextDiff old && rs is Models.TextDiff cur && old.File == cur.File)
-                        cur.SyncScrollOffset = old.SyncScrollOffset;
+                        cur.ScrollOffset = old.ScrollOffset;
                    FileModeChange = latest.FileModeChange;
                    Content = rs;
                    IsTextDiff = rs is Models.TextDiff;
                    IsLoading = false;
                });
            });
        }
@ -241,14 +249,41 @@ namespace SourceGit.ViewModels
            ".ico", ".bmp", ".jpg", ".png", ".jpeg", ".webp"
        };
        private class Info
        {
            public string Argument { get; set; }
            public int UnifiedLines { get; set; }
            public bool IgnoreWhitespace { get; set; }
            public string OldHash { get; set; }
            public string NewHash { get; set; }
            public Info(Models.DiffOption option, int unifiedLines, bool ignoreWhitespace, Models.DiffResult result)
            {
                Argument = option.ToString();
                UnifiedLines = unifiedLines;
                IgnoreWhitespace = ignoreWhitespace;
                OldHash = result.OldHash;
                NewHash = result.NewHash;
            }
            public bool IsSame(Info other)
            {
                return Argument.Equals(other.Argument, StringComparison.Ordinal) &&
                    UnifiedLines == other.UnifiedLines &&
                    IgnoreWhitespace == other.IgnoreWhitespace &&
                    OldHash.Equals(other.OldHash, StringComparison.Ordinal) &&
                    NewHash.Equals(other.NewHash, StringComparison.Ordinal);
            }
        }
        private readonly string _repo;
        private readonly Models.DiffOption _option = null;
        private string _title;
        private string _fileModeChange = string.Empty;
        private int _unifiedLines = 4;
        private bool _isLoading = true;
        private bool _isTextDiff = false;
        private bool _ignoreWhitespace = false;
        private object _content = null;
        private Info _info = null;
    }
 }
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
@ -152,12 +153,9 @@ namespace SourceGit.ViewModels
            }
            else if (commits.Count == 1)
            {
-                var commit = commits[0] as Models.Commit;
+                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);
                }
                AutoSelectedCommit = commit;
                NavigationId = _navigationId + 1;
@ -223,7 +221,7 @@ namespace SourceGit.ViewModels
        public ContextMenu MakeContextMenu(ListBox list)
        {
            var current = _repo.CurrentBranch;
-            if (current == null)
+            if (current == null || list.SelectedItems == null)
                return null;
            if (list.SelectedItems.Count > 1)
@ -258,6 +256,44 @@ namespace SourceGit.ViewModels
                    multipleMenu.Items.Add(new MenuItem() { Header = "-" });
                }
                var saveToPatchMultiple = new MenuItem();
                saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff");
                saveToPatchMultiple.Header = App.Text("CommitCM.SaveAsPatch");
                saveToPatchMultiple.Click += async (_, e) =>
                {
                    var storageProvider = App.GetStorageProvider();
                    if (storageProvider == null)
                        return;
                    var options = new FolderPickerOpenOptions() { AllowMultiple = false };
                    try
                    {
                        var picker = await storageProvider.OpenFolderPickerAsync(options);
                        if (picker.Count == 1)
                        {
                            var saveTo = $"{picker[0].Path.LocalPath}/patches";
                            var succ = false;
                            foreach (var c in selected)
                            {
                                succ = await Task.Run(() => new Commands.FormatPatch(_repo.FullPath, c.SHA, saveTo).Exec());
                                if (!succ)
                                    break;
                            }
                            if (succ)
                                App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
                        }
                    }
                    catch (Exception exception)
                    {
                        App.RaiseException(_repo.FullPath, $"Failed to save as patch: {exception.Message}");
                    }
                    e.Handled = true;
                };
                multipleMenu.Items.Add(saveToPatchMultiple);
                multipleMenu.Items.Add(new MenuItem() { Header = "-" });
                var copyMultipleSHAs = new MenuItem();
                copyMultipleSHAs.Header = App.Text("CommitCM.CopySHA");
                copyMultipleSHAs.Icon = App.CreateMenuIcon("Icons.Copy");
@ -326,7 +362,7 @@ namespace SourceGit.ViewModels
            if (tags.Count > 0)
            {
                foreach (var tag in tags)
-                    FillTagMenu(menu, tag);
+                    FillTagMenu(menu, tag, current, commit.IsMerged);
                menu.Items.Add(new MenuItem() { Header = "-" });
            }
@ -854,7 +890,7 @@ namespace SourceGit.ViewModels
            menu.Items.Add(submenu);
        }
-        private void FillTagMenu(ContextMenu menu, Models.Tag tag)
+        private void FillTagMenu(ContextMenu menu, Models.Tag tag, Models.Branch current, bool merged)
        {
            var submenu = new MenuItem();
            submenu.Header = tag.Name;
@ -873,6 +909,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 (PopupHost.CanCreatePopup())
                    PopupHost.ShowPopup(new Merge(_repo, tag.Name, current.Name));
                e.Handled = true;
            };
            submenu.Items.Add(merge);
            submenu.Items.Add(new MenuItem() { Header = "-" });
            var delete = new MenuItem();
            delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
            delete.Icon = App.CreateMenuIcon("Icons.Clear");
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@ -102,6 +102,12 @@ namespace SourceGit.ViewModels
            set => SetProperty(ref _defaultFontSize, value);
        }
        public double EditorFontSize
        {
            get => _editorFontSize;
            set => SetProperty(ref _editorFontSize, value);
        }
        public LayoutInfo Layout
        {
            get => _layout;
@ -186,6 +192,12 @@ namespace SourceGit.ViewModels
            set => SetProperty(ref _showHiddenSymbolsInDiffView, value);
        }
        public bool UseFullTextDiff
        {
            get => _useFullTextDiff;
            set => SetProperty(ref _useFullTextDiff, value);
        }
        public Models.ChangeViewMode UnstagedChangeViewMode
        {
            get => _unstagedChangeViewMode;
@ -573,6 +585,7 @@ namespace SourceGit.ViewModels
        private bool _onlyUseMonoFontInEditor = false;
        private bool _useSystemWindowFrame = false;
        private double _defaultFontSize = 13;
        private double _editorFontSize = 13;
        private LayoutInfo _layout = new LayoutInfo();
        private int _maxHistoryCommits = 20000;
@ -591,6 +604,7 @@ namespace SourceGit.ViewModels
        private bool _useSyntaxHighlighting = false;
        private bool _enableDiffViewWordWrap = false;
        private bool _showHiddenSymbolsInDiffView = false;
        private bool _useFullTextDiff = false;
        private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List;
        private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List;
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@ -24,6 +24,11 @@ namespace SourceGit.ViewModels
            private set => SetProperty(ref _endPoint, value);
        }
        public bool CanSaveAsPatch
        {
            get => _canSaveAsPatch;
        }
        public List<Models.Change> VisibleChanges
        {
            get => _visibleChanges;
@ -73,6 +78,7 @@ namespace SourceGit.ViewModels
            _repo = repo;
            _startPoint = (object)startPoint ?? new Models.Null();
            _endPoint = (object)endPoint ?? new Models.Null();
            _canSaveAsPatch = startPoint != null && endPoint != null;
            Task.Run(Refresh);
        }
@ -105,6 +111,16 @@ namespace SourceGit.ViewModels
            Task.Run(Refresh);
        }
        public void SaveAsPatch(string saveTo)
        {
            Task.Run(() =>
            {
                var succ = Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo, _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo);
                if (succ)
                    Dispatcher.UIThread.Invoke(() => App.SendNotification(_repo, App.Text("SaveAsPatchSuccess")));
            });
        }
        public void ClearSearchFilter()
        {
            SearchFilter = string.Empty;
@ -218,6 +234,7 @@ namespace SourceGit.ViewModels
        private string _repo;
        private object _startPoint = null;
        private object _endPoint = null;
        private bool _canSaveAsPatch = false;
        private List<Models.Change> _changes = null;
        private List<Models.Change> _visibleChanges = null;
        private List<Models.Change> _selectedChanges = null;
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@ -539,7 +539,7 @@ namespace SourceGit.ViewModels
                        var storageFile = await storageProvider.SaveFilePickerAsync(options);
                        if (storageFile != null)
                        {
-                            var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, _selectedUnstaged, true, storageFile.Path.LocalPath));
+                            var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedUnstaged, true, storageFile.Path.LocalPath));
                            if (succ)
                                App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
                        }
@ -599,7 +599,8 @@ namespace SourceGit.ViewModels
                        byParentFolder.IsVisible = !isRooted;
                        byParentFolder.Click += (_, e) =>
                        {
-                            Commands.GitIgnore.Add(_repo.FullPath, Path.GetDirectoryName(change.Path) + "/");
+                            var path = Path.GetDirectoryName(change.Path).Replace("\\", "/");
                            Commands.GitIgnore.Add(_repo.FullPath, path + "/");
                            e.Handled = true;
                        };
                        addToIgnore.Items.Add(byParentFolder);
@ -620,7 +621,8 @@ namespace SourceGit.ViewModels
                            byExtensionInSameFolder.IsVisible = !isRooted;
                            byExtensionInSameFolder.Click += (_, e) =>
                            {
-                                Commands.GitIgnore.Add(_repo.FullPath, Path.GetDirectoryName(change.Path) + "/*" + extension);
+                                var path = Path.GetDirectoryName(change.Path).Replace("\\", "/");
                                Commands.GitIgnore.Add(_repo.FullPath, path + "/*" + extension);
                                e.Handled = true;
                            };
                            addToIgnore.Items.Add(byExtensionInSameFolder);
@ -858,7 +860,7 @@ namespace SourceGit.ViewModels
                    var storageFile = await storageProvider.SaveFilePickerAsync(options);
                    if (storageFile != null)
                    {
-                        var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, _selectedUnstaged, true, storageFile.Path.LocalPath));
+                        var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedUnstaged, true, storageFile.Path.LocalPath));
                        if (succ)
                            App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
                    }
@ -981,7 +983,7 @@ namespace SourceGit.ViewModels
                    var storageFile = await storageProvider.SaveFilePickerAsync(options);
                    if (storageFile != null)
                    {
-                        var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, _selectedStaged, false, storageFile.Path.LocalPath));
+                        var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedStaged, false, storageFile.Path.LocalPath));
                        if (succ)
                            App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
                    }
@ -1156,7 +1158,7 @@ namespace SourceGit.ViewModels
                    var storageFile = await storageProvider.SaveFilePickerAsync(options);
                    if (storageFile != null)
                    {
-                        var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, _selectedStaged, false, storageFile.Path.LocalPath));
+                        var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedStaged, false, storageFile.Path.LocalPath));
                        if (succ)
                            App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
                    }
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@ -57,6 +57,7 @@
                         Background="Transparent"
                         Foreground="{DynamicResource Brush.FG1}"
                         FontFamily="{DynamicResource Fonts.Monospace}"
                         FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
                         BlameData="{Binding Data}"/>
      <!-- Not supported mask (for binary files) -->
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@ -407,8 +407,8 @@ namespace SourceGit.Views
            var menu = new ContextMenu();
            menu.Items.Add(copy);
            menu.Open(TextArea.TextView);
            TextArea.TextView.OpenContextMenu(menu);
            e.Handled = true;
        }
--- a/src/Views/BranchCompare.axaml.cs
+++ b/src/Views/BranchCompare.axaml.cs
@ -15,7 +15,7 @@ namespace SourceGit.Views
            if (DataContext is ViewModels.BranchCompare vm && sender is ChangeCollectionView view)
            {
                var menu = vm.CreateChangeContextMenu();
-                view.OpenContextMenu(menu);
+                menu?.Open(view);
            }
            e.Handled = true;
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@ -374,7 +374,7 @@ namespace SourceGit.Views
            if (selected.Count == 1 && selected[0] is ViewModels.BranchTreeNode { Backend: Models.Remote remote })
            {
                var menu = repo.CreateContextMenuForRemote(remote);
-                this.OpenContextMenu(menu);
+                menu?.Open(this);
                return;
            }
@ -391,7 +391,7 @@ namespace SourceGit.Views
                var menu = branch.IsLocal ?
                    repo.CreateContextMenuForLocalBranch(branch) :
                    repo.CreateContextMenuForRemoteBranch(branch);
-                this.OpenContextMenu(menu);
+                menu?.Open(this);
            }
            else if (branches.Find(x => x.IsCurrent) == null)
            {
@ -405,7 +405,7 @@ namespace SourceGit.Views
                    ev.Handled = true;
                };
                menu.Items.Add(deleteMulti);
-                this.OpenContextMenu(menu);
+                menu?.Open(this);
            }
        }
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@ -117,7 +117,7 @@
                           TextDecorations="Underline"
                           Cursor="Hand"
                           Margin="0,0,16,0"
-                           PointerPressed="OnParentSHAPressed"/>
+                           PointerPressed="OnSHAPressed"/>
              </DataTemplate>
            </ItemsControl.ItemTemplate>
          </ItemsControl>
@ -135,13 +135,19 @@
          <!-- Messages -->
          <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Message}" VerticalAlignment="Top" Margin="0,4,0,0" />
-          <v:CommitMessagePresenter Grid.Row="3" Grid.Column="1" 
+          <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1" 
                                    Margin="12,5,8,0" 
                                    Classes="primary" 
                                    Message="{Binding #ThisControl.Message}"
                                    IssueTrackerRules="{Binding #ThisControl.IssueTrackerRules}"
                                    HorizontalAlignment="Stretch"
-                                    TextWrapping="Wrap"/>
+                                    TextWrapping="Wrap">
            <v:CommitMessagePresenter.Styles>
              <Style Selector="ToolTip">
                <Setter Property="MaxWidth" Value="800"/>
              </Style>
            </v:CommitMessagePresenter.Styles>
          </v:CommitMessagePresenter>
        </Grid>
      </StackPanel>
    </DataTemplate>
--- a/src/Views/CommitBaseInfo.axaml.cs
+++ b/src/Views/CommitBaseInfo.axaml.cs
@ -68,7 +68,7 @@ namespace SourceGit.Views
        private void OnOpenWebLink(object sender, RoutedEventArgs e)
        {
-            if (DataContext is ViewModels.CommitDetail detail)
+            if (DataContext is ViewModels.CommitDetail detail && sender is Control control)
            {
                var links = WebLinks;
                if (links.Count > 1)
@ -88,7 +88,7 @@ namespace SourceGit.Views
                        menu.Items.Add(item);
                    }
-                    (sender as Control)?.OpenContextMenu(menu);
+                    menu?.Open(control);
                }
                else if (links.Count == 1)
                {
@ -113,7 +113,7 @@ namespace SourceGit.Views
            e.Handled = true;
        }
-        private void OnParentSHAPressed(object sender, PointerPressedEventArgs e)
+        private void OnSHAPressed(object sender, PointerPressedEventArgs e)
        {
            if (DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha })
            {
--- a/src/Views/CommitChanges.axaml.cs
+++ b/src/Views/CommitChanges.axaml.cs
@ -16,7 +16,7 @@ namespace SourceGit.Views
                DataContext is ViewModels.CommitDetail vm)
            {
                var menu = vm.CreateChangeContextMenu(selected[0]);
-                view.OpenContextMenu(menu);
+                menu?.Open(view);
            }
            e.Handled = true;
--- a/src/Views/CommitDetail.axaml.cs
+++ b/src/Views/CommitDetail.axaml.cs
@ -26,7 +26,7 @@ namespace SourceGit.Views
            if (DataContext is ViewModels.CommitDetail detail && sender is Grid grid && grid.DataContext is Models.Change change)
            {
                var menu = detail.CreateChangeContextMenu(change);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
            }
            e.Handled = true;
--- a/src/Views/CommitMessagePresenter.cs
+++ b/src/Views/CommitMessagePresenter.cs
@ -176,7 +176,38 @@ namespace SourceGit.Views
                }
                else
                {
-                    Native.OS.OpenBrowser(_lastHover.Link);
+                    var point = e.GetCurrentPoint(this);
                    var link = _lastHover.Link;
                    if (point.Properties.IsLeftButtonPressed)
                    {
                        Native.OS.OpenBrowser(link);
                    }
                    else if (point.Properties.IsRightButtonPressed)
                    {
                        var open = new MenuItem();
                        open.Header = App.Text("IssueLinkCM.OpenInBrowser");
                        open.Icon = App.CreateMenuIcon("Icons.OpenWith");
                        open.Click += (_, ev) =>
                        {
                            Native.OS.OpenBrowser(link);
                            ev.Handled = true;
                        };
                        var copy = new MenuItem();
                        copy.Header = App.Text("IssueLinkCM.CopyLink");
                        copy.Icon = App.CreateMenuIcon("Icons.Copy");
                        copy.Click += (_, ev) =>
                        {
                            App.CopyText(link);
                            ev.Handled = true;
                        };
                        var menu = new ContextMenu();
                        menu.Items.Add(open);
                        menu.Items.Add(copy);
                        menu.Open(this);
                    }
                }
                e.Handled = true;
--- a/src/Views/CommitMessageTextBox.axaml.cs
+++ b/src/Views/CommitMessageTextBox.axaml.cs
@ -125,7 +125,7 @@ namespace SourceGit.Views
                DescriptionEditor.CaretIndex = 0;
                e.Handled = true;
            }
-            else if (e.Key == Key.V && ((OperatingSystem.IsMacOS() && e.KeyModifiers == KeyModifiers.Meta) || (!OperatingSystem.IsMacOS() && e.KeyModifiers == KeyModifiers.Control)))
+            else if (e.Key == Key.V && e.KeyModifiers == (OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
            {
                e.Handled = true;
--- a/src/Views/ContextMenuExtension.cs
+++ b/src/Views/ContextMenuExtension.cs
@ -1,26 +0,0 @@
 using System.ComponentModel;
 using Avalonia.Controls;
 namespace SourceGit.Views
 {
    public static class ContextMenuExtension
    {
        public static void OpenContextMenu(this Control control, ContextMenu menu)
        {
            if (menu == null)
                return;
            menu.PlacementTarget = control;
            menu.Closing += OnContextMenuClosing; // Clear context menu because it is dynamic.
            control.ContextMenu = menu;
            control.ContextMenu?.Open();
        }
        private static void OnContextMenuClosing(object sender, CancelEventArgs e)
        {
            if (sender is ContextMenu menu && menu.PlacementTarget != null)
                menu.PlacementTarget.ContextMenu = null;
        }
    }
 }
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@ -39,6 +39,9 @@
                    Command="{Binding IncrUnified}" 
                    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}"/>
              </Button.IsEnabled>
              <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Incr}"/>
            </Button>
@ -46,10 +49,26 @@
                    Width="32" 
                    Command="{Binding DecrUnified}" 
                    IsVisible="{Binding IsTextDiff}" 
-                    ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Decr}" 
+                    ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Decr}">
-                    IsEnabled="{Binding UnifiedLines, Converter={x:Static c:IntConverters.IsGreaterThanFour}}">
+              <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}"/>
                </MultiBinding>
              </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="32" Height="18"
                          Background="Transparent"
                          Padding="9,6"
                          Command="{Binding ToggleFullTextDiff}"
                          IsChecked="{Binding Source={x:Static vm:Preference.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"/>
            </ToggleButton>
            <ToggleButton Classes="line_path"
                          Width="32" Height="18"
@ -211,7 +230,9 @@
          <!-- Text Diff -->
          <DataTemplate DataType="m:TextDiff">
-            <v:TextDiffView UseSideBySideDiff="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"/>
+            <v:TextDiffView 
              UseSideBySideDiff="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"
              UseFullTextDiff="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFullTextDiff, Mode=OneWay}"/>
          </DataTemplate>
          <!-- Empty or only EOL changes -->
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@ -706,7 +706,7 @@ namespace SourceGit.Views
            if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems: { Count: > 0 } } list)
            {
                var menu = histories.MakeContextMenu(list);
-                list.OpenContextMenu(menu);
+                menu?.Open(list);
            }
            e.Handled = true;
        }
@ -722,19 +722,39 @@ namespace SourceGit.Views
        private void OnCommitListKeyDown(object sender, KeyEventArgs e)
        {
-            if (sender is ListBox { SelectedItems: { Count: > 0 } selected } &&
+            if (!e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
-                e.Key == Key.C &&
+                return;
-                e.KeyModifiers.HasFlag(KeyModifiers.Control))
+
            // These shortcuts are not mentioned in the Shortcut Reference window. Is this expected?
            if (sender is ListBox { SelectedItems: { Count: > 0 } selected })
            {
-                var builder = new StringBuilder();
+                // CTRL/COMMAND + C -> Copy selected commit SHA and subject.
-                foreach (var item in selected)
+                if (e.Key == Key.C)
                {
-                    if (item is Models.Commit commit)
+                    var builder = new StringBuilder();
-                        builder.AppendLine($"{commit.SHA.Substring(0, 10)} - {commit.Subject}");
+                    foreach (var item in selected)
                    {
                        if (item is Models.Commit commit)
                            builder.AppendLine($"{commit.SHA.Substring(0, 10)} - {commit.Subject}");
                    }
                    App.CopyText(builder.ToString());
                    e.Handled = true;
                    return;
                }
-                App.CopyText(builder.ToString());
+                // CTRL/COMMAND + B -> shows Create Branch pop-up at selected commit.
-                e.Handled = true;
+                if (e.Key == Key.B)
                {
                    if (selected.Count == 1 &&
                        selected[0] is Models.Commit commit &&
                        DataContext is ViewModels.Histories histories &&
                        ViewModels.PopupHost.CanCreatePopup())
                    {
                        ViewModels.PopupHost.ShowPopup(new ViewModels.CreateBranch(histories.Repo, commit));
                        e.Handled = true;
                    }
                }
            }
        }
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@ -71,7 +71,7 @@
                   FontSize="{Binding Source={x:Static vm:Preference.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" ColumnDefinitions="150,*">
+        <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}" />
@ -102,8 +102,20 @@
          <TextBlock Grid.Row="9" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Alt+Enter, macOS=⌥+Enter}"/>
          <TextBlock Grid.Row="9" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CommitAndPush}" />
-          <TextBlock Grid.Row="10" Grid.Column="0" Classes="primary bold" Text="F5"/>
+          <TextBlock Grid.Row="10" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Down, macOS=⌘+Down}"/>
-          <TextBlock Grid.Row="10" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Refresh}" />
+          <TextBlock Grid.Row="10" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Fetch}" />
          <TextBlock Grid.Row="11" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Down, macOS=⌘+⇧+Down}"/>
          <TextBlock Grid.Row="11" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Pull}" />
          <TextBlock Grid.Row="12" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Up, macOS=⌘+⇧+Up}"/>
          <TextBlock Grid.Row="12" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Push}" />
          <TextBlock Grid.Row="13" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+B, macOS=⌘+B}"/>
          <TextBlock Grid.Row="13" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CreateBranchOnCommit}" />
          <TextBlock Grid.Row="14" Grid.Column="0" Classes="primary bold" Text="F5"/>
          <TextBlock Grid.Row="14" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Refresh}" />
        </Grid>
        <TextBlock Text="{DynamicResource Text.Hotkeys.TextEditor}"
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@ -115,8 +115,7 @@ namespace SourceGit.Views
                return;
            }
-            if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Meta)) ||
+            if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
                (!OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Control)))
            {
                if (e.Key == Key.W)
                {
@ -250,7 +249,7 @@ namespace SourceGit.Views
            if (sender is Button btn && DataContext is ViewModels.Launcher launcher)
            {
                var menu = launcher.CreateContextForWorkspace();
-                btn.OpenContextMenu(menu);
+                menu?.Open(btn);
            }
            e.Handled = true;
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@ -5,6 +5,7 @@
             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.LauncherPage"
             x:DataType="vm:LauncherPage">
@ -38,103 +39,100 @@
        </ContentControl.DataTemplates>
      </ContentControl>
    </Border>
    <!-- Popup -->
    <Grid Grid.Row="1" IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}" ClipToBounds="True">
      <Border Background="Transparent" PointerPressed="OnPopupCancelByClickMask"/>
-      <Border Width="500" HorizontalAlignment="Center" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #8F000000)" CornerRadius="0,0,8,8" ClipToBounds="True">                
+    <!-- Floating -->
-        <ContentControl Content="{Binding Popup}" Background="{DynamicResource Brush.Popup}">
+    <Grid Grid.Row="1" ClipToBounds="True">
-          <ContentControl.DataTemplates>
+      <Grid.IsVisible>
-            <DataTemplate DataType="vm:Popup">  
+        <MultiBinding Converter="{x:Static BoolConverters.Or}">
-              <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
+          <Binding Path="Popup" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                <!-- Popup Widget -->
+          <Binding Path="Notifications.Count" Converter="{x:Static c:IntConverters.IsGreaterThanZero}"/>
-                <ContentPresenter Margin="8,16,8,8"
+        </MultiBinding>
-                                  Content="{Binding View}"
+      </Grid.IsVisible>
                                  IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
-                <!-- Options -->
+      <Border Background="Transparent"
-                <StackPanel Margin="8,4,8,8"
+              PointerPressed="OnMaskClicked"
-                            Height="32"
+              IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-                            Orientation="Horizontal"
+
-                            HorizontalAlignment="Right"
+      <Grid RowDefinitions="Auto,*" Width="512" HorizontalAlignment="Center">
-                            IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
+        <!-- Popup -->
-                  <Button Classes="flat primary"
+        <Border Grid.Row="0"
-                          Width="80" Height="28"
+                Margin="6,0"
-                          Padding="0"
+                Effect="drop-shadow(0 0 8 #8F000000)"
-                          HorizontalContentAlignment="Center"
+                CornerRadius="0,0,8,8"
-                          VerticalContentAlignment="Center"
+                ClipToBounds="True"
-                          Content="{DynamicResource Text.Sure}"
+                IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}">
-                          Click="OnPopupSure"
+          <ContentControl Content="{Binding Popup}" Background="{DynamicResource Brush.Popup}">
-                          HotKey="Enter"/>
+            <ContentControl.DataTemplates>
-                  <Button Classes="flat"
+              <DataTemplate DataType="vm:Popup">
-                          Width="80" Height="28"
+                <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
-                          Margin="8,0,0,0"
+                  <!-- Popup Widget -->
-                          Padding="0"
+                  <ContentPresenter Margin="8,16,8,8"
-                          HorizontalContentAlignment="Center"
+                                    Content="{Binding View}"
-                          VerticalContentAlignment="Center"
+                                    IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
-                          Content="{DynamicResource Text.Cancel}"
+
-                          Click="OnPopupCancel"/>
+                  <!-- Options -->
                  <StackPanel Margin="8,4,8,8"
                              Height="32"
                              Orientation="Horizontal"
                              HorizontalAlignment="Right"
                              IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
                    <Button Classes="flat primary"
                            Width="80" Height="28"
                            Padding="0"
                            HorizontalContentAlignment="Center"
                            VerticalContentAlignment="Center"
                            Content="{DynamicResource Text.Sure}"
                            Click="OnPopupSure"
                            HotKey="Enter"/>
                    <Button Classes="flat"
                            Width="80" Height="28"
                            Margin="8,0,0,0"
                            Padding="0"
                            HorizontalContentAlignment="Center"
                            VerticalContentAlignment="Center"
                            Content="{DynamicResource Text.Cancel}"
                            Click="OnPopupCancel"/>
                  </StackPanel>
                  <!-- Running -->
                  <v:PopupRunningStatus Margin="12,8"
                                        Description="{Binding ProgressDescription}"
                                        IsVisible="{Binding InProgress}"/>
                </StackPanel>
              </DataTemplate>
            </ContentControl.DataTemplates>
          </ContentControl>
        </Border>
-                <!-- Running -->
+        <!-- Notifications -->
-                <v:PopupRunningStatus Margin="12,8"
+        <ScrollViewer Grid.Row="1" Margin="0,6,0,0" VerticalAlignment="Top" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                                      Description="{Binding ProgressDescription}"
+          <ItemsControl ItemsSource="{Binding Notifications}">
-                                      IsVisible="{Binding InProgress}"/>
+            <ItemsControl.ItemTemplate>
-              </StackPanel>
+              <DataTemplate DataType="m:Notification">
-            </DataTemplate>
+                <Border Margin="6" HorizontalAlignment="Stretch" VerticalAlignment="Top" Effect="drop-shadow(0 0 12 #A0000000)">
-          </ContentControl.DataTemplates>
+                  <Border Padding="8" CornerRadius="6" Background="{DynamicResource Brush.Popup}">
-        </ContentControl>
+                    <Grid RowDefinitions="26,Auto">
-      </Border>
+                      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Margin="8,0">
-    </Grid>
+                        <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red" IsVisible="{Binding IsError}"/>
-    
+                        <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green" IsVisible="{Binding !IsError}"/>
-    <!-- Notification -->
+                        <TextBlock Grid.Column="1" Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Error}" IsVisible="{Binding IsError}"/>
-    <Grid Grid.Row="1" Width="480" HorizontalAlignment="Right" VerticalAlignment="Top">
+                        <TextBlock Grid.Column="1" Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Info}" IsVisible="{Binding !IsError}"/>
-      <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                        <Button Grid.Column="2" Classes="icon_button" Width="16" Height="16" Click="OnDismissNotification">
-        <ItemsControl ItemsSource="{Binding Notifications}">
+                          <Path Width="10" Height="10" Data="{StaticResource Icons.Window.Close}"/>
-          <ItemsControl.ItemTemplate>
+                        </Button> 
-            <DataTemplate DataType="m:Notification">
+                      </Grid>
              <Border Margin="10,6" HorizontalAlignment="Stretch" VerticalAlignment="Top" Effect="drop-shadow(0 0 12 #A0000000)">
                <Border Padding="8" CornerRadius="6" Background="{DynamicResource Brush.Popup}">
                  <Grid RowDefinitions="26,Auto,32">
                    <StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding IsError}">
                      <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
                      <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Error}"/>
                    </StackPanel>
                    <StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding !IsError}">
                      <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
                      <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Info}"/>
                    </StackPanel>
-                    <TextBox Grid.Row="1"
+                      <ScrollViewer Grid.Row="1" Margin="8" MaxHeight="100" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                             Classes="no_background no_border"
+                        <SelectableTextBlock TextWrapping="Wrap" Text="{Binding Message}"/>
-                             IsReadOnly="True"
+                      </ScrollViewer>
-                             TextWrapping="Wrap"
+                    </Grid>
-                             ScrollViewer.VerticalScrollBarVisibility="Auto"
+                  </Border>
                             MaxHeight="100"
                             Margin="8" Padding="0"
                             VerticalContentAlignment="Top"
                             Text="{Binding Message}"/>
                    <StackPanel Grid.Row="2" Margin="0,4,0,0" Orientation="Horizontal" HorizontalAlignment="Right">
                      <Button Classes="flat"
                              Margin="0,0,8,0"
                              Command="{Binding CopyMessage}"
                              Content="{DynamicResource Text.CopyMessage}"
                              IsVisible="{Binding IsError}"/>
                      <Button Classes="flat primary"
                              Margin="0,0"
                              Content="{DynamicResource Text.Close}"
                              Click="OnDismissNotification"/>
                    </StackPanel>
                  </Grid>
                </Border>
-              </Border>
+              </DataTemplate>
-            </DataTemplate>
+            </ItemsControl.ItemTemplate>
-          </ItemsControl.ItemTemplate>
+          </ItemsControl>
-        </ItemsControl>
+        </ScrollViewer>
-      </ScrollViewer>
+      </Grid>
    </Grid>
  </Grid>
 </UserControl>
--- a/src/Views/LauncherPage.axaml.cs
+++ b/src/Views/LauncherPage.axaml.cs
@ -27,7 +27,7 @@ namespace SourceGit.Views
            e.Handled = true;
        }
-        private void OnPopupCancelByClickMask(object sender, PointerPressedEventArgs e)
+        private void OnMaskClicked(object sender, PointerPressedEventArgs e)
        {
            OnPopupCancel(sender, e);
        }
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@ -234,7 +234,7 @@ namespace SourceGit.Views
            if (sender is Border border && DataContext is ViewModels.Launcher vm)
            {
                var menu = vm.CreateContextForPageTab(border.DataContext as ViewModels.LauncherPage);
-                border.OpenContextMenu(menu);
+                menu?.Open(border);
            }
            e.Handled = true;
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@ -121,7 +121,7 @@
          <TabItem.Header>
            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.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.Preference.Appearance.Theme}"
                       HorizontalAlignment="Right"
@ -170,10 +170,22 @@
                           Value="{Binding DefaultFontSize, Mode=TwoWay}"/>
            <TextBlock Grid.Row="4" Grid.Column="0"
                       Text="{DynamicResource Text.Preference.Appearance.EditorFontSize}"
                       HorizontalAlignment="Right"
                       Margin="0,0,16,0"/>
            <NumericUpDown Grid.Row="4" Grid.Column="1"
                           Minimum="10" Maximum="18" Increment="0.5"
                           Height="28"
                           Padding="4"
                           BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
                           CornerRadius="3"
                           Value="{Binding EditorFontSize, Mode=TwoWay}"/>
            <TextBlock Grid.Row="5" Grid.Column="0"
                       Text="{DynamicResource Text.Preference.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}">
@ -184,16 +196,16 @@
              </TextBox.InnerRightContent>
            </TextBox>
-            <CheckBox Grid.Row="5" Grid.Column="1"
+            <CheckBox Grid.Row="6" Grid.Column="1"
                      Content="{DynamicResource Text.Preference.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.Preference.Appearance.UseFixedTabWidth}"
                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
-            <CheckBox Grid.Row="7" Grid.Column="1"
+            <CheckBox Grid.Row="8" Grid.Column="1"
                      Height="32"
                      Content="{DynamicResource Text.Preference.Appearance.UseNativeWindowFrame}"
                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSystemWindowFrame, Mode=OneTime}"
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@ -189,7 +189,7 @@ namespace SourceGit.Views
            if (sender is ListBox { SelectedItem: Models.Submodule submodule } grid && DataContext is ViewModels.Repository repo)
            {
                var menu = repo.CreateContextMenuForSubmodule(submodule.Path);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
            }
            e.Handled = true;
@ -210,7 +210,7 @@ namespace SourceGit.Views
            if (sender is ListBox { SelectedItem: Models.Worktree worktree } grid && DataContext is ViewModels.Repository repo)
            {
                var menu = repo.CreateContextMenuForWorktree(worktree);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
            }
            e.Handled = true;
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@ -31,7 +31,7 @@
      </StackPanel>
      <StackPanel Grid.Column="1" Orientation="Horizontal">
-        <Button Classes="icon_button" Width="32" Click="Fetch">
+        <Button Classes="icon_button" Width="32" Click="Fetch" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}">
          <ToolTip.Tip>
            <StackPanel Orientation="Vertical">
              <TextBlock Text="{DynamicResource Text.Fetch}"/>
@ -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">
+        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}">
          <ToolTip.Tip>
            <StackPanel Orientation="Vertical">
              <TextBlock Text="{DynamicResource Text.Pull}"/>
@ -53,7 +53,7 @@
          <Path Width="14" Height="14" Data="{StaticResource Icons.Pull}"/>
        </Button>
-        <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Push">
+        <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}"/>
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@ -1,3 +1,5 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@ -17,7 +19,7 @@ namespace SourceGit.Views
            if (sender is Button button && DataContext is ViewModels.Repository repo)
            {
                var menu = repo.CreateContextMenuForExternalTools();
-                button.OpenContextMenu(menu);
+                menu?.Open(button);
                e.Handled = true;
            }
        }
@ -45,22 +47,43 @@ namespace SourceGit.Views
        private void Fetch(object _, RoutedEventArgs e)
        {
            var launcher = this.FindAncestorOfType<Launcher>();
-            (DataContext as ViewModels.Repository)?.Fetch(launcher?.HasKeyModifier(KeyModifiers.Control) ?? false);
+            if (launcher is not null && DataContext is ViewModels.Repository repo)
-            e.Handled = true;
+            {
                var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
                if (!startDirectly && OperatingSystem.IsMacOS())
                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
                repo.Fetch(startDirectly);
                e.Handled = true;
            }
        }
        private void Pull(object _, RoutedEventArgs e)
        {
            var launcher = this.FindAncestorOfType<Launcher>();
-            (DataContext as ViewModels.Repository)?.Pull(launcher?.HasKeyModifier(KeyModifiers.Control) ?? false);
+            if (launcher is not null && DataContext is ViewModels.Repository repo)
-            e.Handled = true;
+            {
                var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
                if (!startDirectly && OperatingSystem.IsMacOS())
                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
                repo.Pull(startDirectly);
                e.Handled = true;
            }
        }
        private void Push(object _, RoutedEventArgs e)
        {
            var launcher = this.FindAncestorOfType<Launcher>();
-            (DataContext as ViewModels.Repository)?.Push(launcher?.HasKeyModifier(KeyModifiers.Control) ?? false);
+            if (launcher is not null && DataContext is ViewModels.Repository repo)
-            e.Handled = true;
+            {
                var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
                if (!startDirectly && OperatingSystem.IsMacOS())
                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
                repo.Push(startDirectly);
                e.Handled = true;
            }
        }
        private void StashAll(object _, RoutedEventArgs e)
@ -72,10 +95,10 @@ namespace SourceGit.Views
        private void OpenGitFlowMenu(object sender, RoutedEventArgs e)
        {
-            if (DataContext is ViewModels.Repository repo)
+            if (DataContext is ViewModels.Repository repo && sender is Control control)
            {
                var menu = repo.CreateContextMenuForGitFlow();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
            }
            e.Handled = true;
@ -83,10 +106,10 @@ namespace SourceGit.Views
        private void OpenGitLFSMenu(object sender, RoutedEventArgs e)
        {
-            if (DataContext is ViewModels.Repository repo)
+            if (DataContext is ViewModels.Repository repo && sender is Control control)
            {
                var menu = repo.CreateContextMenuForGitLFS();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
            }
            e.Handled = true;
@ -94,10 +117,10 @@ namespace SourceGit.Views
        private void OpenCustomActionMenu(object sender, RoutedEventArgs e)
        {
-            if (DataContext is ViewModels.Repository repo)
+            if (DataContext is ViewModels.Repository repo && sender is Control control)
            {
                var menu = repo.CreateContextMenuForCustomAction();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
            }
            e.Handled = true;
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@ -35,21 +35,26 @@
  <Grid RowDefinitions="50,*" Margin="4">
    <!-- Compare Revision Info -->
-    <Grid Grid.Row="0" Margin="48,0,48,4" ColumnDefinitions="*,48,*">
+    <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">
      <!-- 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 Button -->
+      <!-- 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" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Compare}"/>
+        <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" IsVisible="{Binding CanSaveAsPatch}" ToolTip.Tip="{DynamicResource Text.Diff.SaveAsPatch}">
        <Path Width="16" Height="16" Data="{DynamicResource Icons.Diff}"/>
      </Button>
    </Grid>
    <!-- Changes View -->
--- a/src/Views/RevisionCompare.axaml.cs
+++ b/src/Views/RevisionCompare.axaml.cs
@ -1,5 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 namespace SourceGit.Views
 {
@ -15,7 +17,7 @@ namespace SourceGit.Views
            if (DataContext is ViewModels.RevisionCompare vm && sender is ChangeCollectionView view)
            {
                var menu = vm.CreateChangeContextMenu();
-                view.OpenContextMenu(menu);
+                menu?.Open(view);
            }
            e.Handled = true;
@ -28,5 +30,27 @@ namespace SourceGit.Views
            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.RevisionCompare;
            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)
                vm.SaveAsPatch(storageFile.Path.LocalPath);
            e.Handled = true;
        }
    }
 }
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@ -4,6 +4,7 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:m="using:SourceGit.Models"
             xmlns:v="using:SourceGit.Views"
             xmlns:vm="using:SourceGit.ViewModels"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
             x:Class="SourceGit.Views.RevisionFileContentViewer">
  <UserControl.DataTemplates>
@ -19,7 +20,9 @@
    </DataTemplate>
    <DataTemplate DataType="m:RevisionTextFile">
-      <v:RevisionTextFileView FontFamily="{DynamicResource Fonts.Monospace}" Background="{DynamicResource Brush.Contents}"/>
+      <v:RevisionTextFileView FontFamily="{DynamicResource Fonts.Monospace}"
                              FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
                              Background="{DynamicResource Brush.Contents}"/>
    </DataTemplate>
    <DataTemplate DataType="m:RevisionImageFile">
--- a/src/Views/RevisionFileTreeView.axaml.cs
+++ b/src/Views/RevisionFileTreeView.axaml.cs
@ -229,7 +229,7 @@ namespace SourceGit.Views
                if (obj.Type != Models.ObjectType.Tree)
                {
                    var menu = vm.CreateRevisionFileContextMenu(obj);
-                    grid.OpenContextMenu(menu);
+                    menu?.Open(grid);
                }
            }
--- a/src/Views/RevisionFiles.axaml.cs
+++ b/src/Views/RevisionFiles.axaml.cs
@ -95,8 +95,8 @@ namespace SourceGit.Views
            var menu = new ContextMenu();
            menu.Items.Add(copy);
            menu.Open(TextArea.TextView);
            TextArea.TextView.OpenContextMenu(menu);
            e.Handled = true;
        }
--- a/src/Views/StashesPage.axaml.cs
+++ b/src/Views/StashesPage.axaml.cs
@ -28,7 +28,7 @@ namespace SourceGit.Views
            if (DataContext is ViewModels.StashesPage vm && sender is Border border)
            {
                var menu = vm.MakeContextMenu(border.DataContext as Models.Stash);
-                border.OpenContextMenu(menu);
+                menu?.Open(border);
            }
            e.Handled = true;
        }
@ -38,7 +38,7 @@ namespace SourceGit.Views
            if (DataContext is ViewModels.StashesPage vm && sender is Grid grid)
            {
                var menu = vm.MakeContextMenuForChange(grid.DataContext as Models.Change);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
            }
            e.Handled = true;
        }
--- a/src/Views/TagsView.axaml.cs
+++ b/src/Views/TagsView.axaml.cs
@ -225,7 +225,7 @@ namespace SourceGit.Views
            if (selected != null && DataContext is ViewModels.Repository repo)
            {
                var menu = repo.CreateContextMenuForTag(selected);
-                control.OpenContextMenu(menu);
+                menu?.Open(control);
            }
            e.Handled = true;
--- a/src/Views/TextDiffView.axaml
+++ b/src/Views/TextDiffView.axaml
@ -23,6 +23,7 @@
                                       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}"
@ -44,6 +45,7 @@
                                           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="False"
                                           ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
@ -64,6 +66,7 @@
                                           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="False"
                                           ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@ -589,8 +589,8 @@ namespace SourceGit.Views
            var menu = new ContextMenu();
            menu.Items.Add(copy);
            menu.Open(TextArea.TextView);
            TextArea.TextView.OpenContextMenu(menu);
            e.Handled = true;
        }
@ -902,7 +902,7 @@ namespace SourceGit.Views
            var scroller = this.FindDescendantOfType<ScrollViewer>();
            if (scroller != null)
            {
-                scroller.Bind(ScrollViewer.OffsetProperty, new Binding("SyncScrollOffset", BindingMode.TwoWay));
+                scroller.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
                scroller.GotFocus += OnTextViewScrollGotFocus;
            }
        }
@ -1205,6 +1205,15 @@ namespace SourceGit.Views
            set => SetValue(UseSideBySideDiffProperty, value);
        }
        public static readonly StyledProperty<bool> UseFullTextDiffProperty =
            AvaloniaProperty.Register<TextDiffView, bool>(nameof(UseFullTextDiff));
        public bool UseFullTextDiff
        {
            get => GetValue(UseFullTextDiffProperty);
            set => SetValue(UseFullTextDiffProperty, value);
        }
        public static readonly StyledProperty<TextDiffViewChunk> SelectedChunkProperty =
            AvaloniaProperty.Register<TextDiffView, TextDiffViewChunk>(nameof(SelectedChunk));
@ -1236,15 +1245,12 @@ namespace SourceGit.Views
        {
            UseSideBySideDiffProperty.Changed.AddClassHandler<TextDiffView>((v, _) =>
            {
-                if (v.DataContext is Models.TextDiff diff)
+                v.RefreshContent(v.DataContext as Models.TextDiff, false);
-                {
+            });
                    diff.SyncScrollOffset = Vector.Zero;
-                    if (v.UseSideBySideDiff)
+            UseFullTextDiffProperty.Changed.AddClassHandler<TextDiffView>((v, _) =>
-                        v.Editor.Content = new ViewModels.TwoSideTextDiff(diff);
+            {
-                    else
+                v.RefreshContent(v.DataContext as Models.TextDiff, false);
                        v.Editor.Content = diff;
                }
            });
            SelectedChunkProperty.Changed.AddClassHandler<TextDiffView>((v, _) =>
@ -1271,25 +1277,7 @@ namespace SourceGit.Views
        protected override void OnDataContextChanged(EventArgs e)
        {
            base.OnDataContextChanged(e);
-
+            RefreshContent(DataContext as Models.TextDiff, true);
            if (SelectedChunk != null)
                SetCurrentValue(SelectedChunkProperty, null);
            var diff = DataContext as Models.TextDiff;
            if (diff == null)
            {
                Editor.Content = null;
                GC.Collect();
                return;
            }
            if (UseSideBySideDiff)
                Editor.Content = new ViewModels.TwoSideTextDiff(diff, Editor.Content as ViewModels.TwoSideTextDiff);
            else
                Editor.Content = diff;
            IsUnstagedChange = diff.Option.IsUnstaged;
            EnableChunkSelection = diff.Option.WorkingCopyChange != null;
        }
        protected override void OnPointerExited(PointerEventArgs e)
@ -1300,6 +1288,34 @@ namespace SourceGit.Views
                SetCurrentValue(SelectedChunkProperty, null);
        }
        private void RefreshContent(Models.TextDiff diff, bool keepScrollOffset = true)
        {
            if (SelectedChunk != null)
                SetCurrentValue(SelectedChunkProperty, null);
            if (diff == null)
            {
                Editor.Content = null;
                GC.Collect();
                return;
            }
            if (UseSideBySideDiff)
            {
                var previousContent = Editor.Content as ViewModels.TwoSideTextDiff;
                Editor.Content = new ViewModels.TwoSideTextDiff(diff, keepScrollOffset ? previousContent : null);
            }
            else
            {
                if (!keepScrollOffset)
                    diff.ScrollOffset = Vector.Zero;
                Editor.Content = diff;
            }
            IsUnstagedChange = diff.Option.IsUnstaged;
            EnableChunkSelection = diff.Option.WorkingCopyChange != null;
        }
        private void OnStageChunk(object _1, RoutedEventArgs _2)
        {
            var chunk = SelectedChunk;
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@ -117,7 +117,7 @@ namespace SourceGit.Views
            if (sender is Grid { DataContext: ViewModels.RepositoryNode node } grid)
            {
                var menu = ViewModels.Welcome.Instance.CreateContextMenu(node);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
                e.Handled = true;
            }
        }
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@ -31,27 +31,27 @@ namespace SourceGit.Views
            {
                var menu = vm.CreateContextMenuForCommitMessages();
                menu.Placement = PlacementMode.TopEdgeAlignedLeft;
-                button.OpenContextMenu(menu);
+                menu?.Open(button);
                e.Handled = true;
            }
        }
        private void OnUnstagedContextRequested(object sender, ContextRequestedEventArgs e)
        {
-            if (DataContext is ViewModels.WorkingCopy vm)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control)
            {
                var menu = vm.CreateContextMenuForUnstagedChanges();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
                e.Handled = true;
            }
        }
        private void OnStagedContextRequested(object sender, ContextRequestedEventArgs e)
        {
-            if (DataContext is ViewModels.WorkingCopy vm)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control)
            {
                var menu = vm.CreateContextMenuForStagedChanges();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
                e.Handled = true;
            }
        }
@ -136,10 +136,10 @@ namespace SourceGit.Views
        private void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
        {
-            if (DataContext is ViewModels.WorkingCopy vm)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control)
            {
                var menu = vm.CreateContextForOpenAI();
-                (sender as Button)?.OpenContextMenu(menu);
+                menu?.Open(control);
            }
            e.Handled = true;
Author	SHA1	Message	Date
leo	13805f794a	Merge branch 'develop'	2024-11-11 10:29:09 +08:00
github-actions[bot]	79c1fb63d0	doc: Update translation status and missing keys	2024-11-11 02:26:54 +00:00
leo	82320f3494	revert: PR #673 * the `Commands.QueryCommitChildren` takes too much time when executes in a large repo Signed-off-by: leo <longshuang@msn.cn>	2024-11-11 10:26:34 +08:00
leo	a969bd9c99	Merge branch 'master' into develop	2024-11-11 09:56:14 +08:00
leo	3ee56ddd29	Merge branch 'release/v8.38'	2024-11-11 09:55:55 +08:00
leo	7df6d32ad2	version: release 8.38 Signed-off-by: leo <longshuang@msn.cn>	2024-11-11 09:55:40 +08:00
leo	67cf23267a	feature: supports open selected revision file with default editor (#674 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-11 09:37:42 +08:00
github-actions[bot]	06656f625e	doc: Update translation status and missing keys	2024-11-11 01:31:18 +00:00
leo	bbac6c1478	code_review: PR #673 * add translations for zh_CN and zh_TW * hide `CHILDREN` line if it is empty Signed-off-by: leo <longshuang@msn.cn>	2024-11-11 09:31:04 +08:00
github-actions[bot]	055835cac2	doc: Update translation status and missing keys	2024-11-11 01:25:03 +00:00
Dmitrij D. Czarkoff	03f96cc9f8	feature: add children list to the commit base info view (#673 )	2024-11-11 09:24:49 +08:00
github-actions[bot]	e2e79fe1b3	doc: Update translation status and missing keys	2024-11-11 01:19:53 +00:00
Bernat Borràs Civil	8b3212e287	localization: update spanish translation (#676 )	2024-11-11 09:19:41 +08:00
leo	8de37720fa	code_style: remove Rider warnings Some checks are pending Continuous Integration / Build (push) Waiting to run Details Continuous Integration / Prepare version string (push) Waiting to run Details Continuous Integration / Package (push) Blocked by required conditions Details Localization Check / localization-check (push) Waiting to run Details Signed-off-by: leo <longshuang@msn.cn>	2024-11-10 13:19:25 +08:00
leo	daba8e5064	code_review: PR #672 * use formatted string instead of `CommitUrlTitle` Signed-off-by: leo <longshuang@msn.cn>	2024-11-10 13:19:05 +08:00
Dmitrij D. Czarkoff	bbfc94d624	enhance: several commit links improvements (#672 ) * Codeberge (https://codeberg.org/) * Gitea (https://gitea.org/) * sourcehut (https://git.sr.ht/)	2024-11-10 12:56:08 +08:00
github-actions[bot]	96c2d0b3ca	doc: Update translation status and missing keys	2024-11-10 04:51:30 +00:00
Dmitrij D. Czarkoff	4924e960bf	feature: allow merging tags into branches (#671 ) Adds "Merge {tag} into {branch}" menu item to tag menu in histories. The rest is handled by already existing merge code.	2024-11-10 12:51:15 +08:00
github-actions[bot]	b974436c8a	doc: Update translation status and missing keys Some checks failed Continuous Integration / Build (push) Has been cancelled Details Continuous Integration / Prepare version string (push) Has been cancelled Details Localization Check / localization-check (push) Has been cancelled Details Continuous Integration / Package (push) Has been cancelled Details	2024-11-08 13:25:59 +00:00
Katharina Sternbauer	3b4e037547	add missing german localization for v8.37 (#664 ) Add the missing keys in the German translation file.	2024-11-08 21:25:47 +08:00
github-actions[bot]	467371d585	doc: Update translation status and missing keys	2024-11-08 13:25:36 +00:00
Fernando Medeiros	f47f1ac070	Adding missing pt_BR translation keys (#668 )	2024-11-08 21:25:20 +08:00
Nils van Rijsinge	1877e37c9c	localization: adjust 4 DE translations (#665 ) - use formulation of conventionalcommits.org - "Aktiviere" was also used for other keys instead of "einschalten"	2024-11-08 19:24:51 +08:00
github-actions[bot]	f3d377fa59	doc: Update translation status and missing keys	2024-11-08 11:24:12 +00:00
AquariusStar	bfe824bbfc	update translation for russian (#666 )	2024-11-08 19:23:59 +08:00
github-actions[bot]	9d054a3dbf	doc: Update translation status and missing keys Some checks are pending Continuous Integration / Build (push) Waiting to run Details Continuous Integration / Prepare version string (push) Waiting to run Details Continuous Integration / Package (push) Blocked by required conditions Details Localization Check / localization-check (push) Waiting to run Details	2024-11-07 09:52:43 +00:00
leo	ef84891df1	feature: add new `Editor Font Size` configuration for all text editors (#661 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-07 17:52:23 +08:00
leo	ffeb63613c	fix: ignoring new files under folder creates invalid .gitignore entries (#663 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-07 17:18:04 +08:00
leo	243ce8b06d	project: use default optimization settings Signed-off-by: leo <longshuang@msn.cn>	2024-11-07 11:31:51 +08:00
github-actions[bot]	4675b6edb8	doc: Update translation status and missing keys	2024-11-07 03:11:52 +00:00
leo	a919da6b4a	code_style: remove unused code and resources Signed-off-by: leo <longshuang@msn.cn>	2024-11-07 11:11:35 +08:00
leo	45f4a5a4b1	ux: layout of floating panels (commands and notifications) (#659 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-07 11:07:47 +08:00
leo	88cec05e67	ux: do not use OpenAI logo Some checks are pending Continuous Integration / Build (push) Waiting to run Details Continuous Integration / Prepare version string (push) Waiting to run Details Continuous Integration / Package (push) Blocked by required conditions Details Localization Check / localization-check (push) Waiting to run Details Signed-off-by: leo <longshuang@msn.cn>	2024-11-06 14:50:25 +08:00
github-actions[bot]	a715143a16	doc: Update translation status and missing keys	2024-11-06 04:36:13 +00:00
leo	9cb85081ab	feature: saving as patch supports multiple commits (#658 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-06 12:35:55 +08:00
leo	c72506d939	code_style: simplify the way detacting system preferred command key Signed-off-by: leo <longshuang@msn.cn>	2024-11-06 10:36:10 +08:00
leo	d50b2c0298	code_review: PR #657 * add hotkey `Ctrl+Down/⌘+Down` to fetch directly * keep translation keys of en_US in order * add translations for zh_CN and zh_TW * do NOT using namespace under `SourceGit` * use `⇧` instead of `Shift` in hotkey tips * hotkey mismatch on macOS * hotkeys to start fetch/pull/push directly not work on macOS * remove the hotkey of `Create Branch` context menu item - there are other objects (such as branch and tag) also have the `Create Branch` context menu item without hotkeys - on macOS, we already use `⌘+B` to create branch with selected commit, not `Ctrl + B` Signed-off-by: leo <longshuang@msn.cn>	2024-11-06 10:25:44 +08:00
github-actions[bot]	dc49c1bf76	doc: Update translation status and missing keys	2024-11-06 01:15:14 +00:00
Fernando Medeiros	2e6eca26f7	Adding hotkeys for creating branch, pushing and pulling (#657 )	2024-11-06 09:14:56 +08:00
leo	fdf30aa7cc	fix: custom action error message format Some checks are pending Continuous Integration / Package (push) Blocked by required conditions Details Continuous Integration / Build (push) Waiting to run Details Continuous Integration / Prepare version string (push) Waiting to run Details Localization Check / localization-check (push) Waiting to run Details Signed-off-by: leo <longshuang@msn.cn>	2024-11-05 12:24:33 +08:00
leo	680cdca28d	feature: handle custom action error output Signed-off-by: leo <longshuang@msn.cn>	2024-11-05 12:15:20 +08:00
leo	9d2c2df6b3	ux: issue link tooltip max width Signed-off-by: leo <longshuang@msn.cn>	2024-11-05 11:00:04 +08:00
github-actions[bot]	c337d67bbe	doc: Update translation status and missing keys	2024-11-05 01:48:51 +00:00
Bernat Borràs Civil	8f5dfcc209	Add missing translations in spanish (#655 )	2024-11-05 09:48:37 +08:00
leo	dcf5093406	enhance: avoid that diff view refresh more than one times Some checks are pending Continuous Integration / Build (push) Waiting to run Details Continuous Integration / Prepare version string (push) Waiting to run Details Continuous Integration / Package (push) Blocked by required conditions Details Localization Check / localization-check (push) Waiting to run Details Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 18:21:07 +08:00
github-actions[bot]	a5aa2254f6	doc: Update translation status and missing keys	2024-11-04 08:49:32 +00:00
leo	6209326fe0	code_review: PR #652 * update localization for zh_CN and zh_TW * change the icon for `Icons.Lines.All` * reorder diff view toolbar buttons * move private methods after protected Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 16:49:15 +08:00
github-actions[bot]	8d4afafd2d	doc: Update translation status and missing keys	2024-11-04 08:33:05 +00:00
Göran W	1a8acbf934	feature: diff - toggle show all lines (#615 ) (#652 ) * Renamed 1 of 2 SyncScrollOffset props, for clarity The property "SyncScrollOffset" in TextDiff is distinct from the one with the same name in TwoSideTextDiff. These two properties are used in separate (though slightly related) ways and are not really connected. The one in TwoSideTextDiff is mainly used to keep the scroll-pos of the two SingleSideTextDiffPresenter views in sync (aligned), while the one in TextDiff is used only to preserve/reset the scroll-pos in the single CombinedTextDiffPresenter view when (re)loading Diff Content (so not really syncing anything). To clarify this and to make the two properties more distinguishable, I renamed the one in TextDiff to simply "ScrollOffset". * Added icon and string for "Show All Lines" New StreamGeometry "Icons.Lines.All" using SVG path from "text_line_spacing_regular" at https://avaloniaui.github.io/icons.html. New String "Text.Diff.VisualLines.All" for en_US locale (no translations yet). * Implemented new TextDiff feature "Show All Lines" (toggle) * Added new ToggleButton in DiffView toolbar, visible when IsTextDiff, disabling the buttons "Increase/Decrease Number of Visible Lines" when on. * Added new Preference property "UseFullTextDiff". * Added StyledProperty "UseFullTextDiffProperty" in TextDiffView, with a DataTemplate binding to the corresponding preference property. * When changed, UseFullTextDiffProperty is handled identically as UseSideBySideDiffProperty (via new helper method RefreshContent(), for unification with OnDataContextChanged()). * Added new method DiffContext.ToggleFullTextDiff() for changing the preference property and reloading the diff content. * Implemented the new feature by overriding the "unified" (number of context lines) for Commands.Diff() with a very high number. NOTE: The number used (~1 billion) is supposed to be the highest one working on Mac, according to this forum comment: https://stackoverflow.com/questions/28727424/for-git-diff-is-there-a-uinfinity-option-to-show-the-whole-file#comment135202820_28846576	2024-11-04 16:32:51 +08:00
leo	779b38be28	localization: change `OpenAI` to `AI` Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 16:04:19 +08:00
leo	ad01eb442d	localization: change `OpenAI` to `AI` Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 16:00:40 +08:00
leo	635396008d	fix: clicking `Open in Browser` context menu item of issue link does not work (#651 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 15:48:28 +08:00
github-actions[bot]	2f628b0f06	doc: Update translation status and missing keys	2024-11-04 07:35:07 +00:00
leo	fb9e342ee0	localization: add translations for zh_CN and zh_TW Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 15:34:50 +08:00
github-actions[bot]	25028efa4d	doc: Update translation status and missing keys	2024-11-04 07:32:24 +00:00
leo	163e8cc0a4	feature: add context menu for issue link in commit details panel (#651 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 15:31:55 +08:00
leo	64860950c7	localization: update en_US Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 12:03:47 +08:00
leo	310c786693	feature: ignore case when finding visual studio solution file Signed-off-by: leo <longshuang@msn.cn>	2024-11-04 11:54:18 +08:00
leo	921b8599df	Merge branch 'master' into develop	2024-11-04 10:07:37 +08:00