Skip to content

Commit 10ee562

Browse files
authored
Merge branch 'sourcegit-scm:develop' into develop
2 parents ca24af1 + 5db0acf commit 10ee562

43 files changed

Lines changed: 1447 additions & 1244 deletions

Some content is hidden

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

‎TRANSLATION.md‎

Lines changed: 74 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ 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-95.93%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-95.66%25-yellow)
1010

1111
<details>
1212
<summary>Missing keys in de_DE.axaml</summary>
1313

1414
- Text.Blame.Tips
1515
- Text.BranchTree.PushURL
16+
- Text.CommitDetail.Files.Tips
1617
- Text.Dashboard
1718
- Text.Diff.Binary.ViewContentOfNew
1819
- Text.File.Binary
@@ -53,17 +54,20 @@ This document shows the translation status of each locale file in the repository
5354
- Text.SSHKeyHelper.Title
5455
- Text.Statistics.Tips
5556
- Text.Terminate
57+
- Text.WorkingCopy.CollapseSidebar
5658
- Text.WorkingCopy.DiscardAll
59+
- Text.WorkingCopy.ExpandSidebar
5760

5861
</details>
5962

60-
### ![el__GR](https://img.shields.io/badge/el__GR-95.46%25-yellow)
63+
### ![el__GR](https://img.shields.io/badge/el__GR-95.19%25-yellow)
6164

6265
<details>
6366
<summary>Missing keys in el_GR.axaml</summary>
6467

6568
- Text.Blame.Tips
6669
- Text.BranchTree.PushURL
70+
- Text.CommitDetail.Files.Tips
6771
- Text.Dashboard
6872
- Text.Diff.Binary.ViewContentOfNew
6973
- Text.File.Binary
@@ -108,14 +112,25 @@ This document shows the translation status of each locale file in the repository
108112
- Text.SSHKeyHelper.Title
109113
- Text.Statistics.Tips
110114
- Text.Terminate
115+
- Text.WorkingCopy.CollapseSidebar
111116
- Text.WorkingCopy.DiscardAll
117+
- Text.WorkingCopy.ExpandSidebar
112118
- Text.WorkingCopy.FilterChanges
113119

114120
</details>
115121

116-
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
122+
### ![es__ES](https://img.shields.io/badge/es__ES-99.72%25-yellow)
117123

118-
### ![fr__FR](https://img.shields.io/badge/fr__FR-91.67%25-yellow)
124+
<details>
125+
<summary>Missing keys in es_ES.axaml</summary>
126+
127+
- Text.CommitDetail.Files.Tips
128+
- Text.WorkingCopy.CollapseSidebar
129+
- Text.WorkingCopy.ExpandSidebar
130+
131+
</details>
132+
133+
### ![fr__FR](https://img.shields.io/badge/fr__FR-91.42%25-yellow)
119134

120135
<details>
121136
<summary>Missing keys in fr_FR.axaml</summary>
@@ -132,6 +147,7 @@ This document shows the translation status of each locale file in the repository
132147
- Text.CheckoutDetached.Warning
133148
- Text.CommitCM.CopyAuthorTime
134149
- Text.CommitCM.CopyCommitterTime
150+
- Text.CommitDetail.Files.Tips
135151
- Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
136152
- Text.CopyAsPatch
137153
- Text.Dashboard
@@ -206,12 +222,14 @@ This document shows the translation status of each locale file in the repository
206222
- Text.Terminate
207223
- Text.UpdateSubmodules.Recursive
208224
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
225+
- Text.WorkingCopy.CollapseSidebar
209226
- Text.WorkingCopy.DiscardAll
227+
- Text.WorkingCopy.ExpandSidebar
210228
- Text.WorkingCopy.FilterChanges
211229

212230
</details>
213231

214-
### ![he__IL](https://img.shields.io/badge/he__IL-91.67%25-yellow)
232+
### ![he__IL](https://img.shields.io/badge/he__IL-91.42%25-yellow)
215233

216234
<details>
217235
<summary>Missing keys in he_IL.axaml</summary>
@@ -228,6 +246,7 @@ This document shows the translation status of each locale file in the repository
228246
- Text.CheckoutDetached.Warning
229247
- Text.CommitCM.CopyAuthorTime
230248
- Text.CommitCM.CopyCommitterTime
249+
- Text.CommitDetail.Files.Tips
231250
- Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
232251
- Text.CopyAsPatch
233252
- Text.Dashboard
@@ -302,18 +321,21 @@ This document shows the translation status of each locale file in the repository
302321
- Text.Terminate
303322
- Text.UpdateSubmodules.Recursive
304323
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
324+
- Text.WorkingCopy.CollapseSidebar
305325
- Text.WorkingCopy.DiscardAll
326+
- Text.WorkingCopy.ExpandSidebar
306327
- Text.WorkingCopy.FilterChanges
307328

