Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d25f459

Browse files
Merge branch 'release/v2025.35'
2 parents fcc8928 + 5eab2e0 commit d25f459

21 files changed

+341
-46
lines changed

‎THIRD-PARTY-LICENSES.md‎

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

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

@@ -21,7 +21,7 @@ The project uses the following third-party libraries or assets
2121
### LiveChartsCore.SkiaSharpView.Avalonia
2222

2323
- **Source**: https://github.com/beto-rodriguez/LiveCharts2
24-
- **Version**: 2.0.0-rc5.4
24+
- **Version**: 2.0.0-rc6.1
2525
- **License**: MIT License
2626
- **License Link**: https://github.com/beto-rodriguez/LiveCharts2/blob/master/LICENSE
2727

@@ -35,7 +35,7 @@ The project uses the following third-party libraries or assets
3535
### OpenAI .NET SDK
3636

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

‎TRANSLATION.md‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,18 @@ 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-99.55%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
1010

11-
<details>
12-
<summary>Missing keys in de_DE.axaml</summary>
13-
14-
- Text.CommitDetail.Info.CopyEmail
15-
- Text.CommitDetail.Info.CopyName
16-
- Text.CommitDetail.Info.CopyNameAndEmail
17-
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
18-
19-
</details>
20-
21-
### ![es__ES](https://img.shields.io/badge/es__ES-99.55%25-yellow)
11+
### ![es__ES](https://img.shields.io/badge/es__ES-99.89%25-yellow)
2212

2313
<details>
2414
<summary>Missing keys in es_ES.axaml</summary>
2515

26-
- Text.CommitDetail.Info.CopyEmail
27-
- Text.CommitDetail.Info.CopyName
28-
- Text.CommitDetail.Info.CopyNameAndEmail
29-
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
16+
- Text.Preferences.General.UseGitHubStyleAvatar
3017

3118
</details>
3219

33-
### ![fr__FR](https://img.shields.io/badge/fr__FR-78.33%25-yellow)
20+
### ![fr__FR](https://img.shields.io/badge/fr__FR-78.15%25-yellow)
3421

3522
<details>
3623
<summary>Missing keys in fr_FR.axaml</summary>
@@ -122,6 +109,7 @@ This document shows the translation status of each locale file in the repository
122109
- Text.DeleteMultiTags.DeleteFromRemotes
123110
- Text.DeleteMultiTags.Tip
124111
- Text.Diff.Image.Blend
112+
- Text.Diff.Image.Difference
125113
- Text.Diff.Image.SideBySide
126114
- Text.Diff.Image.Swipe
127115
- Text.Diff.New
@@ -151,6 +139,7 @@ This document shows the translation status of each locale file in the repository
151139
- Text.Preferences.General.EnableCompactFolders
152140
- Text.Preferences.General.ShowChangesPageByDefault
153141
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
142+
- Text.Preferences.General.UseGitHubStyleAvatar
154143
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
155144
- Text.Preferences.Git.UseLibsecret
156145
- Text.Pull.RecurseSubmodules
@@ -230,7 +219,7 @@ This document shows the translation status of each locale file in the repository
230219

231220
</details>
232221

233-
### ![it__IT](https://img.shields.io/badge/it__IT-97.40%25-yellow)
222+
### ![it__IT](https://img.shields.io/badge/it__IT-97.18%25-yellow)
234223

235224
<details>
236225
<summary>Missing keys in it_IT.axaml</summary>
@@ -245,6 +234,7 @@ This document shows the translation status of each locale file in the repository
245234
- Text.CommitDetail.Info.CopyName
246235
- Text.CommitDetail.Info.CopyNameAndEmail
247236
- Text.CommitMessageTextBox.PasteAndReplaceAll
237+
- Text.Diff.Image.Difference
248238
- Text.DirtyState.HasLocalChanges
249239
- Text.DirtyState.HasPendingPullOrPush
250240
- Text.DirtyState.UpToDate
@@ -253,6 +243,7 @@ This document shows the translation status of each locale file in the repository
253243
- Text.Preferences.General.EnableCompactFolders
254244
- Text.Preferences.General.ShowChangesPageByDefault
255245
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
246+
- Text.Preferences.General.UseGitHubStyleAvatar
256247
- Text.ScanRepositories.UseCustomDir
257248
- Text.WorkingCopy.ClearCommitHistories
258249
- Text.WorkingCopy.ClearCommitHistories.Confirm
@@ -261,7 +252,7 @@ This document shows the translation status of each locale file in the repository
261252

