Skip to content

Commit 790e1f6

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v8.41'
2 parents ee82067 + dc5cbd0 commit 790e1f6

39 files changed

+1171
-187
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ dotnet_diagnostic.CA1854.severity = warning
206206
#CA2211:Non-constant fields should not be visible
207207
dotnet_diagnostic.CA2211.severity = error
208208

209+
# IDE0005: remove used namespace using
210+
dotnet_diagnostic.IDE0005.severity = error
211+
209212
# Wrapping preferences
210213
csharp_wrap_before_ternary_opsigns = false
211214

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Supports Windows/macOS/Linux
1212
* Opensource/Free
1313
* Fast
14-
* Deutsch/English/Español/Français/Português/Русский/简体中文/繁體中文
14+
* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文
1515
* Built-in light/dark themes
1616
* Customize theme
1717
* Visual commit graph
@@ -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-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.01%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-97.44%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.29%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)
50+
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-97.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.15%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

‎TRANSLATION.md

+32-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<details>
55
<summary>Missing Keys</summary>
66

7-
- Text.Repository.FilterCommits
7+
- Text.WorkingCopy.CommitToEdit
88

99
</details>
1010

11-
### es_ES.axaml: 98.01%
11+
### es_ES.axaml: 97.87%
1212

1313

1414
<details>
@@ -28,10 +28,11 @@
2828
- Text.Repository.HistoriesOrder.ByDate
2929
- Text.Repository.HistoriesOrder.Topo
3030
- Text.SHALinkCM.NavigateTo
31+
- Text.WorkingCopy.CommitToEdit
3132

3233
</details>
3334

34-
### fr_FR.axaml: 97.44%
35+
### fr_FR.axaml: 97.30%
3536

3637

3738
<details>
@@ -55,10 +56,36 @@
5556
- Text.Repository.HistoriesOrder.Topo
5657
- Text.ScanRepositories
5758
- Text.SHALinkCM.NavigateTo
59+
- Text.WorkingCopy.CommitToEdit
60+
61+
</details>
62+
63+
### it_IT.axaml: 97.73%
64+
65+
66+
<details>
67+
<summary>Missing Keys</summary>
68+
69+
- Text.CommitDetail.Info.Children
70+
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
71+
- Text.Configure.OpenAI.Preferred
72+
- Text.Configure.OpenAI.Preferred.Tip
73+
- Text.Fetch.Force
74+
- Text.Preference.General.ShowChildren
75+
- Text.Repository.FilterCommits
76+
- Text.Repository.FilterCommits.Default
77+
- Text.Repository.FilterCommits.Exclude
78+
- Text.Repository.FilterCommits.Include
79+
- Text.Repository.HistoriesOrder
80+
- Text.Repository.HistoriesOrder.ByDate
81+
- Text.Repository.HistoriesOrder.Topo
82+
- Text.SHALinkCM.CopySHA
83+
- Text.SHALinkCM.NavigateTo
84+
- Text.WorkingCopy.CommitToEdit
5885

5986
</details>
6087

61-
### pt_BR.axaml: 99.29%
88+
### pt_BR.axaml: 99.15%
6289

6390

6491
<details>
@@ -69,6 +96,7 @@
6996
- Text.Preference.General.ShowChildren
7097
- Text.Repository.FilterCommits
7198
- Text.SHALinkCM.NavigateTo
99+
- Text.WorkingCopy.CommitToEdit
72100

73101
</details>
74102

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.40
1+
8.41

‎build/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
## How to build this project manually
77

