Merge branch 'release/v2025.12'

Author: love-linger

README.md

@@ -11,7 +11,7 @@
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文
+* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文/日本語
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph

TRANSLATION.md

@@ -24,31 +24,27 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.CopyFullPath
+### ![fr__FR](https://img.shields.io/badge/fr__FR-%E2%88%9A-brightgreen)
 
-</details>
-
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.87%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)
 
 <details>
-<summary>Missing keys in fr_FR.axaml</summary>
+<summary>Missing keys in it_IT.axaml</summary>
 
 - Text.CopyFullPath
+- Text.Preferences.General.ShowTagsInGraph
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-99.73%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.73%25-yellow)
 
 <details>
-<summary>Missing keys in it_IT.axaml</summary>
+<summary>Missing keys in ja_JP.axaml</summary>
 
-- Text.CopyFullPath
-- Text.Preferences.General.ShowTagsInGraph
+- Text.Repository.FilterCommits
+- Text.Repository.Tags.OrderByNameDes
 
 </details>
 

VERSION

@@ -1 +1 @@
-2025.11
+2025.12

src/App.axaml

@@ -20,6 +20,7 @@
       <ResourceInclude x:Key="zh_CN" Source="/Resources/Locales/zh_CN.axaml"/>
       <ResourceInclude x:Key="zh_TW" Source="/Resources/Locales/zh_TW.axaml"/>
       <ResourceInclude x:Key="es_ES" Source="/Resources/Locales/es_ES.axaml"/>
+      <ResourceInclude x:Key="ja_JP" Source="/Resources/Locales/ja_JP.axaml"/>
     </ResourceDictionary>
   </Application.Resources>
 

src/Commands/CompareRevisions.cs

