Skip to content

Commit cb03b07

Browse files
committed
Merge branch 'release/v2025.30'
2 parents 7f5c7ad + f6f7403 commit cb03b07

Some content is hidden

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

45 files changed

+423
-184
lines changed

THIRD-PARTY-LICENSES.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ The project uses the following third-party libraries or assets
77
### AvaloniaUI
88

99
- **Source**: https://github.com/AvaloniaUI/Avalonia
10-
- **Version**: 11.2.8
10+
- **Version**: 11.3.3
1111
- **License**: MIT License
1212
- **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
1313

1414
### AvaloniaEdit
1515

1616
- **Source**: https://github.com/AvaloniaUI/AvaloniaEdit
17-
- **Version**: 11.2.0
17+
- **Version**: 11.3.0
1818
- **License**: MIT License
1919
- **License Link**: https://github.com/AvaloniaUI/AvaloniaEdit/blob/master/LICENSE
2020

@@ -28,21 +28,21 @@ The project uses the following third-party libraries or assets
2828
### TextMateSharp
2929

3030
- **Source**: https://github.com/danipen/TextMateSharp
31-
- **Version**: 1.0.66
31+
- **Version**: 1.0.70
3232
- **License**: MIT License
3333
- **License Link**: https://github.com/danipen/TextMateSharp/blob/master/LICENSE.md
3434

3535
### OpenAI .NET SDK
3636

3737
- **Source**: https://github.com/openai/openai-dotnet
38-
- **Version**: 2.2.0-beta.4
38+
- **Version**: 2.3.0
3939
- **License**: MIT License
4040
- **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
4141

4242
### Azure.AI.OpenAI
4343

4444
- **Source**: https://github.com/Azure/azure-sdk-for-net
45-
- **Version**: 2.2.0-beta.4
45+
- **Version**: 2.2.0-beta.5
4646
- **License**: MIT License
4747
- **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
4848

TRANSLATION.md

Lines changed: 66 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,25 @@ 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)
10-
11-
### ![es__ES](https://img.shields.io/badge/es__ES-99.77%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-99.07%25-yellow)
1210

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

16-
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
17-
- Text.Submodule.CopyBranch
14+
- Text.Repository.Dashboard
15+
- Text.Repository.MoreOptions
16+
- Text.Tag.Tagger
17+
- Text.Tag.Time
18+
- Text.TagCM.Copy.Message
19+
- Text.TagCM.Copy.Name
20+
- Text.TagCM.Copy.Tagger
21+
- Text.TagCM.CopyName
1822

1923
</details>
2024

21-
### ![fr__FR](https://img.shields.io/badge/fr__FR-81.95%25-yellow)
25+
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
26+
27+
### ![fr__FR](https://img.shields.io/badge/fr__FR-81.24%25-yellow)
2228

2329
<details>
2430
<summary>Missing keys in fr_FR.axaml</summary>
@@ -36,7 +42,6 @@ This document shows the translation status of each locale file in the repository
3642
- Text.Bisect.Skip
3743
- Text.Bisect.WaitingForRange
3844
- Text.BranchCM.ResetToSelectedCommit
39-
- Text.BranchTree.Local
4045
- Text.BranchTree.Remote
4146
- Text.BranchTree.Tracking
4247
- Text.BranchTree.URL
@@ -126,6 +131,8 @@ This document shows the translation status of each locale file in the repository
126131
- Text.Repository.BranchSort.ByCommitterDate
127132
- Text.Repository.BranchSort.ByName
128133
- Text.Repository.ClearStashes
134+
- Text.Repository.Dashboard
135+
- Text.Repository.MoreOptions
129136
- Text.Repository.OnlyHighlightCurrentBranchInGraph
130137
- Text.Repository.Search.ByContent
131138
- Text.Repository.Search.ByPath
@@ -163,6 +170,12 @@ This document shows the translation status of each locale file in the repository
163170
- Text.Submodule.Status.Unmerged
164171
- Text.Submodule.Update
165172
- Text.Submodule.URL
173+
- Text.Tag.Tagger
174+
- Text.Tag.Time
175+
- Text.TagCM.Copy.Message
176+
- Text.TagCM.Copy.Name
177+
- Text.TagCM.Copy.Tagger
178+
- Text.TagCM.CopyName
166179
- Text.TagCM.CustomAction
167180
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
168181
- Text.ViewLogs
@@ -180,7 +193,7 @@ This document shows the translation status of each locale file in the repository
180193

181194
</details>
182195