262253
</details>
263254

264-
### ![ja__JP](https://img.shields.io/badge/ja__JP-78.33%25-yellow)
255+
### ![ja__JP](https://img.shields.io/badge/ja__JP-78.15%25-yellow)
265256

266257
<details>
267258
<summary>Missing keys in ja_JP.axaml</summary>
@@ -354,6 +345,7 @@ This document shows the translation status of each locale file in the repository
354345
- Text.DeleteMultiTags.DeleteFromRemotes
355346
- Text.DeleteMultiTags.Tip
356347
- Text.Diff.Image.Blend
348+
- Text.Diff.Image.Difference
357349
- Text.Diff.Image.SideBySide
358350
- Text.Diff.Image.Swipe
359351
- Text.Diff.New
@@ -383,6 +375,7 @@ This document shows the translation status of each locale file in the repository
383375
- Text.Preferences.General.EnableCompactFolders
384376
- Text.Preferences.General.ShowChangesPageByDefault
385377
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
378+
- Text.Preferences.General.UseGitHubStyleAvatar
386379
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
387380
- Text.Preferences.Git.UseLibsecret
388381
- Text.Pull.RecurseSubmodules
@@ -461,7 +454,7 @@ This document shows the translation status of each locale file in the repository
461454

462455
</details>
463456

464-
### ![pt__BR](https://img.shields.io/badge/pt__BR-71.90%25-red)
457+
### ![pt__BR](https://img.shields.io/badge/pt__BR-71.73%25-red)
465458

466459
<details>
467460
<summary>Missing keys in pt_BR.axaml</summary>
@@ -575,6 +568,7 @@ This document shows the translation status of each locale file in the repository
575568
- Text.DeleteRepositoryNode.TipForRepository
576569
- Text.Diff.First
577570
- Text.Diff.Image.Blend
571+
- Text.Diff.Image.Difference
578572
- Text.Diff.Image.SideBySide
579573
- Text.Diff.Image.Swipe
580574
- Text.Diff.Last
@@ -622,6 +616,7 @@ This document shows the translation status of each locale file in the repository
622616
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
623617
- Text.Preferences.General.ShowChildren
624618
- Text.Preferences.General.ShowTagsInGraph
619+
- Text.Preferences.General.UseGitHubStyleAvatar
625620
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
626621
- Text.Preferences.Git.SSLVerify
627622
- Text.Preferences.Git.UseLibsecret
@@ -720,7 +715,7 @@ This document shows the translation status of each locale file in the repository
720715

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

723-
### ![ta__IN](https://img.shields.io/badge/ta__IN-78.44%25-yellow)
718+
### ![ta__IN](https://img.shields.io/badge/ta__IN-78.27%25-yellow)
724719

725720
<details>
726721
<summary>Missing keys in ta_IN.axaml</summary>
@@ -813,6 +808,7 @@ This document shows the translation status of each locale file in the repository
813808
- Text.DeleteMultiTags.DeleteFromRemotes
814809
- Text.DeleteMultiTags.Tip
815810
- Text.Diff.Image.Blend
811+
- Text.Diff.Image.Difference
816812
- Text.Diff.Image.SideBySide
817813
- Text.Diff.Image.Swipe
818814
- Text.Diff.New
@@ -842,6 +838,7 @@ This document shows the translation status of each locale file in the repository
842838
- Text.Preferences.General.EnableCompactFolders
843839
- Text.Preferences.General.ShowChangesPageByDefault
844840
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
841+
- Text.Preferences.General.UseGitHubStyleAvatar
845842
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
846843
- Text.Preferences.Git.UseLibsecret
847844
- Text.Pull.RecurseSubmodules
@@ -919,7 +916,7 @@ This document shows the translation status of each locale file in the repository
919916

