Skip to content

Commit 6d28822

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v2025.32'
2 parents 32eb7fb + 3a1e867 commit 6d28822

File tree

91 files changed

+1363
-1410
lines changed

Some content is hidden

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

91 files changed

+1363
-1410
lines changed

‎TRANSLATION.md‎

Lines changed: 51 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,29 @@ 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-%E2%88%9A-brightgreen)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-99.65%25-yellow)
1010

11-
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
11+
<details>
12+
<summary>Missing keys in de_DE.axaml</summary>
13+
14+
- Text.Preferences.General.ShowChangesPageByDefault
15+
- Text.WorkingCopy.ClearCommitHistories
16+
- Text.WorkingCopy.ClearCommitHistories.Confirm
17+
18+
</details>
19+
20+
### ![es__ES](https://img.shields.io/badge/es__ES-99.65%25-yellow)
21+
22+
<details>
23+
<summary>Missing keys in es_ES.axaml</summary>
24+
25+
- Text.Preferences.General.ShowChangesPageByDefault
26+
- Text.WorkingCopy.ClearCommitHistories
27+
- Text.WorkingCopy.ClearCommitHistories.Confirm
28+
29+
</details>
1230

13-
### ![fr__FR](https://img.shields.io/badge/fr__FR-80.37%25-yellow)
31+
### ![fr__FR](https://img.shields.io/badge/fr__FR-80.07%25-yellow)
1432

1533
<details>
1634
<summary>Missing keys in fr_FR.axaml</summary>
@@ -113,7 +131,8 @@ This document shows the translation status of each locale file in the repository
113131
- Text.MoveSubmodule
114132
- Text.MoveSubmodule.MoveTo
115133
- Text.MoveSubmodule.Submodule
116-
- Text.Preferences.Appearance.EnableCompactFolders
134+
- Text.Preferences.General.EnableCompactFolders
135+
- Text.Preferences.General.ShowChangesPageByDefault
117136
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
118137
- Text.Preferences.Git.UseLibsecret
119138
- Text.Pull.RecurseSubmodules
@@ -178,6 +197,8 @@ This document shows the translation status of each locale file in the repository
178197
- Text.ViewLogs.CopyLog
179198
- Text.ViewLogs.Delete
180199
- Text.WorkingCopy.AddToGitIgnore.InFolder
200+
- Text.WorkingCopy.ClearCommitHistories
201+
- Text.WorkingCopy.ClearCommitHistories.Confirm
181202
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
182203
- Text.WorkingCopy.ConfirmCommitWithFilter
183204
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
@@ -188,140 +209,19 @@ This document shows the translation status of each locale file in the repository
188209

189210
</details>
190211

191-
### ![it__IT](https://img.shields.io/badge/it__IT-85.57%25-yellow)
212+
### ![it__IT](https://img.shields.io/badge/it__IT-99.54%25-yellow)
192213

193214
<details>
194215
<summary>Missing keys in it_IT.axaml</summary>
195216