183-
### ![it__IT](https://img.shields.io/badge/it__IT-87.22%25-yellow)
196+
### ![it__IT](https://img.shields.io/badge/it__IT-86.48%25-yellow)
184197

185198
<details>
186199
<summary>Missing keys in it_IT.axaml</summary>
@@ -191,7 +204,6 @@ This document shows the translation status of each locale file in the repository
191204
- Text.Askpass.Passphrase
192205
- Text.Avatar.Load
193206
- Text.BranchCM.ResetToSelectedCommit
194-
- Text.BranchTree.Local
195207
- Text.BranchTree.Remote
196208
- Text.BranchTree.Tracking
197209
- Text.BranchTree.URL
@@ -264,6 +276,8 @@ This document shows the translation status of each locale file in the repository
264276
- Text.Push.Revision
265277
- Text.Push.Revision.Title
266278
- Text.Repository.ClearStashes
279+
- Text.Repository.Dashboard
280+
- Text.Repository.MoreOptions
267281
- Text.Repository.OnlyHighlightCurrentBranchInGraph
268282
- Text.Repository.Search.ByPath
269283
- Text.Repository.ShowDecoratedCommitsOnly
@@ -289,6 +303,12 @@ This document shows the translation status of each locale file in the repository
289303
- Text.Submodule.SetBranch
290304
- Text.Submodule.SetURL
291305
- Text.Submodule.Update
306+
- Text.Tag.Tagger
307+
- Text.Tag.Time
308+
- Text.TagCM.Copy.Message
309+
- Text.TagCM.Copy.Name
310+
- Text.TagCM.Copy.Tagger
311+
- Text.TagCM.CopyName
292312
- Text.TagCM.CustomAction
293313
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
294314
- Text.WorkingCopy.AddToGitIgnore.InFolder
@@ -297,7 +317,7 @@ This document shows the translation status of each locale file in the repository
297317

298318
</details>
299319

300-
### ![ja__JP](https://img.shields.io/badge/ja__JP-81.95%25-yellow)
320+
### ![ja__JP](https://img.shields.io/badge/ja__JP-81.24%25-yellow)
301321

302322
<details>
303323
<summary>Missing keys in ja_JP.axaml</summary>
@@ -316,7 +336,6 @@ This document shows the translation status of each locale file in the repository
316336
- Text.Bisect.WaitingForRange
317337
- Text.BranchCM.CompareWithCurrent
318338
- Text.BranchCM.ResetToSelectedCommit
319-
- Text.BranchTree.Local
320339
- Text.BranchTree.Remote
321340
- Text.BranchTree.Tracking
322341
- Text.BranchTree.URL
@@ -406,7 +425,9 @@ This document shows the translation status of each locale file in the repository
406425
- Text.Repository.BranchSort.ByCommitterDate
407426
- Text.Repository.BranchSort.ByName
408427
- Text.Repository.ClearStashes
428+
- Text.Repository.Dashboard
409429
- Text.Repository.FilterCommits
430+
- Text.Repository.MoreOptions
410431
- Text.Repository.OnlyHighlightCurrentBranchInGraph
411432
- Text.Repository.Search.ByContent
412433
- Text.Repository.Search.ByPath
@@ -442,6 +463,12 @@ This document shows the translation status of each locale file in the repository
442463
- Text.Submodule.Status.Unmerged
443464
- Text.Submodule.Update
444465
- Text.Submodule.URL
466+
- Text.Tag.Tagger
467+
- Text.Tag.Time
468+
- Text.TagCM.Copy.Message
469+
- Text.TagCM.Copy.Name
470+
- Text.TagCM.Copy.Tagger
471+
- Text.TagCM.CopyName
445472
- Text.TagCM.CustomAction
446473
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
447474
- Text.ViewLogs
@@ -459,7 +486,7 @@ This document shows the translation status of each locale file in the repository
459486

460487
</details>
461488

462-
### ![pt__BR](https://img.shields.io/badge/pt__BR-74.91%25-red)
489+
### ![pt__BR](https://img.shields.io/badge/pt__BR-74.24%25-red)
463490