920917
</details>
921918

922-
### ![uk__UA](https://img.shields.io/badge/uk__UA-79.57%25-yellow)
919+
### ![uk__UA](https://img.shields.io/badge/uk__UA-79.39%25-yellow)
923920

924921
<details>
925922
<summary>Missing keys in uk_UA.axaml</summary>
@@ -1007,6 +1004,7 @@ This document shows the translation status of each locale file in the repository
10071004
- Text.DeleteMultiTags.DeleteFromRemotes
10081005
- Text.DeleteMultiTags.Tip
10091006
- Text.Diff.Image.Blend
1007+
- Text.Diff.Image.Difference
10101008
- Text.Diff.Image.SideBySide
10111009
- Text.Diff.Image.Swipe
10121010
- Text.Diff.New
@@ -1036,6 +1034,7 @@ This document shows the translation status of each locale file in the repository
10361034
- Text.Preferences.General.EnableCompactFolders
10371035
- Text.Preferences.General.ShowChangesPageByDefault
10381036
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
1037+
- Text.Preferences.General.UseGitHubStyleAvatar
10391038
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
10401039
- Text.Preferences.Git.UseLibsecret
10411040
- Text.Pull.RecurseSubmodules

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.34
1+
2025.35

‎src/Commands/QueryCommitsForInteractiveRebase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public QueryCommitsForInteractiveRebase(string repo, string on)
1212

1313
WorkingDirectory = repo;
1414
Context = repo;
15-
Args = $"log --topo-order --right-only --max-parents=1 --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";
15+
Args = $"log --topo-order --cherry-pick --right-only --no-merges --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}...HEAD";
1616
}
1717

1818
public async Task<List<Models.InteractiveCommit>> GetResultAsync()

‎src/Converters/DoubleConverters.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public static class DoubleConverters
1212
new FuncValueConverter<double, double>(v => v - 1.0);
1313

1414
public static readonly FuncValueConverter<double, string> ToPercentage =
15-
new FuncValueConverter<double, string>(v => (v * 100).ToString("F3") + "%");
15+
new FuncValueConverter<double, string>(v => (v * 100).ToString("F0") + "%");
1616

1717
public static readonly FuncValueConverter<double, string> OneMinusToPercentage =
18-
new FuncValueConverter<double, string>(v => ((1.0 - v) * 100).ToString("F3") + "%");
18+
new FuncValueConverter<double, string>(v => ((1.0 - v) * 100).ToString("F0") + "%");
1919

2020
public static readonly FuncValueConverter<double, Thickness> ToLeftMargin =
2121
new FuncValueConverter<double, Thickness>(v => new Thickness(v, 0, 0, 0));

