diff --git a/TODO.txt b/TODO.txt index 2c709d2f7..1054df658 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,5 @@ iPerl: +- log pre pevny start, podobne (zarazky) ako pre letmy - 'Q2 corrected from ...' Evaluate a Publish parametre - STOP nefunguje vzdy (alebo pomaly) - zlepsit uzivatelsky dojem - Oracle DB: UPDATE ... diff --git a/TestBenchFramework/BenchesDlg.Designer.cs b/TestBenchFramework/BenchesDlg.Designer.cs index bbac909b6..de9b9bc13 100644 --- a/TestBenchFramework/BenchesDlg.Designer.cs +++ b/TestBenchFramework/BenchesDlg.Designer.cs @@ -44,26 +44,26 @@ namespace TBF // // okButton // - resources.ApplyResources(this.okButton, "okButton"); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // cancelButton // - resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.Name = "cancelButton"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // testBenchesListBox // - resources.ApplyResources(this.testBenchesListBox, "testBenchesListBox"); this.testBenchesListBox.FormattingEnabled = true; + resources.ApplyResources(this.testBenchesListBox, "testBenchesListBox"); this.testBenchesListBox.Name = "testBenchesListBox"; this.testBenchesListBox.DoubleClick += new System.EventHandler(this.testBenchesListBox_DoubleClick); // @@ -75,32 +75,32 @@ namespace TBF // // editButton // - resources.ApplyResources(this.editButton, "editButton"); this.editButton.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.editButton, "editButton"); this.editButton.Name = "editButton"; this.editButton.UseVisualStyleBackColor = true; this.editButton.Click += new System.EventHandler(this.editButton_Click); // // addButton // - resources.ApplyResources(this.addButton, "addButton"); this.addButton.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.addButton, "addButton"); this.addButton.Name = "addButton"; this.addButton.UseVisualStyleBackColor = true; this.addButton.Click += new System.EventHandler(this.addButton_Click); // // removeButton // - resources.ApplyResources(this.removeButton, "removeButton"); this.removeButton.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.removeButton, "removeButton"); this.removeButton.Name = "removeButton"; this.removeButton.UseVisualStyleBackColor = true; this.removeButton.Click += new System.EventHandler(this.removeButton_Click); // // copyButton // - resources.ApplyResources(this.copyButton, "copyButton"); this.copyButton.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.copyButton, "copyButton"); this.copyButton.Name = "copyButton"; this.copyButton.UseVisualStyleBackColor = true; this.copyButton.Click += new System.EventHandler(this.copyButton_Click); @@ -121,6 +121,7 @@ namespace TBF this.MaximizeBox = false; this.Name = "BenchesDlg"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Load += new System.EventHandler(this.BenchesDlg_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TestBenchFramework/BenchesDlg.cs b/TestBenchFramework/BenchesDlg.cs index 8a9a9ee4b..d135bd41c 100644 --- a/TestBenchFramework/BenchesDlg.cs +++ b/TestBenchFramework/BenchesDlg.cs @@ -3,6 +3,7 @@ /// using System; using System.Windows.Forms; +using TBF.Resources; namespace TBF { @@ -29,6 +30,18 @@ namespace TBF RedrawTestBenchesListBox(); } + private void BenchesDlg_Load(object sender, EventArgs e) + { + Text = Strings.Database_Settings; + label1.Text = Strings.Test_Benches_; + addButton.Text = Strings.AddBtnText; + copyButton.Text = Strings.CopyBtnText; + editButton.Text = Strings.EditBtnText; + removeButton.Text = Strings.RemoveBtnText; + okButton.Text = Strings.OkBtnText; + cancelButton.Text = Strings.CancelBtnText; + } + void RedrawTestBenchesListBox() { testBenchesListBox.Items.Clear(); diff --git a/TestBenchFramework/BenchesDlg.de.resx b/TestBenchFramework/BenchesDlg.de.resx deleted file mode 100644 index da230a148..000000000 --- a/TestBenchFramework/BenchesDlg.de.resx +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - &OK - - - &Abbrechen - - - - 58, 13 - - - Prüfstände - - - &Bearbeiten... - - - &Neu... - - - &Löschen - - - &Kopieren - - - Datenbank Einstellungen - - \ No newline at end of file diff --git a/TestBenchFramework/BenchesDlg.resx b/TestBenchFramework/BenchesDlg.resx index 139fa0b04..741dc3981 100644 --- a/TestBenchFramework/BenchesDlg.resx +++ b/TestBenchFramework/BenchesDlg.resx @@ -117,223 +117,220 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 13 - - - 192, 105 - - - $this - - - 105, 28 - - - 192, 37 - - - 164, 134 - - - &Add - - - 1 - - - 15 - - - $this - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BenchesDlg - - - 5 - - - label1 - - - &Remove - - - 344, 71 - - - $this - - - Cancel - - - testBenchesListBox - - - 192, 71 - - - okButton - - - $this - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 105, 28 - - - 0 - - - 14 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 79, 13 - - - 105, 28 - - - $this - - - 459, 185 - - - 11 - - - 6, 13 + + 344, 37 105, 28 - - &Edit + + + 12 - - addButton + + OK - - - CenterParent + + okButton System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 192, 139 - - - 7 - - - 344, 37 - - - 105, 28 - - - 17 - - - removeButton - - - &Copy - - - 12, 37 - - - 4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this 6 - - $this + + 344, 71 - - copyButton - - + 105, 28 - - True + + 11 - - 3 - - - editButton + + Cancel cancelButton + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + 12, 37 + + + 164, 134 + + + 13 + + + testBenchesListBox + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + 12, 15 - + + 79, 13 + + + 14 + + + Test Benches : + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 192, 105 + + + 105, 28 + + + 15 + + + &Edit + + + editButton + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + $this + + + 3 + + + 192, 37 + + + 105, 28 + + + 16 + + + &Add + + + addButton + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this 2 - - OK + + 192, 139 - - Database Settings + + 105, 28 - + + 17 + + + &Remove + + + removeButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 192, 71 + + + 105, 28 + + + 0 + + + &Copy + + + copyButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this 0 - - 12 - - - 16 - - - Test Benches : - True - - de - + + 6, 13 + + + 459, 185 + + + + CenterParent + + + Database Settings + + + BenchesDlg + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TestBenchFramework/ComponentParametersDlg.de.resx b/TestBenchFramework/ComponentParametersDlg.de.resx deleted file mode 100644 index b344df0f9..000000000 --- a/TestBenchFramework/ComponentParametersDlg.de.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 357, 243 - - - &OK - - - &Abbrechen - - \ No newline at end of file diff --git a/TestBenchFramework/Forms/AboutDlg.Designer.cs b/TestBenchFramework/Forms/AboutDlg.Designer.cs index b68e0e318..91ff8b76a 100644 --- a/TestBenchFramework/Forms/AboutDlg.Designer.cs +++ b/TestBenchFramework/Forms/AboutDlg.Designer.cs @@ -61,16 +61,16 @@ namespace TBF.Forms // // closeButton // + resources.ApplyResources(this.closeButton, "closeButton"); this.closeButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.closeButton.ImageKey = global::TBF.Resources.Strings.String1; - resources.ApplyResources(this.closeButton, "closeButton"); this.closeButton.Name = "closeButton"; this.closeButton.UseVisualStyleBackColor = true; // // logoPictureBox // - this.logoPictureBox.BackgroundImage = global::TBF.Properties.Resources.sensus_logo; resources.ApplyResources(this.logoPictureBox, "logoPictureBox"); + this.logoPictureBox.BackgroundImage = global::TBF.Properties.Resources.sensus_logo; this.logoPictureBox.Name = "logoPictureBox"; this.logoPictureBox.TabStop = false; // diff --git a/TestBenchFramework/Forms/AboutDlg.cs b/TestBenchFramework/Forms/AboutDlg.cs index 6bc52fd3e..537a16fa4 100644 --- a/TestBenchFramework/Forms/AboutDlg.cs +++ b/TestBenchFramework/Forms/AboutDlg.cs @@ -9,6 +9,7 @@ using System.Drawing; using System.Text; using System.Security.Cryptography; using System.Windows.Forms; +using TBF.Resources; namespace TBF.Forms { @@ -24,6 +25,8 @@ namespace TBF.Forms { InitializeComponent(); + Localize(); + System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly(); /// Version ver = asm.GetName().Version; @@ -37,5 +40,14 @@ namespace TBF.Forms foreach (byte oneByte in sha1) { sb.Append(oneByte.ToString("X2")); } secureHashLabel.Text = string.Format("SHA1: {0}", sb); } + + void Localize() + { + Text = Strings.About_Test_Bench_Framework; + copyrightLabel.Text = string.Format(Strings.CopyrightStr, DateTime.Now.Year); + versionLabel.Text = Strings.VersionStr; + buildDateLabel.Text = Strings.BuildDateStr; + closeButton.Text = Strings.CloseBtnText; + } } } \ No newline at end of file diff --git a/TestBenchFramework/Forms/AboutDlg.de.resx b/TestBenchFramework/Forms/AboutDlg.de.resx deleted file mode 100644 index 85a3599fe..000000000 --- a/TestBenchFramework/Forms/AboutDlg.de.resx +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 117, 13 - - - © 2014 Sensus GmbH - - - erstellt am _BUILD_DATE_ - - - &Schließen - - - Über Test Bench Framework - - \ No newline at end of file diff --git a/TestBenchFramework/Forms/AboutDlg.resx b/TestBenchFramework/Forms/AboutDlg.resx index 07bbd3201..28c0ab4e8 100644 --- a/TestBenchFramework/Forms/AboutDlg.resx +++ b/TestBenchFramework/Forms/AboutDlg.resx @@ -117,190 +117,190 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - 145, 19 - - - 123, 13 - - - 4 - - - Copyright © 2013 - 2015 - - - copyrightLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this - - 5 - - - True - - - 145, 40 - - - 105, 13 - - - 5 - - - Version _VERSION_ - - - versionLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - True - - - 145, 62 - - - 136, 13 - - - 6 - - - Build date _BUILD_DATE_ - - - buildDateLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 341, 22 - - - 105, 28 - - - 11 - - - &Close - - - closeButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - 2 - - - Stretch - - - - - - 12, 34 - - - 103, 30 - - - 12 - - - logoPictureBox - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + $this - - 1 + + + 6, 13 - - True + + versionLabel - - NoControl - - - 145, 85 - - - 67, 13 - - - 13 - - - Secure hash - - - secureHashLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + copyrightLabel 0 - - True - - - 6, 13 - - - 458, 116 - - - CenterParent - About Test Bench Framework - - AboutDlg + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 13 + + + AboutDlg + + + $this + + + True + + + True + + + 103, 30 + + + 458, 116 + + + 105, 13 + + + + Stretch + + + 4 + + + 1 + + + 145, 40 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 145, 85 + + + 341, 22 + + + 145, 62 + + + Version _VERSION_ + + + secureHashLabel + + + 136, 13 + + + closeButton + + + logoPictureBox + + + 67, 13 + + + Secure hash + + + 11 + + + 12 + + + 105, 28 + + + True + + + 6 + + + Copyright © 2013 - 2015 + + + 4 + + + &Close + + + 5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CenterParent + + + True + + + 12, 34 + + + 3 + + + $this + + + 145, 19 + + + $this + + + buildDateLabel + + + 123, 13 + + + + + + NoControl + + + 5 + + + $this + + + Build date _BUILD_DATE_ + + + True + \ No newline at end of file diff --git a/TestBenchFramework/Forms/EditSelectedUser.Designer.cs b/TestBenchFramework/Forms/EditSelectedUser.Designer.cs index 275f6d13e..dfc7a25c0 100644 --- a/TestBenchFramework/Forms/EditSelectedUser.Designer.cs +++ b/TestBenchFramework/Forms/EditSelectedUser.Designer.cs @@ -34,15 +34,15 @@ namespace TBF.Forms this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditSelectedUser)); this.txtName = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.nameLabel = new System.Windows.Forms.Label(); this.btnOk = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); this.txtPassword = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); + this.passwordLabel = new System.Windows.Forms.Label(); this.txtDescription = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); + this.descriptionLabel = new System.Windows.Forms.Label(); this.checkedListBoxGroups = new System.Windows.Forms.CheckedListBox(); - this.label5 = new System.Windows.Forms.Label(); + this.groupsLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.SuspendLayout(); // @@ -54,10 +54,10 @@ namespace TBF.Forms this.txtName.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtName_KeyPress); this.txtName.Validated += new System.EventHandler(this.txtName_Validated); // - // label1 + // nameLabel // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; + resources.ApplyResources(this.nameLabel, "nameLabel"); + this.nameLabel.Name = "nameLabel"; // // btnOk // @@ -79,10 +79,10 @@ namespace TBF.Forms this.txtPassword.Name = "txtPassword"; this.txtPassword.TextChanged += new System.EventHandler(this.txtPassword_TextChanged); // - // label3 + // passwordLabel // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; + resources.ApplyResources(this.passwordLabel, "passwordLabel"); + this.passwordLabel.Name = "passwordLabel"; // // txtDescription // @@ -91,10 +91,10 @@ namespace TBF.Forms this.txtDescription.TextChanged += new System.EventHandler(this.txtDescription_TextChanged); this.txtDescription.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtDescription_KeyPress); // - // label4 + // descriptionLabel // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; + resources.ApplyResources(this.descriptionLabel, "descriptionLabel"); + this.descriptionLabel.Name = "descriptionLabel"; // // checkedListBoxGroups // @@ -104,22 +104,22 @@ namespace TBF.Forms this.checkedListBoxGroups.Name = "checkedListBoxGroups"; this.checkedListBoxGroups.Click += new System.EventHandler(this.checkedListBoxGroups_Click); // - // label5 + // groupsLabel // - resources.ApplyResources(this.label5, "label5"); - this.label5.Name = "label5"; + resources.ApplyResources(this.groupsLabel, "groupsLabel"); + this.groupsLabel.Name = "groupsLabel"; // // EditSelectedUser // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label5); + this.Controls.Add(this.groupsLabel); this.Controls.Add(this.checkedListBoxGroups); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOk); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label1); + this.Controls.Add(this.descriptionLabel); + this.Controls.Add(this.passwordLabel); + this.Controls.Add(this.nameLabel); this.Controls.Add(this.txtDescription); this.Controls.Add(this.txtPassword); this.Controls.Add(this.txtName); @@ -134,15 +134,15 @@ namespace TBF.Forms #endregion private System.Windows.Forms.TextBox txtName; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label nameLabel; private System.Windows.Forms.Button btnOk; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.TextBox txtPassword; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label passwordLabel; private System.Windows.Forms.TextBox txtDescription; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label descriptionLabel; private System.Windows.Forms.CheckedListBox checkedListBoxGroups; - private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label groupsLabel; private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/TestBenchFramework/Forms/EditSelectedUser.cs b/TestBenchFramework/Forms/EditSelectedUser.cs index d99ad4079..76f1b3eff 100644 --- a/TestBenchFramework/Forms/EditSelectedUser.cs +++ b/TestBenchFramework/Forms/EditSelectedUser.cs @@ -25,12 +25,25 @@ namespace TBF.Forms private void EditSelectedUser_Load(object sender, EventArgs e) { + Localize(); + txtName.Text = CurrentEditUser.Name; txtDescription.Text = CurrentEditUser.Description; txtPassword.Text = ""; ShowGroups(); } + void Localize() + { + Text = Strings.Edit_User; + nameLabel.Text = Strings.Name; + passwordLabel.Text = Strings.Password; + descriptionLabel.Text = Strings.DescriptionColHdr; + groupsLabel.Text = Strings.Groups; + btnOk.Text = Strings.OkBtnText; + btnCancel.Text = Strings.CancelBtnText; + } + public void ShowGroups() { diff --git a/TestBenchFramework/Forms/EditSelectedUser.de.resx b/TestBenchFramework/Forms/EditSelectedUser.de.resx deleted file mode 100644 index 95145c290..000000000 --- a/TestBenchFramework/Forms/EditSelectedUser.de.resx +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 106, 9 - - - 9, 16 - - - 75, 13 - - - Benutzername - - - 106, 252 - - - 232, 252 - - - 74, 23 - - - Abbrechen - - - 106, 40 - - - 9, 43 - - - 50, 13 - - - Passwort - - - 106, 70 - - - 72, 13 - - - Beschreibung - - - 106, 135 - - - 9, 135 - - - 48, 13 - - - Gruppen - - - Benutzer einrichten - - \ No newline at end of file diff --git a/TestBenchFramework/Forms/EditSelectedUser.resx b/TestBenchFramework/Forms/EditSelectedUser.resx index c37f77d1b..0c006e262 100644 --- a/TestBenchFramework/Forms/EditSelectedUser.resx +++ b/TestBenchFramework/Forms/EditSelectedUser.resx @@ -140,31 +140,31 @@ 9 - + True - - 12, 9 + + 9, 12 - + 35, 13 - + 1 - + Name - - label1 + + nameLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 6 @@ -239,31 +239,31 @@ 8 - + True - - 9, 40 + + 9, 43 - + 53, 13 - + 1 - + Password - - label3 + + passwordLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 5 @@ -290,31 +290,31 @@ 7 - + True - - 9, 70 + + 9, 73 - + 60, 13 - + 1 - + Description - - label4 + + descriptionLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 4 @@ -338,39 +338,36 @@ 1 - + True - - 12, 135 + + 9, 135 - + 41, 13 - + 5 - + Groups - - label5 + + groupsLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 0 17, 17 - - de - True diff --git a/TestBenchFramework/Forms/EditUsers.Designer.cs b/TestBenchFramework/Forms/EditUsers.Designer.cs index d0a3995a0..c017219cc 100644 --- a/TestBenchFramework/Forms/EditUsers.Designer.cs +++ b/TestBenchFramework/Forms/EditUsers.Designer.cs @@ -109,6 +109,7 @@ namespace TBF.Forms this.Controls.Add(this.listViewUsers); this.Name = "EditUsers"; this.Activated += new System.EventHandler(this.EditUsers_Activated); + this.Load += new System.EventHandler(this.EditUsers_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TestBenchFramework/Forms/EditUsers.cs b/TestBenchFramework/Forms/EditUsers.cs index 72d25cd60..55bc0a647 100644 --- a/TestBenchFramework/Forms/EditUsers.cs +++ b/TestBenchFramework/Forms/EditUsers.cs @@ -7,6 +7,7 @@ using System.Windows.Forms; using NHibernate; using TBF.Entities; +using TBF.Resources; namespace TBF.Forms @@ -22,6 +23,15 @@ namespace TBF.Forms InitializeComponent(); } + private void EditUsers_Load(object sender, EventArgs e) + { + Text = Strings.User_Management; + btnAdd.Text = Strings.AddBtnText; + btnEdit.Text = Strings.EditBtnText; + btnDelete.Text = Strings.RemoveBtnText; + btnOk.Text = Strings.OkBtnText; + } + private void EditUsers_Activated(object sender, EventArgs e) { Cursor.Current = Cursors.WaitCursor; @@ -117,7 +127,6 @@ namespace TBF.Forms ListUsers(); } } - } diff --git a/TestBenchFramework/Forms/EditUsers.de.resx b/TestBenchFramework/Forms/EditUsers.de.resx deleted file mode 100644 index c75bf86b5..000000000 --- a/TestBenchFramework/Forms/EditUsers.de.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - &Neu... - - - &Bearbeiten - - - &Löschen - - - Benutzerverwaltung - - \ No newline at end of file diff --git a/TestBenchFramework/Forms/EditUsers.resx b/TestBenchFramework/Forms/EditUsers.resx index 2da933732..a6e7b7768 100644 --- a/TestBenchFramework/Forms/EditUsers.resx +++ b/TestBenchFramework/Forms/EditUsers.resx @@ -117,16 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Name - - - - 162 - - - ID - 12, 12 @@ -134,6 +124,7 @@ 357, 399 + 0 @@ -149,6 +140,15 @@ 5 + + Name + + + 162 + + + ID + 388, 42 @@ -272,9 +272,6 @@ 0 - - de - True @@ -285,7 +282,7 @@ 475, 464 - user management + User Management columnHeader1 diff --git a/TestBenchFramework/Forms/ErrorDlg.Designer.cs b/TestBenchFramework/Forms/ErrorDlg.Designer.cs index ca3b17f95..a7201c529 100644 --- a/TestBenchFramework/Forms/ErrorDlg.Designer.cs +++ b/TestBenchFramework/Forms/ErrorDlg.Designer.cs @@ -58,24 +58,24 @@ namespace TBF.Forms // // btnCancel // - resources.ApplyResources(this.btnCancel, "btnCancel"); this.btnCancel.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.btnCancel, "btnCancel"); this.btnCancel.Name = "btnCancel"; this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // btnIgnore // - resources.ApplyResources(this.btnIgnore, "btnIgnore"); this.btnIgnore.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.btnIgnore, "btnIgnore"); this.btnIgnore.Name = "btnIgnore"; this.btnIgnore.UseVisualStyleBackColor = true; this.btnIgnore.Click += new System.EventHandler(this.btnIgnore_Click); // // btnRetry // - resources.ApplyResources(this.btnRetry, "btnRetry"); this.btnRetry.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.btnRetry, "btnRetry"); this.btnRetry.Name = "btnRetry"; this.btnRetry.UseVisualStyleBackColor = true; this.btnRetry.Click += new System.EventHandler(this.btnRetry_Click); @@ -94,6 +94,7 @@ namespace TBF.Forms this.Controls.Add(this.btnIgnore); this.Controls.Add(this.btnCancel); this.Name = "ErrorDlg"; + this.Load += new System.EventHandler(this.ErrorDlg_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TestBenchFramework/Forms/ErrorDlg.cs b/TestBenchFramework/Forms/ErrorDlg.cs index 1f25c70de..90e0be220 100644 --- a/TestBenchFramework/Forms/ErrorDlg.cs +++ b/TestBenchFramework/Forms/ErrorDlg.cs @@ -11,23 +11,32 @@ using System.Text; using System.Windows.Forms; using TBF; using TBF.ErrorHandler; +using TBF.Resources; namespace TBF.Forms { public partial class ErrorDlg : Form { - public ErrorDlg() + public DialogResult returnvalue; + + public ErrorDlg() { InitializeComponent(); } - public DialogResult returnvalue; - - public ErrorDlg(string ErrorDescription) - { - InitializeComponent(); - textBoxMessage.Text = ErrorDescription; - } + public ErrorDlg(string ErrorDescription) + : this() + { + textBoxMessage.Text = ErrorDescription; + } + + private void ErrorDlg_Load(object sender, EventArgs e) + { + Text = Strings.An_unhandled_error_occured; + btnCancel.Text = Strings.CancelBtnText; + btnRetry.Text = Strings.RetryBtnText; + btnIgnore.Text = Strings.IgnoreBtnText; + } private void btnOk_Click(object sender, EventArgs e) { diff --git a/TestBenchFramework/Forms/ErrorDlg.resx b/TestBenchFramework/Forms/ErrorDlg.resx index b267ccbac..dd43299b4 100644 --- a/TestBenchFramework/Forms/ErrorDlg.resx +++ b/TestBenchFramework/Forms/ErrorDlg.resx @@ -117,127 +117,124 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Vertical - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 13 - - - 1 - - - Ignore - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 1 - - - ErrorDlg - - - 508, 280 - - - 399, 340 - - - btnIgnore - - - 2 - - - $this - - - 1 - - - 0 - - - 530, 375 - 187, 340 100, 23 - - 12, 43 - - + + 1 - - textBoxMessage + + Cancel - + + btnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this 3 - - btnCancel - - - btnRetry - - - $this + + 399, 340 100, 23 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - Cancel + + Ignore - + + btnIgnore + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 293, 340 + + $this 2 - - True + + 293, 340 100, 23 - - $this - - - An unhandled Error occured + + 1 Retry + + btnRetry + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 12, 43 + + + True + + + + Vertical + + + 508, 280 + + + 2 + + + textBoxMessage + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True - - de - + + 6, 13 + + + 530, 375 + + + An unhandled Error occured + + + ErrorDlg + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TestBenchFramework/LoginDlg.de.resx b/TestBenchFramework/LoginDlg.de.resx deleted file mode 100644 index e161a92e1..000000000 --- a/TestBenchFramework/LoginDlg.de.resx +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 75, 13 - - - Benutzername - - - 50, 13 - - - Passwort - - - &Abbrechen - - - &OK - - - Anmelden - - \ No newline at end of file diff --git a/TestBenchFramework/LoginDlgWithBenchSelection.cs b/TestBenchFramework/LoginDlgWithBenchSelection.cs index 5afa11644..93d09326e 100644 --- a/TestBenchFramework/LoginDlgWithBenchSelection.cs +++ b/TestBenchFramework/LoginDlgWithBenchSelection.cs @@ -49,6 +49,7 @@ namespace TBF private void LoginDlgWithBenchSelection_Load(object sender, EventArgs e) { + Localize(); #if DEBUG userNameTextBox.Text = Program.AdminUsername; passwordTextBox.Text = Program.AdminPassword; @@ -63,6 +64,17 @@ namespace TBF } } + void Localize() + { + Text = Strings.User_Login; + label1.Text = Strings.Username; + label2.Text = Strings.Password; + label3.Text = Strings.Test_bench; + okButton.Text = Strings.OkBtnText; + cancelButton.Text = Strings.CancelBtnText; + + } + /// /// OK clicked (authorization is done outside this dialog). /// diff --git a/TestBenchFramework/LoginDlgWithBenchSelection.de.resx b/TestBenchFramework/LoginDlgWithBenchSelection.de.resx deleted file mode 100644 index 030cbca00..000000000 --- a/TestBenchFramework/LoginDlgWithBenchSelection.de.resx +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 75, 13 - - - Benutzername - - - 50, 13 - - - Passwort - - - 52, 13 - - - Prüfstand - - - Abbrechen - - - Anmelden am Prüfstand - - \ No newline at end of file diff --git a/TestBenchFramework/LoginDlgWithBenchSelection.resx b/TestBenchFramework/LoginDlgWithBenchSelection.resx index f44b0b6fe..4aa013558 100644 --- a/TestBenchFramework/LoginDlgWithBenchSelection.resx +++ b/TestBenchFramework/LoginDlgWithBenchSelection.resx @@ -121,14 +121,11 @@ User name - - 402, 102 - 105, 28 - - 285, 48 + + OK Cancel @@ -252,6 +249,9 @@ okButton + + 285, 48 + $this @@ -264,6 +264,9 @@ True + + $this + 3 @@ -276,8 +279,8 @@ $this - - 4 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cancelButton @@ -303,17 +306,14 @@ 7 - - OK - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + 402, 102 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 5 @@ -333,7 +333,4 @@ True - - de - \ No newline at end of file diff --git a/TestBenchFramework/LoginDlgWithBenchSelection.sk.resx b/TestBenchFramework/LoginDlgWithBenchSelection.sk.resx deleted file mode 100644 index 07b0af6b5..000000000 --- a/TestBenchFramework/LoginDlgWithBenchSelection.sk.resx +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 95, 13 - - - Meno používateľa - - - 34, 13 - - - Heslo - - - 97, 13 - - - Testovacia stanica - - - 109, 67 - - - 109, 41 - - - Zrušíť - - - Prihlásiť sa - - - 109, 15 - - - Prihlásenie - - \ No newline at end of file diff --git a/TestBenchFramework/PreferencesDlg.Designer.cs b/TestBenchFramework/PreferencesDlg.Designer.cs index a64b63a27..59320f2a8 100644 --- a/TestBenchFramework/PreferencesDlg.Designer.cs +++ b/TestBenchFramework/PreferencesDlg.Designer.cs @@ -32,17 +32,11 @@ namespace TBF private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PreferencesDlg)); - this.languageLabel = new System.Windows.Forms.Label(); this.okButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); this.languageListBox = new System.Windows.Forms.ListBox(); this.SuspendLayout(); // - // languageLabel - // - resources.ApplyResources(this.languageLabel, "languageLabel"); - this.languageLabel.Name = "languageLabel"; - // // okButton // this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; @@ -73,20 +67,18 @@ namespace TBF this.Controls.Add(this.languageListBox); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); - this.Controls.Add(this.languageLabel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.Name = "PreferencesDlg"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Load += new System.EventHandler(this.PreferencesDlg_Load); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.Label languageLabel; - private System.Windows.Forms.Button okButton; + private System.Windows.Forms.Button okButton; private System.Windows.Forms.Button cancelButton; private System.Windows.Forms.ListBox languageListBox; } diff --git a/TestBenchFramework/PreferencesDlg.cs b/TestBenchFramework/PreferencesDlg.cs index f55ef9cba..882278c61 100644 --- a/TestBenchFramework/PreferencesDlg.cs +++ b/TestBenchFramework/PreferencesDlg.cs @@ -22,14 +22,16 @@ namespace TBF string[] LanguageName = new string[] { "English", - "中国 (Chinese simplified)", "Česky （Czech)", + "中国 (Chinese simplified)", "Deutch (German)", "Español (Spanish)", "Français (French)", "Italiano (Italian)", "Polski (Polish)", + "Română (Romanian)", "Русский (Russion)", + "Slovensky (Slovak)", }; /// @@ -40,14 +42,16 @@ namespace TBF string[] LanguageCode = new string[] { "en", - "zh-CN", "cs", + "zh-CN", "de", "es", "fr", "it", "pl", + "ro", "ru", + "sk", }; // Local copy of 'local settings' initialized to Program.localSettings. @@ -74,6 +78,13 @@ namespace TBF } } + private void PreferencesDlg_Load(object sender, EventArgs e) + { + Text = Strings.Language; + okButton.Text = Strings.OkBtnText; + cancelButton.Text = Strings.CancelBtnText; + } + private void languageListBox_SelectedIndexChanged(object sender, EventArgs e) { localSettings.Language = LanguageCode[languageListBox.SelectedIndex]; diff --git a/TestBenchFramework/PreferencesDlg.de.resx b/TestBenchFramework/PreferencesDlg.de.resx deleted file mode 100644 index b1a0304b9..000000000 --- a/TestBenchFramework/PreferencesDlg.de.resx +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 12, 13 - - - 47, 13 - - - Sprache - - - 271, 13 - - - &OK - - - 271, 52 - - - &Abbrechen - - - 89, 13 - - - Sprache wählen - - \ No newline at end of file diff --git a/TestBenchFramework/PreferencesDlg.resx b/TestBenchFramework/PreferencesDlg.resx index adb65a187..3dbf9c813 100644 --- a/TestBenchFramework/PreferencesDlg.resx +++ b/TestBenchFramework/PreferencesDlg.resx @@ -117,41 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 25, 13 - - - 55, 13 - - - 0 - - - Language - - - languageLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - 271, 11 + 168, 11 105, 28 + 10 @@ -171,7 +144,7 @@ 1 - 271, 45 + 168, 45 105, 28 @@ -195,10 +168,10 @@ 2 - 102, 12 + 13, 12 - 143, 69 + 143, 225 11 @@ -215,9 +188,6 @@ 0 - - de - True @@ -225,7 +195,7 @@ 6, 13 - 388, 92 + 283, 247 diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index c3783e531..a792d22be 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -78,6 +78,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to About Test Bench Framework. + /// + internal static string About_Test_Bench_Framework { + get { + return ResourceManager.GetString("About_Test_Bench_Framework", resourceCulture); + } + } + /// /// Looks up a localized string similar to Activity. /// @@ -159,6 +168,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to An unhandled error occured. + /// + internal static string An_unhandled_error_occured { + get { + return ResourceManager.GetString("An_unhandled_error_occured", resourceCulture); + } + } + /// /// Looks up a localized string similar to Approval: . /// @@ -267,6 +285,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Available Components:. + /// + internal static string Available_Components_ { + get { + return ResourceManager.GetString("Available_Components_", resourceCulture); + } + } + /// /// Looks up a localized string similar to Available results:. /// @@ -330,6 +357,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Build date _BUILD_DATE_. + /// + internal static string BuildDateStr { + get { + return ResourceManager.GetString("BuildDateStr", resourceCulture); + } + } + /// /// Looks up a localized string similar to Calibration Specialist. /// @@ -519,6 +555,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Copyright © 2013 - {0}. + /// + internal static string CopyrightStr { + get { + return ResourceManager.GetString("CopyrightStr", resourceCulture); + } + } + /// /// Looks up a localized string similar to Corrected. /// @@ -573,6 +618,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Database Settings. + /// + internal static string Database_Settings { + get { + return ResourceManager.GetString("Database_Settings", resourceCulture); + } + } + /// /// Looks up a localized string similar to Database type. /// @@ -744,6 +798,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Edit User. + /// + internal static string Edit_User { + get { + return ResourceManager.GetString("Edit_User", resourceCulture); + } + } + /// /// Looks up a localized string similar to Edit. /// @@ -1014,6 +1077,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Groups. + /// + internal static string Groups { + get { + return ResourceManager.GetString("Groups", resourceCulture); + } + } + /// /// Looks up a localized string similar to Head of Lab. /// @@ -1050,6 +1122,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Ignore. + /// + internal static string IgnoreBtnText { + get { + return ResourceManager.GetString("IgnoreBtnText", resourceCulture); + } + } + /// /// Looks up a localized string similar to Invalid password. /// @@ -1086,6 +1167,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Language. + /// + internal static string Language { + get { + return ResourceManager.GetString("Language", resourceCulture); + } + } + /// /// Looks up a localized string similar to Less. /// @@ -2139,6 +2229,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Retry. + /// + internal static string RetryBtnText { + get { + return ResourceManager.GetString("RetryBtnText", resourceCulture); + } + } + /// /// Looks up a localized string similar to Retry connection to the database. /// @@ -2175,6 +2274,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Select Component. + /// + internal static string Select_Component { + get { + return ResourceManager.GetString("Select_Component", resourceCulture); + } + } + /// /// Looks up a localized string similar to Selected results:. /// @@ -2508,6 +2616,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Test bench data. + /// + internal static string Test_bench_data { + get { + return ResourceManager.GetString("Test_bench_data", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test Bench Databases Specification. /// @@ -2544,6 +2661,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Test Benches:. + /// + internal static string Test_Benches_ { + get { + return ResourceManager.GetString("Test_Benches_", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test. /// @@ -2835,6 +2961,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to User Management. + /// + internal static string User_Management { + get { + return ResourceManager.GetString("User_Management", resourceCulture); + } + } + /// /// Looks up a localized string similar to User name. /// @@ -2880,6 +3015,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Version _VERSION_. + /// + internal static string VersionStr { + get { + return ResourceManager.GetString("VersionStr", resourceCulture); + } + } + /// /// Looks up a localized string similar to Vertically. /// diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index f285816d3..e92f5ac69 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -120,6 +120,9 @@ Činnost + + Jazyk + Restartujte aplikaci prosím. diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 7bf13743d..0103ea2a5 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -142,7 +142,7 @@ Bitte starten Sie die Anwendung erneut um die Änderungen zu übernehmen. - Prüfstandsdaten + Prüfstand Benutzername @@ -951,4 +951,46 @@ P aus. start + + Sprache + + + Prüfstandsdaten + + + Komponenten: + + + Komponenten Auswahl + + + Datenbank Einstellungen + + + Prüfstände : + + + Über Test Bench Framework + + + erstellt am _BUILD_DATE_ + + + © 2013 - {0} Sensus GmbH + + + Version _VERSION_ + + + Benutzer einrichten + + + Gruppen + + + Benutzerverwaltung + + + Ein unbehandelter Fehler ist aufgetreten! + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 09aeca53a..a4b637a5e 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1105,4 +1105,52 @@ iPerl Communication in progress + + Language + + + Test bench data + + + Available Components: + + + Select Component + + + Database Settings + + + Test Benches: + + + About Test Bench Framework + + + Build date _BUILD_DATE_ + + + Copyright © 2013 - {0} + + + Version _VERSION_ + + + Edit User + + + Groups + + + User Management + + + An unhandled error occured + + + Ignore + + + Retry + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.ro.resx b/TestBenchFramework/Resources/Strings.ro.resx new file mode 100644 index 000000000..4fdb1b6af --- /dev/null +++ b/TestBenchFramework/Resources/Strings.ro.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TestBenchFramework/Forms/ErrorDlg.de.resx b/TestBenchFramework/Resources/Strings.sk.resx similarity index 94% rename from TestBenchFramework/Forms/ErrorDlg.de.resx rename to TestBenchFramework/Resources/Strings.sk.resx index 5983d6919..720f0f61f 100644 --- a/TestBenchFramework/Forms/ErrorDlg.de.resx +++ b/TestBenchFramework/Resources/Strings.sk.resx @@ -117,10 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - &Abbrechen + + Činnosť - - Ein unbehandelter Fehler ist aufgetreten! + + Zrušiť + + + Jazyk + + + Áno \ No newline at end of file diff --git a/TestBenchFramework/SelectComponentClassDlg.Designer.cs b/TestBenchFramework/SelectComponentClassDlg.Designer.cs index 230e5463c..4dfcac13f 100644 --- a/TestBenchFramework/SelectComponentClassDlg.Designer.cs +++ b/TestBenchFramework/SelectComponentClassDlg.Designer.cs @@ -33,7 +33,7 @@ namespace TBF { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SelectComponentClassDlg)); this.availCmpntsLstBox = new System.Windows.Forms.ListBox(); - this.label1 = new System.Windows.Forms.Label(); + this.availableComponentsLabel = new System.Windows.Forms.Label(); this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -45,11 +45,11 @@ namespace TBF this.availCmpntsLstBox.Name = "availCmpntsLstBox"; this.availCmpntsLstBox.DoubleClick += new System.EventHandler(this.availCmpntsLstBox_DoubleClick); // - // label1 + // availableComponentsLabel // - resources.ApplyResources(this.label1, "label1"); - this.label1.ImageKey = global::TBF.Resources.Strings.String1; - this.label1.Name = "label1"; + resources.ApplyResources(this.availableComponentsLabel, "availableComponentsLabel"); + this.availableComponentsLabel.ImageKey = global::TBF.Resources.Strings.String1; + this.availableComponentsLabel.Name = "availableComponentsLabel"; // // cancelButton // @@ -68,7 +68,7 @@ namespace TBF this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // - // ComponentAddDlg + // SelectComponentClassDlg // this.AcceptButton = this.okButton; resources.ApplyResources(this, "$this"); @@ -76,11 +76,11 @@ namespace TBF this.CancelButton = this.cancelButton; this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); - this.Controls.Add(this.label1); + this.Controls.Add(this.availableComponentsLabel); this.Controls.Add(this.availCmpntsLstBox); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "ComponentAddDlg"; + this.Name = "SelectComponentClassDlg"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.Load += new System.EventHandler(this.SelectComponentClassDlg_Load); this.ResumeLayout(false); @@ -91,7 +91,7 @@ namespace TBF #endregion private System.Windows.Forms.ListBox availCmpntsLstBox; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label availableComponentsLabel; private System.Windows.Forms.Button cancelButton; private System.Windows.Forms.Button okButton; } diff --git a/TestBenchFramework/SelectComponentClassDlg.cs b/TestBenchFramework/SelectComponentClassDlg.cs index 8ebd4cd14..0603af543 100644 --- a/TestBenchFramework/SelectComponentClassDlg.cs +++ b/TestBenchFramework/SelectComponentClassDlg.cs @@ -4,6 +4,7 @@ using System; using System.Windows.Forms; using TBF.BenchControl.Generic; +using TBF.Resources; namespace TBF { @@ -28,12 +29,22 @@ namespace TBF /// Load components from BenchControl.SupportedComponents private void SelectComponentClassDlg_Load(object sender, EventArgs e) { + Localize(); + if (selectedIndex >= 0 && selectedIndex < BenchControl.TbfComponents.Factories.Count) { availCmpntsLstBox.SelectedIndex = selectedIndex; } } + void Localize() + { + Text = Strings.Select_Component; + availableComponentsLabel.Text = Strings.Available_Components_; + okButton.Text = Strings.OkBtnText; + cancelButton.Text = Strings.CancelBtnText; + } + /// Double click - Add the clicked component private void availCmpntsLstBox_DoubleClick(object sender, EventArgs e) { diff --git a/TestBenchFramework/SelectComponentClassDlg.de.resx b/TestBenchFramework/SelectComponentClassDlg.de.resx deleted file mode 100644 index d3dae13f3..000000000 --- a/TestBenchFramework/SelectComponentClassDlg.de.resx +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 128, 13 - - - Verfügbare Komponenten - - - &Abbrechen - - - Komponenten Auswahl - - \ No newline at end of file diff --git a/TestBenchFramework/SelectComponentClassDlg.resx b/TestBenchFramework/SelectComponentClassDlg.resx index c6763ee4b..e2385c739 100644 --- a/TestBenchFramework/SelectComponentClassDlg.resx +++ b/TestBenchFramework/SelectComponentClassDlg.resx @@ -117,9 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cancelButton @@ -131,21 +130,31 @@ 1 + + $this + 99, 25 + + Available Components: + + + okButton + + + 115, 13 + 12, 34 System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Available Components: - - - 0 + + 2 + 8 @@ -155,9 +164,6 @@ 0 - - ComponentAddDlg - 200, 310 @@ -167,36 +173,30 @@ System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 - CenterParent - - label1 + + 9, 9 &Cancel + + True + $this - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - okButton + + 0 95, 310 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True + + $this &OK @@ -204,12 +204,6 @@ 288, 264 - - 115, 13 - - - 9, 9 - 7 @@ -219,20 +213,26 @@ $this - - $this + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3 + + 1 + + + availableComponentsLabel + Select Component System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + SelectComponentClassDlg True diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index 4f07c49a8..e1a4c41b5 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -1705,7 +1705,9 @@ + + ResXFileCodeGenerator Strings.zh-CN.Designer.cs @@ -1719,30 +1721,18 @@ ProcessTabPageCtrl48.cs - - SelectComponentClassDlg.cs - SelectComponentClassDlg.cs ControlBoardCfgCtrl.cs - - ComponentParametersDlg.cs - ComponentParametersDlg.cs ComponentsManagerDlg.cs - - BenchesDlg.cs - - - AboutDlg.cs - Designer AboutDlg.cs @@ -1755,43 +1745,25 @@ Designer DatabaseSettingsDlg.cs - - EditSelectedUser.cs - - - EditUsers.cs - EditUsers.cs EditSelectedUser.cs - - ErrorDlg.cs - ErrorDlg.cs NoBenchOrDatabaseDlg.cs - - LoginDlg.cs - LoginDlg.cs Designer - - LoginDlgWithBenchSelection.cs - LoginDlgWithBenchSelection.cs - - LoginDlgWithBenchSelection.cs - MainWnd.cs Designer @@ -1809,9 +1781,6 @@ PathsDlg.cs - - PreferencesDlg.cs - Designer PreferencesDlg.cs @@ -1872,9 +1841,6 @@ VolumeAndErrorSelection.cs - - TransitionsDlg.cs - TransitionsDlg.cs diff --git a/TestBenchFramework/TransitionsDlg.de.resx b/TestBenchFramework/TransitionsDlg.de.resx deleted file mode 100644 index 97779cd88..000000000 --- a/TestBenchFramework/TransitionsDlg.de.resx +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 139, 269 - - - 139, 237 - - - 139, 203 - - - 24, 272 - - - 24, 240 - - - 24, 206 - - - 348, 205 - - - 281, 208 - - - 61, 13 - - - Bemerkung - - - 139, 162 - - - 526, 20 - - - 24, 165 - - - 348, 120 - - - 291, 123 - - - 38, 13 - - - Datum - - - 140, 121 - - - 24, 123 - - - 102, 13 - - - letzte Änderung von - - - 348, 87 - - - 291, 90 - - - 38, 13 - - - Datum - - - 139, 87 - - - 24, 90 - - - 62, 13 - - - Errstellt von - - - 139, 53 - - - 526, 20 - - - 24, 56 - - - 92, 13 - - - Kurzbeschreibung - - - 75, 13 - - - Prüfungsname - - - 814, 406 - - - Allgemein - - - Benutzername - - - Datum - - - Kurzbeschreibung - - - 808, 400 - - - 814, 406 - - - Änderungen - - - 808, 400 - - - 814, 406 - - - Metrologie I. - - - 808, 400 - - - 814, 406 - - - Metrologie II. - - - 808, 400 - - - 814, 406 - - - Prozess - - - 3, 3 - - - 808, 400 - - - - 3, 3, 3, 3 - - - 814, 406 - - - Spülung - Start - - - 814, 406 - - - 814, 406 - - - Spülung - Ende - - - 822, 444 - - - 925, 444 - - - - 822 - - - 925, 444 - - - Prüfung - - \ No newline at end of file