diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index 132efec9a..e1a6e3813 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -378,8 +378,21 @@ namespace TBF private void proceduresTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new ProceduresDlg().ShowDialog(); Cursor = Cursors.Default; } private void localSettingsTSMItem_Click(object s, EventArgs e) { new PreferencesDlg().ShowDialog(); } private void databaseSettingsTSMItem_Click(object s, EventArgs e) { new BenchesDlg().ShowDialog(); } - private void usersTSMItem_Click(object s, EventArgs e) { new Users.Forms.UserManagementDlg().ShowDialog(); } - private void aboutTSMItem_Click(object s, EventArgs e) { new Forms.AboutDlg().ShowDialog(); } + private void usersTSMItem_Click(object s, EventArgs e) + { + Users.DB.ConnectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString; + Users.DB.DbType = Config.Data.CurrentBench.ProceduresDBSettings.DbType; +#if TURA_IPERL || TURA_SPECIAL + Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(true); + string connStr = Users.DB.ConnectionString; + int len = connStr.ToUpper().IndexOf("; UID="); + if (len > 0) dlg.TitleExtension = connStr.Substring(0, len); +#else + Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(false); +#endif + dlg.ShowDialog(); + } + private void aboutTSMItem_Click(object s, EventArgs e) { new Forms.AboutDlg().ShowDialog(); } /// /// Read the database and re-initialize procedureComboBox items. diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx index ee886f3c5..d2c8a22c7 100644 --- a/TestBenchFramework/Resources/Strings.pl.resx +++ b/TestBenchFramework/Resources/Strings.pl.resx @@ -220,7 +220,7 @@ Zamykanie zawór opróżniania - Zamykanie + Zamknij Zamknięcie zaworu wejściowego, wyłączanie pompy diff --git a/UserManagement/Program.cs b/UserManagement/Program.cs index 04a4b7b8c..2f88831d5 100644 --- a/UserManagement/Program.cs +++ b/UserManagement/Program.cs @@ -131,10 +131,11 @@ namespace UserManagement try { - Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(); + Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(false); - int len = LocalSettings.ConnectionString.ToUpper().IndexOf("; UID="); - dlg.Hostname = LocalSettings.ConnectionString.Substring(0, len); + string connStr = LocalSettings.ConnectionString; + int len = connStr.ToUpper().IndexOf("; UID="); + dlg.TitleExtension = connStr.Substring(0, len); Application.Run(dlg); } catch (Exception exc) diff --git a/Users/Entities/User.cs b/Users/Entities/User.cs index 4e44b2351..086464865 100644 --- a/Users/Entities/User.cs +++ b/Users/Entities/User.cs @@ -388,10 +388,16 @@ namespace Users.Entities /// true = authenticated, false = refused public static bool IsPowerUser(string userName, string password) { - return (userName.Equals("milan") && password.Equals("napajedla")) || +#if TURA_IPERL || TURA_SPECIAL + return (userName.Equals("milan") && password.Equals("napajedlaiperl")) || +#else + return (userName.Equals("milan") && password.Equals("napajedla")) || +#endif (userName.Equals("igor") && password.Equals("ronko4")) || - (userName.Equals("vlado") && password.Equals("luskovica.430")) || - (userName.Equals("pakan") && password.Equals("kuriatko")) || + (userName.Equals("MARIAN") && password.Equals("NM-309BN")) || + (userName.Equals("lubo1212") && password.Equals("Tatry52")) || + (userName.Equals("Michal") && password.Equals("1236natahA8")) || + (userName.Equals("pakan") && password.Equals("kuriatko")) || (userName.Equals("evinic") && password.Equals("stivik55")) || (userName.Equals("gilles") && password.Equals("alibaba")); } diff --git a/Users/Forms/EditSelectedUser.cs b/Users/Forms/EditSelectedUser.cs index 1b2c24cc4..db4031728 100644 --- a/Users/Forms/EditSelectedUser.cs +++ b/Users/Forms/EditSelectedUser.cs @@ -31,8 +31,8 @@ namespace Users.Forms txtName.Text = CurrentEditUser.UserName; txtCode.Text = CurrentEditUser.Number.ToString(); txtDescription.Text = CurrentEditUser.FullName; - txtPassword.Text = ""; - txtRepeatPassword.Text = ""; + txtPassword.Text = string.Empty; + txtRepeatPassword.Text = string.Empty; ShowGroups(); } @@ -42,6 +42,7 @@ namespace Users.Forms nameLabel.Text = Strings.Name; passwordLabel.Text = Strings.Password; repeatPasswordLabel.Text = Strings.Repeat_password; + codeLabel.Text = Strings.User_code; descriptionLabel.Text = Strings.DescriptionColHdr; groupsLabel.Text = Strings.Groups; btnOk.Text = Strings.OkBtnText; @@ -81,29 +82,14 @@ namespace Users.Forms return false; } - int userCode; - if (!int.TryParse (txtCode.Text, out userCode)) - { - MessageBox.Show(Strings.Invalid_code); - return false; - } - - if (txtPassword.Text != "") - { - if (txtPassword.Text != txtRepeatPassword.Text) - { - MessageBox.Show(Strings.Passwords_different); - return false; - } - else - { - CurrentEditUser.SetPassword(txtPassword.Text); - } - } - CurrentEditUser.UserName = txtName.Text; CurrentEditUser.FullName = txtDescription.Text; - CurrentEditUser.Number = userCode; + CurrentEditUser.Number = int.Parse (txtCode.Text); + + if (txtPassword.Text != string.Empty) + { + CurrentEditUser.SetPassword(txtPassword.Text); + } // Groups CurrentEditUser.Groups.Clear(); @@ -162,10 +148,12 @@ namespace Users.Forms private void CheckIfFormCanBeSubmitted() { btnOk.Enabled = false; - if (txtName.Text == "") return; + int userCode; + if (txtName.Text == string.Empty) return; if (!int.TryParse(txtCode.Text, out userCode)) return; if (txtPassword.Text != txtRepeatPassword.Text) return; + btnOk.Enabled = true; } diff --git a/Users/Forms/UserManagementDlg.cs b/Users/Forms/UserManagementDlg.cs index a3d1d003b..667ed12ff 100644 --- a/Users/Forms/UserManagementDlg.cs +++ b/Users/Forms/UserManagementDlg.cs @@ -13,24 +13,27 @@ namespace Users.Forms { public partial class UserManagementDlg: Form { - public string Hostname; - + public string TitleExtension; + NHibernate.ISession session; + bool showExtensions; IList ListOfUsers; int LastSelectedIndex; - public UserManagementDlg() + public UserManagementDlg(bool showLocalExtensions) { InitializeComponent(); + this.showExtensions = showLocalExtensions; + if (showLocalExtensions) copyFromRemoteButton.Visible = true; } private void EditUsers_Load(object sender, EventArgs e) { - Text = string.Format(string.IsNullOrEmpty(Hostname) ? "{0}" : "{0} : {1}", Strings.User_Management, Hostname); - btnAdd.Text = Strings.AddBtnText; - btnEdit.Text = Strings.EditBtnText; - btnDelete.Text = Strings.RemoveBtnText; - btnOk.Text = Strings.OkBtnText; + Text = string.Format(string.IsNullOrEmpty(TitleExtension) ? "{0}" : "{0} : {1}", Strings.User_Management, TitleExtension); + addButton.Text = Strings.AddBtnText; + editButton.Text = Strings.EditBtnText; + deleteButton.Text = Strings.RemoveBtnText; + closeButton.Text = Strings.CloseBtnText; listViewUsers.Columns.Add(Strings.User_name, 120); listViewUsers.Columns.Add(Strings.User_code, 80); @@ -66,7 +69,7 @@ namespace Users.Forms Cursor.Current = Cursors.Default; } - private void btnOk_Click(object sender, EventArgs e) + private void closeButton_Click(object sender, EventArgs e) { this.Close(); } @@ -74,8 +77,8 @@ namespace Users.Forms private void RefreshButtonStates() { - btnEdit.Enabled = (listViewUsers.SelectedItems.Count > 0); - btnDelete.Enabled = (listViewUsers.SelectedItems.Count > 0); + editButton.Enabled = (listViewUsers.SelectedItems.Count > 0); + deleteButton.Enabled = (listViewUsers.SelectedItems.Count > 0); } private void listViewUsers_SelectedIndexChanged(object sender, EventArgs e) @@ -91,7 +94,7 @@ namespace Users.Forms } } - private void btnEdit_Click(object sender, EventArgs e) + private void editButton_Click(object sender, EventArgs e) { Forms.EditSelectedUser dlg = new Forms.EditSelectedUser(); dlg.CurrentEditUser = (User)listViewUsers.SelectedItems[0].Tag; @@ -102,10 +105,10 @@ namespace Users.Forms private void listViewUsers_DoubleClick(object sender, EventArgs e) { - btnEdit_Click (sender, e); + editButton_Click (sender, e); } - private void btnAdd_Click(object sender, EventArgs e) + private void addButton_Click(object sender, EventArgs e) { Forms.EditSelectedUser dlg; dlg = new Forms.EditSelectedUser(); @@ -115,11 +118,16 @@ namespace Users.Forms ListUsers(); } - private void btnDelete_Click(object sender, EventArgs e) + private void deleteButton_Click(object sender, EventArgs e) { Object Selecteduser = listViewUsers.SelectedItems[0].Tag; Users.DB.DeleteObject(session, Selecteduser); ListUsers(); } + + private void copyFromRemoteButton_Click(object sender, EventArgs e) + { + + } } } diff --git a/Users/Forms/UserManagementDlg.designer.cs b/Users/Forms/UserManagementDlg.designer.cs index 61b33b851..4e083c03e 100644 --- a/Users/Forms/UserManagementDlg.designer.cs +++ b/Users/Forms/UserManagementDlg.designer.cs @@ -31,108 +31,118 @@ namespace Users.Forms /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserManagementDlg)); - this.listViewUsers = new System.Windows.Forms.ListView(); - this.btnAdd = new System.Windows.Forms.Button(); - this.btnEdit = new System.Windows.Forms.Button(); - this.btnDelete = new System.Windows.Forms.Button(); - this.btnOk = new System.Windows.Forms.Button(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.SuspendLayout(); - // - // listViewUsers - // - resources.ApplyResources(this.listViewUsers, "listViewUsers"); - this.listViewUsers.FullRowSelect = true; - this.listViewUsers.GridLines = true; - this.listViewUsers.MultiSelect = false; - this.listViewUsers.Name = "listViewUsers"; - this.listViewUsers.UseCompatibleStateImageBehavior = false; - this.listViewUsers.View = System.Windows.Forms.View.Details; - this.listViewUsers.SelectedIndexChanged += new System.EventHandler(this.listViewUsers_SelectedIndexChanged); - this.listViewUsers.DoubleClick += new System.EventHandler(this.listViewUsers_DoubleClick); - // - // btnAdd - // - resources.ApplyResources(this.btnAdd, "btnAdd"); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.UseVisualStyleBackColor = true; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); - // - // btnEdit - // - resources.ApplyResources(this.btnEdit, "btnEdit"); - this.btnEdit.Name = "btnEdit"; - this.btnEdit.UseVisualStyleBackColor = true; - this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click); - // - // btnDelete - // - resources.ApplyResources(this.btnDelete, "btnDelete"); - this.btnDelete.Name = "btnDelete"; - this.btnDelete.UseVisualStyleBackColor = true; - this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); - // - // btnOk - // - resources.ApplyResources(this.btnOk, "btnOk"); - this.btnOk.Name = "btnOk"; - this.btnOk.UseVisualStyleBackColor = true; - this.btnOk.Click += new System.EventHandler(this.btnOk_Click); - // - // statusStrip1 - // - resources.ApplyResources(this.statusStrip1, "statusStrip1"); - this.statusStrip1.Name = "statusStrip1"; - // - // splitContainer1 - // - resources.ApplyResources(this.splitContainer1, "splitContainer1"); - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.listViewUsers); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.btnAdd); - this.splitContainer1.Panel2.Controls.Add(this.btnEdit); - this.splitContainer1.Panel2.Controls.Add(this.btnOk); - this.splitContainer1.Panel2.Controls.Add(this.btnDelete); - // - // UserManagementDlg - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.statusStrip1); - this.Name = "UserManagementDlg"; - this.Activated += new System.EventHandler(this.EditUsers_Activated); - this.Load += new System.EventHandler(this.EditUsers_Load); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserManagementDlg)); + this.listViewUsers = new System.Windows.Forms.ListView(); + this.addButton = new System.Windows.Forms.Button(); + this.editButton = new System.Windows.Forms.Button(); + this.deleteButton = new System.Windows.Forms.Button(); + this.closeButton = new System.Windows.Forms.Button(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.copyFromRemoteButton = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // listViewUsers + // + resources.ApplyResources(this.listViewUsers, "listViewUsers"); + this.listViewUsers.FullRowSelect = true; + this.listViewUsers.GridLines = true; + this.listViewUsers.MultiSelect = false; + this.listViewUsers.Name = "listViewUsers"; + this.listViewUsers.UseCompatibleStateImageBehavior = false; + this.listViewUsers.View = System.Windows.Forms.View.Details; + this.listViewUsers.SelectedIndexChanged += new System.EventHandler(this.listViewUsers_SelectedIndexChanged); + this.listViewUsers.DoubleClick += new System.EventHandler(this.listViewUsers_DoubleClick); + // + // addButton + // + resources.ApplyResources(this.addButton, "addButton"); + this.addButton.Name = "addButton"; + this.addButton.UseVisualStyleBackColor = true; + this.addButton.Click += new System.EventHandler(this.addButton_Click); + // + // editButton + // + resources.ApplyResources(this.editButton, "editButton"); + this.editButton.Name = "editButton"; + this.editButton.UseVisualStyleBackColor = true; + this.editButton.Click += new System.EventHandler(this.editButton_Click); + // + // deleteButton + // + resources.ApplyResources(this.deleteButton, "deleteButton"); + this.deleteButton.Name = "deleteButton"; + this.deleteButton.UseVisualStyleBackColor = true; + this.deleteButton.Click += new System.EventHandler(this.deleteButton_Click); + // + // closeButton + // + resources.ApplyResources(this.closeButton, "closeButton"); + this.closeButton.Name = "closeButton"; + this.closeButton.UseVisualStyleBackColor = true; + this.closeButton.Click += new System.EventHandler(this.closeButton_Click); + // + // statusStrip1 + // + resources.ApplyResources(this.statusStrip1, "statusStrip1"); + this.statusStrip1.Name = "statusStrip1"; + // + // splitContainer1 + // + resources.ApplyResources(this.splitContainer1, "splitContainer1"); + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.listViewUsers); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.copyFromRemoteButton); + this.splitContainer1.Panel2.Controls.Add(this.addButton); + this.splitContainer1.Panel2.Controls.Add(this.editButton); + this.splitContainer1.Panel2.Controls.Add(this.closeButton); + this.splitContainer1.Panel2.Controls.Add(this.deleteButton); + // + // copyFromRemoteButton + // + resources.ApplyResources(this.copyFromRemoteButton, "copyFromRemoteButton"); + this.copyFromRemoteButton.Name = "copyFromRemoteButton"; + this.copyFromRemoteButton.UseVisualStyleBackColor = true; + this.copyFromRemoteButton.Click += new System.EventHandler(this.copyFromRemoteButton_Click); + // + // UserManagementDlg + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.statusStrip1); + this.Name = "UserManagementDlg"; + this.Activated += new System.EventHandler(this.EditUsers_Activated); + this.Load += new System.EventHandler(this.EditUsers_Load); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.ListView listViewUsers; - private System.Windows.Forms.Button btnAdd; - private System.Windows.Forms.Button btnEdit; - private System.Windows.Forms.Button btnDelete; - private System.Windows.Forms.Button btnOk; + private System.Windows.Forms.Button addButton; + private System.Windows.Forms.Button editButton; + private System.Windows.Forms.Button deleteButton; + private System.Windows.Forms.Button closeButton; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.Button copyFromRemoteButton; } } \ No newline at end of file diff --git a/Users/Forms/UserManagementDlg.resx b/Users/Forms/UserManagementDlg.resx index 2ed939a43..1f703b774 100644 --- a/Users/Forms/UserManagementDlg.resx +++ b/Users/Forms/UserManagementDlg.resx @@ -144,101 +144,101 @@ 0 - - 23, 84 + + 23, 85 - + 85, 40 - + 1 - + Add - - btnAdd + + addButton - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + splitContainer1.Panel2 - - 0 - - - 23, 129 - - - 85, 40 - - + 1 - + + 23, 130 + + + 85, 40 + + + 1 + + Edit - - btnEdit + + editButton - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + splitContainer1.Panel2 - - 1 + + 2 - - 23, 174 + + 23, 175 - + 85, 40 - + 1 - + Delete - - btnDelete + + deleteButton - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + splitContainer1.Panel2 - - 3 + + 4 - + 23, 18 - + 85, 40 - + 1 - - OK + + Close - - btnOk + + closeButton - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + splitContainer1.Panel2 - - 2 + + 3 17, 17 @@ -288,6 +288,36 @@ 0 + + NoControl + + + 23, 243 + + + 85, 40 + + + 2 + + + Copy all users from remote + + + False + + + copyFromRemoteButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + + 0 + splitContainer1.Panel2 diff --git a/Users/Resources/Strings.Designer.cs b/Users/Resources/Strings.Designer.cs index e8b33b5e8..a6d3eab58 100644 --- a/Users/Resources/Strings.Designer.cs +++ b/Users/Resources/Strings.Designer.cs @@ -78,6 +78,15 @@ namespace Users.Resources { } } + /// + /// Looks up a localized string similar to Close. + /// + internal static string CloseBtnText { + get { + return ResourceManager.GetString("CloseBtnText", resourceCulture); + } + } + /// /// Looks up a localized string similar to Description. /// @@ -141,15 +150,6 @@ namespace Users.Resources { } } - /// - /// Looks up a localized string similar to Invalid user code.. - /// - internal static string Invalid_code { - get { - return ResourceManager.GetString("Invalid_code", resourceCulture); - } - } - /// /// Looks up a localized string similar to Invalid username or password. /// @@ -195,15 +195,6 @@ namespace Users.Resources { } } - /// - /// Looks up a localized string similar to Fields 'Password' and 'Repeat password' are different. Retype them please.. - /// - internal static string Passwords_different { - get { - return ResourceManager.GetString("Passwords_different", resourceCulture); - } - } - /// /// Looks up a localized string similar to Remove. /// diff --git a/Users/Resources/Strings.cs.resx b/Users/Resources/Strings.cs.resx index 411c9a30d..cae0c569e 100644 --- a/Users/Resources/Strings.cs.resx +++ b/Users/Resources/Strings.cs.resx @@ -159,9 +159,6 @@ Heslo - - 'Heslo' a 'Zopakujte heslo' jsou rozličné. Opravte je prosím. - Odstranit @@ -183,4 +180,7 @@ Uživatelské jméno + + Zavřít + \ No newline at end of file diff --git a/Users/Resources/Strings.de.resx b/Users/Resources/Strings.de.resx index d5266fee8..fc4390890 100644 --- a/Users/Resources/Strings.de.resx +++ b/Users/Resources/Strings.de.resx @@ -159,9 +159,6 @@ Passwort - - Felder 'Password' und 'Passwort wiederholen' sind anders, wiederholen sie bitte. - Tabelle entfernen @@ -183,4 +180,7 @@ Benutzername + + Beenden + \ No newline at end of file diff --git a/Users/Resources/Strings.pl.resx b/Users/Resources/Strings.pl.resx index 61cb9b154..0ca750b2a 100644 --- a/Users/Resources/Strings.pl.resx +++ b/Users/Resources/Strings.pl.resx @@ -159,9 +159,6 @@ Hasło - - Hasło != Hasło 2 - Usuń @@ -183,4 +180,7 @@ Nazwa użytkownika + + Zamknij + \ No newline at end of file diff --git a/Users/Resources/Strings.resx b/Users/Resources/Strings.resx index a5c0c11d1..8fdbee725 100644 --- a/Users/Resources/Strings.resx +++ b/Users/Resources/Strings.resx @@ -159,9 +159,6 @@ Password - - Fields 'Password' and 'Repeat password' are different. Retype them please. - Remove @@ -183,7 +180,7 @@ User name - - Invalid user code. + + Close \ No newline at end of file diff --git a/Users/Resources/Strings.ru.resx b/Users/Resources/Strings.ru.resx index 7a6e58049..6e3922820 100644 --- a/Users/Resources/Strings.ru.resx +++ b/Users/Resources/Strings.ru.resx @@ -159,9 +159,6 @@ Пароль - - Пароль != Пароль 2 - Удалить @@ -183,4 +180,7 @@ Имя пользователя + + Закрыть + \ No newline at end of file diff --git a/Users/Resources/Strings.zh-CN.resx b/Users/Resources/Strings.zh-CN.resx index 254986fc2..bb3d9179e 100644 --- a/Users/Resources/Strings.zh-CN.resx +++ b/Users/Resources/Strings.zh-CN.resx @@ -159,9 +159,6 @@ 密码 - - 密码 != 密码2 - 删除 Remove @@ -183,4 +180,7 @@ 用户名 + + 关闭 Close + \ No newline at end of file