464491
<details>
465492
<summary>Missing keys in pt_BR.axaml</summary>
@@ -485,7 +512,6 @@ This document shows the translation status of each locale file in the repository
485512
- Text.BranchCM.CustomAction
486513
- Text.BranchCM.MergeMultiBranches
487514
- Text.BranchCM.ResetToSelectedCommit
488-
- Text.BranchTree.Local
489515
- Text.BranchTree.Remote
490516
- Text.BranchTree.Tracking
491517
- Text.BranchTree.URL
@@ -611,11 +637,13 @@ This document shows the translation status of each locale file in the repository
611637
- Text.Repository.BranchSort.ByCommitterDate
612638
- Text.Repository.BranchSort.ByName
613639
- Text.Repository.ClearStashes
640+
- Text.Repository.Dashboard
614641
- Text.Repository.FilterCommits
615642
- Text.Repository.HistoriesLayout
616643
- Text.Repository.HistoriesLayout.Horizontal
617644
- Text.Repository.HistoriesLayout.Vertical
618645
- Text.Repository.HistoriesOrder
646+
- Text.Repository.MoreOptions
619647
- Text.Repository.Notifications.Clear
620648
- Text.Repository.OnlyHighlightCurrentBranchInGraph
621649
- Text.Repository.Search.ByContent
@@ -662,6 +690,12 @@ This document shows the translation status of each locale file in the repository
662690
- Text.Submodule.Status.Unmerged
663691
- Text.Submodule.Update
664692
- Text.Submodule.URL
693+
- Text.Tag.Tagger
694+
- Text.Tag.Time
695+
- Text.TagCM.Copy.Message
696+
- Text.TagCM.Copy.Name
697+
- Text.TagCM.Copy.Tagger
698+
- Text.TagCM.CopyName
665699
- Text.TagCM.CustomAction
666700
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
667701
- Text.ViewLogs
@@ -683,7 +717,7 @@ This document shows the translation status of each locale file in the repository
683717

684718
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
685719

686-
### ![ta__IN](https://img.shields.io/badge/ta__IN-82.06%25-yellow)
720+
### ![ta__IN](https://img.shields.io/badge/ta__IN-81.35%25-yellow)
687721

688722
<details>
689723
<summary>Missing keys in ta_IN.axaml</summary>
@@ -702,7 +736,6 @@ This document shows the translation status of each locale file in the repository
702736
- Text.Bisect.WaitingForRange
703737
- Text.BranchCM.CompareWithCurrent
704738
- Text.BranchCM.ResetToSelectedCommit
705-
- Text.BranchTree.Local
706739
- Text.BranchTree.Remote
707740
- Text.BranchTree.Tracking
708741
- Text.BranchTree.URL
@@ -792,6 +825,8 @@ This document shows the translation status of each locale file in the repository
792825
- Text.Repository.BranchSort.ByCommitterDate
793826
- Text.Repository.BranchSort.ByName
794827
- Text.Repository.ClearStashes
828+
- Text.Repository.Dashboard
829+
- Text.Repository.MoreOptions
795830
- Text.Repository.OnlyHighlightCurrentBranchInGraph
796831
- Text.Repository.Search.ByContent
797832
- Text.Repository.Search.ByPath
@@ -827,6 +862,12 @@ This document shows the translation status of each locale file in the repository
827862
- Text.Submodule.Status.Unmerged
828863
- Text.Submodule.Update
829864
- Text.Submodule.URL
865+
- Text.Tag.Tagger
866+
- Text.Tag.Time
867+
- Text.TagCM.Copy.Message
868+
- Text.TagCM.Copy.Name
869+
- Text.TagCM.Copy.Tagger
870+
- Text.TagCM.CopyName
830871
- Text.TagCM.CustomAction
831872
- Text.UpdateSubmodules.Target
832873
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
@@ -844,7 +885,7 @@ This document shows the translation status of each locale file in the repository
844885

845886
</details>
846887

847-
### ![uk__UA](https://img.shields.io/badge/uk__UA-83.24%25-yellow)
888+
### ![uk__UA](https://img.shields.io/badge/uk__UA-82.52%25-yellow)
848889

849890
<details>
850891
<summary>Missing keys in uk_UA.axaml</summary>
@@ -862,7 +903,6 @@ This document shows the translation status of each locale file in the repository
862903
- Text.Bisect.Skip
863904
- Text.Bisect.WaitingForRange
864905
- Text.BranchCM.ResetToSelectedCommit
865-
- Text.BranchTree.Local
866906
- Text.BranchTree.Remote
867907
- Text.BranchTree.Tracking
868908
- Text.BranchTree.URL
@@ -948,6 +988,8 @@ This document shows the translation status of each locale file in the repository
948988
- Text.Repository.BranchSort.ByCommitterDate
949989
- Text.Repository.BranchSort.ByName
950990
- Text.Repository.ClearStashes
991+
- Text.Repository.Dashboard
992+
- Text.Repository.MoreOptions
951993
- Text.Repository.OnlyHighlightCurrentBranchInGraph
952994
- Text.Repository.Search.ByContent
953995
- Text.Repository.Search.ByPath
@@ -983,6 +1025,12 @@ This document shows the translation status of each locale file in the repository
9831025
- Text.Submodule.Status.Unmerged
9841026
- Text.Submodule.Update
9851027
- Text.Submodule.URL
1028+
- Text.Tag.Tagger
1029+
- Text.Tag.Time
1030+
- Text.TagCM.Copy.Message
1031+
- Text.TagCM.Copy.Name
1032+
- Text.TagCM.Copy.Tagger
1033+
- Text.TagCM.CopyName
9861034
- Text.TagCM.CustomAction
9871035
- Text.UpdateSubmodules.UpdateToRemoteTrackingBranch
9881036
- Text.ViewLogs

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.29
1+
2025.30

