Merge branch 'release/v2025.14'

Author: love-linger

.github/workflows/build.yml

@@ -58,7 +58,7 @@ jobs:
         if: ${{ matrix.runtime == 'linux-arm64' }}
         run: |
           sudo apt-get update
-          sudo apt-get install -y llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
+          sudo apt-get install -y llvm gcc-aarch64-linux-gnu
       - name: Build
         run: dotnet build -c Release
       - name: Publish

.github/workflows/localization-check.yml

@@ -4,7 +4,6 @@ on:
     branches: [ develop ]
     paths:
       - 'src/Resources/Locales/**'
-      - 'README.md'
   workflow_dispatch:
   workflow_call:
 
@@ -32,8 +31,8 @@ jobs:
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
           if [ -n "$(git status --porcelain)" ]; then
-            git add README.md TRANSLATION.md
-            git commit -m 'doc: Update translation status and missing keys'
+            git add TRANSLATION.md src/Resources/Locales/*.axaml
+            git commit -m 'doc: Update translation status and sort locale files'
             git push
           else
             echo "No changes to commit"

README.md

@@ -11,7 +11,7 @@
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文/日本語/தமிழ் (Tamil)
+* Deutsch/English/Español/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil)
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph
@@ -35,6 +35,7 @@
   * Revision Diffs
   * Branch Diff
   * Image Diff - Side-By-Side/Swipe/Blend
+* Git command logs
 * Search commits
 * GitFlow
 * Git LFS

TRANSLATION.md

@@ -6,12 +6,16 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-97.34%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-96.19%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
 - Text.BranchUpstreamInvalid
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleAzure
@@ -25,7 +29,12 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.AI.Streaming
 - Text.Preferences.Appearance.EditorTabWidth
 - Text.Preferences.General.ShowTagsInGraph
+- Text.Repository.ViewLogs
 - Text.StashCM.SaveAsPatch
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -34,34 +43,41 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-98.67%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-98.95%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
-- Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Continue
-- Text.ConfirmEmptyCommit.NoLocalChanges
-- Text.ConfirmEmptyCommit.StageAllThenCommit
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.WorkingCopy.ConfirmCommitWithFilter
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.Repository.ViewLogs
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-98.67%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-97.51%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
 - Text.Configure.Git.PreferredMergeMode
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.Repository.ViewLogs
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -70,18 +86,27 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-98.40%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-97.24%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
 - Text.Configure.Git.PreferredMergeMode
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.CopyFullPath
 - Text.Preferences.General.ShowTagsInGraph
+- Text.Repository.ViewLogs
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -90,18 +115,27 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-98.40%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-97.24%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
 - Text.Configure.Git.PreferredMergeMode
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.ConfirmEmptyCommit.WithLocalChanges
 - Text.Repository.FilterCommits
 - Text.Repository.Tags.OrderByNameDes
+- Text.Repository.ViewLogs
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
@@ -110,7 +144,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-89.76%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-88.71%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -125,10 +159,14 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.MergeMultiBranches
 - Text.BranchUpstreamInvalid
 - Text.Clone.RecurseSubmodules
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
 - Text.CommitCM.Merge
 - Text.CommitCM.MergeMultiple
 - Text.CommitDetail.Files.Search
 - Text.CommitDetail.Info.Children
+- Text.CommitMessageTextBox.SubjectCount
 - Text.Configure.CustomAction.Scope.Branch
 - Text.Configure.CustomAction.WaitForExit
 - Text.Configure.Git.PreferredMergeMode
@@ -177,6 +215,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.Tags.OrderByNameDes
 - Text.Repository.Tags.Sort
 - Text.Repository.UseRelativeTimeInHistories
+- Text.Repository.ViewLogs
 - Text.SetUpstream
 - Text.SetUpstream.Local
 - Text.SetUpstream.Unset
@@ -185,6 +224,10 @@ This document shows the translation status of each locale file in the repository
 - Text.Stash.AutoRestore
 - Text.Stash.AutoRestore.Tip
 - Text.StashCM.SaveAsPatch
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 - Text.WorkingCopy.CommitToEdit
 - Text.WorkingCopy.ConfirmCommitWithFilter
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
@@ -195,26 +238,68 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-98.82%25-yellow)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-98.67%25-yellow)
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
+- Text.Repository.ViewLogs
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
+
+</details>
+
+### ![ta__IN](https://img.shields.io/badge/ta__IN-97.51%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
 
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
 - Text.Configure.Git.PreferredMergeMode
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
 - Text.ConfirmEmptyCommit.StageAllThenCommit
 - Text.ConfirmEmptyCommit.WithLocalChanges
+- Text.Repository.ViewLogs
 - Text.UpdateSubmodules.Target
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
 - Text.WorkingCopy.Conflicts.OpenExternalMergeTool
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
 
 </details>
 
+### ![uk__UA](https://img.shields.io/badge/uk__UA-98.69%25-yellow)
+
+<details>
+<summary>Missing keys in uk_UA.axaml</summary>
+
+- Text.CommitCM.CopyAuthor
+- Text.CommitCM.CopyCommitter
+- Text.CommitCM.CopySubject
+- Text.CommitMessageTextBox.SubjectCount
+- Text.ConfigureWorkspace.Name
+- Text.Repository.ViewLogs
+- Text.ViewLogs
+- Text.ViewLogs.Clear
+- Text.ViewLogs.CopyLog
+- Text.ViewLogs.Delete
+
+</details>
+
 ### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
 ### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)

VERSION

@@ -1 +1 @@
-2025.13
+2025.14

build/scripts/localization-check.js

@@ -14,6 +14,22 @@ async function parseXml(filePath) {
     return parser.parseStringPromise(data);
 }
 
+async function filterAndSortTranslations(localeData, enUSKeys, enUSData) {
+    const strings = localeData.ResourceDictionary['x:String'];
+    // Remove keys that don't exist in English file
+    const filtered = strings.filter(item => enUSKeys.has(item.$['x:Key']));
+
+    // Sort based on the key order in English file
+    const enUSKeysArray = enUSData.ResourceDictionary['x:String'].map(item => item.$['x:Key']);
+    filtered.sort((a, b) => {
+        const aIndex = enUSKeysArray.indexOf(a.$['x:Key']);
+        const bIndex = enUSKeysArray.indexOf(b.$['x:Key']);
+        return aIndex - bIndex;
+    });
+
+    return filtered;
+}
+
 async function calculateTranslationRate() {
     const enUSData = await parseXml(enUSFile);
     const enUSKeys = new Set(enUSData.ResourceDictionary['x:String'].map(item => item.$['x:Key']));
@@ -33,6 +49,21 @@ async function calculateTranslationRate() {
         const localeKeys = new Set(localeData.ResourceDictionary['x:String'].map(item => item.$['x:Key']));
         const missingKeys = [...enUSKeys].filter(key => !localeKeys.has(key));
 
+        // Sort and clean up extra translations
+        const sortedAndCleaned = await filterAndSortTranslations(localeData, enUSKeys, enUSData);
+        localeData.ResourceDictionary['x:String'] = sortedAndCleaned;
+
+        // Save the updated file
+        const builder = new xml2js.Builder({
+            headless: true,
+            renderOpts: { pretty: true, indent: '  ' }
+        });
+        let xmlStr = builder.buildObject(localeData);
+
+        // Add an empty line before the first x:String
+        xmlStr = xmlStr.replace('  <x:String', '\n  <x:String');
+        await fs.writeFile(filePath, xmlStr + '\n', 'utf8');
+
         if (missingKeys.length > 0) {
             const progress = ((enUSKeys.size - missingKeys.length) / enUSKeys.size) * 100;
             const badgeColor = progress >= 75 ? 'yellow' : 'red';
@@ -41,7 +72,7 @@ async function calculateTranslationRate() {
             lines.push(`<details>\n<summary>Missing keys in ${file}</summary>\n\n${missingKeys.map(key => `- ${key}`).join('\n')}\n\n</details>`)
         } else {
             lines.push(`### ![${locale}](https://img.shields.io/badge/${locale}-%E2%88%9A-brightgreen)`);
-        }    
+        }
     }
 
     const content = lines.join('\n\n');

src/App.axaml

@@ -16,6 +16,7 @@
       <ResourceInclude x:Key="fr_FR" Source="/Resources/Locales/fr_FR.axaml"/>
       <ResourceInclude x:Key="it_IT" Source="/Resources/Locales/it_IT.axaml"/>
       <ResourceInclude x:Key="pt_BR" Source="/Resources/Locales/pt_BR.axaml"/>
+      <ResourceInclude x:Key="uk_UA" Source="/Resources/Locales/uk_UA.axaml"/>
       <ResourceInclude x:Key="ru_RU" Source="/Resources/Locales/ru_RU.axaml"/>
       <ResourceInclude x:Key="zh_CN" Source="/Resources/Locales/zh_CN.axaml"/>
       <ResourceInclude x:Key="zh_TW" Source="/Resources/Locales/zh_TW.axaml"/>