diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index 888bca862..2bbfba710 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -528,6 +528,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Batch numbers. + /// + internal static string Batch_numbers { + get { + return ResourceManager.GetString("Batch_numbers", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bench. /// @@ -591,6 +600,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Body number. + /// + internal static string Body_number { + get { + return ResourceManager.GetString("Body_number", resourceCulture); + } + } + /// /// Looks up a localized string similar to Build date {0}. /// @@ -1320,6 +1338,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to digits. + /// + internal static string digits { + get { + return ResourceManager.GetString("digits", resourceCulture); + } + } + /// /// Looks up a localized string similar to Direction. /// @@ -1365,6 +1392,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Do you really want to delete all codes ?. + /// + internal static string Do_you_really_want_to_delete_all_codes_Q { + get { + return ResourceManager.GetString("Do_you_really_want_to_delete_all_codes_Q", resourceCulture); + } + } + /// /// Looks up a localized string similar to Do you really want to delete sequence '{0}' ?. /// @@ -2076,6 +2112,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to first s/n. + /// + internal static string first_sn { + get { + return ResourceManager.GetString("first_sn", resourceCulture); + } + } + /// /// Looks up a localized string similar to Fix. /// @@ -3579,6 +3624,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to pieces. + /// + internal static string pieces { + get { + return ResourceManager.GetString("pieces", resourceCulture); + } + } + /// /// Looks up a localized string similar to Pipeline. /// @@ -3948,6 +4002,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Production order and serial numbers. + /// + internal static string Production_order_and_serial_numbers { + get { + return ResourceManager.GetString("Production_order_and_serial_numbers", resourceCulture); + } + } + /// /// Looks up a localized string similar to Profile. /// @@ -5011,11 +5074,20 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Serial Number. + /// Looks up a localized string similar to Serial number. /// - internal static string Serial_Number { + internal static string Serial_number { get { - return ResourceManager.GetString("Serial_Number", resourceCulture); + return ResourceManager.GetString("Serial_number", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Serial numbers. + /// + internal static string Serial_numbers { + get { + return ResourceManager.GetString("Serial_numbers", resourceCulture); } } @@ -5406,6 +5478,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to . + /// + internal static string String1 { + get { + return ResourceManager.GetString("String1", resourceCulture); + } + } + /// /// Looks up a localized string similar to Sun. /// @@ -6201,6 +6282,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Two identical codes were found. + /// + internal static string Two_identical_codes_were_found { + get { + return ResourceManager.GetString("Two_identical_codes_were_found", resourceCulture); + } + } + /// /// Looks up a localized string similar to Type. /// @@ -6597,6 +6687,24 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Workflow. + /// + internal static string Workflow { + get { + return ResourceManager.GetString("Workflow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Workflow step. + /// + internal static string Workflow_step { + get { + return ResourceManager.GetString("Workflow_step", resourceCulture); + } + } + /// /// Looks up a localized string similar to Writing to the production tracing DB failed. /// diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx index 591174065..5e9db5385 100644 --- a/TBF/Resources/Strings.cs.resx +++ b/TBF/Resources/Strings.cs.resx @@ -822,7 +822,7 @@ Sensory - + Sériové číslo @@ -1668,4 +1668,37 @@ Zakázky + + Čísla šarží + + + Číslo puzdra + + + číslic + + + první s/n + + + kusů + + + Výrobní zakázka a sériové čísla + + + Sériová čísla + + + Pracovní postup + + + Krok pracovního postupu + + + Našli se dva stejné kódy + + + Určitě chcete vymazat všechny kódy ? + \ No newline at end of file diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 67726710c..ae84bb13a 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -898,8 +898,8 @@ Qrise - - Serial Number + + Serial number State @@ -2314,4 +2314,40 @@ Orders + + Batch numbers + + + Body number + + + digits + + + first s/n + + + pieces + + + Production order and serial numbers + + + Serial numbers + + + + + + Workflow + + + Workflow step + + + Two identical codes were found + + + Do you really want to delete all codes ? + \ No newline at end of file diff --git a/TBF/Resources/Strings.sk.resx b/TBF/Resources/Strings.sk.resx index 2faa2e634..6cf0c83d6 100644 --- a/TBF/Resources/Strings.sk.resx +++ b/TBF/Resources/Strings.sk.resx @@ -194,8 +194,45 @@ Str. + Batch_numbers Spúšťače udalostí + + Čísla šarží + + + Číslo púzdra + + + číslic + + + prvé s/n + + + kusov + + + Výrobná zákazka a sériové čísla + + + Sériové číslo + + + Sériové čísla + + + Pracovný postup + + + Krok pracovného postupu + + + Našli sa dva rovnaké kódy + + + Naozaj chcete vymazať všetky kódy ? + \ No newline at end of file diff --git a/TBF/Rig/DataEntry/Fewa/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Fewa/CycleBeginningForm.cs index 8602223ef..8fad72311 100644 --- a/TBF/Rig/DataEntry/Fewa/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Fewa/CycleBeginningForm.cs @@ -151,7 +151,7 @@ namespace TBF.Rig.DataEntry.Fewa orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs b/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs index 0bc842865..d8da25d85 100644 --- a/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs @@ -175,7 +175,7 @@ namespace TBF.Rig.DataEntry.HeatMeters12 orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs b/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs index 6adf1b052..b61fa8377 100644 --- a/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs @@ -168,7 +168,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6 orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/S620/CheckItems/Barcode.cs b/TBF/Rig/DataEntry/S620/CheckItems/Barcode.cs index 9e6829c6d..99d7236da 100644 --- a/TBF/Rig/DataEntry/S620/CheckItems/Barcode.cs +++ b/TBF/Rig/DataEntry/S620/CheckItems/Barcode.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2020-2021 Sensus Slovensko a.s. +/// Copyright (c) 2020 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -9,6 +9,7 @@ using System.Linq; using System.Reflection; using System.Windows.Forms; using SharedDatabase; +using SharedDatabase.Entities; namespace TBF.Rig.DataEntry.S620.CheckItems { @@ -21,8 +22,8 @@ namespace TBF.Rig.DataEntry.S620.CheckItems FormForMechanicalMetersWithTracing parent; - public SharedDatabase.Entities.Part Part { get { return part; } } - SharedDatabase.Entities.Part part; + public Part Part { get { return part; } } + Part part; public int IxPolozky { @@ -42,7 +43,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems InitializeComponent(); } - public Barcode(FormForMechanicalMetersWithTracing parent, SharedDatabase.Entities.Part part) + public Barcode(FormForMechanicalMetersWithTracing parent, Part part) : this() { this.parent = parent; diff --git a/TBF/Rig/DataEntry/S620/CheckItems/Keyboard.cs b/TBF/Rig/DataEntry/S620/CheckItems/Keyboard.cs index 7d9a02c7c..02e62091e 100644 --- a/TBF/Rig/DataEntry/S620/CheckItems/Keyboard.cs +++ b/TBF/Rig/DataEntry/S620/CheckItems/Keyboard.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; using SharedDatabase; +using SharedDatabase.Entities; namespace TBF.Rig.DataEntry.S620.CheckItems { @@ -18,8 +19,8 @@ namespace TBF.Rig.DataEntry.S620.CheckItems FormForMechanicalMetersWithTracing parent; - public SharedDatabase.Entities.Part Part { get { return part; } } - SharedDatabase.Entities.Part part; + public Part Part { get { return part; } } + Part part; public int IxPolozky { @@ -66,7 +67,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems InitializeComponent(); } - public Keyboard(FormForMechanicalMetersWithTracing parent, SharedDatabase.Entities.Part part) + public Keyboard(FormForMechanicalMetersWithTracing parent, Part part) : this() { this.parent = parent; @@ -105,7 +106,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems private void setFocusButton_Click(object sender, EventArgs e) { setFocusButton.Text = ">"; - parent.OnFocusPressed(this, new FocusPressedEventArgs(IxPolozky, Part.CodeLocation)); + parent.OnFocusPressed(this, new FocusPressedEventArgs(IxPolozky, Part.CodeLocation)); } private void scannedCodeTextBox_KeyPress(object sender, KeyPressEventArgs e) diff --git a/TBF/Rig/DataEntry/S620/CheckItems/OkNok.cs b/TBF/Rig/DataEntry/S620/CheckItems/OkNok.cs index e2ae860d5..eb4c5acdc 100644 --- a/TBF/Rig/DataEntry/S620/CheckItems/OkNok.cs +++ b/TBF/Rig/DataEntry/S620/CheckItems/OkNok.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -using SharedDatabase; using SharedDatabase.Entities; namespace TBF.Rig.DataEntry.S620.CheckItems @@ -19,8 +18,8 @@ namespace TBF.Rig.DataEntry.S620.CheckItems FormForMechanicalMetersWithTracing parent; - public SharedDatabase.Entities.Part Part { get { return part; } } - SharedDatabase.Entities.Part part; + public Part Part { get { return part; } } + Part part; public int IxPolozky { @@ -62,7 +61,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems InitializeComponent(); } - public OkNok(FormForMechanicalMetersWithTracing parent, SharedDatabase.Entities.Part part) + public OkNok(FormForMechanicalMetersWithTracing parent, Part part) : this() { this.parent = parent; diff --git a/TBF/Rig/DataEntry/S620/EntryFormCfg.cs b/TBF/Rig/DataEntry/S620/EntryFormCfg.cs index f808472a1..8b9170849 100644 --- a/TBF/Rig/DataEntry/S620/EntryFormCfg.cs +++ b/TBF/Rig/DataEntry/S620/EntryFormCfg.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.DataEntry.S620 public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new EntryFormCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/Rig/DataEntry/S620/EntryFormCfgCtrl.cs b/TBF/Rig/DataEntry/S620/EntryFormCfgCtrl.cs index 9ded4e322..ba3c1f578 100644 --- a/TBF/Rig/DataEntry/S620/EntryFormCfgCtrl.cs +++ b/TBF/Rig/DataEntry/S620/EntryFormCfgCtrl.cs @@ -7,12 +7,13 @@ using Common; using Config.Entities; using TBF.Rig.Generic; using TBF.Resources; +using TBF.UI.Bench.Components; namespace TBF.Rig.DataEntry.S620 { public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl { - TBF.UI.Bench.Components.ComponentParametersDlg parent; + ComponentParametersDlg parent; public bool ShowMore { get { return false; } } @@ -36,7 +37,7 @@ namespace TBF.Rig.DataEntry.S620 { Localize(); - parent = ParentForm as TBF.UI.Bench.Components.ComponentParametersDlg; + parent = ParentForm as ComponentParametersDlg; if (parent == null) return; parentNameComboBox.Items.Add("---"); diff --git a/TBF/Rig/DataEntry/S620/FocusPressedEventArgs.cs b/TBF/Rig/DataEntry/S620/FocusPressedEventArgs.cs index 9d613f0e6..4c6ea666c 100644 --- a/TBF/Rig/DataEntry/S620/FocusPressedEventArgs.cs +++ b/TBF/Rig/DataEntry/S620/FocusPressedEventArgs.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2020 Sensus Slovensko a.s. /// using System; +using SharedDatabase; namespace TBF.Rig.DataEntry.S620 { @@ -15,9 +16,9 @@ namespace TBF.Rig.DataEntry.S620 /// 100.. parts with batch numbers /// public int IxPolozky; - public SharedDatabase.CodeLocation CodeLocation; + public CodeLocation CodeLocation; - public FocusPressedEventArgs(int ixPolozky, SharedDatabase.CodeLocation codeLocation) + public FocusPressedEventArgs(int ixPolozky, CodeLocation codeLocation) { this.IxPolozky = ixPolozky; this.CodeLocation = codeLocation; diff --git a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs index ea62e1159..dd667a166 100644 --- a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs +++ b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs @@ -372,22 +372,22 @@ namespace TBF.Rig.DataEntry.S620 { Text = Strings.Data; - workflowGroupBox.Text = "Pracovný postup"; - workstepGroupBox.Text = "Krok prac. postupu"; + workflowGroupBox.Text = Strings.Workflow; + workstepGroupBox.Text = Strings.Workflow_step; - orderCheckBox.Text = "Výrobná zakázka a sériové čísla"; - firstSNLabel.Text = "prvé s/n"; - snDigitsLabel.Text = "číslic"; - piecesCountLabel.Text = "kusov"; + orderCheckBox.Text = Strings.Production_order_and_serial_numbers; + firstSNLabel.Text = Strings.first_sn; + snDigitsLabel.Text = Strings.digits; + piecesCountLabel.Text = Strings.pieces; reloadButton.Text = "@"; - fromLabel.Text = "od"; - toLabel.Text = "do"; + fromLabel.Text = Strings.from; + toLabel.Text = Strings.to; - serialNumbersGroupBox.Text = "Sériové čísla"; - bodyLabel.Text = bodyLabel2.Text = "Číslo púzdra"; - snLabel.Text = snLabel2.Text = "Sériové číslo"; + serialNumbersGroupBox.Text = Strings.Serial_numbers; + bodyLabel.Text = bodyLabel2.Text = Strings.Body_number; + snLabel.Text = snLabel2.Text = Strings.Serial_number; - batchesCheckBox.Text = "Šarže"; + batchesCheckBox.Text = Strings.Batch_numbers; okButton.Text = Strings.OkBtnText; //clearButton.Text = Strings.ClearBtnText; @@ -792,7 +792,7 @@ namespace TBF.Rig.DataEntry.S620 textBoxes[ix1].BackColor = Color.Yellow; textBoxes[ix2].BackColor = Color.Yellow; - MessageBox.Show("Našli sa dva rovnaké kódy."); + MessageBox.Show(Strings.Two_identical_codes_were_found); textBoxes[ix1].BackColor = oriBackColor1; textBoxes[ix2].BackColor = oriBackColor2; @@ -806,7 +806,7 @@ namespace TBF.Rig.DataEntry.S620 private void clearButton_Click(object sender, EventArgs e) { - if (MessageBox.Show("Naozaj chcete všetky kódy vymazať?", "Upozonenie", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes) + if (MessageBox.Show(Strings.Do_you_really_want_to_delete_all_codes_Q, Strings.Warning, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes) { for (int i = 0; i < Math.Min(wmsCount, textBoxesCount); i++) { diff --git a/TBF/Rig/DataEntry/S620/ICheckItem.cs b/TBF/Rig/DataEntry/S620/ICheckItem.cs index 43b4d9590..59afc9605 100644 --- a/TBF/Rig/DataEntry/S620/ICheckItem.cs +++ b/TBF/Rig/DataEntry/S620/ICheckItem.cs @@ -3,6 +3,7 @@ /// using System; using System.Collections.Generic; +using SharedDatabase.Entities; namespace TBF.Rig.DataEntry.S620 { @@ -11,7 +12,7 @@ namespace TBF.Rig.DataEntry.S620 /// /// Part to be scanned / checked /// - SharedDatabase.Entities.Part Part { get; } + Part Part { get; } /// /// ID of a part in this workstep: diff --git a/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs index 761350f84..575b9ed0a 100644 --- a/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs @@ -133,7 +133,7 @@ namespace TBF.Rig.DataEntry.Single orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs index ea446b397..6c03edff2 100644 --- a/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs @@ -177,7 +177,7 @@ namespace TBF.Rig.DataEntry.Standard12 orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs index b3e6d4eff..f9a4296f5 100644 --- a/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs @@ -133,7 +133,7 @@ namespace TBF.Rig.DataEntry.Standard24 orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs index 7b5e38c0e..9fa38d154 100644 --- a/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs @@ -137,7 +137,7 @@ namespace TBF.Rig.DataEntry.Standard48 orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs index 23775ce54..9f424e8d7 100644 --- a/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs @@ -111,7 +111,7 @@ namespace TBF.Rig.DataEntry.Standard6 { Text = Strings.Data; orderLabel.Text = Strings.Purchase_order; - snLabel.Text = Strings.Serial_Number; + snLabel.Text = Strings.Serial_number; remarkLabel.Text = Strings.Remark; okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs b/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs index c495b8ba0..a3b76af81 100644 --- a/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs +++ b/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs @@ -136,7 +136,7 @@ namespace TBF.Rig.DataEntry.StandardCamera orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; diff --git a/TBF/Rig/Network/Camera/CLP1611/CameraCfgCtrl.cs b/TBF/Rig/Network/Camera/CLP1611/CameraCfgCtrl.cs index f87849066..913b897e5 100644 --- a/TBF/Rig/Network/Camera/CLP1611/CameraCfgCtrl.cs +++ b/TBF/Rig/Network/Camera/CLP1611/CameraCfgCtrl.cs @@ -63,7 +63,7 @@ namespace TBF.Rig.Network.Camera.CLP1611 { nameLabel.Text = Strings.Name; parentNameLabel.Text = Strings.Parent_name; - hwAddressLabel.Text = Strings.Serial_Number; + hwAddressLabel.Text = Strings.Serial_number; } public void Closing() diff --git a/TBF/Rig/Network/Comet/Ambient/AmbientCfgCtrl.cs b/TBF/Rig/Network/Comet/Ambient/AmbientCfgCtrl.cs index 77a666996..1a0d13efc 100644 --- a/TBF/Rig/Network/Comet/Ambient/AmbientCfgCtrl.cs +++ b/TBF/Rig/Network/Comet/Ambient/AmbientCfgCtrl.cs @@ -40,7 +40,7 @@ namespace TBF.Rig.Network.Comet.Ambient void Localize() { nameLabel.Text = Strings.Name; - serialNrLabel.Text = Strings.Serial_Number; + serialNrLabel.Text = Strings.Serial_number; } public void Closing() diff --git a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs index 2b443c125..398abc763 100644 --- a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs +++ b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs @@ -137,7 +137,7 @@ namespace TBF.Rig.RegisterReaders.KPackE.DataEntryForRadio orderGroupBox.Text = Strings.Purchase_order; for (int i = 0; i < textBoxesCount; i++) { - labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString(); + labels[i].Text = Strings.Serial_number + " " + (i + 1).ToString(); } okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText;