Compare commits

..

No commits in common. "1dfb629cef04619986bb9b624bfe224a7d49d1a7" and "57ee1f7dbd9f55aecb1111bd67ef08d9434de927" have entirely different histories.

5 changed files with 10 additions and 31 deletions

View file

@ -6,12 +6,11 @@ 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-98.10%25-yellow)
### ![de__DE](https://img.shields.io/badge/de__DE-98.23%25-yellow)
<details>
<summary>Missing keys in de_DE.axaml</summary>
- Text.CommitDetail.Changes.Count
- Text.GitFlow.FinishWithPush
- Text.GitFlow.FinishWithSquash
- Text.Hotkeys.Global.SwitchWorkspace
@ -29,12 +28,11 @@ This document shows the translation status of each locale file in the repository
</details>
### ![es__ES](https://img.shields.io/badge/es__ES-99.37%25-yellow)
### ![es__ES](https://img.shields.io/badge/es__ES-99.49%25-yellow)
<details>
<summary>Missing keys in es_ES.axaml</summary>
- Text.CommitDetail.Changes.Count
- Text.Hotkeys.Global.SwitchWorkspace
- Text.Hotkeys.Global.SwitchTab
- Text.Launcher.Workspaces
@ -42,7 +40,7 @@ This document shows the translation status of each locale file in the repository
</details>
### ![fr__FR](https://img.shields.io/badge/fr__FR-93.93%25-yellow)
### ![fr__FR](https://img.shields.io/badge/fr__FR-94.05%25-yellow)
<details>
<summary>Missing keys in fr_FR.axaml</summary>
@ -58,7 +56,6 @@ This document shows the translation status of each locale file in the repository
- Text.CommitCM.CopyAuthor
- Text.CommitCM.CopyCommitter
- Text.CommitCM.CopySubject
- Text.CommitDetail.Changes.Count
- Text.CommitMessageTextBox.SubjectCount
- Text.Configure.Git.PreferredMergeMode
- Text.ConfirmEmptyCommit.Continue
@ -98,12 +95,11 @@ This document shows the translation status of each locale file in the repository
</details>
### ![it__IT](https://img.shields.io/badge/it__IT-99.37%25-yellow)
### ![it__IT](https://img.shields.io/badge/it__IT-99.49%25-yellow)
<details>
<summary>Missing keys in it_IT.axaml</summary>
- Text.CommitDetail.Changes.Count
- Text.Hotkeys.Global.SwitchWorkspace
- Text.Hotkeys.Global.SwitchTab
- Text.Launcher.Workspaces
@ -111,7 +107,7 @@ This document shows the translation status of each locale file in the repository
</details>
### ![ja__JP](https://img.shields.io/badge/ja__JP-93.68%25-yellow)
### ![ja__JP](https://img.shields.io/badge/ja__JP-93.80%25-yellow)
<details>
<summary>Missing keys in ja_JP.axaml</summary>
@ -127,7 +123,6 @@ This document shows the translation status of each locale file in the repository
- Text.CommitCM.CopyAuthor
- Text.CommitCM.CopyCommitter
- Text.CommitCM.CopySubject
- Text.CommitDetail.Changes.Count
- Text.CommitMessageTextBox.SubjectCount
- Text.Configure.Git.PreferredMergeMode
- Text.ConfirmEmptyCommit.Continue
@ -169,7 +164,7 @@ This document shows the translation status of each locale file in the repository
</details>
### ![pt__BR](https://img.shields.io/badge/pt__BR-85.46%25-yellow)
### ![pt__BR](https://img.shields.io/badge/pt__BR-85.57%25-yellow)
<details>
<summary>Missing keys in pt_BR.axaml</summary>
@ -197,7 +192,6 @@ This document shows the translation status of each locale file in the repository
- Text.CommitCM.CopySubject
- Text.CommitCM.Merge
- Text.CommitCM.MergeMultiple
- Text.CommitDetail.Changes.Count
- Text.CommitDetail.Files.Search
- Text.CommitDetail.Info.Children
- Text.CommitMessageTextBox.SubjectCount
@ -292,18 +286,17 @@ This document shows the translation status of each locale file in the repository
</details>
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.62%25-yellow)
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.75%25-yellow)
<details>
<summary>Missing keys in ru_RU.axaml</summary>
- Text.CommitDetail.Changes.Count
- Text.Hotkeys.Global.SwitchTab
- Text.Launcher.Pages
</details>
### ![ta__IN](https://img.shields.io/badge/ta__IN-93.93%25-yellow)
### ![ta__IN](https://img.shields.io/badge/ta__IN-94.05%25-yellow)
<details>
<summary>Missing keys in ta_IN.axaml</summary>
@ -319,7 +312,6 @@ This document shows the translation status of each locale file in the repository
- Text.CommitCM.CopyAuthor
- Text.CommitCM.CopyCommitter
- Text.CommitCM.CopySubject
- Text.CommitDetail.Changes.Count
- Text.CommitMessageTextBox.SubjectCount
- Text.Configure.Git.PreferredMergeMode
- Text.ConfirmEmptyCommit.Continue
@ -359,7 +351,7 @@ This document shows the translation status of each locale file in the repository
</details>
### ![uk__UA](https://img.shields.io/badge/uk__UA-95.07%25-yellow)
### ![uk__UA](https://img.shields.io/badge/uk__UA-95.19%25-yellow)
<details>
<summary>Missing keys in uk_UA.axaml</summary>
@ -375,7 +367,6 @@ This document shows the translation status of each locale file in the repository
- Text.CommitCM.CopyAuthor
- Text.CommitCM.CopyCommitter
- Text.CommitCM.CopySubject
- Text.CommitDetail.Changes.Count
- Text.CommitMessageTextBox.SubjectCount
- Text.ConfigureWorkspace.Name
- Text.GitFlow.FinishWithPush