196-
- Text.AddToIgnore
197-
- Text.AddToIgnore.Pattern
198-
- Text.AddToIgnore.Storage
199-
- Text.App.Hide
200-
- Text.App.ShowAll
201-
- Text.Askpass.Passphrase
202-
- Text.Avatar.Load
203-
- Text.BranchCM.ResetToSelectedCommit
204-
- Text.BranchTree.InvalidUpstream
205-
- Text.BranchTree.Remote
206-
- Text.BranchTree.Tracking
207-
- Text.BranchTree.URL
208-
- Text.ChangeSubmoduleUrl
209-
- Text.ChangeSubmoduleUrl.Submodule
210-
- Text.ChangeSubmoduleUrl.URL
211-
- Text.Checkout.WarnLostCommits
212-
- Text.Checkout.WithFastForward
213-
- Text.Checkout.WithFastForward.Upstream
214-
- Text.CommitCM.CopyCommitMessage
215-
- Text.CommitCM.InteractiveRebase
216-
- Text.CommitCM.InteractiveRebase.Drop
217-
- Text.CommitCM.InteractiveRebase.Edit
218-
- Text.CommitCM.InteractiveRebase.Fixup
219-
- Text.CommitCM.InteractiveRebase.Manually
220-
- Text.CommitCM.InteractiveRebase.Reword
221-
- Text.CommitCM.InteractiveRebase.Squash
222-
- Text.CommitCM.PushRevision
223-
- Text.CommitCM.Rebase
224-
- Text.CommitCM.Reset
225-
- Text.CommitDetail.Changes.Count
226-
- Text.CommitDetail.Info.Key
227-
- Text.CommitDetail.Info.Signer
228-
- Text.Configure.CommitMessageTemplate.BuiltinVars
229-
- Text.Configure.CustomAction.Arguments.Tip
230-
- Text.Configure.CustomAction.InputControls
231-
- Text.Configure.CustomAction.InputControls.Edit
232-
- Text.Configure.CustomAction.Scope.Remote
233-
- Text.Configure.CustomAction.Scope.Tag
234-
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
235-
- Text.Configure.IssueTracker.Share
236-
- Text.ConfigureCustomActionControls
237-
- Text.ConfigureCustomActionControls.CheckedValue
238-
- Text.ConfigureCustomActionControls.CheckedValue.Tip
239-
- Text.ConfigureCustomActionControls.Description
240-
- Text.ConfigureCustomActionControls.DefaultValue
241-
- Text.ConfigureCustomActionControls.IsFolder
242-
- Text.ConfigureCustomActionControls.Label
243-
- Text.ConfigureCustomActionControls.Options
244-
- Text.ConfigureCustomActionControls.Options.Tip
245-
- Text.ConfigureCustomActionControls.Type
246-
- Text.ConfirmRestart.Title
247-
- Text.ConfirmRestart.Message
248-
- Text.CreateBranch.OverwriteExisting
249-
- Text.DeinitSubmodule
250-
- Text.DeinitSubmodule.Force
251-
- Text.DeinitSubmodule.Path
252-
- Text.DeleteMultiTags
253-
- Text.DeleteMultiTags.DeleteFromRemotes
254-
- Text.DeleteMultiTags.Tip
255-
- Text.Diff.Image.Blend
256-
- Text.Diff.Image.SideBySide
257-
- Text.Diff.Image.Swipe
258-
- Text.Diff.New
259-
- Text.Diff.Old
260-
- Text.Diff.Submodule.Deleted
261-
- Text.DirHistories
262-
- Text.Discard.IncludeUntracked
263-
- Text.ExecuteCustomAction.Target
264-
- Text.ExecuteCustomAction.Repository
265-
- Text.Hotkeys.Global.SwitchWorkspace
266-
- Text.Hotkeys.Global.SwitchTab
267-
- Text.InteractiveRebase.ReorderTip
268-
- Text.Launcher.Workspaces
269-
- Text.Launcher.Pages
270-
- Text.Merge.Edit
271-
- Text.MoveSubmodule
272-
- Text.MoveSubmodule.MoveTo
273-
- Text.MoveSubmodule.Submodule
274-
- Text.Preferences.Appearance.EnableCompactFolders
275-
- Text.Preferences.Git.UseLibsecret
276-
- Text.Pull.RecurseSubmodules
277-
- Text.Push.New
278-
- Text.Push.Revision
279-
- Text.Push.Revision.Title
280-
- Text.RemoteCM.CustomAction
281-
- Text.Repository.ClearStashes
282-
- Text.Repository.Dashboard
283-
- Text.Repository.MoreOptions
284-
- Text.Repository.OnlyHighlightCurrentBranchInGraph
285-
- Text.Repository.Search.ByPath
286-
- Text.Repository.ShowDecoratedCommitsOnly
287-
- Text.Repository.ShowFirstParentOnly
288-
- Text.Repository.ShowFlags
289-
- Text.Repository.ShowLostCommits
290-
- Text.Repository.UseRelativeTimeInGraph
291-
- Text.ResetWithoutCheckout
292-
- Text.ResetWithoutCheckout.MoveTo
293-
- Text.ResetWithoutCheckout.Target
294-
- Text.SetSubmoduleBranch
295-
- Text.SetSubmoduleBranch.Submodule
296-
- Text.SetSubmoduleBranch.Current
297-
- Text.SetSubmoduleBranch.New
298-
- Text.SetSubmoduleBranch.New.Tip
299-
- Text.Stash.Mode
300-
- Text.StashCM.CopyMessage
301-
- Text.Submodule.Branch
302-
- Text.Submodule.CopyBranch
303-
- Text.Submodule.Deinit
304-
- Text.Submodule.Histories
305-
- Text.Submodule.Move
306-
- Text.Submodule.SetBranch
307-
- Text.Submodule.SetURL
308-
- Text.Submodule.Update
309-
- Text.Tag.Tagger
310-
- Text.Tag.Time
311-
- Text.TagCM.Copy.Message
312-
- Text.TagCM.Copy.Name
313-
- Text.TagCM.Copy.Tagger
314-
- Text.TagCM.CopyName
315-
- Text.TagCM.CustomAction
316-
- Text.TagCM.DeleteMultiple
317-
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
318-
- Text.WorkingCopy.AddToGitIgnore.InFolder
319-
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
320-
- Text.WorkingCopy.ResetAuthor
217+
- Text.Preferences.General.EnableCompactFolders
218+
- Text.Preferences.General.ShowChangesPageByDefault
219+
- Text.WorkingCopy.ClearCommitHistories
220+
- Text.WorkingCopy.ClearCommitHistories.Confirm
321221

