@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
6
6
7
7
### ![ en_US] ( https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen )
8
8
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 )
10
10
11
11
<details >
12
12
<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
27
27
- Text.Preferences.General.ShowTagsInGraph
28
28
- Text.StashCM.SaveAsPatch
29
29
- Text.WorkingCopy.ConfirmCommitWithFilter
30
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
31
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
32
+ - Text.WorkingCopy.Conflicts.UseMine
33
+ - Text.WorkingCopy.Conflicts.UseTheirs
30
34
31
35
</details >
32
36
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 )
34
38
35
39
<details >
36
40
<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
41
45
- Text.ConfirmEmptyCommit.Continue
42
46
- Text.ConfirmEmptyCommit.StageAllThenCommit
43
47
- Text.WorkingCopy.ConfirmCommitWithFilter
48
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
49
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
50
+ - Text.WorkingCopy.Conflicts.UseMine
51
+ - Text.WorkingCopy.Conflicts.UseTheirs
44
52
45
53
</details >
46
54
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 )
48
56
49
57
<details >
50
58
<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
55
63
- Text.ConfirmEmptyCommit.Continue
56
64
- Text.ConfirmEmptyCommit.StageAllThenCommit
57
65
- Text.WorkingCopy.ConfirmCommitWithFilter
66
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
67
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
68
+ - Text.WorkingCopy.Conflicts.UseMine
69
+ - Text.WorkingCopy.Conflicts.UseTheirs
58
70
59
71
</details >
60
72
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 )
62
74
63
75
<details >
64
76
<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
71
83
- Text.CopyFullPath
72
84
- Text.Preferences.General.ShowTagsInGraph
73
85
- Text.WorkingCopy.ConfirmCommitWithFilter
86
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
87
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
88
+ - Text.WorkingCopy.Conflicts.UseMine
89
+ - Text.WorkingCopy.Conflicts.UseTheirs
74
90
75
91
</details >
76
92
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 )
78
94
79
95
<details >
80
96
<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
87
103
- Text.Repository.FilterCommits
88
104
- Text.Repository.Tags.OrderByNameDes
89
105
- Text.WorkingCopy.ConfirmCommitWithFilter
106
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
107
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
108
+ - Text.WorkingCopy.Conflicts.UseMine
109
+ - Text.WorkingCopy.Conflicts.UseTheirs
90
110
91
111
</details >
92
112
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 )
94
114
95
115
<details >
96
116
<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
167
187
- Text.StashCM.SaveAsPatch
168
188
- Text.WorkingCopy.CommitToEdit
169
189
- Text.WorkingCopy.ConfirmCommitWithFilter
190
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
191
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
192
+ - Text.WorkingCopy.Conflicts.UseMine
193
+ - Text.WorkingCopy.Conflicts.UseTheirs
170
194
- Text.WorkingCopy.SignOff
171
195
172
196
</details >
173
197
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 )
175
199
176
200
<details >
177
201
<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
182
206
- Text.ConfirmEmptyCommit.Continue
183
207
- Text.ConfirmEmptyCommit.StageAllThenCommit
184
208
- Text.WorkingCopy.ConfirmCommitWithFilter
209
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
210
+ - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
211
+ - Text.WorkingCopy.Conflicts.UseMine
212
+ - Text.WorkingCopy.Conflicts.UseTheirs
185
213
186
214
</details >
187
215
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 )
189
217
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