diff --git a/TRANSLATION.md b/TRANSLATION.md
index 4a49828a..f338da12 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -10,7 +10,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-94.11%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-94.31%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -46,9 +46,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.No
 - Text.OpenFile
@@ -74,7 +72,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-92.01%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-92.20%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -126,9 +124,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.No
 - Text.Open
@@ -158,7 +154,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-89.48%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-89.67%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -223,9 +219,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.No
 - Text.Open
@@ -266,7 +260,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-72.13%25-red)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-72.29%25-red)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -425,9 +419,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.MoveSubmodule
 - Text.MoveSubmodule.MoveTo
@@ -539,7 +531,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-92.32%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-92.52%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -586,9 +578,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.No
 - Text.Open
@@ -620,7 +610,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-69.93%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-70.07%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -773,9 +763,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.MergeMultiple
 - Text.MergeMultiple.CommitChanges
@@ -914,7 +902,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-97.48%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-97.68%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
@@ -936,9 +924,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.Repository.Resolve
 - Text.WorkingCopy.Conflicts.Merge
@@ -946,7 +932,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-72.24%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-72.39%25-red)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -1105,9 +1091,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.MoveSubmodule
 - Text.MoveSubmodule.MoveTo
@@ -1218,7 +1202,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-73.08%25-red)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-73.23%25-red)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1373,9 +1357,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MergeConflictEditor.Title
 - Text.MergeConflictEditor.UnsavedChanges
 - Text.MergeConflictEditor.UseMine
-- Text.MergeConflictEditor.UseMine.Tip
 - Text.MergeConflictEditor.UseTheirs
-- Text.MergeConflictEditor.UseTheirs.Tip
 - Text.MergeConflictEditor.Undo
 - Text.MoveSubmodule
 - Text.MoveSubmodule.MoveTo
@@ -1482,22 +1464,6 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.79%25-yellow)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in zh_CN.axaml</summary>
-
-- Text.MergeConflictEditor.UseMine.Tip
-- Text.MergeConflictEditor.UseTheirs.Tip
-
-</details>
-
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.79%25-yellow)
-
-<details>
-<summary>Missing keys in zh_TW.axaml</summary>
-
-- Text.MergeConflictEditor.UseMine.Tip
-- Text.MergeConflictEditor.UseTheirs.Tip
-
-</details>
\ No newline at end of file
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 9d4e0c07..a3fd5c17 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -556,9 +556,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.MergeConflictEditor.Title" xml:space="preserve">Merge-Konflikt – {0}</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UnsavedChanges" xml:space="preserve">Ungespeicherte Änderungen verwerfen?</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseMine" xml:space="preserve">MEINE VERWENDEN</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.UseMine.Tip" xml:space="preserve">Aktuellen Konflikt mit meiner Version lösen</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseTheirs" xml:space="preserve">DEREN VERWENDEN</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.UseTheirs.Tip" xml:space="preserve">Aktuellen Konflikt mit deren Version lösen</x:String>
   <x:String x:Key="Text.MergeConflictEditor.Undo" xml:space="preserve">RÜCKGÄNGIG MACHEN</x:String>
   <x:String x:Key="Text.MergeMultiple" xml:space="preserve">Merge (mehrere)</x:String>
   <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Alle Änderungen committen</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 9e70e309..7180e8e4 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -556,9 +556,7 @@
   <x:String x:Key="Text.MergeConflictEditor.Title" xml:space="preserve">Conflictos de Merge</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UnsavedChanges" xml:space="preserve">¿Descartar cambios sin guardar?</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseMine" xml:space="preserve">USAR MÍOS</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.UseMine.Tip" xml:space="preserve">Resolver el conflicto actual usando Mi versión</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseTheirs" xml:space="preserve">USAR SUYOS</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.UseTheirs.Tip" xml:space="preserve">Resolver el conflicto actual usando Su versión</x:String>
   <x:String x:Key="Text.MergeConflictEditor.Undo" xml:space="preserve">DESHACER</x:String>
   <x:String x:Key="Text.MergeMultiple" xml:space="preserve">Merge (Multiple)</x:String>
   <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">Commit todos los cambios</x:String>