308329
</details>
309330

310-
### ![id__ID](https://img.shields.io/badge/id__ID-95.93%25-yellow)
331+
### ![id__ID](https://img.shields.io/badge/id__ID-95.66%25-yellow)
311332

312333
<details>
313334
<summary>Missing keys in id_ID.axaml</summary>
314335

315336
- Text.Blame.Tips
316337
- Text.BranchTree.PushURL
338+
- Text.CommitDetail.Files.Tips
317339
- Text.Dashboard
318340
- Text.Diff.Binary.ViewContentOfNew
319341
- Text.File.Binary
@@ -353,12 +375,14 @@ This document shows the translation status of each locale file in the repository
353375
- Text.SSHKeyHelper.Title
354376
- Text.Statistics.Tips
355377
- Text.Terminate
378+
- Text.WorkingCopy.CollapseSidebar
356379
- Text.WorkingCopy.DiscardAll
380+
- Text.WorkingCopy.ExpandSidebar
357381
- Text.WorkingCopy.FilterChanges
358382

359383
</details>
360384

361-
### ![it__IT](https://img.shields.io/badge/it__IT-85.53%25-yellow)
385+
### ![it__IT](https://img.shields.io/badge/it__IT-85.28%25-yellow)
362386

363387
<details>
364388
<summary>Missing keys in it_IT.axaml</summary>
@@ -390,6 +414,7 @@ This document shows the translation status of each locale file in the repository
390414
- Text.CommitCM.CopyAuthorTime
391415
- Text.CommitCM.CopyCommitterTime
392416
- Text.CommitDetail.CollapseToBottom
417+
- Text.CommitDetail.Files.Tips
393418
- Text.CommitMessageTextBox.Column
394419
- Text.Compare.Changes
395420
- Text.Compare.Commits
@@ -511,17 +536,28 @@ This document shows the translation status of each locale file in the repository
511536
- Text.Terminate
512537
- Text.UpdateSubmodules.Recursive
513538
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
539+
- Text.WorkingCopy.CollapseSidebar
514540
- Text.WorkingCopy.DiscardAll
541+
- Text.WorkingCopy.ExpandSidebar
515542
- Text.WorkingCopy.FilterChanges
516543
- Text.Worktree.Branch
517544
- Text.Worktree.Head
518545
- Text.Worktree.Path
519546

520547
</details>
521548

522-
### ![ja__JP](https://img.shields.io/badge/ja__JP-%E2%88%9A-brightgreen)
549+
### ![ja__JP](https://img.shields.io/badge/ja__JP-99.72%25-yellow)
550+
551+
<details>
552+
<summary>Missing keys in ja_JP.axaml</summary>
553+
554+
- Text.CommitDetail.Files.Tips
555+
- Text.WorkingCopy.CollapseSidebar
556+
- Text.WorkingCopy.ExpandSidebar
557+
558+
</details>
523559

524-
### ![ko__KR](https://img.shields.io/badge/ko__KR-93.09%25-yellow)
560+
### ![ko__KR](https://img.shields.io/badge/ko__KR-92.83%25-yellow)
525561

526562
<details>
527563
<summary>Missing keys in ko_KR.axaml</summary>
@@ -533,6 +569,7 @@ This document shows the translation status of each locale file in the repository
533569
- Text.CheckoutDetached
534570
- Text.CheckoutDetached.Target
535571
- Text.CheckoutDetached.Warning
572+
- Text.CommitDetail.Files.Tips
536573
- Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
537574
- Text.Dashboard
538575
- Text.DeleteBranch.Force
@@ -597,12 +634,14 @@ This document shows the translation status of each locale file in the repository
597634
- Text.Terminate
598635
- Text.UpdateSubmodules.Recursive
599636
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
637+
- Text.WorkingCopy.CollapseSidebar
600638
- Text.WorkingCopy.DiscardAll
639+
- Text.WorkingCopy.ExpandSidebar
601640
- Text.WorkingCopy.FilterChanges
602641

603642
</details>
604643

605-
### ![pt__BR](https://img.shields.io/badge/pt__BR-60.36%25-red)
644+
### ![pt__BR](https://img.shields.io/badge/pt__BR-60.19%25-red)
606645

