Skip to content

Commit 190d2ee

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v2025.23'
2 parents 74d77ab + bfb9d6b commit 190d2ee

File tree

97 files changed

+1308
-744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1308
-744
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ dotnet_style_predefined_type_for_member_access = true:suggestion
7171

7272
# name all constant fields using PascalCase
7373
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
74-
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
74+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
7575
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
7676

77-
dotnet_naming_symbols.constant_fields.applicable_kinds = field
77+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
7878
dotnet_naming_symbols.constant_fields.required_modifiers = const
7979

8080
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
8181

8282
# private static fields should have s_ prefix
8383
dotnet_naming_rule.private_static_fields_should_have_prefix.severity = suggestion
84-
dotnet_naming_rule.private_static_fields_should_have_prefix.symbols = private_static_fields
84+
dotnet_naming_rule.private_static_fields_should_have_prefix.symbols = private_static_fields
8585
dotnet_naming_rule.private_static_fields_should_have_prefix.style = private_static_prefix_style
8686

87-
dotnet_naming_symbols.private_static_fields.applicable_kinds = field
87+
dotnet_naming_symbols.private_static_fields.applicable_kinds = field
8888
dotnet_naming_symbols.private_static_fields.required_modifiers = static
8989
dotnet_naming_symbols.private_static_fields.applicable_accessibilities = private
9090

@@ -93,7 +93,7 @@ dotnet_naming_style.private_static_prefix_style.capitalization = camel_case
9393

9494
# internal and private fields should be _camelCase
9595
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
96-
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
96+
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
9797
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
9898

9999
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field

‎TRANSLATION.md‎

Lines changed: 60 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,24 @@ 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-96.14%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
10+
11+
### ![es__ES](https://img.shields.io/badge/es__ES-99.13%25-yellow)
1012

1113
<details>
12-
<summary>Missing keys in de_DE.axaml</summary>
14+
<summary>Missing keys in es_ES.axaml</summary>
1315

14-
- Text.Avatar.Load
15-
- Text.BranchCM.ResetToSelectedCommit
16-
- Text.Checkout.WithFastForward
17-
- Text.Checkout.WithFastForward.Upstream
18-
- Text.CommitDetail.Changes.Count
19-
- Text.CreateBranch.OverwriteExisting
20-
- Text.DeinitSubmodule
21-
- Text.DeinitSubmodule.Force
22-
- Text.DeinitSubmodule.Path
23-
- Text.Diff.Submodule.Deleted
24-
- Text.GitFlow.FinishWithPush
25-
- Text.GitFlow.FinishWithSquash
26-
- Text.Hotkeys.Global.SwitchWorkspace
27-
- Text.Hotkeys.Global.SwitchTab
28-
- Text.Hotkeys.TextEditor.OpenExternalMergeTool
29-
- Text.Launcher.Workspaces
30-
- Text.Launcher.Pages
31-
- Text.Pull.RecurseSubmodules
32-
- Text.Repository.ClearStashes
33-
- Text.Repository.ShowSubmodulesAsTree
34-
- Text.ResetWithoutCheckout
35-
- Text.ResetWithoutCheckout.MoveTo
36-
- Text.ResetWithoutCheckout.Target
37-
- Text.Submodule.Deinit
38-
- Text.Submodule.Status
39-
- Text.Submodule.Status.Modified
40-
- Text.Submodule.Status.NotInited
41-
- Text.Submodule.Status.RevisionChanged
42-
- Text.Submodule.Status.Unmerged
43-
- Text.Submodule.URL
44-
- Text.WorkingCopy.ResetAuthor
16+
- Text.CommitCM.PushRevision
17+
- Text.Merge.Edit
18+
- Text.Push.Revision
19+
- Text.Push.Revision.Title
20+
- Text.Stash.Mode
21+
- Text.StashCM.CopyMessage
22+
- Text.WorkingCopy.AddToGitIgnore.InFolder
4523

4624
</details>
4725

48-
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
49-
50-
### ![fr__FR](https://img.shields.io/badge/fr__FR-92.03%25-yellow)
26+
### ![fr__FR](https://img.shields.io/badge/fr__FR-91.19%25-yellow)
5127

