diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 6c27fa1194..cfbafc50e5 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -1405,7 +1405,7 @@
 					<MenuItem id = "ConfigurationBuilder" type = "Builder" class = "ICSharpCode.SharpDevelop.Project.Commands.SetConfigurationMenuBuilder"/>
 				</MenuItem>
 				<MenuItem id = "EditConfigurations"
-				          label = "Edit configurations/platforms"
+				          label = "${res:XML.MainMenu.BuildMenu.EditConfigurationsPlatforms}"
 				          class = "ICSharpCode.SharpDevelop.Project.Commands.EditConfigurationsCommand"/>
 			</ComplexCondition>
 		</MenuItem> <!-- end BUILD menu -->
diff --git a/data/resources/StringResources.de.resources b/data/resources/StringResources.de.resources
index 30e4c50688..24c4f8ab89 100644
Binary files a/data/resources/StringResources.de.resources and b/data/resources/StringResources.de.resources differ
diff --git a/data/resources/StringResources.es-mx.resources b/data/resources/StringResources.es-mx.resources
index 0500641982..6534f8c6f5 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 5fab90df4c..f3e217449d 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 546ada944e..81dfe60f30 100644
Binary files a/data/resources/StringResources.nl.resources and b/data/resources/StringResources.nl.resources differ
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
index 6ea641c70b..d6b3c036fa 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
+++ b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
@@ -35,26 +35,26 @@
 			
 			<Condition name = "SubversionState" state = "Modified;Added;Replaced">
 				<MenuItem id = "SvnCommit"
-				          label = "Commit..."
+				          label = "${res:AddIns.Subversion.Commit}..."
 				          icon  = "Svn.Commit"
 				          class = "ICSharpCode.Svn.Commands.CommitCommand"/>
 			</Condition>
 			<Condition name = "SubversionState" state = "Modified;Conflicted;Added;Replaced">
 				<Condition name = "SubversionState" state = "Modified" item = "File">
 					<MenuItem id = "SvnDiff"
-					          label = "Diff"
+					          label = "${res:AddIns.Subversion.Diff}"
 					          class = "ICSharpCode.Svn.Commands.DiffCommand"/>
 				</Condition>
 				<Condition name = "SubversionState" state = "Conflicted" item = "File">
 					<MenuItem id = "SvnEditConflicts"
-					          label = "Edit conflicts"
+					          label = "${res:AddIns.Subversion.EditConflicts}"
 					          class = "ICSharpCode.Svn.Commands.EditConflictsCommand"/>
 					<MenuItem id = "SvnResolveConflicts"
-					          label = "Mark conflicts as resolved..."
+					          label = "${res:AddIns.Subversion.MarkConflictsAsResolved}"
 					          class = "ICSharpCode.Svn.Commands.ResolveConflictsCommand"/>
 				</Condition>
 				<MenuItem id = "SvnRevert"
-				          label = "Revert..."
+				          label = "${res:AddIns.Subversion.Revert}"
 				          icon = "Icons.16x16.UndoIcon"
 				          class = "ICSharpCode.Svn.Commands.RevertCommand"/>
 			</Condition>
@@ -65,13 +65,13 @@
 						<Condition name = "SubversionState" state = "Unversioned;Ignored"/>
 					</Not>
 					<MenuItem id = "SvnRepoBrowser"
-					          label = "Repo-browser"
+					          label = "${res:AddIns.Subversion.RepositoryBrowser}"
 					          class = "ICSharpCode.Svn.Commands.RepoBrowserCommand"/>
 					<MenuItem id = "SvnRepoStatus"
-					          label = "Check for modifications"
+					          label = "${res:AddIns.Subversion.CheckForModifications}"
 					          class = "ICSharpCode.Svn.Commands.RepoStatusCommand"/>
 					<MenuItem id = "SvnRevisionGraph"
-					          label = "Revision graph"
+					          label = "${res:AddIns.Subversion.RevisionGraph}"
 					          class = "ICSharpCode.Svn.Commands.RevisionGraphCommand"/>
 					<MenuItem id = "Sep1" type = "Separator"/>
 					<MenuItem id = "SvnUpdate"
@@ -79,31 +79,31 @@
 					          icon  = "Svn.Update"
 					          class = "ICSharpCode.Svn.Commands.UpdateCommand"/>
 					<MenuItem id = "SvnUpdateToRev"
-					          label = "Update to revision..."
+					          label = "${res:AddIns.Subversion.UpdateToRevision}..."
 					          icon  = "Svn.Update"
 					          class = "ICSharpCode.Svn.Commands.UpdateToRevisionCommand"/>
 					<MenuItem id = "SvnShowLog"
-					          label = "Show Log"
+					          label = "${res:AddIns.Subversion.ShowLog}"
 					          class = "ICSharpCode.Svn.Commands.ShowLogCommand"/>
 					<MenuItem id = "SvnCleanup"
