Skip to content

Commit f7ef61f

Browse files
love-lingerlove-linger
committed
Merge branch 'release/8.39'
2 parents 13805f7 + 0da46cb commit f7ef61f

Some content is hidden

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

72 files changed

+1779
-832
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,10 @@ end_of_line = lf
293293
[*.{cmd,bat}]
294294
end_of_line = crlf
295295

296+
# Package manifests
297+
[{*.spec,control}]
298+
end_of_line = lf
299+
296300
# YAML files
297301
[*.{yml,yaml}]
298302
indent_size = 2

‎.gitattributes‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
*.png binary
44
*.ico binary
55
*.sh text eol=lf
6+
*.spec text eol=lf
7+
control text eol=lf
68
*.bat text eol=crlf
79
*.cmd text eol=crlf
810
*.ps1 text eol=crlf
911
*.json text
1012

1113
.gitattributes export-ignore
12-
.gitignore export-ignore
14+
.gitignore export-ignore

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Setup .NET
3333
uses: actions/setup-dotnet@v4
3434
with:
35-
dotnet-version: 8.0.x
35+
dotnet-version: 9.0.x
3636
- name: Configure arm64 packages
3737
if: ${{ matrix.runtime == 'linux-arm64' }}
3838
run: |

‎.github/workflows/package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_call:
44
inputs:
55
version:
6-
description: Source Git package version
6+
description: SourceGit package version
77
required: true
88
type: string
99
jobs:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
4848
## Translation Status
4949

50-
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.70%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-86.58%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-100.00%25-brightgreen)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
50+
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-100.00%25-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.14%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-98.42%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.14%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
5151

5252
## How to Use
5353

‎SourceGit.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F45A
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{67B6D05F-A000-40BA-ADB4-C9065F880D7B}"
1515
ProjectSection(SolutionItems) = preProject
16+
.github\workflows\build.yml = .github\workflows\build.yml
1617
.github\workflows\ci.yml = .github\workflows\ci.yml
1718
.github\workflows\package.yml = .github\workflows\package.yml
1819
.github\workflows\release.yml = .github\workflows\release.yml

‎TRANSLATION.md‎

Lines changed: 23 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,60 @@
1-
### de_DE.axaml: 98.70%
1+
### de_DE.axaml: 100.00%
22

33

44
<details>
55
<summary>Missing Keys</summary>
66

7-
- Text.Diff.SaveAsPatch
8-
- Text.Diff.VisualLines.All
9-
- Text.Hotkeys.Repo.CreateBranchOnCommit
10-
- Text.Hotkeys.Repo.Fetch
11-
- Text.Hotkeys.Repo.Pull
12-
- Text.Hotkeys.Repo.Push
13-
- Text.IssueLinkCM.OpenInBrowser
14-
- Text.IssueLinkCM.CopyLink
15-
- Text.Preference.Appearance.EditorFontSize
7+
168

179
</details>
1810

19-
### es_ES.axaml: 100.00%
11+
### es_ES.axaml: 99.14%
2012

2113

2214
<details>
2315
<summary>Missing Keys</summary>
2416

25-
17+
- Text.Preference.Appearance.FontSize
18+
- Text.Preference.Appearance.FontSize.Default
19+
- Text.Preference.Appearance.FontSize.Editor
20+
- Text.Repository.FilterCommits.Default
21+
- Text.Repository.FilterCommits.Exclude
22+
- Text.Repository.FilterCommits.Include
2623

2724
</details>
2825

29-
### fr_FR.axaml: 86.58%
26+
### fr_FR.axaml: 98.42%
3027

3128

3229
<details>
3330
<summary>Missing Keys</summary>
3431