5228
<details>
5329
<summary>Missing keys in fr_FR.axaml</summary>
@@ -67,6 +43,7 @@ This document shows the translation status of each locale file in the repository
6743
- Text.CommitCM.CopyAuthor
6844
- Text.CommitCM.CopyCommitter
6945
- Text.CommitCM.CopySubject
46+
- Text.CommitCM.PushRevision
7047
- Text.CommitDetail.Changes.Count
7148
- Text.CommitMessageTextBox.SubjectCount
7249
- Text.Configure.Git.PreferredMergeMode
@@ -86,8 +63,11 @@ This document shows the translation status of each locale file in the repository
8663
- Text.Hotkeys.TextEditor.OpenExternalMergeTool
8764
- Text.Launcher.Workspaces
8865
- Text.Launcher.Pages
66+
- Text.Merge.Edit
8967
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
9068
- Text.Pull.RecurseSubmodules
69+
- Text.Push.Revision
70+
- Text.Push.Revision.Title
9171
- Text.Repository.BranchSort
9272
- Text.Repository.BranchSort.ByCommitterDate
9373
- Text.Repository.BranchSort.ByName
@@ -99,6 +79,8 @@ This document shows the translation status of each locale file in the repository
9979
- Text.ResetWithoutCheckout
10080
- Text.ResetWithoutCheckout.MoveTo
10181
- Text.ResetWithoutCheckout.Target
82+
- Text.Stash.Mode
83+
- Text.StashCM.CopyMessage
10284
- Text.Submodule.Deinit
10385
- Text.Submodule.Status
10486
- Text.Submodule.Status.Modified
@@ -110,6 +92,7 @@ This document shows the translation status of each locale file in the repository
11092
- Text.ViewLogs.Clear
11193
- Text.ViewLogs.CopyLog
11294
- Text.ViewLogs.Delete
95+
- Text.WorkingCopy.AddToGitIgnore.InFolder
11396
- Text.WorkingCopy.ConfirmCommitWithFilter
11497
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
11598
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -119,7 +102,7 @@ This document shows the translation status of each locale file in the repository
119102

120103
</details>
121104

122-
### ![it__IT](https://img.shields.io/badge/it__IT-97.38%25-yellow)
105+
### ![it__IT](https://img.shields.io/badge/it__IT-96.53%25-yellow)
123106

124107
<details>
125108
<summary>Missing keys in it_IT.axaml</summary>
@@ -128,6 +111,7 @@ This document shows the translation status of each locale file in the repository
128111
- Text.BranchCM.ResetToSelectedCommit
129112
- Text.Checkout.WithFastForward
130113
- Text.Checkout.WithFastForward.Upstream
114+
- Text.CommitCM.PushRevision
131115
- Text.CommitDetail.Changes.Count
132116
- Text.CreateBranch.OverwriteExisting
133117
- Text.DeinitSubmodule
@@ -138,17 +122,23 @@ This document shows the translation status of each locale file in the repository
138122
- Text.Hotkeys.Global.SwitchTab
139123
- Text.Launcher.Workspaces
140124
- Text.Launcher.Pages
125+
- Text.Merge.Edit
141126
- Text.Pull.RecurseSubmodules
127+
- Text.Push.Revision
128+
- Text.Push.Revision.Title
142129
- Text.Repository.ClearStashes
143130
- Text.ResetWithoutCheckout
144131
- Text.ResetWithoutCheckout.MoveTo
145132
- Text.ResetWithoutCheckout.Target
133+
- Text.Stash.Mode
134+
- Text.StashCM.CopyMessage
146135
- Text.Submodule.Deinit
136+
- Text.WorkingCopy.AddToGitIgnore.InFolder
147137
- Text.WorkingCopy.ResetAuthor
148138

149139
</details>
150140

151-
### ![ja__JP](https://img.shields.io/badge/ja__JP-91.78%25-yellow)
141+
### ![ja__JP](https://img.shields.io/badge/ja__JP-90.94%25-yellow)
152142

153143
<details>
154144
<summary>Missing keys in ja_JP.axaml</summary>
@@ -169,6 +159,7 @@ This document shows the translation status of each locale file in the repository
169159
- Text.CommitCM.CopyAuthor
170160
- Text.CommitCM.CopyCommitter
171161
- Text.CommitCM.CopySubject
162+
- Text.CommitCM.PushRevision
172163
- Text.CommitDetail.Changes.Count
173164
- Text.CommitMessageTextBox.SubjectCount
174165
- Text.Configure.Git.PreferredMergeMode
@@ -188,8 +179,11 @@ This document shows the translation status of each locale file in the repository
188179
- Text.Hotkeys.TextEditor.OpenExternalMergeTool
189180
- Text.Launcher.Workspaces
190181
- Text.Launcher.Pages
182+
- Text.Merge.Edit
191183
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
192184
- Text.Pull.RecurseSubmodules
185+
- Text.Push.Revision
186+
- Text.Push.Revision.Title
193187
- Text.Repository.BranchSort
194188
- Text.Repository.BranchSort.ByCommitterDate
195189
- Text.Repository.BranchSort.ByName
@@ -202,6 +196,8 @@ This document shows the translation status of each locale file in the repository
202196
- Text.ResetWithoutCheckout
203197
- Text.ResetWithoutCheckout.MoveTo
204198
- Text.ResetWithoutCheckout.Target
199+
- Text.Stash.Mode
200+
- Text.StashCM.CopyMessage
205201
- Text.Submodule.Deinit
206202
- Text.Submodule.Status
207203
- Text.Submodule.Status.Modified
@@ -213,6 +209,7 @@ This document shows the translation status of each locale file in the repository
213209
- Text.ViewLogs.Clear
214210
- Text.ViewLogs.CopyLog
215211
- Text.ViewLogs.Delete
212+
- Text.WorkingCopy.AddToGitIgnore.InFolder
216213
- Text.WorkingCopy.ConfirmCommitWithFilter
217214
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
218215
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -222,7 +219,7 @@ This document shows the translation status of each locale file in the repository
222219

