Skip to content

Commit 6391867

Browse files
NathanBaulchNathanBaulch
committed
localization: move 22 strings into resources
1 parent aec5cab commit 6391867

File tree

9 files changed

+47
-25
lines changed

9 files changed

+47
-25
lines changed

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<x:String x:Key="Text.Archive.Revision" xml:space="preserve">Revision:</x:String>
3636
<x:String x:Key="Text.Archive.Title" xml:space="preserve">Archive</x:String>
3737
<x:String x:Key="Text.Askpass" xml:space="preserve">SourceGit Askpass</x:String>
38+
<x:String x:Key="Text.Askpass.Passphrase" xml:space="preserve">Enter passphrase:</x:String>
3839
<x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">FILES ASSUME UNCHANGED</x:String>
3940
<x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">NO FILES ASSUMED AS UNCHANGED</x:String>
4041
<x:String x:Key="Text.AssumeUnchanged.Remove" xml:space="preserve">REMOVE</x:String>
@@ -150,17 +151,20 @@
150151
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Check refs that contains this commit</x:String>
151152
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT IS CONTAINED BY</x:String>
152153
<x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">Shows only the first 100 changes. See all changes on the CHANGES tab.</x:String>
154+
<x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">Key:</x:String>
153155
<x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">MESSAGE</x:String>
154156
<x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">PARENTS</x:String>
155157
<x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">REFS</x:String>
156158
<x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
159+
<x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">Signer:</x:String>
157160
<x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Open in Browser</x:String>
158161
<x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">Description</x:String>
159162
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">SUBJECT</x:String>
160163
<x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Enter commit subject</x:String>
161164
<x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
162165
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
163166
<x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Template Content:</x:String>
167+
<x:String x:Key="Text.Configure.CommitMessageTemplate.Explanation" xml:space="preserve">You can use ${files_num}, ${branch_name}, ${files} and ${files:N} where N is the max number of file paths to output.</x:String>
164168
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
165169
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
166170
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments:</x:String>
@@ -221,6 +225,8 @@
221225
<x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
222226
<x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">STAGE ALL &amp; COMMIT</x:String>
223227
<x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
228+
<x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">Restart Required</x:String>
229+
<x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">You need to restart this app to apply changes.</x:String>
224230
<x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</x:String>
225231
<x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Breaking Change:</x:String>
226232
<x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">Closed Issue:</x:String>
@@ -286,6 +292,9 @@
286292
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
287293
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
288294
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore All Whitespace Changes</x:String>
295+
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">SIDE-BY-SIDE</x:String>
296+
<x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">SWIPE</x:String>
297+
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">BLEND</x:String>
289298
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
290299
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
291300
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>
@@ -456,7 +465,19 @@
456465
<x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert in progress.</x:String>
457466
<x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Reverting commit</x:String>
458467
<x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
468+
<x:String x:Key="Text.InteractiveRebase.Drop" xml:space="preserve">Drop</x:String>
469+
<x:String x:Key="Text.InteractiveRebase.Drop.Message" xml:space="preserve">Remove commit</x:String>
470+
<x:String x:Key="Text.InteractiveRebase.Edit" xml:space="preserve">Edit</x:String>
471+
<x:String x:Key="Text.InteractiveRebase.Edit.Message" xml:space="preserve">Stop for amending</x:String>
472+
<x:String x:Key="Text.InteractiveRebase.Fixup" xml:space="preserve">Fixup</x:String>
473+
<x:String x:Key="Text.InteractiveRebase.Fixup.Message" xml:space="preserve">Like 'Squash' but discard message</x:String>
459474
<x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
475+
<x:String x:Key="Text.InteractiveRebase.Pick" xml:space="preserve">Pick</x:String>
476+
<x:String x:Key="Text.InteractiveRebase.Pick.Message" xml:space="preserve">Use this commit</x:String>
477+
<x:String x:Key="Text.InteractiveRebase.Reword" xml:space="preserve">Reword</x:String>
478+
<x:String x:Key="Text.InteractiveRebase.Reword.Message" xml:space="preserve">Edit the commit message</x:String>
479+
<x:String x:Key="Text.InteractiveRebase.Squash" xml:space="preserve">Squash</x:String>
480+
<x:String x:Key="Text.InteractiveRebase.Squash.Message" xml:space="preserve">Squash into previous commit</x:String>
460481
<x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
461482
<x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copy Link</x:String>
462483
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
@@ -579,6 +600,7 @@
579600
<x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">Make sure submodules have been pushed</x:String>
580601
<x:String x:Key="Text.Push.Force" xml:space="preserve">Force push</x:String>
581602
<x:String x:Key="Text.Push.Local" xml:space="preserve">Local Branch:</x:String>
603+
<x:String x:Key="Text.Push.New" xml:space="preserve">NEW</x:String>
582604
<x:String x:Key="Text.Push.Remote" xml:space="preserve">Remote:</x:String>
583605
<x:String x:Key="Text.Push.Revision" xml:space="preserve">Revision:</x:String>
584606
<x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Push Revision To Remote</x:String>

‎src/Views/Askpass.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
3838
<Border Margin="16,0">
39-
<TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/>
39+
<TextBlock x:Name="TxtDescription" Text="{DynamicResource Text.Askpass.Passphrase}" TextWrapping="Wrap"/>
4040
</Border>
4141

4242
<TextBox x:Name="TxtPassphrase"

‎src/Views/CommitBaseInfo.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
<StackPanel Orientation="Vertical">
8181
<TextBlock Margin="0,0,0,12" Text="{Binding ToolTip}"/>
8282
<Grid ColumnDefinitions="Auto,8,Auto" RowDefinitions="Auto,Auto">
83-
<TextBlock Grid.Row="0" Grid.Column="0" Text="Signer:" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
83+
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Text.CommitDetail.Info.Signer}" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
8484
<TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Signer}" IsVisible="{Binding HasSigner}" VerticalAlignment="Center"/>
85-
<TextBlock Grid.Row="1" Grid.Column="0" Text="Key:" VerticalAlignment="Center"/>
85+
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Text.CommitDetail.Info.Key}" VerticalAlignment="Center"/>
8686
<TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding Key}" VerticalAlignment="Center"/>
8787
</Grid>
8888
</StackPanel>

‎src/Views/CommitMessageEditor.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</Grid>
3737

3838
<StackPanel Grid.Row="1" Orientation="Vertical" Margin="8">
39-
<v:CommitMessageTextBox x:Name="Editor" Height="400" Text=""/>
39+
<v:CommitMessageTextBox x:Name="Editor" Height="400"/>
4040
<Button Classes="flat primary"
4141
Width="80"
4242
Margin="0,8,0,4"

‎src/Views/ConfirmRestart.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
IsVisible="{OnPlatform True, macOS=False}"/>
2626

2727
<TextBlock Classes="bold"
28-
Text="Restart Required"
28+
Text="{DynamicResource Text.ConfirmRestart.Title}"
2929
HorizontalAlignment="Center" VerticalAlignment="Center"
3030
IsHitTestVisible="False"/>
3131

@@ -36,7 +36,7 @@
3636

3737
<StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
3838
<Border Margin="16,0">
39-
<TextBlock Text="You need to restart this app to apply changes."/>
39+
<TextBlock Text="{DynamicResource Text.ConfirmRestart.Message}"/>
4040
</Border>
4141

4242
<Button Classes="flat primary"

‎src/Views/ImageDiffView.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<TabItem>
1919
<TabItem.Header>
20-
<TextBlock Text="SIDE-BY-SIDE" FontSize="11"/>
20+
<TextBlock Text="{DynamicResource Text.Diff.Image.SideBySide}" FontSize="11"/>
2121
</TabItem.Header>
2222

2323
<UniformGrid Rows="1" Margin="0,16" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -65,7 +65,7 @@
6565

6666
<TabItem>
6767
<TabItem.Header>
68-
<TextBlock Text="SWIPE" FontSize="11"/>
68+
<TextBlock Text="{DynamicResource Text.Diff.Image.Swipe}" FontSize="11"/>
6969
</TabItem.Header>
7070

7171
<Grid RowDefinitions="Auto,*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16">
@@ -101,7 +101,7 @@
101101

102102
<TabItem>
103103
<TabItem.Header>
104-
<TextBlock Text="BLEND" FontSize="11"/>
104+
<TextBlock Text="{DynamicResource Text.Diff.Image.Blend}" FontSize="11"/>
105105
</TabItem.Header>
106106

107107
<Grid RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16,8,0">
@@ -135,7 +135,7 @@
135135

136136
<Grid Grid.Row="2" ColumnDefinitions="100,200,100" Margin="0,12,0,0" HorizontalAlignment="Center">
137137
<StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,8,0">
138-
<TextBlock Classes="primary" Text="OLD"/>
138+
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Binary.Old}"/>
139139
<TextBlock Classes="primary"
140140
Margin="8,0,0,0"
141141
Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}"
@@ -153,7 +153,7 @@
153153
Value="0.5"/>
154154

155155
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" Margin="8,0,0,0">
156-
<TextBlock Classes="primary" Text="NEW"/>
156+
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Binary.New}"/>
157157
<TextBlock Classes="primary"
158158
Margin="8,0,0,0"
159159
Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.ToPercentage}}"