322222
</details>
323223

324-
### ![ja__JP](https://img.shields.io/badge/ja__JP-80.37%25-yellow)
224+
### ![ja__JP](https://img.shields.io/badge/ja__JP-80.07%25-yellow)
325225

326226
<details>
327227
<summary>Missing keys in ja_JP.axaml</summary>
@@ -425,7 +325,8 @@ This document shows the translation status of each locale file in the repository
425325
- Text.MoveSubmodule
426326
- Text.MoveSubmodule.MoveTo
427327
- Text.MoveSubmodule.Submodule
428-
- Text.Preferences.Appearance.EnableCompactFolders
328+
- Text.Preferences.General.EnableCompactFolders
329+
- Text.Preferences.General.ShowChangesPageByDefault
429330
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
430331
- Text.Preferences.Git.UseLibsecret
431332
- Text.Pull.RecurseSubmodules
@@ -489,6 +390,8 @@ This document shows the translation status of each locale file in the repository
489390
- Text.ViewLogs.CopyLog
490391
- Text.ViewLogs.Delete
491392
- Text.WorkingCopy.AddToGitIgnore.InFolder
393+
- Text.WorkingCopy.ClearCommitHistories
394+
- Text.WorkingCopy.ClearCommitHistories.Confirm
492395
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
493396
- Text.WorkingCopy.ConfirmCommitWithFilter
494397
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
@@ -499,7 +402,7 @@ This document shows the translation status of each locale file in the repository
499402

500403
</details>
501404

502-
### ![pt__BR](https://img.shields.io/badge/pt__BR-73.56%25-red)
405+
### ![pt__BR](https://img.shields.io/badge/pt__BR-73.39%25-red)
503406

504407
<details>
505408
<summary>Missing keys in pt_BR.axaml</summary>
@@ -610,7 +513,6 @@ This document shows the translation status of each locale file in the repository
610513
- Text.Diff.New
611514
- Text.Diff.Old
612515
- Text.Diff.Submodule.Deleted
613-
- Text.Diff.UseBlockNavigation
614516
- Text.DirHistories
615517
- Text.Discard.IncludeUntracked
616518
- Text.ExecuteCustomAction.Target
@@ -641,8 +543,9 @@ This document shows the translation status of each locale file in the repository
641543
- Text.MoveSubmodule.Submodule
642544
- Text.Preferences.AI.Streaming
643545
- Text.Preferences.Appearance.EditorTabWidth
644-
- Text.Preferences.Appearance.EnableCompactFolders
645546
- Text.Preferences.General.DateFormat
547+
- Text.Preferences.General.EnableCompactFolders
548+
- Text.Preferences.General.ShowChangesPageByDefault
646549
- Text.Preferences.General.ShowChildren
647550
- Text.Preferences.General.ShowTagsInGraph
648551
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
@@ -724,6 +627,8 @@ This document shows the translation status of each locale file in the repository
724627
- Text.ViewLogs.CopyLog
725628
- Text.ViewLogs.Delete
726629
- Text.WorkingCopy.AddToGitIgnore.InFolder
630+
- Text.WorkingCopy.ClearCommitHistories
631+
- Text.WorkingCopy.ClearCommitHistories.Confirm
727632
- Text.WorkingCopy.CommitToEdit
728633
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
729634
- Text.WorkingCopy.ConfirmCommitWithFilter
@@ -736,18 +641,9 @@ This document shows the translation status of each locale file in the repository
736641

737642
</details>
738643

739-
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.65%25-yellow)
740-
741-
<details>
742-
<summary>Missing keys in ru_RU.axaml</summary>
743-
744-
- Text.App.Hide
745-
- Text.App.ShowAll
746-
- Text.Configure.CustomAction.Arguments.Tip
747-
748-
</details>
644+
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
749645

