aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-06-30 15:35:09 -0400
committerMichael <[email protected]>2017-06-30 15:35:09 -0400
commit70c4aa1c23c2329f3471d4510675b4b374c65f07 (patch)
treedb1183189d090df499a88296b269327b60d140e4
parentc7061e8e457a04a9dcecfd7eeb0db7d9e753ee31 (diff)
downloadshiftos_thereturn-70c4aa1c23c2329f3471d4510675b4b374c65f07.tar.gz
shiftos_thereturn-70c4aa1c23c2329f3471d4510675b4b374c65f07.tar.bz2
shiftos_thereturn-70c4aa1c23c2329f3471d4510675b4b374c65f07.zip
Fix bug with System Prep dialog
-rw-r--r--ShiftOS.WinForms/Resources/strings_en.txt2
-rw-r--r--ShiftOS.WinForms/UniteSignupDialog.Designer.cs15
-rw-r--r--ShiftOS.WinForms/UniteSignupDialog.cs2
3 files changed, 11 insertions, 8 deletions
diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt
index 028aad3..d6816c1 100644
--- a/ShiftOS.WinForms/Resources/strings_en.txt
+++ b/ShiftOS.WinForms/Resources/strings_en.txt
@@ -24,6 +24,7 @@
"{GEN_APPLY}": "Apply",
"{GEN_RESET}": "Reset",
"{GEN_LOADDEFAULT}": "Load default",
+ "{GEN_ROOTPASSWORD}":"Root password",
"{GEN_CANCEL}": "Cancel",
"{GEN_CONTINUE}": "Continue",
"{GEN_BACK}": "Back",
@@ -133,6 +134,7 @@
"{TITLE_ICONMANAGER}": "Icon Manager",
"{TITLE_INSTALLER}": "Installer",
"{TITLE_MINDBLOW}": "MindBlow",
+ "{TITLE_SYSTEMPREPARATION}": "System preparation",
"{TITLE_PONG}": "Pong",
"{TITLE_SHIFTER}": "Shifter",
"{TITLE_SHIFTLETTERS}": "ShiftLetters",
diff --git a/ShiftOS.WinForms/UniteSignupDialog.Designer.cs b/ShiftOS.WinForms/UniteSignupDialog.Designer.cs
index 52c06b7..5559d3d 100644
--- a/ShiftOS.WinForms/UniteSignupDialog.Designer.cs
+++ b/ShiftOS.WinForms/UniteSignupDialog.Designer.cs
@@ -43,7 +43,7 @@
this.btnlogin.Name = "btnlogin";
this.btnlogin.Size = new System.Drawing.Size(75, 23);
this.btnlogin.TabIndex = 11;
- this.btnlogin.Text = "{UI_SUBMIT}";
+ this.btnlogin.Text = "{GEN_OK}";
this.btnlogin.UseVisualStyleBackColor = true;
this.btnlogin.Click += new System.EventHandler(this.btnlogin_Click);
//
@@ -52,10 +52,10 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(17, 36);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(169, 13);
+ this.label1.Size = new System.Drawing.Size(172, 13);
this.label1.TabIndex = 6;
this.label1.Tag = "header2";
- this.label1.Text = "{INIT_SYSTEM_PREPARATION}";
+ this.label1.Text = "{TITLE_SYSTEMPREPARATION}";
//
// txtsys
//
@@ -71,9 +71,9 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(17, 103);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(116, 13);
+ this.label5.Size = new System.Drawing.Size(119, 13);
this.label5.TabIndex = 14;
- this.label5.Text = "{SE_SYSTEM_NAME}";
+ this.label5.Text = "{GEN_SYSTEMNAME}";
//
// txtroot
//
@@ -83,15 +83,16 @@
this.txtroot.Name = "txtroot";
this.txtroot.Size = new System.Drawing.Size(424, 20);
this.txtroot.TabIndex = 18;
+ this.txtroot.UseSystemPasswordChar = true;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(17, 129);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(135, 13);
+ this.label7.Size = new System.Drawing.Size(138, 13);
this.label7.TabIndex = 17;
- this.label7.Text = "{SE_ROOT_PASSWORD}";
+ this.label7.Text = "{GEN_ROOTPASSWORD}";
//
// UniteSignupDialog
//
diff --git a/ShiftOS.WinForms/UniteSignupDialog.cs b/ShiftOS.WinForms/UniteSignupDialog.cs
index b2b5052..87629ce 100644
--- a/ShiftOS.WinForms/UniteSignupDialog.cs
+++ b/ShiftOS.WinForms/UniteSignupDialog.cs
@@ -70,7 +70,7 @@ namespace ShiftOS.WinForms
SystemName = sys,
RootPassword = root
});
-
+ AppearanceManager.Close(this);
}
}
}