diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0a469262..aee13ea5 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-97.86%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-97.34%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -27,10 +27,14 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.General.ShowTagsInGraph
 - Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.20%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-98.67%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
@@ -41,10 +45,14 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.20%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-98.67%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -55,10 +63,14 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-98.93%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-98.40%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -71,10 +83,14 @@ This document shows the translation status of each locale file in the repository
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-98.93%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-98.40%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -87,10 +103,14 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-90.24%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-89.76%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -167,11 +187,15 @@ This document shows the translation status of each locale file in the repository
 - Text.StashCM.SaveAsPatch
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.20%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-98.67%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
@@ -182,9 +206,33 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.WorkingCopy.ConfirmCommitWithFilter
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-99.47%25-yellow)
 
-### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file
+<details>
+<summary>Missing keys in zh_CN.axaml</summary>
+
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
+
+</details>
+
+### ![zh__TW](https://img.shields.io/badge/zh__TW-99.47%25-yellow)
+
+<details>
+<summary>Missing keys in zh_TW.axaml</summary>
+
+- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
+- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
+- Text.WorkingCopy.Conflicts.UseMine
+- Text.WorkingCopy.Conflicts.UseTheirs
+
+</details>
\ No newline at end of file