‎src/Views/InteractiveRebase.axaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
</MenuItem.Icon>
112112
<MenuItem.Header>
113113
<Grid ColumnDefinitions="64,240">
114-
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="Pick"/>
115-
<TextBlock Grid.Column="1" Text="Use this commit" Foreground="{DynamicResource Brush.FG2}"/>
114+
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="{DynamicResource Text.InteractiveRebase.Pick}"/>
115+
<TextBlock Grid.Column="1" Text="{DynamicResource Text.InteractiveRebase.Pick.Message}" Foreground="{DynamicResource Brush.FG2}"/><!-- NATO -->
116116
</Grid>
117117
</MenuItem.Header>
118118
</MenuItem>
@@ -123,8 +123,8 @@
123123
</MenuItem.Icon>
124124
<MenuItem.Header>
125125
<Grid ColumnDefinitions="64,240">
126-
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="Edit"/>
127-
<TextBlock Grid.Column="1" Text="Stop for amending" Foreground="{DynamicResource Brush.FG2}"/>
126+
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="{DynamicResource Text.InteractiveRebase.Edit}"/>
127+
<TextBlock Grid.Column="1" Text="{DynamicResource Text.InteractiveRebase.Edit.Message}" Foreground="{DynamicResource Brush.FG2}"/><!-- NATO -->
128128
</Grid>
129129
</MenuItem.Header>
130130
</MenuItem>
@@ -135,8 +135,8 @@
135135
</MenuItem.Icon>
136136
<MenuItem.Header>
137137
<Grid ColumnDefinitions="64,240">
138-
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="Reword"/>
139-
<TextBlock Grid.Column="1" Text="Edit the commit message" Foreground="{DynamicResource Brush.FG2}"/>
138+
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="{DynamicResource Text.InteractiveRebase.Reword}"/>
139+
<TextBlock Grid.Column="1" Text="{DynamicResource Text.InteractiveRebase.Reword.Message}" Foreground="{DynamicResource Brush.FG2}"/><!-- NATO -->
140140
</Grid>
141141
</MenuItem.Header>
142142
</MenuItem>
@@ -147,8 +147,8 @@
147147
</MenuItem.Icon>
148148
<MenuItem.Header>
149149
<Grid ColumnDefinitions="64,240">
150-
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="Squash"/>
151-
<TextBlock Grid.Column="1" Text="Meld into previous commit" Foreground="{DynamicResource Brush.FG2}"/>
150+
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="{DynamicResource Text.InteractiveRebase.Squash}"/>
151+
<TextBlock Grid.Column="1" Text="{DynamicResource Text.InteractiveRebase.Squash.Message}" Foreground="{DynamicResource Brush.FG2}"/><!-- NATO -->
152152
</Grid>
153153
</MenuItem.Header>
154154
</MenuItem>
@@ -159,8 +159,8 @@
159159
</MenuItem.Icon>
160160
<MenuItem.Header>
161161
<Grid ColumnDefinitions="64,240">
162-
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="Fixup"/>
163-
<TextBlock Grid.Column="1" Text="Like 'Squash' but discard message" Foreground="{DynamicResource Brush.FG2}"/>
162+
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="{DynamicResource Text.InteractiveRebase.Fixup}"/>
163+
<TextBlock Grid.Column="1" Text="{DynamicResource Text.InteractiveRebase.Fixup.Message}" Foreground="{DynamicResource Brush.FG2}"/><!-- NATO -->
164164
</Grid>
165165
</MenuItem.Header>
166166
</MenuItem>
@@ -171,8 +171,8 @@
171171
</MenuItem.Icon>
172172
<MenuItem.Header>
173173
<Grid ColumnDefinitions="64,240">
174-
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="Drop"/>
175-
<TextBlock Grid.Column="1" Text="Remove commit" Foreground="{DynamicResource Brush.FG2}"/>
174+
<TextBlock Grid.Column="0" Classes="primary" Margin="4,0" Text="{DynamicResource Text.InteractiveRebase.Drop}"/>
175+
<TextBlock Grid.Column="1" Text="{DynamicResource Text.InteractiveRebase.Drop.Message}" Foreground="{DynamicResource Brush.FG2}"/><!-- NATO -->
176176
</Grid>
177177
</MenuItem.Header>
178178
</MenuItem>

‎src/Views/Push.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
VerticalAlignment="Center"
8181
Background="Green"
8282
IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
83-
<TextBlock Text="NEW" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
83+
<TextBlock Text="{DynamicResource Text.Push.New}" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
8484
</Border>
8585
</StackPanel>
8686
</DataTemplate>

‎src/Views/RepositoryConfigure.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
<TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CommitMessageTemplate.Content}"/>
261261
<v:CommitMessageTextBox Margin="0,4,0,0" Height="150" Text="{Binding Content, Mode=TwoWay}"/>
262262
<TextBlock Margin="0,2,0,0"
263-
Text="You can use ${files_num}, ${branch_name}, ${files} and ${files:N} where N is the max number of file paths to output."
263+
Text="{DynamicResource Text.Configure.CommitMessageTemplate.Explanation}"
264264
Foreground="{DynamicResource Brush.FG2}"
265265
TextWrapping="Wrap"/>
266266
</StackPanel>

0 commit comments

Comments
 (0)