Skip to content

Commit 4887252

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v2025.19'
2 parents 7dd1389 + 860f6f2 commit 4887252

File tree

95 files changed

+1329
-831
lines changed

Some content is hidden

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

95 files changed

+1329
-831
lines changed

‎TRANSLATION.md‎

Lines changed: 94 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,31 @@ 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-98.23%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-96.75%25-yellow)
1010

1111
<details>
1212
<summary>Missing keys in de_DE.axaml</summary>
1313

14+
- Text.BranchCM.ResetToSelectedCommit
15+
- Text.CommitDetail.Changes.Count
16+
- Text.CreateBranch.OverwriteExisting
17+
- Text.DeinitSubmodule
18+
- Text.DeinitSubmodule.Force
19+
- Text.DeinitSubmodule.Path
20+
- Text.Diff.Submodule.Deleted
1421
- Text.GitFlow.FinishWithPush
1522
- Text.GitFlow.FinishWithSquash
1623
- Text.Hotkeys.Global.SwitchWorkspace
1724
- Text.Hotkeys.Global.SwitchTab
1825
- Text.Hotkeys.TextEditor.OpenExternalMergeTool
1926
- Text.Launcher.Workspaces
2027
- Text.Launcher.Pages
28+
- Text.Pull.RecurseSubmodules
2129
- Text.Repository.ShowSubmodulesAsTree
30+
- Text.ResetWithoutCheckout
31+
- Text.ResetWithoutCheckout.MoveTo
32+
- Text.ResetWithoutCheckout.Target
33+
- Text.Submodule.Deinit
2234
- Text.Submodule.Status
2335
- Text.Submodule.Status.Modified
2436
- Text.Submodule.Status.NotInited
@@ -28,19 +40,16 @@ This document shows the translation status of each locale file in the repository
2840

2941
</details>
3042

31-
### ![es__ES](https://img.shields.io/badge/es__ES-99.49%25-yellow)
43+
### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
3244

3345
<details>
3446
<summary>Missing keys in es_ES.axaml</summary>
3547

36-
- Text.Hotkeys.Global.SwitchWorkspace
37-
- Text.Hotkeys.Global.SwitchTab
38-
- Text.Launcher.Workspaces
39-
- Text.Launcher.Pages
48+
- Text.CreateBranch.OverwriteExisting
4049

4150
</details>
4251

43-
### ![fr__FR](https://img.shields.io/badge/fr__FR-94.05%25-yellow)
52+
### ![fr__FR](https://img.shields.io/badge/fr__FR-92.62%25-yellow)
4453

4554
<details>
4655
<summary>Missing keys in fr_FR.axaml</summary>
@@ -52,16 +61,23 @@ This document shows the translation status of each locale file in the repository
5261
- Text.Bisect.Good
5362
- Text.Bisect.Skip
5463
- Text.Bisect.WaitingForRange
64+
- Text.BranchCM.ResetToSelectedCommit
5565
- Text.Checkout.RecurseSubmodules
5666
- Text.CommitCM.CopyAuthor
5767
- Text.CommitCM.CopyCommitter
5868
- Text.CommitCM.CopySubject
69+
- Text.CommitDetail.Changes.Count
5970
- Text.CommitMessageTextBox.SubjectCount
6071
- Text.Configure.Git.PreferredMergeMode
6172
- Text.ConfirmEmptyCommit.Continue
6273
- Text.ConfirmEmptyCommit.NoLocalChanges
6374
- Text.ConfirmEmptyCommit.StageAllThenCommit
6475
- Text.ConfirmEmptyCommit.WithLocalChanges
76+
- Text.CreateBranch.OverwriteExisting
77+
- Text.DeinitSubmodule
78+
- Text.DeinitSubmodule.Force
79+
- Text.DeinitSubmodule.Path
80+
- Text.Diff.Submodule.Deleted
6581
- Text.GitFlow.FinishWithPush
6682
- Text.GitFlow.FinishWithSquash
6783
- Text.Hotkeys.Global.SwitchWorkspace
@@ -70,13 +86,18 @@ This document shows the translation status of each locale file in the repository
7086
- Text.Launcher.Workspaces
7187
- Text.Launcher.Pages
7288
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
89+
- Text.Pull.RecurseSubmodules
7390
- Text.Repository.BranchSort
7491
- Text.Repository.BranchSort.ByCommitterDate
7592
- Text.Repository.BranchSort.ByName
7693
- Text.Repository.Search.ByContent
7794
- Text.Repository.ShowSubmodulesAsTree
7895
- Text.Repository.ViewLogs
7996
- Text.Repository.Visit
97+
- Text.ResetWithoutCheckout
98+
- Text.ResetWithoutCheckout.MoveTo
99+
- Text.ResetWithoutCheckout.Target
100+
- Text.Submodule.Deinit
80101
- Text.Submodule.Status
81102
- Text.Submodule.Status.Modified
82103
- Text.Submodule.Status.NotInited
@@ -95,19 +116,31 @@ This document shows the translation status of each locale file in the repository
95116

96117
</details>
97118

98-
### ![it__IT](https://img.shields.io/badge/it__IT-99.49%25-yellow)
119+
### ![it__IT](https://img.shields.io/badge/it__IT-98.00%25-yellow)
99120

100121
<details>
101122
<summary>Missing keys in it_IT.axaml</summary>
102123

124+
- Text.BranchCM.ResetToSelectedCommit
125+
- Text.CommitDetail.Changes.Count
126+
- Text.CreateBranch.OverwriteExisting
127+
- Text.DeinitSubmodule
128+
- Text.DeinitSubmodule.Force
129+
- Text.DeinitSubmodule.Path
130+
- Text.Diff.Submodule.Deleted
103131
- Text.Hotkeys.Global.SwitchWorkspace
104132
- Text.Hotkeys.Global.SwitchTab
105133
- Text.Launcher.Workspaces
106134
- Text.Launcher.Pages
135+
- Text.Pull.RecurseSubmodules
136+
- Text.ResetWithoutCheckout
137+
- Text.ResetWithoutCheckout.MoveTo
138+
- Text.ResetWithoutCheckout.Target
139+
- Text.Submodule.Deinit
107140

108141
</details>
109142

110-
### ![ja__JP](https://img.shields.io/badge/ja__JP-93.80%25-yellow)
143+
### ![ja__JP](https://img.shields.io/badge/ja__JP-92.37%25-yellow)
111144

112145
<details>
113146
<summary>Missing keys in ja_JP.axaml</summary>
@@ -119,16 +152,23 @@ This document shows the translation status of each locale file in the repository
119152
- Text.Bisect.Good
120153
- Text.Bisect.Skip
121154
- Text.Bisect.WaitingForRange
155+
- Text.BranchCM.ResetToSelectedCommit
122156
- Text.Checkout.RecurseSubmodules
123157
- Text.CommitCM.CopyAuthor
124158
- Text.CommitCM.CopyCommitter
125159
- Text.CommitCM.CopySubject
160+
- Text.CommitDetail.Changes.Count
126161
- Text.CommitMessageTextBox.SubjectCount
127162
- Text.Configure.Git.PreferredMergeMode
128163
- Text.ConfirmEmptyCommit.Continue
129164
- Text.ConfirmEmptyCommit.NoLocalChanges
130165
- Text.ConfirmEmptyCommit.StageAllThenCommit
131166
- Text.ConfirmEmptyCommit.WithLocalChanges
167+
- Text.CreateBranch.OverwriteExisting
168+
- Text.DeinitSubmodule
169+
- Text.DeinitSubmodule.Force
170+
- Text.DeinitSubmodule.Path
171+
- Text.Diff.Submodule.Deleted
132172
- Text.GitFlow.FinishWithPush
133173
- Text.GitFlow.FinishWithSquash
134174
- Text.Hotkeys.Global.SwitchWorkspace
@@ -137,6 +177,7 @@ This document shows the translation status of each locale file in the repository
137177
- Text.Launcher.Workspaces
138178
- Text.Launcher.Pages
139179
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
180+
- Text.Pull.RecurseSubmodules
140181
- Text.Repository.BranchSort
141182
- Text.Repository.BranchSort.ByCommitterDate
142183
- Text.Repository.BranchSort.ByName
@@ -146,6 +187,10 @@ This document shows the translation status of each locale file in the repository
146187
- Text.Repository.Tags.OrderByNameDes
147188
- Text.Repository.ViewLogs
148189
- Text.Repository.Visit
190+
- Text.ResetWithoutCheckout
191+
- Text.ResetWithoutCheckout.MoveTo
192+
- Text.ResetWithoutCheckout.Target
193+
- Text.Submodule.Deinit
149194
- Text.Submodule.Status
150195
- Text.Submodule.Status.Modified
151196
- Text.Submodule.Status.NotInited
@@ -164,7 +209,7 @@ This document shows the translation status of each locale file in the repository
164209

165210
</details>
166211

167-
### ![pt__BR](https://img.shields.io/badge/pt__BR-85.57%25-yellow)
212+
### ![pt__BR](https://img.shields.io/badge/pt__BR-84.23%25-yellow)
168213

