Skip to content

Commit 9452b79

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v8.37'
2 parents bb29476 + 5966b8a commit 9452b79

File tree

101 files changed

+2580
-1155
lines changed

Some content is hidden

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

101 files changed

+2580
-1155
lines changed

‎README.md

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
# SourceGit - Opensource Git GUI client.
22

3-
![stars](https://img.shields.io/github/stars/sourcegit-scm/sourcegit.svg) ![forks](https://img.shields.io/github/forks/sourcegit-scm/sourcegit.svg) ![license](https://img.shields.io/github/license/sourcegit-scm/sourcegit.svg) ![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg) ![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)
3+
[![stars](https://img.shields.io/github/stars/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/stargazers)
4+
[![forks](https://img.shields.io/github/forks/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/forks)
5+
[![license](https://img.shields.io/github/license/sourcegit-scm/sourcegit.svg)](LICENSE)
6+
[![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/releases/latest)
7+
[![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)](https://github.com/sourcegit-scm/sourcegit/releases)
48

59
## Highlights
610

711
* Supports Windows/macOS/Linux
812
* Opensource/Free
913
* Fast
10-
* English/Français/Deutsch/Português/Русский/简体中文/繁體中文
14+
* Deutsch/English/Español/Français/Português/Русский/简体中文/繁體中文
1115
* Built-in light/dark themes
1216
* Customize theme
1317
* Visual commit graph
@@ -43,7 +47,7 @@
4347
4448
## Translation Status
4549

46-
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.95%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-90.36%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-93.52%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-99.10%25-yellow)](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-96.05%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.08%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-87.72%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-90.79%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)
4751

4852
## How to Use
4953

@@ -80,11 +84,16 @@ For **Windows** users:
8084

8185
For **macOS** users:
8286

83-
* Download `sourcegit_x.y.osx-x64.zip` or `sourcegit_x.y.osx-arm64.zip` from Releases. `x64` for Intel and `arm64` for Apple Silicon.
84-
* Move `SourceGit.app` to `Applications` folder.
85-
* Make sure your mac trusts all software from anywhere. For more information, search `spctl --master-disable`.
87+
* Thanks [@ybeapps](https://github.com/ybeapps) for making `SourceGit` available on `Homebrew`. You can simply install it with following command:
88+
```shell
89+
brew tap ybeapps/homebrew-sourcegit
90+
brew install --cask --no-quarantine sourcegit
91+
```
92+
* If you want to install `SourceGit.app` from Github Release manually, you need run following command to make sure it works:
93+
```shell
94+
sudo xattr -cr /Applications/SourceGit.app
95+
```
8696
* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your mac.
87-
* You may need to run `sudo xattr -cr /Applications/SourceGit.app` to make sure the software works.
8897
* You can run `echo $PATH > ~/Library/Application\ Support/SourceGit/PATH` to generate a custom PATH env file to introduce `PATH` env to SourceGit.
8998

9099
For **Linux** users:
@@ -110,22 +119,23 @@ For other AI service:
110119

111120
This app supports open repository in external tools listed in the table below.
112121

113-
| Tool | Windows | macOS | Linux | KEY IN `external_editors.json` |
114-
|-------------------------------|---------|-------|-------|--------------------------------|
115-
| Visual Studio Code | YES | YES | YES | VSCODE |
116-
| Visual Studio Code - Insiders | YES | YES | YES | VSCODE_INSIDERS |
117-
| VSCodium | YES | YES | YES | VSCODIUM |
118-
| JetBrains Fleet | YES | YES | YES | FLEET |
119-
| Sublime Text | YES | YES | YES | SUBLIME_TEXT |
120-
| Zed | NO | YES | YES | ZED |
122+
| Tool | Windows | macOS | Linux |
123+
|-------------------------------|---------|-------|-------|
124+
| Visual Studio Code | YES | YES | YES |
125+
| Visual Studio Code - Insiders | YES | YES | YES |
126+
| VSCodium | YES | YES | YES |
127+
| Fleet | YES | YES | YES |
128+
| Sublime Text | YES | YES | YES |
129+
| Zed | NO | YES | YES |
130+
| Visual Studio | YES | NO | NO |
121131

122132
> [!NOTE]
123133
> This app will try to find those tools based on some pre-defined or expected locations automatically. If you are using one portable version of these tools, it will not be detected by this app.
124134
> To solve this problem you can add a file named `external_editors.json` in app data dir and provide the path directly. For example:
125135
```json
126136
{
127137
"tools": {
128-
"VSCODE": "D:\\VSCode\\Code.exe"
138+
"Visual Studio Code": "D:\\VSCode\\Code.exe"
129139
}
130140
}
131141
```
@@ -153,4 +163,4 @@ Everyone is welcome to submit a PR. Please make sure your PR is based on the lat
153163

154164
Thanks to all the people who contribute.
155165

156-
[![Contributors](https://contrib.rocks/image?repo=sourcegit-scm/sourcegit&columns=10)](https://github.com/sourcegit-scm/sourcegit/graphs/contributors)
166+
[![Contributors](https://contrib.rocks/image?repo=sourcegit-scm/sourcegit&columns=20)](https://github.com/sourcegit-scm/sourcegit/graphs/contributors)

‎SourceGit.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "appimage", "appimage", "{5D
7676
EndProject
7777
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{C54D4001-9940-477C-A0B6-E795ED0A3209}"
7878
ProjectSection(SolutionItems) = preProject
79+
build\scripts\localization-check.js = build\scripts\localization-check.js
7980
build\scripts\package.linux.sh = build\scripts\package.linux.sh
8081
build\scripts\package.osx-app.sh = build\scripts\package.osx-app.sh
8182
build\scripts\package.windows-portable.sh = build\scripts\package.windows-portable.sh

‎TRANSLATION.md

Lines changed: 97 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,69 @@
1-
### de_DE.axaml: 98.95%
1+
### de_DE.axaml: 96.05%
22

33

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

7+
- Text.BranchCM.FetchInto
8+
- Text.ChangeCM.GenerateCommitMessage
9+
- Text.CommitCM.CustomAction
10+
- Text.Configure.CustomAction
11+
- Text.Configure.CustomAction.Arguments
12+
- Text.Configure.CustomAction.Arguments.Tip
13+
- Text.Configure.CustomAction.Executable
14+
- Text.Configure.CustomAction.Name
15+
- Text.Configure.CustomAction.Scope
16+
- Text.Configure.CustomAction.Scope.Commit
17+
- Text.Configure.CustomAction.Scope.Repository
18+
- Text.Configure.Git.EnablePruneOnFetch
719
- Text.Configure.Git.EnableSignOff
820
- Text.Configure.IssueTracker.AddSampleGitLabIssue
921
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
10-
- Text.Preference.Advanced
22+
- Text.Configure.OpenAI
23+
- Text.Configure.OpenAI.Prefered
24+
- Text.Configure.OpenAI.Prefered.Tip
25+
- Text.ExecuteCustomAction
26+
- Text.ExecuteCustomAction.Name
1127
- Text.Preference.AI.AnalyzeDiffPrompt
1228
- Text.Preference.AI.GenerateSubjectPrompt
29+
- Text.Preference.AI.Name
30+
- Text.Repository.CustomActions
31+
- Text.Repository.CustomActions.Empty
32+
- Text.Stash.KeepIndex
1333
- Text.WorkingCopy.ConfirmCommitWithoutFiles
1434

1535
</details>
1636

17-
### fr_FR.axaml: 90.36%
37+
### es_ES.axaml: 97.08%
38+
39+
40+
<details>
41+
<summary>Missing Keys</summary>
42+
43+
- Text.ChangeCM.GenerateCommitMessage
44+
- Text.CommitCM.CustomAction
45+
- Text.Configure.CustomAction
46+
- Text.Configure.CustomAction.Arguments
47+
- Text.Configure.CustomAction.Arguments.Tip
48+
- Text.Configure.CustomAction.Executable
49+
- Text.Configure.CustomAction.Name
50+
- Text.Configure.CustomAction.Scope
51+
- Text.Configure.CustomAction.Scope.Commit
52+
- Text.Configure.CustomAction.Scope.Repository
53+
- Text.Configure.Git.EnablePruneOnFetch
54+
- Text.Configure.OpenAI
55+
- Text.Configure.OpenAI.Prefered
56+
- Text.Configure.OpenAI.Prefered.Tip
57+
- Text.ExecuteCustomAction
58+
- Text.ExecuteCustomAction.Name
59+
- Text.Preference.AI.Name
60+
- Text.Repository.CustomActions
61+
- Text.Repository.CustomActions.Empty
62+
- Text.Stash.KeepIndex
63+
64+
</details>
65+
66+
### fr_FR.axaml: 87.72%
1867

1968

2069
<details>
@@ -23,16 +72,31 @@
2372
- Text.About.Chart
2473
- Text.AIAssistant
2574
- Text.AIAssistant.Tip
75+
- Text.BranchCM.FetchInto
76+
- Text.ChangeCM.GenerateCommitMessage
2677
- Text.CherryPick.AppendSourceToMessage
2778
- Text.CherryPick.Mainline
2879
- Text.CherryPick.Mainline.Tips
2980
- Text.CommitCM.CherryPickMultiple
81+
- Text.CommitCM.CustomAction
3082
- Text.CommitCM.SquashCommitsSinceThis
3183
- Text.CommitDetail.Info.WebLinks
84+
- Text.Configure.CustomAction
85+
- Text.Configure.CustomAction.Arguments
86+
- Text.Configure.CustomAction.Arguments.Tip
87+
- Text.Configure.CustomAction.Executable
88+
- Text.Configure.CustomAction.Name
89+
- Text.Configure.CustomAction.Scope
90+
- Text.Configure.CustomAction.Scope.Commit
91+
- Text.Configure.CustomAction.Scope.Repository
3292
- Text.Configure.Git.DefaultRemote
93+
- Text.Configure.Git.EnablePruneOnFetch
3394
- Text.Configure.Git.EnableSignOff
3495
- Text.Configure.IssueTracker.AddSampleGitLabIssue
3596
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
97+
- Text.Configure.OpenAI
98+
- Text.Configure.OpenAI.Prefered
99+
- Text.Configure.OpenAI.Prefered.Tip
36100
- Text.ConfigureWorkspace
37101
- Text.ConfigureWorkspace.Color
38102
- Text.ConfigureWorkspace.Restore
@@ -45,6 +109,8 @@
45109
- Text.ConventionalCommit.Type
46110
- Text.Diff.IgnoreWhitespace
47111
- Text.Discard.IncludeIgnored
112+
- Text.ExecuteCustomAction
113+
- Text.ExecuteCustomAction.Name
48114
- Text.FileHistory.FileChange
49115
- Text.GitLFS.Locks.OnlyMine
50116
- Text.Histories.Header.AuthorTime
@@ -55,24 +121,27 @@
55121
- Text.Hotkeys.Repo.DiscardSelected
56122
- Text.MoveRepositoryNode
57123
- Text.MoveRepositoryNode.Target
58-
- Text.Preference.Advanced
59124
- Text.Preference.AI
60125
- Text.Preference.AI.AnalyzeDiffPrompt
61126
- Text.Preference.AI.ApiKey
62127
- Text.Preference.AI.GenerateSubjectPrompt
63128
- Text.Preference.AI.Model
129+
- Text.Preference.AI.Name
64130
- Text.Preference.AI.Server
65131
- Text.Preference.General.ShowAuthorTime
66132
- Text.Preference.Integration
67133
- Text.Preference.Shell
68134
- Text.Preference.Shell.Type
69135
- Text.Preference.Shell.Path
70136
- Text.Repository.AutoFetching
137+
- Text.Repository.CustomActions
138+
- Text.Repository.CustomActions.Empty
71139
- Text.Repository.EnableReflog
72140
- Text.Repository.Search.InCurrentBranch
73141
- Text.ScanRepositories
74142
- Text.ScanRepositories.RootDir
75143
- Text.Squash.Into
144+
- Text.Stash.KeepIndex
76145
- Text.Stash.OnlyStagedChanges
77146
- Text.Stash.TipForSelectedFiles
78147
- Text.Statistics.Overview
@@ -87,7 +156,7 @@
87156

88157
</details>
89158

90-
### pt_BR.axaml: 93.52%
159+
### pt_BR.axaml: 90.79%
91160

92161

93162
<details>
@@ -96,18 +165,33 @@
96165
- Text.About.Chart
97166
- Text.AIAssistant
98167
- Text.AIAssistant.Tip
168+
- Text.BranchCM.FetchInto
169+
- Text.ChangeCM.GenerateCommitMessage
99170
- Text.CherryPick.AppendSourceToMessage
100171
- Text.CherryPick.Mainline
101172
- Text.CherryPick.Mainline.Tips
102173
- Text.CommitCM.CherryPickMultiple
174+
- Text.CommitCM.CustomAction
103175
- Text.CommitCM.SquashCommitsSinceThis
104176
- Text.CommitDetail.Info.ContainsIn
105177
- Text.CommitDetail.Info.ContainsIn.Title
106178
- Text.CommitDetail.Info.WebLinks
179+
- Text.Configure.CustomAction
180+
- Text.Configure.CustomAction.Arguments
181+
- Text.Configure.CustomAction.Arguments.Tip
182+
- Text.Configure.CustomAction.Executable
183+
- Text.Configure.CustomAction.Name
184+
- Text.Configure.CustomAction.Scope
185+
- Text.Configure.CustomAction.Scope.Commit
186+
- Text.Configure.CustomAction.Scope.Repository
107187
- Text.Configure.Git.DefaultRemote
188+
- Text.Configure.Git.EnablePruneOnFetch
108189
- Text.Configure.Git.EnableSignOff
109190
- Text.Configure.IssueTracker.AddSampleGitLabIssue
110191
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
192+
- Text.Configure.OpenAI
193+
- Text.Configure.OpenAI.Prefered
194+
- Text.Configure.OpenAI.Prefered.Tip
111195
- Text.ConfigureWorkspace
112196
- Text.ConfigureWorkspace.Color
113197
- Text.ConfigureWorkspace.Restore
@@ -120,14 +204,19 @@
120204
- Text.ConventionalCommit.Type
121205
- Text.CopyAllText
122206
- Text.Discard.IncludeIgnored
207+
- Text.ExecuteCustomAction
208+
- Text.ExecuteCustomAction.Name
123209
- Text.FileHistory.FileContent
124210
- Text.FileHistory.FileChange
125211
- Text.GitLFS.Locks.OnlyMine
126212
- Text.MoveRepositoryNode
127213
- Text.MoveRepositoryNode.Target
128-
- Text.Preference.Advanced
214+
- Text.Preference.AI.Name
129215
- Text.Push.CheckSubmodules
216+
- Text.Repository.CustomActions
217+
- Text.Repository.CustomActions.Empty
130218
- Text.Squash.Into
219+
- Text.Stash.KeepIndex
131220
- Text.Stash.OnlyStagedChanges
132221
- Text.Stash.TipForSelectedFiles
133222
- Text.Statistics.Overview
@@ -149,18 +238,13 @@
149238

150239
</details>
151240

152-
### zh_CN.axaml: 99.10%
241+
### zh_CN.axaml: 100.00%
153242

154243

155244
<details>
156245
<summary>Missing Keys</summary>
157246

158-
- Text.Preference.AI
159-
- Text.Preference.AI.AnalyzeDiffPrompt
160-
- Text.Preference.AI.ApiKey
161-
- Text.Preference.AI.GenerateSubjectPrompt
162-
- Text.Preference.AI.Model
163-
- Text.Preference.AI.Server
247+
164248

165249
</details>
166250

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.36
1+
8.37

‎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
9-
Requires: libSM
8+
Requires: (libX11 or libX11-6)
9+
Requires: (libSM or libSM6)
1010

1111
%define _build_id_links none
1212

‎src/App.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<ResourceInclude x:Key="ru_RU" Source="/Resources/Locales/ru_RU.axaml"/>
1919
<ResourceInclude x:Key="zh_CN" Source="/Resources/Locales/zh_CN.axaml"/>
2020
<ResourceInclude x:Key="zh_TW" Source="/Resources/Locales/zh_TW.axaml"/>
21+
<ResourceInclude x:Key="es_ES" Source="/Resources/Locales/es_ES.axaml"/>
2122
</ResourceDictionary>
2223
</Application.Resources>
2324

‎src/App.axaml.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public static AppBuilder BuildAvaloniaApp()
5959
builder.UsePlatformDetect();
6060
builder.LogToTrace();
6161
builder.WithInterFont();
62+
builder.With(new FontManagerOptions()
63+
{
64+
DefaultFamilyName = "fonts:Inter#Inter"
65+
});
6266
builder.ConfigureFonts(manager =>
6367
{
6468
var monospace = new EmbeddedFontCollection(
@@ -223,7 +227,7 @@ public static void SetFonts(string defaultFont, string monospaceFont, bool onlyU
223227
if (onlyUseMonospaceFontInEditor)
224228
{
225229
if (string.IsNullOrEmpty(defaultFont))
226-
resDic.Add("Fonts.Primary", new FontFamily("fonts:Inter#Inter, $Default"));
230+
resDic.Add("Fonts.Primary", new FontFamily("fonts:Inter#Inter"));
227231
else
228232
resDic.Add("Fonts.Primary", new FontFamily(defaultFont));
229233
}

0 commit comments

Comments
 (0)