223220
</details>
224221

225-
### ![pt__BR](https://img.shields.io/badge/pt__BR-83.81%25-yellow)
222+
### ![pt__BR](https://img.shields.io/badge/pt__BR-83.25%25-yellow)
226223

227224
<details>
228225
<summary>Missing keys in pt_BR.axaml</summary>
@@ -254,6 +251,7 @@ This document shows the translation status of each locale file in the repository
254251
- Text.CommitCM.CopySubject
255252
- Text.CommitCM.Merge
256253
- Text.CommitCM.MergeMultiple
254+
- Text.CommitCM.PushRevision
257255
- Text.CommitDetail.Changes.Count
258256
- Text.CommitDetail.Files.Search
259257
- Text.CommitDetail.Info.Children
@@ -294,6 +292,7 @@ This document shows the translation status of each locale file in the repository
294292
- Text.InProgress.Revert.Head
295293
- Text.Launcher.Workspaces
296294
- Text.Launcher.Pages
295+
- Text.Merge.Edit
297296
- Text.Merge.Source
298297
- Text.MergeMultiple
299298
- Text.MergeMultiple.CommitChanges
@@ -307,6 +306,8 @@ This document shows the translation status of each locale file in the repository
307306
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
308307
- Text.Preferences.Git.SSLVerify
309308
- Text.Pull.RecurseSubmodules
309+
- Text.Push.Revision
310+
- Text.Push.Revision.Title
310311
- Text.Repository.BranchSort
311312
- Text.Repository.BranchSort.ByCommitterDate
312313
- Text.Repository.BranchSort.ByName
@@ -335,8 +336,8 @@ This document shows the translation status of each locale file in the repository
335336
- Text.SetUpstream.Unset
336337
- Text.SetUpstream.Upstream
337338
- Text.SHALinkCM.NavigateTo
338-
- Text.Stash.AutoRestore
339-
- Text.Stash.AutoRestore.Tip
339+
- Text.Stash.Mode
340+
- Text.StashCM.CopyMessage
340341
- Text.StashCM.SaveAsPatch
341342
- Text.Submodule.Deinit
342343
- Text.Submodule.Status
@@ -349,6 +350,7 @@ This document shows the translation status of each locale file in the repository
349350
- Text.ViewLogs.Clear
350351
- Text.ViewLogs.CopyLog
351352
- Text.ViewLogs.Delete
353+
- Text.WorkingCopy.AddToGitIgnore.InFolder
352354
- Text.WorkingCopy.CommitToEdit
353355
- Text.WorkingCopy.ConfirmCommitWithFilter
354356
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
@@ -360,17 +362,9 @@ This document shows the translation status of each locale file in the repository
360362

361363
</details>
362364

363-
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.75%25-yellow)
364-
365-
<details>
366-
<summary>Missing keys in ru_RU.axaml</summary>
367-
368-
- Text.Checkout.WithFastForward
369-
- Text.Checkout.WithFastForward.Upstream
370-
371-
</details>
365+
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
372366

373-
### ![ta__IN](https://img.shields.io/badge/ta__IN-91.91%25-yellow)
367+
### ![ta__IN](https://img.shields.io/badge/ta__IN-91.07%25-yellow)
374368

