More localizations, @rubberduck, @ckuhn2013 z-strings need to be tran…

…slated, @simon @Zomis @mat @retailcoder
retailcoder · Jun 4, 2015 · fb73040 · fb73040
1 parent 5b00147
commit fb73040
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 0 deletions.
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.fr.resx b/RetailCoder.VBE/UI/RubberduckUI.fr.resx
@@ -903,6 +903,9 @@ Do you want to continue?</value>
   <data name="About_Stargazers" xml:space="preserve">
     <value>z All our stargazers, likers &amp; followers, for the warm fuzzies</value>
   </data>
+  <data name="Okay" xml:space="preserve">
+    <value>z Okay</value>
+  </data>
   <data name="SourceControlPanel_Caption" xml:space="preserve">
     <value>z Source Control</value>
   </data>
@@ -942,6 +945,9 @@ Do you want to continue?</value>
   <data name="SourceControl_DefaultRepoLocationLabel" xml:space="preserve">
     <value>z Default Repository Location</value>
   </data>
+  <data name="SourceControl_DestinationLabel" xml:space="preserve">
+    <value>z Destination</value>
+  </data>
   <data name="SourceControl_EmailAddressLabel" xml:space="preserve">
     <value>z Email Address</value>
   </data>
@@ -969,6 +975,9 @@ Do you want to continue?</value>
   <data name="SourceControl_MergeBranch" xml:space="preserve">
     <value>z Merge</value>
   </data>
+  <data name="SourceControl_MergeFormCaption" xml:space="preserve">
+    <value>z Merge Branch</value>
+  </data>
   <data name="SourceControl_NewBranch" xml:space="preserve">
     <value>z New Branch</value>
   </data>
@@ -996,6 +1005,9 @@ Do you want to continue?</value>
   <data name="SourceControl_Settings" xml:space="preserve">
     <value>z Settings</value>
   </data>
+  <data name="SourceControl_SourceLabel" xml:space="preserve">
+    <value>z Source</value>
+  </data>
   <data name="SourceControl_SyncCommitsLabel" xml:space="preserve">
     <value>z Sync</value>
   </data>

diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -948,6 +948,9 @@ Do you want to continue?</value>
   <data name="SourceControl_Changes" xml:space="preserve">
     <value>Changes</value>
   </data>
+  <data name="Okay" xml:space="preserve">
+    <value>Okay</value>
+  </data>
   <data name="SourceControl_Branches" xml:space="preserve">
     <value>Branches</value>
   </data>
@@ -972,6 +975,9 @@ Do you want to continue?</value>
   <data name="SourceControl_CurrentBranchLabel" xml:space="preserve">
     <value>Branch:</value>
   </data>
+  <data name="SourceControl_DestinationLabel" xml:space="preserve">
+    <value>Destination</value>
+  </data>
   <data name="SourceControl_ExcludedChanges" xml:space="preserve">
     <value>Excluded changes</value>
   </data>
@@ -987,6 +993,9 @@ Do you want to continue?</value>
   <data name="SourceControl_MergeBranch" xml:space="preserve">
     <value>Merge</value>
   </data>
+  <data name="SourceControl_MergeFormCaption" xml:space="preserve">
+    <value>Merge Branch</value>
+  </data>
   <data name="SourceControl_NewBranch" xml:space="preserve">
     <value>New Branch</value>
   </data>
@@ -1005,6 +1014,9 @@ Do you want to continue?</value>
   <data name="SourceControl_Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
+  <data name="SourceControl_SourceLabel" xml:space="preserve">
+    <value>Source</value>
+  </data>
   <data name="SourceControl_SyncCommitsLabel" xml:space="preserve">
     <value>Sync</value>
   </data>

diff --git a/RetailCoder.VBE/UI/RubberduckUI.sv.resx b/RetailCoder.VBE/UI/RubberduckUI.sv.resx
@@ -889,6 +889,9 @@ Varning: Alla anpassade inställningar kommer att försvinna.</value>
   <data name="About_Stargazers" xml:space="preserve">
     <value>z All our stargazers, likers &amp; followers, for the warm fuzzies</value>
   </data>
+  <data name="Okay" xml:space="preserve">
+    <value>z Okay</value>
+  </data>
   <data name="SourceControlPanel_Caption" xml:space="preserve">
     <value>z Source Control</value>
   </data>
@@ -928,6 +931,9 @@ Varning: Alla anpassade inställningar kommer att försvinna.</value>
   <data name="SourceControl_DefaultRepoLocationLabel" xml:space="preserve">
     <value>z Default Repository Location</value>
   </data>
+  <data name="SourceControl_DestinationLabel" xml:space="preserve">
+    <value>z Destination</value>
+  </data>
   <data name="SourceControl_EmailAddressLabel" xml:space="preserve">
     <value>z Email Address</value>
   </data>
@@ -955,6 +961,9 @@ Varning: Alla anpassade inställningar kommer att försvinna.</value>
   <data name="SourceControl_MergeBranch" xml:space="preserve">
     <value>z Merge</value>
   </data>
+  <data name="SourceControl_MergeFormCaption" xml:space="preserve">
+    <value>z Merge Branch</value>
+  </data>
   <data name="SourceControl_NewBranch" xml:space="preserve">
     <value>z New Branch</value>
   </data>
@@ -982,6 +991,9 @@ Varning: Alla anpassade inställningar kommer att försvinna.</value>
   <data name="SourceControl_Settings" xml:space="preserve">
     <value>z Settings</value>
   </data>
+  <data name="SourceControl_SourceLabel" xml:space="preserve">
+    <value>z Source</value>
+  </data>
   <data name="SourceControl_SyncCommitsLabel" xml:space="preserve">
     <value>z Sync</value>
   </data>

diff --git a/RetailCoder.VBE/UI/SourceControl/MergeForm.cs b/RetailCoder.VBE/UI/SourceControl/MergeForm.cs
@@ -10,6 +10,12 @@ public partial class MergeForm : Form, IMergeView
         public MergeForm()
         {
             InitializeComponent();
+
+            Text = RubberduckUI.SourceControl_MergeFormCaption;
+            SourceLabel.Text = RubberduckUI.SourceControl_SourceLabel;
+            DestinationLabel.Text = RubberduckUI.SourceControl_DestinationLabel;
+            OkayButton.Text = RubberduckUI.Okay;
+            CancelButton.Text = RubberduckUI.CancelButtonText;
         }
 
         public bool OkayButtonEnabled