750-
### ![ta__IN](https://img.shields.io/badge/ta__IN-80.48%25-yellow)
646+
### ![ta__IN](https://img.shields.io/badge/ta__IN-80.18%25-yellow)
751647

752648
<details>
753649
<summary>Missing keys in ta_IN.axaml</summary>
@@ -851,7 +747,8 @@ This document shows the translation status of each locale file in the repository
851747
- Text.MoveSubmodule
852748
- Text.MoveSubmodule.MoveTo
853749
- Text.MoveSubmodule.Submodule
854-
- Text.Preferences.Appearance.EnableCompactFolders
750+
- Text.Preferences.General.EnableCompactFolders
751+
- Text.Preferences.General.ShowChangesPageByDefault
855752
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
856753
- Text.Preferences.Git.UseLibsecret
857754
- Text.Pull.RecurseSubmodules
@@ -915,6 +812,8 @@ This document shows the translation status of each locale file in the repository
915812
- Text.ViewLogs.CopyLog
916813
- Text.ViewLogs.Delete
917814
- Text.WorkingCopy.AddToGitIgnore.InFolder
815+
- Text.WorkingCopy.ClearCommitHistories
816+
- Text.WorkingCopy.ClearCommitHistories.Confirm
918817
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
919818
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
920819
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -924,7 +823,7 @@ This document shows the translation status of each locale file in the repository
924823

925824
</details>
926825

927-
### ![uk__UA](https://img.shields.io/badge/uk__UA-81.64%25-yellow)
826+
### ![uk__UA](https://img.shields.io/badge/uk__UA-81.34%25-yellow)
928827

929828
<details>
930829
<summary>Missing keys in uk_UA.axaml</summary>
@@ -1023,7 +922,8 @@ This document shows the translation status of each locale file in the repository
1023922
- Text.MoveSubmodule
1024923
- Text.MoveSubmodule.MoveTo
1025924
- Text.MoveSubmodule.Submodule
1026-
- Text.Preferences.Appearance.EnableCompactFolders
925+
- Text.Preferences.General.EnableCompactFolders
926+
- Text.Preferences.General.ShowChangesPageByDefault
1027927
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
1028928
- Text.Preferences.Git.UseLibsecret
1029929
- Text.Pull.RecurseSubmodules
@@ -1086,6 +986,8 @@ This document shows the translation status of each locale file in the repository
1086986
- Text.ViewLogs.CopyLog
1087987
- Text.ViewLogs.Delete
1088988
- Text.WorkingCopy.AddToGitIgnore.InFolder
989+
- Text.WorkingCopy.ClearCommitHistories
990+
- Text.WorkingCopy.ClearCommitHistories.Confirm
1089991
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
1090992
- Text.WorkingCopy.ResetAuthor
1091993

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.31
1+
2025.32

‎build/resources/rpm/SPECS/build.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ mkdir -p %{buildroot}/opt/sourcegit
2020
mkdir -p %{buildroot}/%{_bindir}
2121
mkdir -p %{buildroot}/usr/share/applications
2222
mkdir -p %{buildroot}/usr/share/icons
23-
cp -f ../../../SourceGit/* %{buildroot}/opt/sourcegit/
23+
cp -f %{_topdir}/../../SourceGit/* %{buildroot}/opt/sourcegit/
2424
ln -rsf %{buildroot}/opt/sourcegit/sourcegit %{buildroot}/%{_bindir}
25-
cp -r ../../_common/applications %{buildroot}/%{_datadir}
26-
cp -r ../../_common/icons %{buildroot}/%{_datadir}
25+
cp -r %{_topdir}/../_common/applications %{buildroot}/%{_datadir}
26+
cp -r %{_topdir}/../_common/icons %{buildroot}/%{_datadir}
2727
chmod 755 -R %{buildroot}/opt/sourcegit
2828
chmod 755 %{buildroot}/%{_datadir}/applications/sourcegit.desktop
2929

‎src/App.axaml.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,10 @@ private void Check4Update(bool manually = false)
608608
try
609609
{
610610
// Fetch latest release information.
611-
using var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };
612-
var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
611+
using var client = new HttpClient();
612+
client.Timeout = TimeSpan.FromSeconds(5);
613613

614-
// Parse JSON into Models.Version.
614+
var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
615615
var ver = JsonSerializer.Deserialize(data, JsonCodeGen.Default.Version);
616616
if (ver == null)
617617
return;

0 commit comments

Comments
 (0)