-					          label = "Clean up"
+					          label = "${res:AddIns.Subversion.CleanUp}"
 					          class = "ICSharpCode.Svn.Commands.CleanupCommand"/>
 					<MenuItem id = "Sep2" type = "Separator"/>
 					<MenuItem id = "SvnBranch"
-					          label = "Branch/tag..."
+					          label = "${res:AddIns.Subversion.BranchOrTag}..."
 					          class = "ICSharpCode.Svn.Commands.BranchCommand"/>
 					<MenuItem id = "SvnSwitch"
-					          label = "Switch..."
+					          label = "${res:AddIns.Subversion.Switch}..."
 					          class = "ICSharpCode.Svn.Commands.SwitchCommand"/>
 					<MenuItem id = "SvnMerge"
-					          label = "Merge..."
+					          label = "${res:AddIns.Subversion.Merge}..."
 					          class = "ICSharpCode.Svn.Commands.MergeCommand"/>
-					<Condition name = "SubversionState" item = "File">
+					<Condition name = "SubversionState" item = "Folder">
 						<MenuItem id = "SvnExport"
-						          label = "Export..."
+						          label = "${res:AddIns.Subversion.Export}..."
 						          class = "ICSharpCode.Svn.Commands.ExportWorkingCopyCommand"/>
 						<MenuItem id = "SvnRelocate"
-						          label = "Relocate..."
+						          label = "${res:AddIns.Subversion.Relocate}..."
 						          class = "ICSharpCode.Svn.Commands.RelocateCommand"/>
 					</Condition>
 					<MenuItem id = "Sep3" type = "Separator"/>
@@ -111,27 +111,27 @@
 				
 				<Condition name = "SubversionState" state = "Unversioned;Ignored">
 					<MenuItem id = "SvnAdd"
-					          label = "Add..."
+					          label = "${res:Global.AddButtonText}..."
 					          class = "ICSharpCode.Svn.Commands.AddCommand"/>
 				</Condition>
 				<Condition name = "SubversionState" state = "Unversioned">
 					<MenuItem id = "SvnIgnore"
-					          label = "Add to ignore list"
+					          label = "${res:AddIns.Subversion.AddToIgnoreList}"
 					          class = "ICSharpCode.Svn.Commands.IgnoreCommand"/>
 				</Condition>
 				<Condition name = "SubversionState" state = "Ignored">
 					<MenuItem id = "SvnIgnore"
-					          label = "Remove from ignore list"
+					          label = "${res:AddIns.Subversion.RemoveFromIgnoreList}"
 					          class = "ICSharpCode.Svn.Commands.UnignoreCommand"/>
 				</Condition>
 				<Condition name = "SubversionState" state = "Modified;Normal" item = "File">
 					<MenuItem id = "SvnBlame"
-					          label = "Blame..."
+					          label = "${res:AddIns.Subversion.Blame}..."
 					          class = "ICSharpCode.Svn.Commands.BlameCommand"/>
 				</Condition>
 				<Condition name = "SubversionState" state = "Modified;Conflicted;Added;Replaced">
 					<MenuItem id = "SvnCreatePatch"
-					          label = "Create patch..."
+					          label = "${res:AddIns.Subversion.CreatePatch}..."
 					          icon  = "Svn.CreatePatch"
 					          class = "ICSharpCode.Svn.Commands.CreatePatchCommand"/>
 				</Condition>
@@ -143,14 +143,14 @@
 				</Condition>-->
 				<MenuItem id = "Sep4" type = "Separator"/>
 				<MenuItem id = "SvnHelp"
-				          label = "Help"
+				          label = "${res:MainWindow.Windows.HelpScoutLabel}"
 				          icon = "Icons.16x16.HelpIcon"
 				          class = "ICSharpCode.Svn.Commands.HelpCommand"/>
 				<MenuItem id = "SvnSettings"
-				          label = "Settings"
+				          label = "${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.SettingsGroupBox}"
 				          class = "ICSharpCode.Svn.Commands.SettingsCommand"/>
 				<MenuItem id = "SvnAbout"
-				          label = "About"
+				          label = "${res:ComponentInspector.AboutDialog.Title}"
 				          class = "ICSharpCode.Svn.Commands.AboutCommand"/>
 			</MenuItem>
 		</Condition>
@@ -172,14 +172,10 @@
 		<Include id = "SubversionInclude" path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SubversionItem"/>
 	</Path>
 	
-	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id    = "Subversion Options"
-		             label = "Subversion Options">
-			<DialogPanel id = "SubversionOptionsPanel"
-			             label = "Subversion Options"
-			             class = "ICSharpCode.Svn.Gui.SubversionOptionsPanel"/>
-		</DialogPanel>
-	
+	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/Tools">
+		<DialogPanel id = "SubversionOptionsPanel"
+		             label = "${res:AddIns.Subversion.Options.Title}"
+		             class = "ICSharpCode.Svn.Gui.SubversionOptionsPanel"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Tools">
@@ -188,11 +184,11 @@
 		          insertbefore = "LastSeparator"
 		          type="Menu">
 			<MenuItem id = "SvnExport"
