Skip to content

Commit feed428

Browse files
committed
More localization
1 parent c2f2b96 commit feed428

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/UI/RubberduckUI.fr.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,4 +1076,7 @@ Attention: les valeurs personnalisées seront perdues.</value>
10761076
<data name="ToDoPriority_Medium" xml:space="preserve">
10771077
<value>z Medium</value>
10781078
</data>
1079+
<data name="SourceControl_SuccessfulMerge" xml:space="preserve">
1080+
<value>z Successfully Merged {0} into {1}</value>
1081+
</data>
10791082
</root>

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,4 +1080,7 @@ Are you sure you want to proceed with this rename?</value>
10801080
<data name="ToDoPriority_Medium" xml:space="preserve">
10811081
<value>Medium</value>
10821082
</data>
1083+
<data name="SourceControl_SuccessfulMerge" xml:space="preserve">
1084+
<value>Successfully Merged {0} into {1}</value>
1085+
</data>
10831086
</root>

RetailCoder.VBE/UI/RubberduckUI.sv.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,4 +1067,7 @@ Are you sure you want to proceed with this rename?</value>
10671067
<data name="ToDoPriority_Medium" xml:space="preserve">
10681068
<value>z Medium</value>
10691069
</data>
1070+
<data name="SourceControl_SuccessfulMerge" xml:space="preserve">
1071+
<value>z Successfully Merged {0} into {1}</value>
1072+
</data>
10701073
</root>

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private void OnMerge(object sender, EventArgs e)
169169
this.Provider.Merge(source, destination);
170170
_view.Current = this.Provider.CurrentBranch.Name;
171171

172-
_mergeView.StatusText = string.Format("Successfully Merged {0} into {1}", source, destination);
172+
_mergeView.StatusText = string.Format(RubberduckUI.SourceControl_SuccessfulMerge, source, destination);
173173
_mergeView.Status = MergeStatus.Success;
174174

175175
_mergeView.Hide();

0 commit comments

Comments
 (0)