diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 538077e0e7..c870c0ee0b 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -1315,11 +1315,11 @@
 		<Condition name="RefactoringProviderSupports" supports="*">
 			<MenuItem id = "Refactor" label = "${res:XML.MainMenu.RefactorMenu}" type="Menu">
 				<MenuItem id    = "Rename"
-				          label = "Rename"
+				          label = "${res:SharpDevelop.Refactoring.RenameCommand}"
 				          class = "ICSharpCode.SharpDevelop.Refactoring.RenameCommand" />
 				<Condition name="RefactoringProviderSupports" supports="FindUnusedUsingDeclarations">
 					<MenuItem id    = "RemoveUnusedUsings"
-					          label = "Removed unused import statements"
+					          label = "${res:SharpDevelop.Refactoring.RemoveUnusedImports}"
 					          class = "ICSharpCode.SharpDevelop.Refactoring.RemoveUnusedUsingsCommand" />
 				</Condition>
 			</MenuItem>
diff --git a/data/resources/StringResources.es.resources b/data/resources/StringResources.es.resources
index e6c5ea61b9..ec6ab76618 100644
Binary files a/data/resources/StringResources.es.resources and b/data/resources/StringResources.es.resources differ
diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs b/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
index 44d49d4c53..94112294d7 100644
--- a/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
@@ -60,7 +60,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 					{
 						if (c.CompilationUnit.Classes.Count == 1) {
 							// Rename file to ##
-							cmd = new MenuCommand("Rename file to " + Path.GetFileName(correctFileName),
+							cmd = new MenuCommand(StringParser.Parse("${res:SharpDevelop.Refactoring.RenameFileTo}", new string[,] {{ "FileName", Path.GetFileName(correctFileName) }}),
 							                      delegate {
 							                      	FileService.RenameFile(c.CompilationUnit.FileName, correctFileName, false);
 							                      	if (c.ProjectContent.Project != null) {
@@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 							list.Add(cmd);
 						} else if (language.RefactoringProvider.SupportsCreateNewFileLikeExisting && language.RefactoringProvider.SupportsGetFullCodeRangeForType) {
 							// Move class to file ##
-							cmd = new MenuCommand("Move class to file " + Path.GetFileName(correctFileName),
+							cmd = new MenuCommand(StringParser.Parse("${res:SharpDevelop.Refactoring.MoveClassToFile}", new string[,] {{ "FileName", Path.GetFileName(correctFileName) }}),
 							                      delegate {
 							                      	MoveClassToFile(c, correctFileName);
 							                      });
@@ -261,14 +261,16 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 				res.ProvidedDocumentInformation = FindReferencesAndRenameHelper.GetDocumentInformation(derivedClass.CompilationUnit.FileName);
 				results.Add(res);
 			}
-			SearchInFilesManager.ShowSearchResults("Classes deriving from " + c.Name, results);
+			SearchInFilesManager.ShowSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ClassesDerivingFrom}", new string[,] {{ "Name", c.Name }}),
+			                                       results);
 		}
 		
 		void FindReferences(object sender, EventArgs e)
 		{
 			MenuCommand item = (MenuCommand)sender;
 			IClass c = (IClass)item.Tag;
-			FindReferencesAndRenameHelper.ShowAsSearchResults("References to " + c.Name, RefactoringService.FindReferences(c, null));
+			FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", new string[,] {{ "Name", c.Name }}),
+			                                                  RefactoringService.FindReferences(c, null));
 		}
 	}
 }
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs
index 7d451ea081..d7b0f0d303 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs
@@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
 		
 		static void ShowSourceCodeErrors(string errors)
 		{
-			HostCallback.ShowMessage("The operation cannot be performed because your source code contains errors:\n" + errors);
+			HostCallback.ShowMessage("${res:SharpDevelop.Refactoring.CannotPerformOperationBecauseOfSyntaxErrors}\n" + errors);
 		}
 		
 		NR.IParser ParseFile(string fileContent)
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index c2d5f8388d..72c196dc40 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