8-
1. Make sure [.NET SDK 8](https://dotnet.microsoft.com/en-us/download) is installed on your machine.
8+
1. Make sure [.NET SDK 9](https://dotnet.microsoft.com/en-us/download) is installed on your machine.
99
2. Clone this project
1010
3. Run the follow command under the project root dir
1111
```sh

‎src/App.axaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ResourceInclude x:Key="de_DE" Source="/Resources/Locales/de_DE.axaml"/>
1515
<ResourceInclude x:Key="en_US" Source="/Resources/Locales/en_US.axaml"/>
1616
<ResourceInclude x:Key="fr_FR" Source="/Resources/Locales/fr_FR.axaml"/>
17+
<ResourceInclude x:Key="it_IT" Source="/Resources/Locales/it_IT.axaml"/>
1718
<ResourceInclude x:Key="pt_BR" Source="/Resources/Locales/pt_BR.axaml"/>
1819
<ResourceInclude x:Key="ru_RU" Source="/Resources/Locales/ru_RU.axaml"/>
1920
<ResourceInclude x:Key="zh_CN" Source="/Resources/Locales/zh_CN.axaml"/>

‎src/App.axaml.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,7 @@ public static void SetTheme(string theme, string themeOverridesFile)
164164
var resDic = new ResourceDictionary();
165165
var overrides = JsonSerializer.Deserialize(File.ReadAllText(themeOverridesFile), JsonCodeGen.Default.ThemeOverrides);
166166
foreach (var kv in overrides.BasicColors)
167-
{
168-
if (kv.Key.Equals("SystemAccentColor", StringComparison.Ordinal))
169-
resDic["SystemAccentColor"] = kv.Value;
170-
else
171-
resDic[$"Color.{kv.Key}"] = kv.Value;
172-
}
167+
resDic[$"Color.{kv.Key}"] = kv.Value;
173168

174169
if (overrides.GraphColors.Count > 0)
175170
Models.CommitGraph.SetPens(overrides.GraphColors, overrides.GraphPenThickness);

‎src/Commands/Diff.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
2828
Context = repo;
2929

3030
if (ignoreWhitespace)
31-
Args = $"diff --no-ext-diff --patch --ignore-cr-at-eol --ignore-all-space --unified={unified} {opt}";
31+
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --ignore-all-space --unified={unified} {opt}";
3232
else
33-
Args = $"diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
33+
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
3434
}
3535

3636
public Models.DiffResult Result()

‎src/Commands/QueryCommitChildren.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ namespace SourceGit.Commands
44
{
55
public class QueryCommitChildren : Command
66
{
7-
public QueryCommitChildren(string repo, string commit, int max, string filters)
7+
public QueryCommitChildren(string repo, string commit, int max)
88
{
99
WorkingDirectory = repo;
1010
Context = repo;
1111
_commit = commit;
12-
if (string.IsNullOrEmpty(filters))
13-
filters = "--branches --remotes --tags";
14-
Args = $"rev-list -{max} --parents {filters} ^{commit}";
12+
Args = $"rev-list -{max} --parents --branches --remotes ^{commit}";
1513
}
1614

1715
public IEnumerable<string> Result()

‎src/Commands/QueryLocalChanges.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Text.RegularExpressions;
43

54
namespace SourceGit.Commands

‎src/Models/Locales.cs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class Locale
1212
new Locale("English", "en_US"),
1313
new Locale("Español", "es_ES"),
1414
new Locale("Français", "fr_FR"),
15+
new Locale("Italiano", "it_IT"),
1516
new Locale("Português (Brasil)", "pt_BR"),
1617
new Locale("Русский", "ru_RU"),
1718
new Locale("简体中文", "zh_CN"),

‎src/Resources/Locales/de_DE.axaml

+1
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@
546546
<x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Aktiviere '--reflog' Option</x:String>
547547
<x:String x:Key="Text.Repository.Explore" xml:space="preserve">Öffne im Datei-Browser</x:String>
548548
<x:String x:Key="Text.Repository.Filter" xml:space="preserve">Suche Branches/Tags/Submodule</x:String>
549+
<x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Sichtbarkeit im Graphen</x:String>
549550
<x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Aufheben</x:String>
550551
<x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Im Graph ausblenden</x:String>
551552
<x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Im Graph filtern</x:String>

‎src/Resources/Locales/en_US.axaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
<x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remote:</x:String>
342342
<x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Track files named '{0}'</x:String>
343343
<x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Track all *{0} files</x:String>
344-
<x:String x:Key="Text.Histories" xml:space="preserve">Histories</x:String>
344+
<x:String x:Key="Text.Histories" xml:space="preserve">HISTORY</x:String>
345345
<x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Switch Horizontal/Vertical Layout</x:String>
346346
<x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTHOR</x:String>
347347
<x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">AUTHOR TIME</x:String>
@@ -453,7 +453,7 @@
453453
<x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
454454
<x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
455455
<x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>
456-
<x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Show children in the comment details</x:String>
456+
<x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
457457
<x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
458458
<x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
459459
<x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Enable Auto CRLF</x:String>
@@ -621,7 +621,7 @@
621621
<x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
622622
<x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Drop Stash</x:String>
623623
<x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Drop:</x:String>
624-
<x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>
624+
<x:String x:Key="Text.Stashes" xml:space="preserve">STASHES</x:String>
625625
<x:String x:Key="Text.Stashes.Changes" xml:space="preserve">CHANGES</x:String>
626626
<x:String x:Key="Text.Stashes.Stashes" xml:space="preserve">STASHES</x:String>
627627
<x:String x:Key="Text.Statistics" xml:space="preserve">Statistics</x:String>
@@ -668,7 +668,7 @@
668668
<x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">Rescan Repositories in Default Clone Dir</x:String>
669669
<x:String x:Key="Text.Welcome.Search" xml:space="preserve">Search Repositories...</x:String>
670670
<x:String x:Key="Text.Welcome.Sort" xml:space="preserve">Sort</x:String>
671-
<x:String x:Key="Text.WorkingCopy" xml:space="preserve">Changes</x:String>
671+
<x:String x:Key="Text.WorkingCopy" xml:space="preserve">LOCAL CHANGES</x:String>
672672
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">Git Ignore</x:String>
673673
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">Ignore all *{0} files</x:String>
674674
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignore *{0} files in the same folder</x:String>
@@ -680,6 +680,7 @@
680680
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
681681
<x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/Histories</x:String>
682682
<x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
683+
<x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Edit)</x:String>
683684
<x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
684685
<x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
685686
<x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>

0 commit comments

Comments
 (0)