build/resources/_common/applications/sourcegit.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Desktop Entry]
22
Name=SourceGit
33
Comment=Open-source & Free Git GUI Client
4-
Exec=/usr/bin/sourcegit
4+
Exec=/opt/sourcegit/sourcegit
55
Icon=/usr/share/icons/sourcegit.png
66
Terminal=false
77
Type=Application

build/resources/_common/sourcegit

Lines changed: 0 additions & 4 deletions
This file was deleted.

build/resources/appimage/sourcegit

Lines changed: 0 additions & 4 deletions
This file was deleted.

build/resources/rpm/SPECS/build.spec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ mkdir -p %{buildroot}/%{_bindir}
2121
mkdir -p %{buildroot}/usr/share/applications
2222
mkdir -p %{buildroot}/usr/share/icons
2323
cp -f ../../../SourceGit/* %{buildroot}/opt/sourcegit/
24-
cp -f ../../_common/sourcegit %{buildroot}/%{_bindir}
24+
ln -rsf %{buildroot}/opt/sourcegit/sourcegit %{buildroot}/%{_bindir}
2525
cp -r ../../_common/applications %{buildroot}/%{_datadir}
2626
cp -r ../../_common/icons %{buildroot}/%{_datadir}
2727
chmod 755 -R %{buildroot}/opt/sourcegit
2828
chmod 755 %{buildroot}/%{_datadir}/applications/sourcegit.desktop
29-
chmod 755 %{buildroot}/%{_bindir}/sourcegit
3029

3130
%files
3231
%dir /opt/sourcegit/

build/scripts/package.linux.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ desktop-file-install resources/_common/applications/sourcegit.desktop --dir Sour
4242
--set-icon com.sourcegit_scm.SourceGit --set-key=Exec --set-value=AppRun
4343
mv SourceGit.AppDir/usr/share/applications/{sourcegit,com.sourcegit_scm.SourceGit}.desktop
4444
cp resources/_common/icons/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png
45-
cp -f resources/appimage/sourcegit SourceGit.AppDir/AppRun
46-
chmod 755 SourceGit.AppDir/AppRun
45+
ln -rsf SourceGit.AppDir/opt/sourcegit/sourcegit SourceGit.AppDir/AppRun
4746
ln -rsf SourceGit.AppDir/usr/share/applications/com.sourcegit_scm.SourceGit.desktop SourceGit.AppDir
4847
cp resources/appimage/sourcegit.appdata.xml SourceGit.AppDir/usr/share/metainfo/com.sourcegit_scm.SourceGit.appdata.xml
4948

@@ -54,10 +53,9 @@ mkdir -p resources/deb/usr/bin
5453
mkdir -p resources/deb/usr/share/applications
5554
mkdir -p resources/deb/usr/share/icons
5655
cp -f SourceGit/* resources/deb/opt/sourcegit
57-
cp -f resources/_common/sourcegit resources/deb/usr/bin/
56+
ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
5857
cp -r resources/_common/applications resources/deb/usr/share
5958
cp -r resources/_common/icons resources/deb/usr/share
60-
chmod 755 resources/deb/usr/bin/sourcegit
6159
# Calculate installed size in KB
6260
installed_size=$(du -sk resources/deb | cut -f1)
6361
# Update the control file

src/Commands/Command.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private ProcessStartInfo CreateGitStartInfo(bool redirect)
172172

173173
// If an SSH private key was provided, sets the environment.
174174
if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
175-
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o AddKeysToAgent=yes -i {SSHKey.Quoted()}");
175+
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
176176

177177
// Force using en_US.UTF-8 locale
178178
if (OperatingSystem.IsLinux())

0 commit comments

Comments
 (0)