169214
<details>
170215
<summary>Missing keys in pt_BR.axaml</summary>
@@ -184,6 +229,7 @@ This document shows the translation status of each locale file in the repository
184229
- Text.Bisect.WaitingForRange
185230
- Text.BranchCM.CustomAction
186231
- Text.BranchCM.MergeMultiBranches
232+
- Text.BranchCM.ResetToSelectedCommit
187233
- Text.BranchUpstreamInvalid
188234
- Text.Checkout.RecurseSubmodules
189235
- Text.Clone.RecurseSubmodules
@@ -192,6 +238,7 @@ This document shows the translation status of each locale file in the repository
192238
- Text.CommitCM.CopySubject
193239
- Text.CommitCM.Merge
194240
- Text.CommitCM.MergeMultiple
241+
- Text.CommitDetail.Changes.Count
195242
- Text.CommitDetail.Files.Search
196243
- Text.CommitDetail.Info.Children
197244
- Text.CommitMessageTextBox.SubjectCount
@@ -206,11 +253,16 @@ This document shows the translation status of each locale file in the repository
206253
- Text.ConfirmEmptyCommit.WithLocalChanges
207254
- Text.CopyFullPath
208255
- Text.CreateBranch.Name.WarnSpace
256+
- Text.CreateBranch.OverwriteExisting
257+
- Text.DeinitSubmodule
258+
- Text.DeinitSubmodule.Force
259+
- Text.DeinitSubmodule.Path
209260
- Text.DeleteRepositoryNode.Path
210261
- Text.DeleteRepositoryNode.TipForGroup
211262
- Text.DeleteRepositoryNode.TipForRepository
212263
- Text.Diff.First
213264
- Text.Diff.Last
265+
- Text.Diff.Submodule.Deleted
214266
- Text.Diff.UseBlockNavigation
215267
- Text.Fetch.Force
216268
- Text.FileCM.ResolveUsing
@@ -238,6 +290,7 @@ This document shows the translation status of each locale file in the repository
238290
- Text.Preferences.General.ShowTagsInGraph
239291
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
240292
- Text.Preferences.Git.SSLVerify
293+
- Text.Pull.RecurseSubmodules
241294
- Text.Repository.BranchSort
242295
- Text.Repository.BranchSort.ByCommitterDate
243296
- Text.Repository.BranchSort.ByName
@@ -258,6 +311,9 @@ This document shows the translation status of each locale file in the repository
258311
- Text.Repository.UseRelativeTimeInHistories
259312
- Text.Repository.ViewLogs
260313
- Text.Repository.Visit
314+
- Text.ResetWithoutCheckout
315+
- Text.ResetWithoutCheckout.MoveTo
316+
- Text.ResetWithoutCheckout.Target
261317
- Text.SetUpstream
262318
- Text.SetUpstream.Local
263319
- Text.SetUpstream.Unset
@@ -266,6 +322,7 @@ This document shows the translation status of each locale file in the repository
266322
- Text.Stash.AutoRestore
267323
- Text.Stash.AutoRestore.Tip
268324
- Text.StashCM.SaveAsPatch
325+
- Text.Submodule.Deinit
269326
- Text.Submodule.Status
270327
- Text.Submodule.Status.Modified
271328
- Text.Submodule.Status.NotInited
@@ -286,17 +343,9 @@ This document shows the translation status of each locale file in the repository
286343

287344
</details>
288345

289-
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.75%25-yellow)
290-
291-
<details>
292-
<summary>Missing keys in ru_RU.axaml</summary>
293-
294-
- Text.Hotkeys.Global.SwitchTab
295-
- Text.Launcher.Pages
296-
297-
</details>
346+
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
298347

299-
### ![ta__IN](https://img.shields.io/badge/ta__IN-94.05%25-yellow)
348+
### ![ta__IN](https://img.shields.io/badge/ta__IN-92.62%25-yellow)
300349

