Skip to content

Commit 4b5b702

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v2025.28'
2 parents 0a5b14e + 0375fe9 commit 4b5b702

File tree

90 files changed

+5798
-5471
lines changed

Some content is hidden

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

90 files changed

+5798
-5471
lines changed

‎SourceGit.sln

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

‎SourceGit.slnx

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<Solution>
2+
<Folder Name="/.github/workflows/">
3+
<File Path=".github/workflows/build.yml"/>
4+
<File Path=".github/workflows/ci.yml"/>
5+
<File Path=".github/workflows/format-check.yml"/>
6+
<File Path=".github/workflows/localization-check.yml"/>
7+
<File Path=".github/workflows/package.yml"/>
8+
<File Path=".github/workflows/release.yml"/>
9+
</Folder>
10+
11+
<Folder Name="/build/resources/_common/applications/">
12+
<File Path="build/resources/_common/applications/sourcegit.desktop"/>
13+
</Folder>
14+
15+
<Folder Name="/build/resources/_common/icons/">
16+
<File Path="build/resources/_common/icons/sourcegit.png"/>
17+
</Folder>
18+
19+
<Folder Name="/build/resources/_common/">
20+
<File Path="build/resources/_common/sourcegit"/>
21+
</Folder>
22+
23+
<Folder Name="/build/resources/app/">
24+
<File Path="build/resources/app/App.icns"/>
25+
<File Path="build/resources/app/App.plist"/>
26+
</Folder>
27+
28+
<Folder Name="/build/resources/appimage/">
29+
<File Path="build/resources/appimage/sourcegit"/>
30+
<File Path="build/resources/appimage/sourcegit.appdata.xml"/>
31+
</Folder>
32+
33+
<Folder Name="/build/resources/deb/DEBIAN/">
34+
<File Path="build/resources/deb/DEBIAN/control"/>
35+
<File Path="build/resources/deb/DEBIAN/preinst"/>
36+
<File Path="build/resources/deb/DEBIAN/prerm"/>
37+
</Folder>
38+
39+
<Folder Name="/build/resources/rpm/SPECS/">
40+
<File Path="build/resources/rpm/SPECS/build.spec"/>
41+
</Folder>
42+
43+
<Folder Name="/build/scripts/">
44+
<File Path="build/scripts/localization-check.js"/>
45+
<File Path="build/scripts/package.linux.sh"/>
46+
<File Path="build/scripts/package.osx-app.sh"/>
47+
<File Path="build/scripts/package.windows.sh"/>
48+
</Folder>
49+
50+
<Folder Name="/build/">
51+
<File Path="build/README.md"/>
52+
</Folder>
53+
54+
<Folder Name="/src/">
55+
<Project Path="src/SourceGit.csproj" />
56+
</Folder>
57+
58+
<Folder Name="/files/">
59+
<File Path=".editconfig"/>
60+
<File Path=".gitattributes"/>
61+
<File Path=".gitignore"/>
62+
<File Path=".issuetracker"/>
63+
<File Path="global.json"/>
64+
<File Path="LICENSE"/>
65+
<File Path="README.md"/>
66+
<File Path="THIRD-PARTY-LICENSES.md"/>
67+
<File Path="TRANSLATION.md"/>
68+
</Folder>
69+
</Solution>

‎TRANSLATION.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,16 @@ This document shows the translation status of each locale file in the repository
88

99
### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
1010

11-
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
11+
### ![es__ES](https://img.shields.io/badge/es__ES-99.88%25-yellow)
1212

13-
### ![fr__FR](https://img.shields.io/badge/fr__FR-82.16%25-yellow)
13+
<details>
14+
<summary>Missing keys in es_ES.axaml</summary>
15+
16+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
17+
18+
</details>
19+
20+
### ![fr__FR](https://img.shields.io/badge/fr__FR-82.04%25-yellow)
1421

1522
<details>
1623
<summary>Missing keys in fr_FR.axaml</summary>
@@ -64,6 +71,7 @@ This document shows the translation status of each locale file in the repository
6471
- Text.Configure.CustomAction.InputControls.Tip
6572
- Text.Configure.CustomAction.Scope.Tag
6673
- Text.Configure.Git.PreferredMergeMode
74+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
6775
- Text.Configure.IssueTracker.Share
6876
- Text.ConfigureCustomActionControls
6977
- Text.ConfigureCustomActionControls.CheckedValue
@@ -170,7 +178,7 @@ This document shows the translation status of each locale file in the repository
170178

171179
</details>
172180

173-
### ![it__IT](https://img.shields.io/badge/it__IT-87.44%25-yellow)
181+
### ![it__IT](https://img.shields.io/badge/it__IT-87.32%25-yellow)
174182

175183
<details>
176184
<summary>Missing keys in it_IT.axaml</summary>
@@ -211,6 +219,7 @@ This document shows the translation status of each locale file in the repository
211219
- Text.Configure.CustomAction.InputControls.Edit
212220
- Text.Configure.CustomAction.InputControls.Tip
213221
- Text.Configure.CustomAction.Scope.Tag
222+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
214223
- Text.Configure.IssueTracker.Share
215224
- Text.ConfigureCustomActionControls
216225
- Text.ConfigureCustomActionControls.CheckedValue
@@ -285,7 +294,7 @@ This document shows the translation status of each locale file in the repository
285294

286295
</details>
287296

288-
### ![ja__JP](https://img.shields.io/badge/ja__JP-82.16%25-yellow)
297+
### ![ja__JP](https://img.shields.io/badge/ja__JP-82.04%25-yellow)
289298

290299
<details>
291300
<summary>Missing keys in ja_JP.axaml</summary>
@@ -340,6 +349,7 @@ This document shows the translation status of each locale file in the repository
340349
- Text.Configure.CustomAction.InputControls.Tip
341350
- Text.Configure.CustomAction.Scope.Tag
342351
- Text.Configure.Git.PreferredMergeMode
352+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
343353
- Text.Configure.IssueTracker.Share
344354
- Text.ConfigureCustomActionControls
345355
- Text.ConfigureCustomActionControls.CheckedValue
@@ -445,7 +455,7 @@ This document shows the translation status of each locale file in the repository
445455

446456
</details>
447457

448-
### ![pt__BR](https://img.shields.io/badge/pt__BR-75.12%25-yellow)
458+
### ![pt__BR](https://img.shields.io/badge/pt__BR-75.00%25-yellow)
449459

450460
<details>
451461
<summary>Missing keys in pt_BR.axaml</summary>
@@ -515,6 +525,7 @@ This document shows the translation status of each locale file in the repository
515525
- Text.Configure.CustomAction.Scope.Tag
516526
- Text.Configure.CustomAction.WaitForExit
517527
- Text.Configure.Git.PreferredMergeMode
528+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
518529
- Text.Configure.IssueTracker.AddSampleGiteeIssue
519530
- Text.Configure.IssueTracker.AddSampleGiteePullRequest
520531
- Text.Configure.IssueTracker.Share
@@ -667,7 +678,7 @@ This document shows the translation status of each locale file in the repository
667678

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

670-
### ![ta__IN](https://img.shields.io/badge/ta__IN-82.28%25-yellow)
681+
### ![ta__IN](https://img.shields.io/badge/ta__IN-82.16%25-yellow)
671682

672683
<details>
673684
<summary>Missing keys in ta_IN.axaml</summary>
@@ -722,6 +733,7 @@ This document shows the translation status of each locale file in the repository
722733
- Text.Configure.CustomAction.InputControls.Tip
723734
- Text.Configure.CustomAction.Scope.Tag
724735
- Text.Configure.Git.PreferredMergeMode
736+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
725737
- Text.Configure.IssueTracker.Share
726738
- Text.ConfigureCustomActionControls
727739
- Text.ConfigureCustomActionControls.CheckedValue
@@ -826,7 +838,7 @@ This document shows the translation status of each locale file in the repository
826838

827839
</details>
828840

829-
### ![uk__UA](https://img.shields.io/badge/uk__UA-83.45%25-yellow)
841+
### ![uk__UA](https://img.shields.io/badge/uk__UA-83.33%25-yellow)
830842

831843
<details>
832844
<summary>Missing keys in uk_UA.axaml</summary>
@@ -879,6 +891,7 @@ This document shows the translation status of each locale file in the repository
879891
- Text.Configure.CustomAction.InputControls.Edit
880892
- Text.Configure.CustomAction.InputControls.Tip
881893
- Text.Configure.CustomAction.Scope.Tag
894+
- Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
882895
- Text.Configure.IssueTracker.Share
883896
- Text.ConfigureCustomActionControls
884897
- Text.ConfigureCustomActionControls.CheckedValue

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.27
1+
2025.28

‎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=/opt/sourcegit/sourcegit
4+
Exec=/usr/bin/sourcegit
55
Icon=/usr/share/icons/sourcegit.png
66
Terminal=false
77
Type=Application

‎build/resources/_common/sourcegit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
eval `ssh-agent -s`
4+
/opt/sourcegit/sourcegit $@

‎build/resources/appimage/sourcegit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
eval `ssh-agent -s`
4+
"$APPDIR/opt/sourcegit/sourcegit" $@

‎build/resources/appimage/sourcegit.png

-36.6 KB
Binary file not shown.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ 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-
ln -rsf %{buildroot}/opt/sourcegit/sourcegit %{buildroot}/%{_bindir}
24+
cp -f ../../_common/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
2930

3031
%files
3132
%dir /opt/sourcegit/

‎build/scripts/package.linux.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ cp -r SourceGit SourceGit.AppDir/opt/sourcegit
4141
desktop-file-install resources/_common/applications/sourcegit.desktop --dir SourceGit.AppDir/usr/share/applications \
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
44-
cp resources/appimage/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png
45-
ln -rsf SourceGit.AppDir/opt/sourcegit/sourcegit SourceGit.AppDir/AppRun
44+
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
4647
ln -rsf SourceGit.AppDir/usr/share/applications/com.sourcegit_scm.SourceGit.desktop SourceGit.AppDir
4748
cp resources/appimage/sourcegit.appdata.xml SourceGit.AppDir/usr/share/metainfo/com.sourcegit_scm.SourceGit.appdata.xml
4849

@@ -53,9 +54,10 @@ mkdir -p resources/deb/usr/bin
5354
mkdir -p resources/deb/usr/share/applications
5455
mkdir -p resources/deb/usr/share/icons
5556
cp -f SourceGit/* resources/deb/opt/sourcegit
56-
ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
57+
cp -f resources/_common/sourcegit resources/deb/usr/bin/
5758
cp -r resources/_common/applications resources/deb/usr/share
5859
cp -r resources/_common/icons resources/deb/usr/share
60+
chmod 755 resources/deb/usr/bin/sourcegit
5961
# Calculate installed size in KB
6062
installed_size=$(du -sk resources/deb | cut -f1)
6163
# Update the control file

0 commit comments

Comments
 (0)