‎src/Native/Windows.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal struct MARGINS
5656
public void SetupApp(AppBuilder builder)
5757
{
5858
// Fix drop shadow issue on Windows 10
59-
if (!OperatingSystem.IsWindowsVersionAtLeast(10, 22000))
59+
if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0,22000))
6060
{
6161
Window.WindowStateProperty.Changed.AddClassHandler<Window>((w, _) => FixWindowFrameOnWin10(w));
6262
Control.LoadedEvent.AddClassHandler<Window>((w, _) => FixWindowFrameOnWin10(w));

‎src/Resources/Locales/de_DE.axaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@
167167
<x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">COMMITTER</x:String>
168168
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Prüfe Refs, die diesen Commit enthalten</x:String>
169169
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT ENTHALTEN IN</x:String>
170+
<x:String x:Key="Text.CommitDetail.Info.CopyEmail" xml:space="preserve">Email kopieren</x:String>
171+
<x:String x:Key="Text.CommitDetail.Info.CopyName" xml:space="preserve">Name kopieren</x:String>
172+
<x:String x:Key="Text.CommitDetail.Info.CopyNameAndEmail" xml:space="preserve">Name &amp; Email kopieren</x:String>
170173
<x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Zeigt nur die ersten 100 Änderungen. Alle Änderungen im ÄNDERUNGEN Tab.</x:String>
171174
<x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">Schlüssel:</x:String>
172175
<x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">COMMIT-NACHRICHT</x:String>
@@ -321,6 +324,7 @@
321324
<x:String x:Key="Text.Diff.First" xml:space="preserve">Erste Differenz</x:String>
322325
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignoriere Leerzeichenänderungen</x:String>
323326
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">Überblenden</x:String>
327+
<x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">Differenz</x:String>
324328
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">Nebeneinander</x:String>
325329
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">Wischen</x:String>
326330
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Letzte Differenz</x:String>
@@ -572,9 +576,11 @@
572576
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
573577
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
574578
<x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">Standardmäßig Seite `Änderungen` anzeigen</x:String>
579+
<x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">Standardmäßig Tab `ÄNDERUNGEN` in Commit-Details anzeigen</x:String>
575580
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Zeige Nachfolger in den Commit Details</x:String>
576581
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Zeige Tags im Commit Verlauf</x:String>
577582
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</x:String>
583+
<x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">Standard-Avatar im GitHub-Stil generieren</x:String>
578584
<x:String x:Key="Text.Preferences.Git" xml:space="preserve">GIT</x:String>
579585
<x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">Aktiviere Auto-CRLF</x:String>
580586
<x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Standard Klon-Ordner</x:String>

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@
319319
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
320320
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore All Whitespace Changes</x:String>
321321
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">BLEND</x:String>
322+
<x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">DIFFERENCE</x:String>
322323
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">SIDE-BY-SIDE</x:String>
323324
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">SWIPE</x:String>
324325
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
@@ -574,6 +575,7 @@
574575
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
575576
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Show tags in commit graph</x:String>
576577
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
578+
<x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">Generate Github style default avatar</x:String>
577579
<x:String x:Key="Text.Preferences.Git" xml:space="preserve">GIT</x:String>
578580
<x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">Enable Auto CRLF</x:String>
579581
<x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Default Clone Dir</x:String>

‎src/Resources/Locales/es_ES.axaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@
167167
<x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">COMMITTER</x:String>
168168
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Ver refs que contienen este commit</x:String>
169169
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT ESTÁ CONTENIDO EN</x:String>
170+
<x:String x:Key="Text.CommitDetail.Info.CopyEmail" xml:space="preserve">Copiar Email</x:String>
171+
<x:String x:Key="Text.CommitDetail.Info.CopyName" xml:space="preserve">Copiar Nombre</x:String>
172+
<x:String x:Key="Text.CommitDetail.Info.CopyNameAndEmail" xml:space="preserve">Copiar Nombre &amp; Email</x:String>
170173
<x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Muestra solo los primeros 100 cambios. Ver todos los cambios en la pestaña CAMBIOS.</x:String>
171174
<x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">Clave:</x:String>
172175
<x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">MENSAJE</x:String>
@@ -320,6 +323,7 @@
320323
<x:String x:Key="Text.Diff.First" xml:space="preserve">Primera Diferencia</x:String>
321324
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorar Cambio de Espacios en Blanco</x:String>
322325
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">MEZCLAR</x:String>
326+
<x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">DIFERENCIA</x:String>
323327
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">LADO-A-LADO</x:String>
324328
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">DESLIZAR</x:String>
325329
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Última Diferencia</x:String>
@@ -571,6 +575,7 @@
571575
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commits en el historial</x:String>
572576
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostrar hora del autor en lugar de la hora del commit en el gráfico</x:String>
573577
<x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">Mostrar la página `CAMBIOS LOCALES` por defecto</x:String>
578+
<x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">Mostrar pestaña de `CAMBIOS` en los detalles del commit por defecto</x:String>
574579
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Mostrar hijos en los detalles de commit</x:String>
575580
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Mostrar etiquetas en el gráfico de commit</x:String>
576581
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Longitud de la guía del asunto</x:String>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /