From be76fb40015e938d0f27e5a2825b4d3a25c45a70 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Thu, 19 May 2016 12:44:56 +0200
Subject: [PATCH] Munich/CycleBeginningForm localization modified.

---
 .../DataEntry/Munich/CycleBeginningForm.cs    | 25 ++++++++-----------
 .../Resources/Strings.Designer.cs             |  9 +++++++
 TestBenchFramework/Resources/Strings.cs.resx  |  3 +++
 TestBenchFramework/Resources/Strings.de.resx  |  6 +++++
 TestBenchFramework/Resources/Strings.pl.resx  |  3 +++
 TestBenchFramework/Resources/Strings.resx     |  3 +++
 .../Resources/Strings.zh-CN.resx              |  3 +++
 7 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
index fed9d6e51..43b1e98f2 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
@@ -50,24 +50,19 @@ namespace TBF.BenchControl.DataEntry.Munich
 		void Localize()
 		{
 			Text = Strings.Data;
-			groupBox1.Text = Strings.Water_Meter + " 1";
+            okButton.Text = Strings.OkBtnText;
+            
+            groupBox1.Text = string.Format(Strings.Water_Meter_nr, 1);
 			mainSN1Label.Text = Strings.Main_WM_SerialNr;
 			auxSN1Label.Text = Strings.Aux_WM_SerialNr;
-            okButton.Text = Strings.OkBtnText;
 
-            if (Config.Data.CompoundWMsCount >= 2)
-            {
-                groupBox2.Text = Strings.Water_Meter + " 2";
-                mainSN2Label.Text = Strings.Main_WM_SerialNr;
-                auxSN2Label.Text = Strings.Aux_WM_SerialNr;
-            }
-            
-            if (Config.Data.CompoundWMsCount >= 3)
-            {
-                groupBox3.Text = Strings.Water_Meter + " 3";
-                mainSN3Label.Text = Strings.Main_WM_SerialNr;
-                auxSN3Label.Text = Strings.Aux_WM_SerialNr;
-            }
+            groupBox2.Text = string.Format(Strings.Water_Meter_nr, 2);
+            mainSN2Label.Text = Strings.Main_WM_SerialNr;
+            auxSN2Label.Text = Strings.Aux_WM_SerialNr;
+
+            groupBox3.Text = string.Format(Strings.Water_Meter_nr, 3);
+            mainSN3Label.Text = Strings.Main_WM_SerialNr;
+            auxSN3Label.Text = Strings.Aux_WM_SerialNr;
 		}
 
         private void okButton_Click(object sender, EventArgs e)
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index 74d47bc1d..299c41a52 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -3672,6 +3672,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Water Meter {0}.
+        /// </summary>
+        internal static string Water_Meter_nr {
+            get {
+                return ResourceManager.GetString("Water_Meter_nr", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Water Meter Serial Numbers ans States.
         /// </summary>
diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx
index 550e65e1e..668c2d864 100644
--- a/TestBenchFramework/Resources/Strings.cs.resx
+++ b/TestBenchFramework/Resources/Strings.cs.resx
@@ -1170,4 +1170,7 @@
   <data name="Valid_until" xml:space="preserve">
     <value>Platná do</value>
   </data>
+  <data name="Water_Meter_nr" xml:space="preserve">
+    <value>Vodoměr {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx
index c77931887..937397e07 100644
--- a/TestBenchFramework/Resources/Strings.de.resx
+++ b/TestBenchFramework/Resources/Strings.de.resx
@@ -1131,4 +1131,10 @@
   <data name="Save_column_widths" xml:space="preserve">
     <value>Speichern</value>
   </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Wasserzähler</value>
+  </data>
+  <data name="Water_Meter_nr" xml:space="preserve">
+    <value>Wasserzähler {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx
index f59592706..15548b45d 100644
--- a/TestBenchFramework/Resources/Strings.pl.resx
+++ b/TestBenchFramework/Resources/Strings.pl.resx
@@ -1062,4 +1062,7 @@
   <data name="VersionStr" xml:space="preserve">
     <value>Wersja {0}</value>
   </data>
+  <data name="Water_Meter_nr" xml:space="preserve">
+    <value>Wodomierz {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index b50737da6..744ee0eb3 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -1348,4 +1348,7 @@
   <data name="Save_column_widths" xml:space="preserve">
     <value>Save column widths</value>
   </data>
+  <data name="Water_Meter_nr" xml:space="preserve">
+    <value>Water Meter {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TestBenchFramework/Resources/Strings.zh-CN.resx
index 943e3edae..9ea70dacd 100644
--- a/TestBenchFramework/Resources/Strings.zh-CN.resx
+++ b/TestBenchFramework/Resources/Strings.zh-CN.resx
@@ -1182,4 +1182,7 @@
   <data name="Camera" xml:space="preserve">
     <value>相机</value>
   </data>
+  <data name="Water_Meter_nr" xml:space="preserve">
+    <value>水表 {0}</value>
+  </data>
 </root>
\ No newline at end of file