@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
66
77### ![ en_US] ( https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen )
88
9- ### ![ de__ DE] ( https://img.shields.io/badge/de__DE-97.86 %25-yellow )
9+ ### ![ de__ DE] ( https://img.shields.io/badge/de__DE-97.34 %25-yellow )
1010
1111<details >
1212<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
2727- Text.Preferences.General.ShowTagsInGraph
2828- Text.StashCM.SaveAsPatch
2929- Text.WorkingCopy.ConfirmCommitWithFilter
30+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
31+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
32+ - Text.WorkingCopy.Conflicts.UseMine
33+ - Text.WorkingCopy.Conflicts.UseTheirs
3034
3135</details >
3236
33- ### ![ es__ ES] ( https://img.shields.io/badge/es__ES-99.20 %25-yellow )
37+ ### ![ es__ ES] ( https://img.shields.io/badge/es__ES-98.67 %25-yellow )
3438
3539<details >
3640<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
4145- Text.ConfirmEmptyCommit.Continue
4246- Text.ConfirmEmptyCommit.StageAllThenCommit
4347- Text.WorkingCopy.ConfirmCommitWithFilter
48+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
49+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
50+ - Text.WorkingCopy.Conflicts.UseMine
51+ - Text.WorkingCopy.Conflicts.UseTheirs
4452
4553</details >
4654
47- ### ![ fr__ FR] ( https://img.shields.io/badge/fr__FR-99.20 %25-yellow )
55+ ### ![ fr__ FR] ( https://img.shields.io/badge/fr__FR-98.67 %25-yellow )
4856
4957<details >
5058<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
5563- Text.ConfirmEmptyCommit.Continue
5664- Text.ConfirmEmptyCommit.StageAllThenCommit
5765- Text.WorkingCopy.ConfirmCommitWithFilter
66+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
67+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
68+ - Text.WorkingCopy.Conflicts.UseMine
69+ - Text.WorkingCopy.Conflicts.UseTheirs
5870
5971</details >
6072
61- ### ![ it__ IT] ( https://img.shields.io/badge/it__IT-98.93 %25-yellow )
73+ ### ![ it__ IT] ( https://img.shields.io/badge/it__IT-98.40 %25-yellow )
6274
6375<details >
6476<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
7183- Text.CopyFullPath
7284- Text.Preferences.General.ShowTagsInGraph
7385- Text.WorkingCopy.ConfirmCommitWithFilter
86+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
87+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
88+ - Text.WorkingCopy.Conflicts.UseMine
89+ - Text.WorkingCopy.Conflicts.UseTheirs
7490
7591</details >
7692
77- ### ![ ja__ JP] ( https://img.shields.io/badge/ja__JP-98.93 %25-yellow )
93+ ### ![ ja__ JP] ( https://img.shields.io/badge/ja__JP-98.40 %25-yellow )
7894
7995<details >
8096<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
87103- Text.Repository.FilterCommits
88104- Text.Repository.Tags.OrderByNameDes
89105- Text.WorkingCopy.ConfirmCommitWithFilter
106+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
107+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
108+ - Text.WorkingCopy.Conflicts.UseMine
109+ - Text.WorkingCopy.Conflicts.UseTheirs
90110
91111</details >
92112
93- ### ![ pt__ BR] ( https://img.shields.io/badge/pt__BR-90.24 %25-yellow )
113+ ### ![ pt__ BR] ( https://img.shields.io/badge/pt__BR-89.76 %25-yellow )
94114
95115<details >
96116<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
167187- Text.StashCM.SaveAsPatch
168188- Text.WorkingCopy.CommitToEdit
169189- Text.WorkingCopy.ConfirmCommitWithFilter
190+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
191+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
192+ - Text.WorkingCopy.Conflicts.UseMine
193+ - Text.WorkingCopy.Conflicts.UseTheirs
170194- Text.WorkingCopy.SignOff
171195
172196</details >
173197
174- ### ![ ru__ RU] ( https://img.shields.io/badge/ru__RU-99.20 %25-yellow )
198+ ### ![ ru__ RU] ( https://img.shields.io/badge/ru__RU-98.67 %25-yellow )
175199
176200<details >
177201<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
182206- Text.ConfirmEmptyCommit.Continue
183207- Text.ConfirmEmptyCommit.StageAllThenCommit
184208- Text.WorkingCopy.ConfirmCommitWithFilter
209+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
210+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
211+ - Text.WorkingCopy.Conflicts.UseMine
212+ - Text.WorkingCopy.Conflicts.UseTheirs
185213
186214</details >
187215
188- ### ![ zh__ CN] ( https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen )
216+ ### ![ zh__ CN] ( https://img.shields.io/badge/zh__CN-99.47%25-yellow )
189217
190- ### ![ zh__ TW] ( https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen )
218+ <details >
219+ <summary >Missing keys in zh_CN.axaml</summary >
220+
221+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
222+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
223+ - Text.WorkingCopy.Conflicts.UseMine
224+ - Text.WorkingCopy.Conflicts.UseTheirs
225+
226+ </details >
227+
228+ ### ![ zh__ TW] ( https://img.shields.io/badge/zh__TW-99.47%25-yellow )
229+
230+ <details >
231+ <summary >Missing keys in zh_TW.axaml</summary >
232+
233+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
234+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
235+ - Text.WorkingCopy.Conflicts.UseMine
236+ - Text.WorkingCopy.Conflicts.UseTheirs
237+
238+ </details >
0 commit comments