-			          label = "Export"
+			          label = "${res:AddIns.Subversion.Export}..."
 			          icon  = "Svn.Export"
 			          class = "ICSharpCode.Svn.Commands.ExportCommand"/>
 			<MenuItem id = "SvnCheckout"
-			          label = "Checkout"
+			          label = "${res:AddIns.Subversion.Checkout}..."
 			          icon  = "Svn.Checkout"
 			          class = "ICSharpCode.Svn.Commands.CheckoutCommand"/>
 		</MenuItem>
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Resources/SubversionOptionsPanel.xfrm b/src/AddIns/Misc/SubversionAddIn/Project/Resources/SubversionOptionsPanel.xfrm
index fb60c0a958..20e445582d 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Resources/SubversionOptionsPanel.xfrm
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Resources/SubversionOptionsPanel.xfrm
@@ -6,7 +6,7 @@
       <System.Windows.Forms.CheckBox>
         <Name value="useHistoryDisplayBindingCheckBox" />
         <Location value="8, 135" />
-        <Text value="Add &amp;history tab to version-controlled files" />
+        <Text value="${res:AddIns.Subversion.Options.UseHistoryDisplayBinding}" />
         <TabIndex value="6" />
         <Size value="280, 24" />
         <UseVisualStyleBackColor value="True" />
@@ -15,7 +15,7 @@
       <System.Windows.Forms.CheckBox>
         <Name value="autoRenameFilesCheckBox" />
         <Location value="8, 63" />
-        <Text value="&amp;Keep history for renamed files (rename in Subversion)" />
+        <Text value="${res:AddIns.Subversion.Options.RenameInsideSubversion}" />
         <TabIndex value="5" />
         <Size value="280, 24" />
         <Anchor value="Top, Left, Right" />
@@ -24,7 +24,7 @@
       <System.Windows.Forms.CheckBox>
         <Name value="autoDeleteFilesCheckBox" />
         <Location value="8, 33" />
-        <Text value="Automatically &amp;delete removed files" />
+        <Text value="${res:AddIns.Subversion.Options.AutoDelete}" />
         <TabIndex value="3" />
         <Size value="280, 24" />
         <Anchor value="Top, Left, Right" />
@@ -32,7 +32,7 @@
       <System.Windows.Forms.CheckBox>
         <Name value="autoReloadProjectCheckBox" />
         <Location value="8, 105" />
-        <Text value="&amp;Re-load project after projectfile change" />
+        <Text value="${res:AddIns.Subversion.Options.ReloadProjectAfterChanges}" />
         <TabIndex value="4" />
         <Size value="280, 24" />
         <Anchor value="Top, Left, Right" />
@@ -40,7 +40,7 @@
       <System.Windows.Forms.CheckBox>
         <Name value="autoAddFilesCheckBox" />
         <Location value="8, 3" />
-        <Text value="Automatically &amp;add new files" />
+        <Text value="${res:AddIns.Subversion.Options.AutoAdd}" />
         <TabIndex value="2" />
         <Size value="280, 24" />
         <Anchor value="Top, Left, Right" />
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/TortoiseSvnNotFoundForm.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/TortoiseSvnNotFoundForm.cs
index 90e8cf9cd3..8626a09550 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/TortoiseSvnNotFoundForm.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/TortoiseSvnNotFoundForm.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.Svn
 		{
 			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.Svn.Resources.TortoiseSvnNotFoundForm.xfrm"));
 		
-			((Label)ControlDictionary["messageLabel"]).Text = StringParser.Parse("TortoiseSVN needs to be installed to execute this action.");
+			((Label)ControlDictionary["messageLabel"]).Text = StringParser.Parse("${res:AddIns.Subversion.TortoiseSVNRequired}");
 			((PictureBox)ControlDictionary["iconPictureBox"]).Image = ResourceService.GetBitmap("Icons.32x32.Information");
 			((LinkLabel)ControlDictionary["linkLabel"]).Click += LinkLabelClicked;
 		}
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/SubversionStateCondition.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/SubversionStateCondition.cs
index 268ef8be25..b23eded830 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/SubversionStateCondition.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/SubversionStateCondition.cs
@@ -85,7 +85,7 @@ namespace ICSharpCode.Svn
 		bool Test(Condition condition, string fileName)
 		{
 			string[] allowedStatus = condition.Properties["state"].Split(';');
-			if (allowedStatus.Length == 0) {
+			if (allowedStatus.Length == 0 || (allowedStatus.Length == 1 && allowedStatus[0].Length == 0)) {
 				return true;
 			}
 			string status;
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index 5626d2b118..e540094bc2 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