607646
<details>
608647
<summary>Missing keys in pt_BR.axaml</summary>
@@ -668,6 +707,7 @@ This document shows the translation status of each locale file in the repository
668707
- Text.CommitDetail.Changes.Count
669708
- Text.CommitDetail.CollapseToBottom
670709
- Text.CommitDetail.Files.Search
710+
- Text.CommitDetail.Files.Tips
671711
- Text.CommitDetail.Info.CopyEmail
672712
- Text.CommitDetail.Info.CopyName
673713
- Text.CommitDetail.Info.CopyNameAndEmail
@@ -1008,6 +1048,7 @@ This document shows the translation status of each locale file in the repository
10081048
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
10091049
- Text.WorkingCopy.ClearCommitHistories
10101050
- Text.WorkingCopy.ClearCommitHistories.Confirm
1051+
- Text.WorkingCopy.CollapseSidebar
10111052
- Text.WorkingCopy.CommitToEdit
10121053
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
10131054
- Text.WorkingCopy.ConfirmCommitWithFilter
@@ -1017,6 +1058,7 @@ This document shows the translation status of each locale file in the repository
10171058
- Text.WorkingCopy.Conflicts.UseMine
10181059
- Text.WorkingCopy.Conflicts.UseTheirs
10191060
- Text.WorkingCopy.DiscardAll
1061+
- Text.WorkingCopy.ExpandSidebar
10201062
- Text.WorkingCopy.FilterChanges
10211063
- Text.WorkingCopy.NoVerify
10221064
- Text.WorkingCopy.ResetAuthor
@@ -1029,13 +1071,14 @@ This document shows the translation status of each locale file in the repository
10291071

10301072
</details>
10311073

1032-
### ![ru__RU](https://img.shields.io/badge/ru__RU-98.30%25-yellow)
1074+
### ![ru__RU](https://img.shields.io/badge/ru__RU-98.02%25-yellow)
10331075

10341076
<details>
10351077
<summary>Missing keys in ru_RU.axaml</summary>
10361078

10371079
- Text.Blame.Tips
10381080
- Text.BranchTree.PushURL
1081+
- Text.CommitDetail.Files.Tips
10391082
- Text.Dashboard
10401083
- Text.Histories.AdvancedOptions
10411084
- Text.Hotkeys.Repo.ToggleCommitDetailPanel
@@ -1051,11 +1094,13 @@ This document shows the translation status of each locale file in the repository
10511094
- Text.SetPushUrl.Remote
10521095
- Text.SetPushUrl.URL
10531096
- Text.Statistics.Tips
1097+
- Text.WorkingCopy.CollapseSidebar
10541098
- Text.WorkingCopy.DiscardAll
1099+
- Text.WorkingCopy.ExpandSidebar
10551100

10561101
</details>
10571102

1058-
### ![ta__IN](https://img.shields.io/badge/ta__IN-61.97%25-red)
1103+
### ![ta__IN](https://img.shields.io/badge/ta__IN-61.79%25-red)
10591104

10601105
<details>
10611106
<summary>Missing keys in ta_IN.axaml</summary>
@@ -1147,6 +1192,7 @@ This document shows the translation status of each locale file in the repository
11471192
- Text.CommitCM.Reset
11481193
- Text.CommitDetail.Changes.Count
11491194
- Text.CommitDetail.CollapseToBottom
1195+
- Text.CommitDetail.Files.Tips
11501196
- Text.CommitDetail.Info.CopyEmail
11511197
- Text.CommitDetail.Info.CopyName
11521198
- Text.CommitDetail.Info.CopyNameAndEmail
@@ -1447,13 +1493,15 @@ This document shows the translation status of each locale file in the repository
14471493
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
14481494
- Text.WorkingCopy.ClearCommitHistories
14491495
- Text.WorkingCopy.ClearCommitHistories.Confirm
1496+
- Text.WorkingCopy.CollapseSidebar
14501497
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
14511498
- Text.WorkingCopy.Conflicts.Merge
14521499
- Text.WorkingCopy.Conflicts.MergeExternal
14531500
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
14541501
- Text.WorkingCopy.Conflicts.UseMine
14551502
- Text.WorkingCopy.Conflicts.UseTheirs
14561503
- Text.WorkingCopy.DiscardAll
1504+
- Text.WorkingCopy.ExpandSidebar
14571505
- Text.WorkingCopy.FilterChanges
14581506
- Text.WorkingCopy.NoVerify
14591507
- Text.WorkingCopy.ResetAuthor
@@ -1465,7 +1513,7 @@ This document shows the translation status of each locale file in the repository
14651513

14661514
</details>
14671515