View file

@ -124,7 +124,6 @@
<x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">Squash into Parent</x:String>
<x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">Squash Children into Here</x:String>
<x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">CHANGES</x:String>
<x:String x:Key="Text.CommitDetail.Changes.Count" xml:space="preserve">{0} changed file(s)</x:String>
<x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">Search Changes...</x:String>
<x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">FILES</x:String>
<x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">LFS File</x:String>

View file

@ -128,7 +128,6 @@
<x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">合并此提交到上一个提交</x:String>
<x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">合并之后的提交到此处</x:String>
<x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">变更对比</x:String>
<x:String x:Key="Text.CommitDetail.Changes.Count" xml:space="preserve">{0} 个文件发生变更</x:String>
<x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">查找变更...</x:String>
<x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">文件列表</x:String>
<x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">LFS文件</x:String>

View file

@ -128,7 +128,6 @@
<x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">合併此提交到上一個提交</x:String>
<x:String x:Key="Text.CommitCM.SquashCommitsSinceThis" xml:space="preserve">合併之後的提交到此處</x:String>
<x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">變更對比</x:String>
<x:String x:Key="Text.CommitDetail.Changes.Count" xml:space="preserve">更改了 {0} 個檔案</x:String>
<x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">搜尋變更...</x:String>
<x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">檔案列表</x:String>
<x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">LFS 檔案</x:String>

View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.CommitChanges"
x:DataType="vm:CommitDetail">
@ -15,7 +14,7 @@
<ColumnDefinition Width="*" MinWidth="100"/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" RowDefinitions="26,*,26">
<Grid Grid.Column="0" RowDefinitions="26,*">
<!-- Search & Display Mode -->
<Grid Grid.Row="0" ColumnDefinitions="*,Auto">
<TextBox Grid.Column="0"
@ -53,14 +52,6 @@
AutoSelectFirstChange="True"
ContextRequested="OnChangeContextRequested"/>
</Border>
<!-- Summary -->
<Border Grid.Row="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1,0,1,1" Background="Transparent">
<TextBlock Margin="4,0,0,0"
Foreground="{DynamicResource Brush.FG2}"
Text="{Binding Changes.Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='CommitDetail.Changes.Count'}"
HorizontalAlignment="Left" VerticalAlignment="Center"/>
</Border>
</Grid>
<GridSplitter Grid.Column="1"