375369
<details>
376370
<summary>Missing keys in ta_IN.axaml</summary>
@@ -391,6 +385,7 @@ This document shows the translation status of each locale file in the repository
391385
- Text.CommitCM.CopyAuthor
392386
- Text.CommitCM.CopyCommitter
393387
- Text.CommitCM.CopySubject
388+
- Text.CommitCM.PushRevision
394389
- Text.CommitDetail.Changes.Count
395390
- Text.CommitMessageTextBox.SubjectCount
396391
- Text.Configure.Git.PreferredMergeMode
@@ -410,8 +405,11 @@ This document shows the translation status of each locale file in the repository
410405
- Text.Hotkeys.TextEditor.OpenExternalMergeTool
411406
- Text.Launcher.Workspaces
412407
- Text.Launcher.Pages
408+
- Text.Merge.Edit
413409
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
414410
- Text.Pull.RecurseSubmodules
411+
- Text.Push.Revision
412+
- Text.Push.Revision.Title
415413
- Text.Repository.BranchSort
416414
- Text.Repository.BranchSort.ByCommitterDate
417415
- Text.Repository.BranchSort.ByName
@@ -423,6 +421,8 @@ This document shows the translation status of each locale file in the repository
423421
- Text.ResetWithoutCheckout
424422
- Text.ResetWithoutCheckout.MoveTo
425423
- Text.ResetWithoutCheckout.Target
424+
- Text.Stash.Mode
425+
- Text.StashCM.CopyMessage
426426
- Text.Submodule.Deinit
427427
- Text.Submodule.Status
428428
- Text.Submodule.Status.Modified
@@ -435,6 +435,7 @@ This document shows the translation status of each locale file in the repository
435435
- Text.ViewLogs.Clear
436436
- Text.ViewLogs.CopyLog
437437
- Text.ViewLogs.Delete
438+
- Text.WorkingCopy.AddToGitIgnore.InFolder
438439
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
439440
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
440441
- Text.WorkingCopy.Conflicts.UseMine
@@ -443,7 +444,7 @@ This document shows the translation status of each locale file in the repository
443444

444445
</details>
445446

446-
### ![uk__UA](https://img.shields.io/badge/uk__UA-93.15%25-yellow)
447+
### ![uk__UA](https://img.shields.io/badge/uk__UA-92.31%25-yellow)
447448

448449
<details>
449450
<summary>Missing keys in uk_UA.axaml</summary>
@@ -463,6 +464,7 @@ This document shows the translation status of each locale file in the repository
463464
- Text.CommitCM.CopyAuthor
464465
- Text.CommitCM.CopyCommitter
465466
- Text.CommitCM.CopySubject
467+
- Text.CommitCM.PushRevision
466468
- Text.CommitDetail.Changes.Count
467469
- Text.CommitMessageTextBox.SubjectCount
468470
- Text.ConfigureWorkspace.Name
@@ -478,8 +480,11 @@ This document shows the translation status of each locale file in the repository
478480
- Text.Hotkeys.TextEditor.OpenExternalMergeTool
479481
- Text.Launcher.Workspaces
480482
- Text.Launcher.Pages
483+
- Text.Merge.Edit
481484
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
482485
- Text.Pull.RecurseSubmodules
486+
- Text.Push.Revision
487+
- Text.Push.Revision.Title
483488
- Text.Repository.BranchSort
484489
- Text.Repository.BranchSort.ByCommitterDate
485490
- Text.Repository.BranchSort.ByName
@@ -491,6 +496,8 @@ This document shows the translation status of each locale file in the repository
491496
- Text.ResetWithoutCheckout
492497
- Text.ResetWithoutCheckout.MoveTo
493498
- Text.ResetWithoutCheckout.Target
499+
- Text.Stash.Mode
500+
- Text.StashCM.CopyMessage
494501
- Text.Submodule.Deinit
495502
- Text.Submodule.Status
496503
- Text.Submodule.Status.Modified
@@ -502,6 +509,7 @@ This document shows the translation status of each locale file in the repository
502509
- Text.ViewLogs.Clear
503510
- Text.ViewLogs.CopyLog
504511
- Text.ViewLogs.Delete
512+
- Text.WorkingCopy.AddToGitIgnore.InFolder
505513
- Text.WorkingCopy.ResetAuthor
506514

507515
</details>

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.22
1+
2025.23

‎src/App.axaml.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCo
521521
private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
522522
{
523523
var args = desktop.Args;
524-
if (args == null || args.Length <= 1 || !args[0].Equals("--core-editor", StringComparison.Ordinal))
524+
if (args is not { Length: > 1 } || !args[0].Equals("--core-editor", StringComparison.Ordinal))
525525
return false;
526526

527527
var file = args[1];
@@ -531,8 +531,8 @@ private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime deskt
531531
return true;
532532
}
533533

534-
var editor = new Views.StandaloneCommitMessageEditor();
535-
editor.SetFile(file);
534+
var editor = new Views.CommitMessageEditor();
535+
editor.AsStandalone(file);
536536
desktop.MainWindow = editor;
537537
return true;
538538
}

0 commit comments

Comments
 (0)