diff --git a/data/resources/StringResources.es-mx.resources b/data/resources/StringResources.es-mx.resources
index c6cfa998b1..953cb1d3c1 100644
Binary files a/data/resources/StringResources.es-mx.resources and b/data/resources/StringResources.es-mx.resources differ
diff --git a/data/resources/StringResources.es.resources b/data/resources/StringResources.es.resources
index 60e823ad59..a9658d33cb 100644
Binary files a/data/resources/StringResources.es.resources and b/data/resources/StringResources.es.resources differ
diff --git a/data/resources/StringResources.nl.resources b/data/resources/StringResources.nl.resources
index 3cf1a43f31..fd218df2c4 100644
Binary files a/data/resources/StringResources.nl.resources and b/data/resources/StringResources.nl.resources differ
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
index 87dcf51b76..d24443df1f 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
@@ -13,11 +13,10 @@ using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-//using System.Diagnostics;
 
+using HexEditor.Util;
 using ICSharpCode.SharpDevelop;
 
-using HexEditor.Util;
 //using HexEditor.Commands;
 
 namespace HexEditor
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/BufferManager.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/BufferManager.cs
index 3853000b62..4f52960378 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/BufferManager.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/BufferManager.cs
@@ -7,16 +7,10 @@
 
 using System;
 using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Threading;
 
-using ICSharpCode.SharpDevelop;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 
 namespace HexEditor.Util
 {
@@ -68,7 +62,7 @@ namespace HexEditor.Util
 					}
 				} while (count > 0);
 			} else {
-				MessageService.ShowError(new FileNotFoundException("The file " + currentFile.FileName + " doesn't exist!", currentFile.FileName), "The file " + currentFile.FileName + " doesn't exist!");
+				MessageService.ShowErrorFormatted("${res:Fileutility.CantFindFileError}", currentFile.FileName);
 			}
 			
 			this.parent.Invalidate();
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/Settings.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/Settings.cs
index 93b414b954..bb11801e71 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/Settings.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/Settings.cs
@@ -6,8 +6,8 @@
 // </file>
 
 using System;
-using System.Xml;
 using System.Drawing;
+using System.Xml;
 
 namespace HexEditor.Util
 {
@@ -23,10 +23,6 @@ namespace HexEditor.Util
 		int bytesPerLine;
 		ViewMode viewMode;
 		string[] fileTypes;
-
-		public Settings()
-		{
-		}
 		
 		public static Settings FromXML(XmlDocument document)
 		{
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/UndoAction.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/UndoAction.cs
index 00327ad6df..2077e78c07 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/UndoAction.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Util/UndoAction.cs
@@ -14,6 +14,8 @@ namespace HexEditor.Util
 	/// </summary>
 	public enum UndoAction
 	{
-		Insert, Remove, Overwrite
+		Insert,
+		Remove,
+		Overwrite
 	}
 }
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.Designer.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.Designer.cs
index ecf5c9fd17..ef1c46a75e 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.Designer.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.Designer.cs
@@ -57,7 +57,7 @@ namespace HexEditor.View
             this.tbSizeToFit.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tbSizeToFit.Name = "tbSizeToFit";
             this.tbSizeToFit.Size = new System.Drawing.Size(23, 22);
-            this.tbSizeToFit.Text = "Resize to fit current width";
+            this.tbSizeToFit.Text = "${res:AddIns.HexEditor.SizeToFit}";
             this.tbSizeToFit.Click += new System.EventHandler(this.TbSizeToFitClick);
             // 
             // toolStripSeparator1
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.cs
index d24c9d5eee..dc5119aa9c 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.cs
@@ -10,6 +10,7 @@ using System.IO;
 using System.Windows.Forms;
 
 using HexEditor.Util;
+using ICSharpCode.Core;
 using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop;
 
@@ -37,6 +38,8 @@ namespace HexEditor.View
 		{
 			InitializeComponent();
 			
+			tbSizeToFit.Text = StringParser.Parse(tbSizeToFit.Text);
+			
 			ToolStripControlHost bytesPerLine = new ToolStripControlHost(tSTBCharsPerLine);
 			this.toolStrip1.Items.Insert(1, bytesPerLine);
 			
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditOptionsPanel.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditOptionsPanel.cs
index d237cbee40..280040babc 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditOptionsPanel.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditOptionsPanel.cs
@@ -6,12 +6,10 @@
 // </file>
 
 using System;
-using System.Windows.Forms;
-using System.Xml.Serialization;
-using System.Drawing;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.Drawing;
 using System.IO;
+using System.Windows.Forms;
 using System.Xml;
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs
index d5bee46c6e..2b33388003 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.IO;
+
 using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index 124508c528..97af9f6535 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