diff --git a/TRANSLATION.md b/TRANSLATION.md
index 83ebcaa8..45f75642 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
### 
-### 
+### 
Missing keys in de_DE.axaml
@@ -20,16 +20,36 @@ This document shows the translation status of each locale file in the repository
- Text.Compare.WithHead
- Text.Configure.Git.AskBeforeAutoUpdatingSubmodules
- Text.No
+- Text.OpenInBuiltinMergeTool
- Text.Repository.OpenAsFolder
- Text.Repository.Resolve
- Text.TagCM.CompareTwo
- Text.TagCM.CompareWith
- Text.TagCM.CompareWithHead
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.Yes
-### 
+### 
Missing keys in es_ES.axaml
@@ -44,16 +64,36 @@ This document shows the translation status of each locale file in the repository
- Text.Configure.Git.AskBeforeAutoUpdatingSubmodules
- Text.Hotkeys.Global.Zoom
- Text.No
+- Text.OpenInBuiltinMergeTool
- Text.Repository.OpenAsFolder
- Text.Repository.Resolve
- Text.TagCM.CompareTwo
- Text.TagCM.CompareWith
- Text.TagCM.CompareWithHead
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.Yes
-### 
+### 
Missing keys in fr_FR.axaml
@@ -75,6 +115,7 @@ This document shows the translation status of each locale file in the repository
- Text.Hotkeys.Global.Zoom
- Text.No
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.DiffMerge.DiffArgs
@@ -91,11 +132,30 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CompareTwo
- Text.TagCM.CompareWith
- Text.TagCM.CompareWithHead
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.Yes
-### 
+### 
Missing keys in id_ID.axaml
@@ -135,6 +195,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.DiffMerge.DiffArgs
@@ -153,11 +214,30 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CompareTwo
- Text.TagCM.CompareWith
- Text.TagCM.CompareWithHead
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.Yes
-### 
+### 
Missing keys in it_IT.axaml
@@ -210,6 +290,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.AI.ReadApiKeyFromEnv
@@ -235,15 +316,34 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CompareTwo
- Text.TagCM.CompareWith
- Text.TagCM.CompareWithHead
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
- Text.WorkingCopy.ClearCommitHistories
- Text.WorkingCopy.ClearCommitHistories.Confirm
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.WorkingCopy.NoVerify
- Text.Worktree.Open
- Text.Yes
-### 
+### 
Missing keys in ja_JP.axaml
@@ -393,6 +493,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.AI.ReadApiKeyFromEnv
@@ -474,6 +575,24 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CopyName
- Text.TagCM.CustomAction
- Text.TagCM.DeleteMultiple
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
- Text.ViewLogs
- Text.ViewLogs.Clear
@@ -484,6 +603,7 @@ This document shows the translation status of each locale file in the repository
- Text.WorkingCopy.ClearCommitHistories.Confirm
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
- Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
- Text.WorkingCopy.Conflicts.UseMine
@@ -495,7 +615,7 @@ This document shows the translation status of each locale file in the repository
-### 
+### 
Missing keys in ko_KR.axaml
@@ -530,6 +650,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.Appearance.UseFixedTabWidth
@@ -550,11 +671,30 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CompareTwo
- Text.TagCM.CompareWith
- Text.TagCM.CompareWithHead
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.Yes
-### 
+### 
Missing keys in pt_BR.axaml
@@ -702,6 +842,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.AI.ReadApiKeyFromEnv
@@ -804,6 +945,24 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CopyName
- Text.TagCM.CustomAction
- Text.TagCM.DeleteMultiple
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
- Text.ViewLogs
- Text.ViewLogs.Clear
@@ -815,6 +974,7 @@ This document shows the translation status of each locale file in the repository
- Text.WorkingCopy.CommitToEdit
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
- Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
- Text.WorkingCopy.Conflicts.UseMine
@@ -827,17 +987,37 @@ This document shows the translation status of each locale file in the repository
-### 
+### 
Missing keys in ru_RU.axaml
- Text.Blame.IgnoreWhitespace
+- Text.OpenInBuiltinMergeTool
- Text.Repository.Resolve
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
-### 
+### 
Missing keys in ta_IN.axaml
@@ -987,6 +1167,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.AI.ReadApiKeyFromEnv
@@ -1067,6 +1248,24 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CopyName
- Text.TagCM.CustomAction
- Text.TagCM.DeleteMultiple
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
- Text.UpdateSubmodules.Target
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
- Text.ViewLogs
@@ -1077,6 +1276,7 @@ This document shows the translation status of each locale file in the repository
- Text.WorkingCopy.ClearCommitHistories
- Text.WorkingCopy.ClearCommitHistories.Confirm
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
- Text.WorkingCopy.Conflicts.UseMine
@@ -1088,7 +1288,7 @@ This document shows the translation status of each locale file in the repository
-### 
+### 
Missing keys in uk_UA.axaml
@@ -1234,6 +1434,7 @@ This document shows the translation status of each locale file in the repository
- Text.Open
- Text.Open.SystemDefaultEditor
- Text.OpenFile
+- Text.OpenInBuiltinMergeTool
- Text.PageTabBar.Tab.MoveToWorkspace
- Text.PageTabBar.Tab.Refresh
- Text.Preferences.AI.ReadApiKeyFromEnv
@@ -1314,6 +1515,24 @@ This document shows the translation status of each locale file in the repository
- Text.TagCM.CopyName
- Text.TagCM.CustomAction
- Text.TagCM.DeleteMultiple
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
- Text.ViewLogs
- Text.ViewLogs.Clear
@@ -1323,6 +1542,7 @@ This document shows the translation status of each locale file in the repository
- Text.WorkingCopy.ClearCommitHistories
- Text.WorkingCopy.ClearCommitHistories.Confirm
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
- Text.WorkingCopy.NoVerify
- Text.WorkingCopy.ResetAuthor
- Text.Worktree.Open
@@ -1330,6 +1550,58 @@ This document shows the translation status of each locale file in the repository
-### 
+### 
-### 
\ No newline at end of file
+
+Missing keys in zh_CN.axaml
+
+- Text.OpenInBuiltinMergeTool
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
+
+
+
+### 
+
+
+Missing keys in zh_TW.axaml
+
+- Text.OpenInBuiltinMergeTool
+- Text.MergeConflictEditor.AcceptBoth.MineFirst
+- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
+- Text.MergeConflictEditor.UseBoth
+- Text.MergeConflictEditor.AllResolved
+- Text.MergeConflictEditor.ConflictsRemaining
+- Text.MergeConflictEditor.Mine
+- Text.MergeConflictEditor.NextConflict
+- Text.MergeConflictEditor.PrevConflict
+- Text.MergeConflictEditor.Result
+- Text.MergeConflictEditor.SaveAndStage
+- Text.MergeConflictEditor.Theirs
+- Text.MergeConflictEditor.Title
+- Text.MergeConflictEditor.UnsavedChanges
+- Text.MergeConflictEditor.UseMine
+- Text.MergeConflictEditor.UseMine.Tip
+- Text.MergeConflictEditor.UseTheirs
+- Text.MergeConflictEditor.UseTheirs.Tip
+- Text.MergeConflictEditor.Undo
+- Text.WorkingCopy.Conflicts.OpenBuiltinMergeTool
+
+
\ No newline at end of file