301350
<details>
302351
<summary>Missing keys in ta_IN.axaml</summary>
@@ -308,16 +357,23 @@ This document shows the translation status of each locale file in the repository
308357
- Text.Bisect.Good
309358
- Text.Bisect.Skip
310359
- Text.Bisect.WaitingForRange
360+
- Text.BranchCM.ResetToSelectedCommit
311361
- Text.Checkout.RecurseSubmodules
312362
- Text.CommitCM.CopyAuthor
313363
- Text.CommitCM.CopyCommitter
314364
- Text.CommitCM.CopySubject
365+
- Text.CommitDetail.Changes.Count
315366
- Text.CommitMessageTextBox.SubjectCount
316367
- Text.Configure.Git.PreferredMergeMode
317368
- Text.ConfirmEmptyCommit.Continue
318369
- Text.ConfirmEmptyCommit.NoLocalChanges
319370
- Text.ConfirmEmptyCommit.StageAllThenCommit
320371
- Text.ConfirmEmptyCommit.WithLocalChanges
372+
- Text.CreateBranch.OverwriteExisting
373+
- Text.DeinitSubmodule
374+
- Text.DeinitSubmodule.Force
375+
- Text.DeinitSubmodule.Path
376+
- Text.Diff.Submodule.Deleted
321377
- Text.GitFlow.FinishWithPush
322378
- Text.GitFlow.FinishWithSquash
323379
- Text.Hotkeys.Global.SwitchWorkspace
@@ -326,13 +382,18 @@ This document shows the translation status of each locale file in the repository
326382
- Text.Launcher.Workspaces
327383
- Text.Launcher.Pages
328384
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
385+
- Text.Pull.RecurseSubmodules
329386
- Text.Repository.BranchSort
330387
- Text.Repository.BranchSort.ByCommitterDate
331388
- Text.Repository.BranchSort.ByName
332389
- Text.Repository.Search.ByContent
333390
- Text.Repository.ShowSubmodulesAsTree
334391
- Text.Repository.ViewLogs
335392
- Text.Repository.Visit
393+
- Text.ResetWithoutCheckout
394+
- Text.ResetWithoutCheckout.MoveTo
395+
- Text.ResetWithoutCheckout.Target
396+
- Text.Submodule.Deinit
336397
- Text.Submodule.Status
337398
- Text.Submodule.Status.Modified
338399
- Text.Submodule.Status.NotInited
@@ -351,7 +412,7 @@ This document shows the translation status of each locale file in the repository
351412

352413
</details>
353414

354-
### ![uk__UA](https://img.shields.io/badge/uk__UA-95.19%25-yellow)
415+
### ![uk__UA](https://img.shields.io/badge/uk__UA-93.74%25-yellow)
355416

356417
<details>
357418
<summary>Missing keys in uk_UA.axaml</summary>
@@ -363,12 +424,19 @@ This document shows the translation status of each locale file in the repository
363424
- Text.Bisect.Good
364425
- Text.Bisect.Skip
365426
- Text.Bisect.WaitingForRange
427+
- Text.BranchCM.ResetToSelectedCommit
366428
- Text.Checkout.RecurseSubmodules
367429
- Text.CommitCM.CopyAuthor
368430
- Text.CommitCM.CopyCommitter
369431
- Text.CommitCM.CopySubject
432+
- Text.CommitDetail.Changes.Count
370433
- Text.CommitMessageTextBox.SubjectCount
371434
- Text.ConfigureWorkspace.Name
435+
- Text.CreateBranch.OverwriteExisting
436+
- Text.DeinitSubmodule
437+
- Text.DeinitSubmodule.Force
438+
- Text.DeinitSubmodule.Path
439+
- Text.Diff.Submodule.Deleted
372440
- Text.GitFlow.FinishWithPush
373441
- Text.GitFlow.FinishWithSquash
374442
- Text.Hotkeys.Global.SwitchWorkspace
@@ -377,13 +445,18 @@ This document shows the translation status of each locale file in the repository
377445
- Text.Launcher.Workspaces
378446
- Text.Launcher.Pages
379447
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
448+
- Text.Pull.RecurseSubmodules
380449
- Text.Repository.BranchSort
381450
- Text.Repository.BranchSort.ByCommitterDate
382451
- Text.Repository.BranchSort.ByName
383452
- Text.Repository.Search.ByContent
384453
- Text.Repository.ShowSubmodulesAsTree
385454
- Text.Repository.ViewLogs
386455
- Text.Repository.Visit
456+
- Text.ResetWithoutCheckout
457+
- Text.ResetWithoutCheckout.MoveTo
458+
- Text.ResetWithoutCheckout.Target
459+
- Text.Submodule.Deinit
387460
- Text.Submodule.Status
388461
- Text.Submodule.Status.Modified
389462
- Text.Submodule.Status.NotInited

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.18
1+
2025.19

‎src/App.axaml.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
548548

549549
private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
550550
{
551-
Native.OS.SetupEnternalTools();
551+
Native.OS.SetupExternalTools();
552552
Models.AvatarManager.Instance.Start();
553553

554554
string startupRepo = null;
@@ -671,7 +671,16 @@ private string FixFontFamilyName(string input)
671671
prevChar = c;
672672
}
673673

674-
trimmed.Add(sb.ToString());
674+
var name = sb.ToString();
675+
var idx = name.IndexOf('#');
676+
if (idx >= 0)
677+
{
678+
if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
679+
!name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))
680+
continue;
681+
}
682+
683+
trimmed.Add(name);
675684
}
676685

677686
return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;

0 commit comments

Comments
 (0)