@@ -6,8 +6,10 @@ namespace SourceGit.Commands
 {
     public partial class CompareRevisions : Command
     {
-        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
+        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
+        private static partial Regex REG_RENAME_FORMAT();
 
         public CompareRevisions(string repo, string start, string end)
         {
@@ -38,7 +40,17 @@ protected override void OnReadline(string line)
         {
             var match = REG_FORMAT().Match(line);
             if (!match.Success)
+            {
+                match = REG_RENAME_FORMAT().Match(line);
+                if (match.Success)
+                {
+                    var renamed = new Models.Change() { Path = match.Groups[1].Value };
+                    renamed.Set(Models.ChangeState.Renamed);
+                    _changes.Add(renamed);
+                }
+
                 return;
+            }
 
             var change = new Models.Change() { Path = match.Groups[2].Value };
             var status = match.Groups[1].Value;
@@ -57,10 +69,6 @@ protected override void OnReadline(string line)
                     change.Set(Models.ChangeState.Deleted);
                     _changes.Add(change);
                     break;
-                case 'R':
-                    change.Set(Models.ChangeState.Renamed);
-                    _changes.Add(change);
-                    break;
                 case 'C':
                     change.Set(Models.ChangeState.Copied);
                     _changes.Add(change);

src/Commands/QueryStashChanges.cs

@@ -9,8 +9,10 @@ namespace SourceGit.Commands
     /// </summary>
     public partial class QueryStashChanges : Command
     {
-        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
+        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
+        private static partial Regex REG_RENAME_FORMAT();
 
         public QueryStashChanges(string repo, string stash) 
         {
@@ -31,7 +33,17 @@ public QueryStashChanges(string repo, string stash)
             {
                 var match = REG_FORMAT().Match(line);
                 if (!match.Success)
+                {
+                    match = REG_RENAME_FORMAT().Match(line);
+                    if (match.Success)
+                    {
+                        var renamed = new Models.Change() { Path = match.Groups[1].Value };
+                        renamed.Set(Models.ChangeState.Renamed);
+                        outs.Add(renamed);
+                    }
+
                     continue;
+                }
 
                 var change = new Models.Change() { Path = match.Groups[2].Value };
                 var status = match.Groups[1].Value;
@@ -50,10 +62,6 @@ public QueryStashChanges(string repo, string stash)
                         change.Set(Models.ChangeState.Deleted);
                         outs.Add(change);
                         break;
-                    case 'R':
-                        change.Set(Models.ChangeState.Renamed);
-                        outs.Add(change);
-                        break;
                     case 'C':
                         change.Set(Models.ChangeState.Copied);
                         outs.Add(change);

src/Models/DateTimeFormat.cs

@@ -32,17 +32,17 @@ public static DateTimeFormat Actived
 
         public static readonly List<DateTimeFormat> Supported = new List<DateTimeFormat>
         {
-            new DateTimeFormat("yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss"),
-            new DateTimeFormat("yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss"),
-            new DateTimeFormat("yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss"),
-            new DateTimeFormat("MM/dd/yyyy", "MM/dd/yyyy HH:mm:ss"),
-            new DateTimeFormat("MM.dd.yyyy", "MM.dd.yyyy HH:mm:ss"),
-            new DateTimeFormat("MM-dd-yyyy", "MM-dd-yyyy HH:mm:ss"),
-            new DateTimeFormat("dd/MM/yyyy", "dd/MM/yyyy HH:mm:ss"),
-            new DateTimeFormat("dd.MM.yyyy", "dd.MM.yyyy HH:mm:ss"),
-            new DateTimeFormat("dd-MM-yyyy", "dd-MM-yyyy HH:mm:ss"),
-            new DateTimeFormat("MMM d yyyy", "MMM d yyyy HH:mm:ss"),
-            new DateTimeFormat("d MMM yyyy", "d MMM yyyy HH:mm:ss"),
+            new DateTimeFormat("yyyy/MM/dd", "yyyy/MM/dd, HH:mm:ss"),
+            new DateTimeFormat("yyyy.MM.dd", "yyyy.MM.dd, HH:mm:ss"),
+            new DateTimeFormat("yyyy-MM-dd", "yyyy-MM-dd, HH:mm:ss"),
+            new DateTimeFormat("MM/dd/yyyy", "MM/dd/yyyy, HH:mm:ss"),
+            new DateTimeFormat("MM.dd.yyyy", "MM.dd.yyyy, HH:mm:ss"),
+            new DateTimeFormat("MM-dd-yyyy", "MM-dd-yyyy, HH:mm:ss"),
+            new DateTimeFormat("dd/MM/yyyy", "dd/MM/yyyy, HH:mm:ss"),
+            new DateTimeFormat("dd.MM.yyyy", "dd.MM.yyyy, HH:mm:ss"),
+            new DateTimeFormat("dd-MM-yyyy", "dd-MM-yyyy, HH:mm:ss"),
+            new DateTimeFormat("MMM d yyyy", "MMM d yyyy, HH:mm:ss"),
+            new DateTimeFormat("d MMM yyyy", "d MMM yyyy, HH:mm:ss"),
         };
 
         private static readonly DateTime _example = new DateTime(2025, 1, 31, 8, 0, 0, DateTimeKind.Local);

src/Models/Locales.cs

@@ -17,6 +17,7 @@ public class Locale
             new Locale("Русский", "ru_RU"),
             new Locale("简体中文", "zh_CN"),
             new Locale("繁體中文", "zh_TW"),
+            new Locale("日本語", "ja_JP"),
         };
 
         public Locale(string name, string key)

src/Resources/Locales/en_US.axaml

@@ -719,6 +719,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Edit)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter">You have staged {0} file(s) but only {1} file(s) displayed ({2} files are filtered out). Do you want to continue?</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>

src/Resources/Locales/es_ES.axaml

@@ -189,6 +189,7 @@
   <x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar Todo el Texto</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Ruta</x:String>
+  <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copiar Ruta Completa</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Crear Rama...</x:String>
   <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basado En:</x:String>
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>