1468-
### ![uk__UA](https://img.shields.io/badge/uk__UA-62.72%25-red)
1516+
### ![uk__UA](https://img.shields.io/badge/uk__UA-62.55%25-red)
14691517

14701518
<details>
14711519
<summary>Missing keys in uk_UA.axaml</summary>
@@ -1557,6 +1605,7 @@ This document shows the translation status of each locale file in the repository
15571605
- Text.CommitCM.Reset
15581606
- Text.CommitDetail.Changes.Count
15591607
- Text.CommitDetail.CollapseToBottom
1608+
- Text.CommitDetail.Files.Tips
15601609
- Text.CommitDetail.Info.CopyEmail
15611610
- Text.CommitDetail.Info.CopyName
15621611
- Text.CommitDetail.Info.CopyNameAndEmail
@@ -1852,10 +1901,12 @@ This document shows the translation status of each locale file in the repository
18521901
- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
18531902
- Text.WorkingCopy.ClearCommitHistories
18541903
- Text.WorkingCopy.ClearCommitHistories.Confirm
1904+
- Text.WorkingCopy.CollapseSidebar
18551905
- Text.WorkingCopy.ConfirmCommitWithDetachedHead
18561906
- Text.WorkingCopy.Conflicts.Merge
18571907
- Text.WorkingCopy.Conflicts.MergeExternal
18581908
- Text.WorkingCopy.DiscardAll
1909+
- Text.WorkingCopy.ExpandSidebar
18591910
- Text.WorkingCopy.FilterChanges
18601911
- Text.WorkingCopy.NoVerify
18611912
- Text.WorkingCopy.ResetAuthor
@@ -1869,4 +1920,13 @@ This document shows the translation status of each locale file in the repository
18691920

18701921
### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
18711922

1872-
### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
1923+
### ![zh__TW](https://img.shields.io/badge/zh__TW-99.72%25-yellow)
1924+
1925+
<details>
1926+
<summary>Missing keys in zh_TW.axaml</summary>
1927+
1928+
- Text.CommitDetail.Files.Tips
1929+
- Text.WorkingCopy.CollapseSidebar
1930+
- Text.WorkingCopy.ExpandSidebar
1931+
1932+
</details>

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2026.20
1+
2026.21

‎build/resources/flatpak/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=sourcegit.sh
4+
Exec=sourcegit
55
Icon=io.github.sourcegit_scm.sourcegit
66
Terminal=false
77
Type=Application

‎build/scripts/package.osx-app.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ case "$RUNTIME" in
2121
esac
2222

2323
clang -arch "$ARCH" ../tools/setsid-macos/setsid.c -o SourceGit.app/Contents/MacOS/setsid -mmacosx-version-min=13.0
24+
codesign --force --deep --sign - SourceGit.app
25+
codesign --verify --deep --strict --verbose=2 SourceGit.app
2426

2527
zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit.app

‎src/Commands/Config.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Globalization;
43
using System.Threading.Tasks;
54

65
namespace SourceGit.Commands
@@ -46,7 +45,7 @@ public async Task<Dictionary<string, string>> ReadAllAsync()
4645
Args = "config -l";
4746

4847
var output = await ReadToEndAsync().ConfigureAwait(false);
49-
var rs = new Dictionary<string, string>();
48+
var rs = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
5049
if (output.IsSuccess)
5150
{
5251
var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
@@ -55,7 +54,7 @@ public async Task<Dictionary<string, string>> ReadAllAsync()
5554
var parts = line.Split('=', 2);
5655
if (parts.Length == 2)
5756
{
58-
var key = parts[0].ToLower(CultureInfo.CurrentCulture); // Always use lower case for key
57+
var key = parts[0];
5958
var value = parts[1];
6059
rs[key] = value;
6160
}

‎src/Commands/Remote.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ public async Task<bool> RenameAsync(string name, string to)
2929
return await ExecAsync();
3030
}
3131

32-
public async Task<bool> PruneAsync(string name)
32+
public async Task<bool> PruneAsync(string name, string sshKey)
3333
{
34+
SSHKey = sshKey;
3435
Args = $"remote prune {name}";
3536
return await ExecAsync();
3637
}

‎src/Converters/IntConverters.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ public static class IntConverters
1414
public static readonly FuncValueConverter<int, bool> IsZero =
1515
new(v => v == 0);
1616

17-
public static readonly FuncValueConverter<int, bool> IsNotOne =
18-
new(v => v != 1);
19-
2017
public static readonly FuncValueConverter<int, Thickness> ToTreeMargin =
2118
new(v => new Thickness(v * 16, 0, 0, 0));
2219

0 commit comments

Comments
 (0)