35-
- Text.About.Chart
36-
- Text.AIAssistant
37-
- Text.AIAssistant.Tip
38-
- Text.BranchCM.FetchInto
39-
- Text.ChangeCM.GenerateCommitMessage
4032
- Text.CherryPick.AppendSourceToMessage
41-
- Text.CherryPick.Mainline
4233
- Text.CherryPick.Mainline.Tips
4334
- Text.CommitCM.CherryPickMultiple
44-
- Text.CommitCM.CustomAction
45-
- Text.CommitCM.SquashCommitsSinceThis
46-
- Text.CommitDetail.Info.WebLinks
47-
- Text.Configure.CustomAction
48-
- Text.Configure.CustomAction.Arguments
49-
- Text.Configure.CustomAction.Arguments.Tip
50-
- Text.Configure.CustomAction.Executable
51-
- Text.Configure.CustomAction.Name
52-
- Text.Configure.CustomAction.Scope
53-
- Text.Configure.CustomAction.Scope.Commit
54-
- Text.Configure.CustomAction.Scope.Repository
55-
- Text.Configure.Git.DefaultRemote
56-
- Text.Configure.Git.EnablePruneOnFetch
57-
- Text.Configure.Git.EnableSignOff
58-
- Text.Configure.IssueTracker.AddSampleGitLabIssue
59-
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
60-
- Text.Configure.OpenAI
61-
- Text.Configure.OpenAI.Prefered
62-
- Text.Configure.OpenAI.Prefered.Tip
63-
- Text.ConfigureWorkspace
64-
- Text.ConfigureWorkspace.Color
65-
- Text.ConfigureWorkspace.Restore
66-
- Text.ConventionalCommit
67-
- Text.ConventionalCommit.BreakingChanges
68-
- Text.ConventionalCommit.ClosedIssue
69-
- Text.ConventionalCommit.Detail
70-
- Text.ConventionalCommit.Scope
71-
- Text.ConventionalCommit.ShortDescription
72-
- Text.ConventionalCommit.Type
73-
- Text.Diff.IgnoreWhitespace
74-
- Text.Diff.SaveAsPatch
75-
- Text.Diff.VisualLines.All
76-
- Text.Discard.IncludeIgnored
77-
- Text.ExecuteCustomAction
78-
- Text.ExecuteCustomAction.Name
79-
- Text.FileHistory.FileChange
80-
- Text.GitLFS.Locks.OnlyMine
81-
- Text.Histories.Header.AuthorTime
82-
- Text.Histories.Tips
83-
- Text.Histories.Tips.MacOS
84-
- Text.Histories.Tips.Prefix
85-
- Text.Hotkeys.Repo.CommitWithAutoStage
86-
- Text.Hotkeys.Repo.CreateBranchOnCommit
87-
- Text.Hotkeys.Repo.DiscardSelected
88-
- Text.Hotkeys.Repo.Fetch
89-
- Text.Hotkeys.Repo.Pull
90-
- Text.Hotkeys.Repo.Push
91-
- Text.IssueLinkCM.OpenInBrowser
92-
- Text.IssueLinkCM.CopyLink
93-
- Text.MoveRepositoryNode
94-
- Text.MoveRepositoryNode.Target
95-
- Text.Preference.AI
96-
- Text.Preference.AI.AnalyzeDiffPrompt
97-
- Text.Preference.AI.ApiKey
98-
- Text.Preference.AI.GenerateSubjectPrompt
99-
- Text.Preference.AI.Model
100-
- Text.Preference.AI.Name
101-
- Text.Preference.AI.Server
102-
- Text.Preference.Appearance.EditorFontSize
103-
- Text.Preference.General.ShowAuthorTime
104-
- Text.Preference.Integration
105-
- Text.Preference.Shell
106-
- Text.Preference.Shell.Type
107-
- Text.Preference.Shell.Path
108-
- Text.Repository.AutoFetching
35+
- Text.Preference.Appearance.FontSize
36+
- Text.Preference.Appearance.FontSize.Default
37+
- Text.Preference.Appearance.FontSize.Editor
10938
- Text.Repository.CustomActions
110-
- Text.Repository.CustomActions.Empty
111-
- Text.Repository.EnableReflog
112-
- Text.Repository.Search.InCurrentBranch
39+
- Text.Repository.FilterCommits.Default
40+
- Text.Repository.FilterCommits.Exclude
41+
- Text.Repository.FilterCommits.Include
11342
- Text.ScanRepositories
114-
- Text.ScanRepositories.RootDir
115-
- Text.Squash.Into
116-
- Text.Stash.KeepIndex
117-
- Text.Stash.OnlyStagedChanges
118-
- Text.Stash.TipForSelectedFiles
119-
- Text.Statistics.Overview
120-
- Text.TagCM.CopyMessage
121-
- Text.Welcome.Move
122-
- Text.Welcome.ScanDefaultCloneDir
123-
- Text.WorkingCopy.CommitTip
124-
- Text.WorkingCopy.CommitWithAutoStage
125-
- Text.WorkingCopy.ConfirmCommitWithoutFiles
126-
- Text.Workspace
127-
- Text.Workspace.Configure
12843

12944
</details>
13045

131-
### pt_BR.axaml: 100.00%
46+
### pt_BR.axaml: 99.14%
13247

13348

13449
<details>
13550
<summary>Missing Keys</summary>
13651

137-
52+
- Text.Preference.Appearance.FontSize
53+
- Text.Preference.Appearance.FontSize.Default
54+
- Text.Preference.Appearance.FontSize.Editor
55+
- Text.Repository.FilterCommits.Default
56+
- Text.Repository.FilterCommits.Exclude
57+
- Text.Repository.FilterCommits.Include
13858

13959
</details>
14060

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.38
1+
8.39

‎build/resources/_common/applications/sourcegit.desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Desktop Entry]
2-
Name=Source Git
2+
Name=SourceGit
33
Comment=Open-source & Free Git GUI Client
44
Exec=/opt/sourcegit/sourcegit
55
Icon=/usr/share/icons/sourcegit.png

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Summary: Open-source & Free Git Gui Client
55
License: MIT
66
URL: https://sourcegit-scm.github.io/
77
Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
8-
Requires: (libX11 or libX11-6)
9-
Requires: (libSM or libSM6)
8+
Requires: libX11.so.6()(%{__isa_bits}bit)
9+
Requires: libSM.so.6()(%{__isa_bits}bit)
1010

1111
%define _build_id_links none
1212

0 commit comments

Comments
 (0)