diff --git a/Source/Core/Controls/ScriptEditorPanel.cs b/Source/Core/Controls/ScriptEditorPanel.cs index dd5e3065..9eeada01 100644 --- a/Source/Core/Controls/ScriptEditorPanel.cs +++ b/Source/Core/Controls/ScriptEditorPanel.cs @@ -262,7 +262,7 @@ namespace CodeImp.DoomBuilder.Controls if(!string.IsNullOrEmpty(findoptions.FindText) && (ActiveTab != null)) { if(!ActiveTab.FindNext(findoptions)) - DisplayStatus(ScriptStatusType.Warning, "Can't find any occurence of \"" + findoptions.FindText + "\"."); + DisplayStatus(ScriptStatusType.Warning, "Can't find any occurrence of \"" + findoptions.FindText + "\"."); } else { @@ -284,7 +284,7 @@ namespace CodeImp.DoomBuilder.Controls if(!string.IsNullOrEmpty(findoptions.FindText) && (ActiveTab != null)) { if(!ActiveTab.FindPrevious(findoptions)) - DisplayStatus(ScriptStatusType.Warning, "Can't find any occurence of \"" + findoptions.FindText + "\"."); + DisplayStatus(ScriptStatusType.Warning, "Can't find any occurrence of \"" + findoptions.FindText + "\"."); } else { @@ -354,9 +354,9 @@ namespace CodeImp.DoomBuilder.Controls // Show result if(replacements == 0) - DisplayStatus(ScriptStatusType.Warning, "Can't find any occurence of \"" + findoptions.FindText + "\"."); + DisplayStatus(ScriptStatusType.Warning, "Can't find any occurrence of \"" + findoptions.FindText + "\"."); else - DisplayStatus(ScriptStatusType.Info, "Replaced " + replacements + " occurences of \"" + findoptions.FindText + "\" with \"" + findoptions.ReplaceWith + "\"."); + DisplayStatus(ScriptStatusType.Info, "Replaced " + replacements + " occurrences of \"" + findoptions.FindText + "\" with \"" + findoptions.ReplaceWith + "\"."); } else { diff --git a/Source/Core/Controls/TagSelector.Designer.cs b/Source/Core/Controls/TagSelector.Designer.cs index ccc41ebf..ad548818 100644 --- a/Source/Core/Controls/TagSelector.Designer.cs +++ b/Source/Core/Controls/TagSelector.Designer.cs @@ -47,7 +47,7 @@ this.label1.Size = new System.Drawing.Size(29, 13); this.label1.TabIndex = 0; this.label1.Text = "Tag:"; - this.tooltip.SetToolTip(this.label1, "Use \">=\" or \"<=\" prefixes to create\r\nacsending or descending tags range.\r\nUse \"++" + + this.tooltip.SetToolTip(this.label1, "Use \">=\" or \"<=\" prefixes to create\r\nascending or descending tags range.\r\nUse \"++" + "\" or \"--\" prefixes to increment\r\nor decrement already existing tags \r\nby given v" + "alue."); // diff --git a/Source/Core/Controls/TagsSelector.Designer.cs b/Source/Core/Controls/TagsSelector.Designer.cs index 2bfb017a..66ba510e 100644 --- a/Source/Core/Controls/TagsSelector.Designer.cs +++ b/Source/Core/Controls/TagsSelector.Designer.cs @@ -49,7 +49,7 @@ this.curtaglabel.TabIndex = 0; this.curtaglabel.Text = "Tag 1:"; this.curtaglabel.TextAlign = System.Drawing.ContentAlignment.TopRight; - this.tooltip.SetToolTip(this.curtaglabel, "Use \">=\" or \"<=\" prefixes to create\r\nacsending or descending tags range.\r\nUse \"++" + + this.tooltip.SetToolTip(this.curtaglabel, "Use \">=\" or \"<=\" prefixes to create\r\nascending or descending tags range.\r\nUse \"++" + "\" or \"--\" prefixes to increment\r\nor decrement already existing tags \r\nby given v" + "alue."); // diff --git a/Source/Core/Data/DataManager.cs b/Source/Core/Data/DataManager.cs index b124a994..3395843b 100644 --- a/Source/Core/Data/DataManager.cs +++ b/Source/Core/Data/DataManager.cs @@ -568,7 +568,7 @@ namespace CodeImp.DoomBuilder.Data // Output info General.WriteLogLine("Loaded " + texcount + " textures, " + flatcount + " flats, " + hirestexcount + " hires textures, " + colormapcount + " colormaps, " + spritecount + " sprites, " + - thingcount + " decorate things, " + modeldefentries.Count + " model/voxel deinitions, " + + thingcount + " decorate things, " + modeldefentries.Count + " model/voxel definitions, " + gldefsentries.Count + " dynamic light definitions, " + glowingflats.Count + " glowing flat definitions, " + skyboxes.Count + " skybox definitions, " + reverbs.Count + " sound environment definitions"); diff --git a/Source/Core/Editing/ClassicMode.cs b/Source/Core/Editing/ClassicMode.cs index 2063fd09..c3ebb084 100644 --- a/Source/Core/Editing/ClassicMode.cs +++ b/Source/Core/Editing/ClassicMode.cs @@ -682,7 +682,7 @@ namespace CodeImp.DoomBuilder.Editing { if(!mouseinside) { - General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse is outside editing vindow!"); + General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse is outside editing window!"); return false; } diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs index 1fbf1f1a..2a2a8af5 100644 --- a/Source/Core/General/General.cs +++ b/Source/Core/General/General.cs @@ -2096,7 +2096,7 @@ namespace CodeImp.DoomBuilder // Try getting exception details... try { exceptionmsg = "Fatal Windows Forms error occurred: " + e.Exception.Message + "\n\nStack Trace:\n" + e.Exception.StackTrace; } - catch(Exception exc) { exceptionmsg = "Failed to get initial excepton details: " + exc.Message + "\n\nStack Trace:\n" + exc.StackTrace; } + catch(Exception exc) { exceptionmsg = "Failed to get initial exception details: " + exc.Message + "\n\nStack Trace:\n" + exc.StackTrace; } // Try logging it... try { WriteLogLine(exceptionmsg); } catch { } @@ -2129,7 +2129,7 @@ namespace CodeImp.DoomBuilder } catch(Exception exc) { - exceptionmsg = "Failed to get initial excepton details: " + exc.Message + "\n\nStack Trace:\n" + exc.StackTrace; + exceptionmsg = "Failed to get initial exception details: " + exc.Message + "\n\nStack Trace:\n" + exc.StackTrace; } // Try logging it... diff --git a/Source/Core/Plugins/Plugin.cs b/Source/Core/Plugins/Plugin.cs index f75d585c..5ccf5b83 100644 --- a/Source/Core/Plugins/Plugin.cs +++ b/Source/Core/Plugins/Plugin.cs @@ -102,7 +102,7 @@ namespace CodeImp.DoomBuilder.Plugins { string message = shortfilename + " plugin's assembly version (" + plug.MinimumRevision + ") doesn't match main module version (" + thisrevision + ")."; if(General.ShowWarningMessage(message + Environment.NewLine + - "It's strongly recomended to update the editor." + Environment.NewLine + + "It's strongly recommended to update the editor." + Environment.NewLine + "Program stability is not guaranteed." + Environment.NewLine + Environment.NewLine + "Continue anyway?", MessageBoxButtons.YesNo, MessageBoxDefaultButton.Button2, false) == DialogResult.No) { diff --git a/Source/Core/Windows/ExceptionDialog.cs b/Source/Core/Windows/ExceptionDialog.cs index c8736890..afbb66f5 100644 --- a/Source/Core/Windows/ExceptionDialog.cs +++ b/Source/Core/Windows/ExceptionDialog.cs @@ -52,7 +52,7 @@ namespace CodeImp.DoomBuilder.Windows { string[] titles = { - "0x000000 at 0xFFFFFF. That's probaby bad", + "0x000000 at 0xFFFFFF. That's probably bad", "Here we go again...", "Uh oh, you're screwed", "All is lost!", @@ -76,7 +76,7 @@ namespace CodeImp.DoomBuilder.Windows "You aren't expected to understand this", "Back to the drawing board...", "I'm sorry... :(", - "This is a horrbble day for you, and of course, the world", + "This is a horrible day for you, and of course, the world", "Abort, Retry, Fail?", "You are making progress. I'm afraid that's something I can't allow to happen", "You are making progress. That's not OK", diff --git a/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs b/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs index a1c865db..7ae19d9f 100644 --- a/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs +++ b/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs @@ -110,7 +110,7 @@ this.deletepreset.Name = "deletepreset"; this.deletepreset.Size = new System.Drawing.Size(70, 25); this.deletepreset.TabIndex = 10; - this.deletepreset.Text = "Delele"; + this.deletepreset.Text = "Delete"; this.deletepreset.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.deletepreset.UseVisualStyleBackColor = true; this.deletepreset.Click += new System.EventHandler(this.deletepreset_Click); diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 492753e3..728f1eab 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -550,11 +550,11 @@ namespace CodeImp.DoomBuilder.Windows // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(29, 94); + this.label15.Location = new System.Drawing.Point(26, 94); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(88, 13); + this.label15.Size = new System.Drawing.Size(91, 13); this.label15.TabIndex = 35; - this.label15.Text = "Autoscroll speed:"; + this.label15.Text = "Auto-scroll speed:"; // // previewsize // @@ -629,8 +629,8 @@ namespace CodeImp.DoomBuilder.Windows label18.TabIndex = 25; label18.Text = "Max. dynamic lights to render:"; label18.TextAlign = System.Drawing.ContentAlignment.TopRight; - this.toolTip1.SetToolTip(label18, "Controlls how many dynamic lights could be \r\nrendered simultaneously in Visual mo" + - "de "); + this.toolTip1.SetToolTip(label18, "Controls how many dynamic lights could be \r\nrendered simultaneously in Visual mod" + + "e "); // // label20 // @@ -665,11 +665,11 @@ namespace CodeImp.DoomBuilder.Windows // label29 // label29.AutoSize = true; - label29.Location = new System.Drawing.Point(97, 356); + label29.Location = new System.Drawing.Point(90, 356); label29.Name = "label29"; - label29.Size = new System.Drawing.Size(91, 13); + label29.Size = new System.Drawing.Size(94, 13); label29.TabIndex = 38; - label29.Text = "Edge Antialiasing:"; + label29.Text = "Edge Anti-aliasing:"; label29.TextAlign = System.Drawing.ContentAlignment.TopRight; // // keyusedlabel diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs index 30c533e2..42fbcbff 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs @@ -494,7 +494,7 @@ label17.Name = "label17"; label17.Size = new System.Drawing.Size(74, 14); label17.TabIndex = 29; - label17.Text = "Ammount:"; + label17.Text = "Amount:"; label17.TextAlign = System.Drawing.ContentAlignment.TopRight; this.tooltip.SetToolTip(label17, "Amount of damage inflicted by this sector.\r\nIf this is 0, all other damage proper" + "ties will be ignored.\r\nSetting this to a negative value will create a healing se" + diff --git a/Source/Core/Windows/TextureSetForm.cs b/Source/Core/Windows/TextureSetForm.cs index b6fea829..a4b0326f 100644 --- a/Source/Core/Windows/TextureSetForm.cs +++ b/Source/Core/Windows/TextureSetForm.cs @@ -159,7 +159,7 @@ namespace CodeImp.DoomBuilder.Windows // Determine tooltip text string tooltiptext = null; - if(nomatchesbutton.Checked) tooltiptext = "Doubleclick to include this texture"; + if(nomatchesbutton.Checked) tooltiptext = "Double-click to include this texture"; // Start adding matcheslist.PreventSelection = matchesbutton.Checked; diff --git a/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs index cb98eeb3..0aa72c97 100644 --- a/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs +++ b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs @@ -180,7 +180,7 @@ this.cbusevertexheight.Name = "cbusevertexheight"; this.cbusevertexheight.Size = new System.Drawing.Size(95, 17); this.cbusevertexheight.TabIndex = 22; - this.cbusevertexheight.Text = "Sloped Terrian"; + this.cbusevertexheight.Text = "Sloped Terrain"; this.cbusevertexheight.UseVisualStyleBackColor = true; // // browse diff --git a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs index 205b2de7..54cd4a19 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs @@ -2471,14 +2471,14 @@ namespace CodeImp.DoomBuilder.BuilderModes s.Fields.BeforeFieldsChange(); //floor - if(General.Map.Renderer2D.ViewMode == ViewMode.FloorTextures || General.Map.Renderer2D.ViewMode != ViewMode.CeilingTextures) + if(General.Map.Renderer2D.ViewMode != ViewMode.CeilingTextures) { UniFields.SetFloat(s.Fields, "rotationfloor", General.ClampAngle(UniFields.GetFloat(s.Fields, "rotationfloor") + increment)); s.UpdateNeeded = true; } //ceiling - if(General.Map.Renderer2D.ViewMode == ViewMode.CeilingTextures || General.Map.Renderer2D.ViewMode != ViewMode.FloorTextures) + if(General.Map.Renderer2D.ViewMode != ViewMode.FloorTextures) { UniFields.SetFloat(s.Fields, "rotationceiling", General.ClampAngle(UniFields.GetFloat(s.Fields, "rotationceiling") + increment)); s.UpdateNeeded = true; diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs index 977d0ba5..cbdcc247 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs @@ -56,7 +56,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.ErrorChecks public override string ToString() { if(toowide && toohigh) return "Map's width and height is bigger than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues."; - if(toowide) return "Map is wider than than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues."; + if(toowide) return "Map is wider than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues."; return "Map is taller than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues."; } diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs index eba0afd0..7b2db8aa 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs @@ -31,7 +31,7 @@ namespace CodeImp.DoomBuilder.BuilderModes line = l; viewobjects.Add(l); hidden = l.IgnoredErrorChecks.Contains(this.GetType()); //mxd - description = "This linedef is shorter than 1 map unit. This can porentially cause nodebuilding errors."; + description = "This linedef is shorter than 1 map unit. This can potentially cause nodebuilding errors."; } #endregion diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs index fb352bf1..3988066c 100644 --- a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs +++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs @@ -283,7 +283,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface if(sectors.Count > 0) { //make undo - General.Map.UndoRedo.CreateUndo("Fill all texturs for " + sectors.Count + (sectors.Count > 1 ? " sectors" : " sector")); + General.Map.UndoRedo.CreateUndo("Fill all textures for " + sectors.Count + (sectors.Count > 1 ? " sectors" : " sector")); foreach(Sector s in sectors) { @@ -306,7 +306,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface if(lines.Count == 0) return; //make undo - General.Map.UndoRedo.CreateUndo("Fill all texturs for " + lines.Count + (lines.Count > 1 ? " linedefs" : " linedef")); + General.Map.UndoRedo.CreateUndo("Fill all textures for " + lines.Count + (lines.Count > 1 ? " linedefs" : " linedef")); //fill textures foreach(Linedef l in lines) diff --git a/Source/Plugins/BuilderModes/Resources/Actions.cfg b/Source/Plugins/BuilderModes/Resources/Actions.cfg index c5000306..92627e7a 100644 --- a/Source/Plugins/BuilderModes/Resources/Actions.cfg +++ b/Source/Plugins/BuilderModes/Resources/Actions.cfg @@ -84,7 +84,7 @@ drawrectanglemode { title = "Start Rectangle Drawing"; category = "drawing"; - description = "Starts drawing rectangle. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are avaliable in this mode."; + description = "Starts drawing rectangle. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are available in this mode."; allowkeys = true; allowmouse = true; allowscroll = true; @@ -96,7 +96,7 @@ drawellipsemode { title = "Start Ellipse Drawing"; category = "drawing"; - description = "Starts drawing ellipse. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are avaliable in this mode."; + description = "Starts drawing ellipse. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are available in this mode."; allowkeys = true; allowmouse = true; allowscroll = true; @@ -108,7 +108,7 @@ drawcurvemode { title = "Start Curve Drawing"; category = "drawing"; - description = "Starts drawing a curve. Increase/Decrease Subdivision Level actions are avaliable in this mode."; + description = "Starts drawing a curve. Increase/Decrease Subdivision Level actions are available in this mode."; allowkeys = true; allowmouse = true; allowscroll = true; @@ -120,7 +120,7 @@ drawgridmode { title = "Start Grid Drawing"; category = "drawing"; - description = "Starts drawing a grid. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are avaliable in this mode."; + description = "Starts drawing a grid. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are available in this mode."; allowkeys = true; allowmouse = true; allowscroll = true; @@ -1318,7 +1318,7 @@ gzdbvisualmode { title = "GZDB Visual Mode"; category = "modes"; - description = "Switches to the (G)ZDoom visual editing mode. Hold Shift key to invert 'Synhcronise selection between Visual and Classic modes' setting. Hold Control key to disable position synchronization when 'Synchronize camera position between 2D and 3D modes' Preferences option is enabled."; + description = "Switches to the (G)ZDoom visual editing mode. Hold Shift key to invert 'Synhcronize selection between Visual and Classic modes' setting. Hold Control key to disable position synchronization when 'Synchronize camera position between 2D and 3D modes' Preferences option is enabled."; allowkeys = true; allowmouse = true; allowscroll = true; diff --git a/Source/Plugins/BuilderModes/Resources/Hints.cfg b/Source/Plugins/BuilderModes/Resources/Hints.cfg index 3638080f..f7bf54f4 100644 --- a/Source/Plugins/BuilderModes/Resources/Hints.cfg +++ b/Source/Plugins/BuilderModes/Resources/Hints.cfg @@ -57,7 +57,7 @@ group general "Press builder_classicedit to edit properties of current selection" "Use builder_griddec and builder_gridinc to change grid size" "Press buildermodes_joinsectors to join two or more selected sectors together and keep all linedefs" -"Press buildermodes_mergesectors to join two or more selected sectors together and remove the shared inedefs" +"Press buildermodes_mergesectors to join two or more selected sectors together and remove the shared linedefs" "Press buildermodes_gradientbrightness to create a brightness or color gradient over all selected sectors from the first to the last selected sector" "Press buildermodes_gradientfloors to create a floor heights gradient over all selected sectors from the first to the last selected sector" "Press buildermodes_gradientceilings to create a ceiling heights gradient over all selected sectors from the first to the last selected sector" diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs b/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs index 13afd3c6..8d0bc95b 100644 --- a/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs +++ b/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs @@ -558,7 +558,7 @@ namespace CodeImp.DoomBuilder.BuilderModes } List neighbours = new List(); - bool regularorvavoom = extrafloor == null || (extrafloor != null && extrafloor.VavoomType); + bool regularorvavoom = (extrafloor == null || extrafloor.VavoomType); //collect neighbour sectors foreach(Sidedef side in Sector.Sector.Sidedefs) diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs b/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs index ea4e4232..0f29b87d 100644 --- a/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs +++ b/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs @@ -501,7 +501,7 @@ namespace CodeImp.DoomBuilder.BuilderModes } List neighbours = new List(); - bool regularorvavoom = extrafloor == null || (extrafloor != null && extrafloor.VavoomType); + bool regularorvavoom = (extrafloor == null || extrafloor.VavoomType); //collect neighbour sectors foreach(Sidedef side in Sector.Sector.Sidedefs)