Skip to content

Commit bbcbe1c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feat-copy-clipboard-menu
2 parents bb752f9 + 941ea4a commit bbcbe1c

File tree

17 files changed

+861
-99
lines changed

17 files changed

+861
-99
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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-100.00%25-brightgreen)](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) [![it__IT](https://img.shields.io/badge/it__IT-97.87%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)
5151

5252
## How to Use
5353

TRANSLATION.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
### de_DE.axaml: 99.86%
1+
### de_DE.axaml: 100.00%
22

33

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

7-
- Text.Repository.FilterCommits
7+
88

99
</details>
1010

@@ -58,6 +58,30 @@
5858

5959
</details>
6060

61+
### it_IT.axaml: 97.87%
62+
63+
64+
<details>
65+
<summary>Missing Keys</summary>
66+
67+
- Text.CommitDetail.Info.Children
68+
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
69+
- Text.Configure.OpenAI.Preferred
70+
- Text.Configure.OpenAI.Preferred.Tip
71+
- Text.Fetch.Force
72+
- Text.Preference.General.ShowChildren
73+
- Text.Repository.FilterCommits
74+
- Text.Repository.FilterCommits.Default
75+
- Text.Repository.FilterCommits.Exclude
76+
- Text.Repository.FilterCommits.Include
77+
- Text.Repository.HistoriesOrder
78+
- Text.Repository.HistoriesOrder.ByDate
79+
- Text.Repository.HistoriesOrder.Topo
80+
- Text.SHALinkCM.CopySHA
81+
- Text.SHALinkCM.NavigateTo
82+
83+
</details>
84+
6185
### pt_BR.axaml: 99.29%
6286

6387

build/README.md

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 6 deletions
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

Lines changed: 2 additions & 2 deletions
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/QueryLocalChanges.cs

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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>

0 commit comments

Comments
 (0)