From b2100bcd00e8d1b849b8b9325236cfbf1bdaa258 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 18 Dec 2014 18:59:30 -0800 Subject: [PATCH] Translation fixes --- Misc/Util.cs | 2 + SAV/SAV_BerryField.Designer.cs | 80 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/Misc/Util.cs b/Misc/Util.cs index a4757b0ab..5a768b830 100644 --- a/Misc/Util.cs +++ b/Misc/Util.cs @@ -380,6 +380,7 @@ internal static void TranslateInterface(Control form, string lang, Control.Contr string text = SplitString[1]; // Text to set Control.Text to... Control[] controllist = Controls.Find(ctrl, true); if (controllist.Length == 0) // If Control isn't found... + try { // Menu Items can't be found with Controls.Find as they aren't Controls ToolStripDropDownItem TSI = (ToolStripDropDownItem)menu.Items[ctrl]; @@ -395,6 +396,7 @@ internal static void TranslateInterface(Control form, string lang, Control.Contr } // If not found, it is not something to rename and is thus skipped. } + catch { } else // Set the input control's text. controllist[0].Text = text; } diff --git a/SAV/SAV_BerryField.Designer.cs b/SAV/SAV_BerryField.Designer.cs index a9026e81f..898b7a9fb 100644 --- a/SAV/SAV_BerryField.Designer.cs +++ b/SAV/SAV_BerryField.Designer.cs @@ -45,10 +45,10 @@ private void InitializeComponent() this.TB_u7 = new System.Windows.Forms.TextBox(); this.TB_u6 = new System.Windows.Forms.TextBox(); this.TB_u5 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.L_u7 = new System.Windows.Forms.Label(); + this.L_u6 = new System.Windows.Forms.Label(); + this.L_u5 = new System.Windows.Forms.Label(); + this.L_u4 = new System.Windows.Forms.Label(); this.TB_u4 = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // @@ -233,41 +233,41 @@ private void InitializeComponent() this.TB_u5.Size = new System.Drawing.Size(100, 20); this.TB_u5.TabIndex = 20; // - // label3 + // L_u7 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(58, 197); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(13, 13); - this.label3.TabIndex = 19; - this.label3.Text = "7"; + this.L_u7.AutoSize = true; + this.L_u7.Location = new System.Drawing.Point(58, 197); + this.L_u7.Name = "L_u7"; + this.L_u7.Size = new System.Drawing.Size(13, 13); + this.L_u7.TabIndex = 19; + this.L_u7.Text = "7"; // - // label4 + // L_u6 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(58, 171); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(13, 13); - this.label4.TabIndex = 18; - this.label4.Text = "6"; + this.L_u6.AutoSize = true; + this.L_u6.Location = new System.Drawing.Point(58, 171); + this.L_u6.Name = "L_u6"; + this.L_u6.Size = new System.Drawing.Size(13, 13); + this.L_u6.TabIndex = 18; + this.L_u6.Text = "6"; // - // label5 + // L_u5 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(58, 145); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(13, 13); - this.label5.TabIndex = 17; - this.label5.Text = "5"; + this.L_u5.AutoSize = true; + this.L_u5.Location = new System.Drawing.Point(58, 145); + this.L_u5.Name = "L_u5"; + this.L_u5.Size = new System.Drawing.Size(13, 13); + this.L_u5.TabIndex = 17; + this.L_u5.Text = "5"; // - // label6 + // L_u4 // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(58, 119); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(13, 13); - this.label6.TabIndex = 16; - this.label6.Text = "4"; + this.L_u4.AutoSize = true; + this.L_u4.Location = new System.Drawing.Point(58, 119); + this.L_u4.Name = "L_u4"; + this.L_u4.Size = new System.Drawing.Size(13, 13); + this.L_u4.TabIndex = 16; + this.L_u4.Text = "4"; // // TB_u4 // @@ -285,10 +285,10 @@ private void InitializeComponent() this.Controls.Add(this.TB_u7); this.Controls.Add(this.TB_u6); this.Controls.Add(this.TB_u5); - this.Controls.Add(this.label3); - this.Controls.Add(this.label4); - this.Controls.Add(this.label5); - this.Controls.Add(this.label6); + this.Controls.Add(this.L_u7); + this.Controls.Add(this.L_u6); + this.Controls.Add(this.L_u5); + this.Controls.Add(this.L_u4); this.Controls.Add(this.TB_u4); this.Controls.Add(this.TB_u3); this.Controls.Add(this.TB_u2); @@ -333,10 +333,10 @@ private void InitializeComponent() private System.Windows.Forms.TextBox TB_u7; private System.Windows.Forms.TextBox TB_u6; private System.Windows.Forms.TextBox TB_u5; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label L_u7; + private System.Windows.Forms.Label L_u6; + private System.Windows.Forms.Label L_u5; + private System.Windows.Forms.Label L_u4; private System.Windows.Forms.TextBox TB_u4; } } \ No newline at end of file