diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index 491b9a7b53..9390e2ff06 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -8254,4 +8254,46 @@ a line break</value>
     <value>Update cursor ...</value>
     <comment>Text for the button that makes it possible to update the stored cursor</comment>
   </data>
+  <data name="XML.MainMenu.SearchMenu.SearchForIssues" xml:space="preserve">
+    <value>Search For Issues...</value>
+  </data>
+  <data name="Dialog.SearchForIssues.AutoFix" xml:space="preserve">
+    <value>Automatically fix issues if possible</value>
+  </data>
+  <data name="Dialog.Options.ServicesReferencesText" xml:space="preserve">
+    <value>Service References</value>
+  </data>
+  <data name="XML.TextAreaContextMenu.Reformat" xml:space="preserve">
+    <value>Reformat</value>
+  </data>
+  <data name="Global.Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Dialog.ProjectOptions.CustomTool.RunOnBuild" xml:space="preserve">
+    <value>Run on Build</value>
+  </data>
+  <data name="Dialog.ProjectOptions.CustomTool.Filenames" xml:space="preserve">
+    <value>Filenames:</value>
+  </data>
+  <data name="Debugger.Visualizers.ColumnPickerLabel" xml:space="preserve">
+    <value>Columns:</value>
+  </data>
+  <data name="Global.Shortcuts.Ctrl" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+  <data name="Global.Shortcuts.Shift" xml:space="preserve">
+    <value>Shift</value>
+  </data>
+  <data name="Global.Shortcuts.Alt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="Global.Shortcuts.Win" xml:space="preserve">
+    <value>Win</value>
+  </data>
+  <data name="AddIns.Debugger.Console.Clear" xml:space="preserve">
+    <value>Clear console</value>
+  </data>
+  <data name="AddIns.Debugger.Console.DeleteHistory" xml:space="preserve">
+    <value>Delete history</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index b70e3a2dcf..8c96374744 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -165,7 +165,7 @@
 	
 	<Path path = "/SharpDevelop/Workbench/MainMenu/Search">
 		<MenuItem id = "SearchForIssues"
-		          label="Search For Issues..."
+		          label="${res:XML.MainMenu.SearchMenu.SearchForIssues}"
 		          class="CSharpBinding.Refactoring.SearchForIssuesCommand"/>
 	</Path>
 	
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs
index b36677c142..feaeb1c39e 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs
@@ -22,6 +22,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.SharpDevelop;
 using CSharpBinding.OptionPanels;
 
 namespace CSharpBinding.FormattingStrategy
@@ -143,9 +144,8 @@ namespace CSharpBinding.FormattingStrategy
 		
 		static void FillBoolComboValues(ComboBox comboBox)
 		{
-			// TODO Add located resources!
-			comboBox.Items.Add(new ComboBoxItem { Content = "Yes", Tag = true });
-			comboBox.Items.Add(new ComboBoxItem { Content = "No", Tag = false });
+			comboBox.Items.Add(new ComboBoxItem { Content = SD.ResourceService.GetString("Global.Yes"), Tag = true });
+			comboBox.Items.Add(new ComboBoxItem { Content = SD.ResourceService.GetString("Global.No"), Tag = false });
 		}
 		
 		static void FillIntComboValues(ComboBox comboBox)
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesDialog.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesDialog.xaml
index 3e5d356063..7f1f749f85 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesDialog.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesDialog.xaml
@@ -11,7 +11,7 @@
         WindowStartupLocation="CenterOwner"
         Closing="Window_Closing"
         MinHeight="250" MinWidth="200"
-        Height="450" Width="400" Title="Search For Issues">
+        Height="450" Width="400" Title="{core:Localize XML.MainMenu.SearchMenu.SearchForIssues}">
 	<Grid Margin="6">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />
@@ -24,15 +24,15 @@
 			<ColumnDefinition Width="*" />
 		</Grid.ColumnDefinitions>
 		<StackPanel Orientation="Horizontal">
-			<Label Content="Search In:" />
+			<Label Content="{core:Localize Dialog.NewProject.SearchReplace.SearchIn}" />
 			<widgets:RadioButtonGroup Name="searchInRBG" Margin="0,6,0,0" sd:EnumBinding.EnumType="local:SearchForIssuesTarget" />
 		</StackPanel>
 		<Label Content="Issues:" Grid.Row="1" HorizontalAlignment="Left" />
 		<tv:SharpTreeView Name="treeView" Grid.Row="2" Margin="4,0,4,4" />
 		<CheckBox Name="fixCheckBox" Grid.Row="3" Margin="8,0,0,0" Checked="FixCheckBox_Checked" Unchecked="FixCheckBox_Unchecked"
-		          HorizontalAlignment="Left" Content="Automatically fix issues if possible" />
+		          HorizontalAlignment="Left" Content="{core:Localize Dialog.SearchForIssues.AutoFix}" />
 		<StackPanel Grid.Row="4" Margin="4" HorizontalAlignment="Right" Orientation="Horizontal">
-			<Button Content="Search" Style="{x:Static core:GlobalStyles.ButtonStyle}" Name="searchButton" IsDefault="True" Click="searchButton_Click" Margin="0,0,5,0" />
+			<Button Content="{core:Localize MainWindow.Windows.ClassBrowser.CommitSearch.ToolTip}" Style="{x:Static core:GlobalStyles.ButtonStyle}" Name="searchButton" IsDefault="True" Click="searchButton_Click" Margin="0,0,5,0" />
 			<Button Content="{core:Localize Global.CloseButtonText}" Style="{x:Static core:GlobalStyles.ButtonStyle}" IsCancel="True" />
 		</StackPanel>
 	</Grid>
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Service/ExecuteProcessWindow.xaml b/src/AddIns/Debugger/Debugger.AddIn/Service/ExecuteProcessWindow.xaml
index e3e510fcc0..032f62a07f 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Service/ExecuteProcessWindow.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Service/ExecuteProcessWindow.xaml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Window
-	x:Class="ICSharpCode.SharpDevelop.Services.ExecuteProcessWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	x:Class="ICSharpCode.SharpDevelop.Services.ExecuteProcessWindow"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	Title="Select process to debug..."
 	WindowStartupLocation="CenterOwner"
 	WindowState="Normal"
@@ -105,7 +108,7 @@
 			<Button
 				DockPanel.Dock="Right"
 				x:Name="CancelButton"
-				Content="Cancel"
+				Content="{core:Localize Global.CancelButtonText}"
 				Click="CancelButton_Click"
 				Width="100" />
 		</DockPanel>
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ColumnPicker.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ColumnPicker.xaml
index f6b28deee9..e66963e5f6 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ColumnPicker.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ColumnPicker.xaml
@@ -165,7 +165,7 @@
                                 IsHitTestVisible="false" 
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
                                 ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" 
-                                Content="Columns" />
+                                Content="{core:Localize Debugger.Visualizers.ColumnPickerLabel}" />
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml
index b78fff3c35..12e26cc7de 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml
@@ -48,7 +48,7 @@
 				          Content="{core:Localize Dialog.HighlightingEditor.ColorDlg.Underline}"/>
 				<Button Name="resetButton" IsEnabled="{Binding IsCustomized}" HorizontalAlignment="Left"
 				        Click="ResetButtonClick" Style="{x:Static core:GlobalStyles.ButtonStyle}" Margin="0,4"
-				        Content="Reset" />
+				        Content="{core:Localize Global.Reset}" />
 				<Label Content="{core:StringParse ${res:Dialog.HighlightingEditor.SampleText}:}" />
 				<core:RestrictDesiredSize Height="50" MinWidth="200">
 					<avalonedit:TextEditor Name="textEditor" IsReadOnly="True" />
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index f56c9d0d50..3240976654 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1001,7 +1001,7 @@
 			          class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.PermanentlyAddModuleToWorkspaceCommand"/>
 		</Condition>
 		<MenuItem id = "RemoveAssembly"
-		          label = "Remove"
+		          label = "${res:Global.RemoveButtonText}"
 		          icon = "Icons.16x16.DeleteIcon"
 		          class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.RemoveAssemblyCommand"/>
 	</Path>
@@ -1313,7 +1313,7 @@
 			
 			<OptionPanel id    = "TaskListOptions"
 			             label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}"
-			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"/>
+			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListOptionsPanel"/>
 			
 			
 			<OptionPanel id    = "OutputWindowOptions"
@@ -1346,7 +1346,7 @@
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ExternalToolPanel"/>
 			
 			<OptionPanel id    = "ServiceReferences"
-			             label = "Service References"
+			             label = "${res:Dialog.Options.ServicesReferencesText}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ServiceReference.ServiceReferenceOptionsPanel"/>
 		</OptionPanel>
 	</Path>
@@ -2078,7 +2078,7 @@
 		          shortcut = "Control|I"
 		          class = "ICSharpCode.SharpDevelop.Editor.Commands.IndentSelection" />
 		<MenuItem id = "Reformat"
-		          label = "Reformat"
+		          label = "${res:XML.TextAreaContextMenu.Reformat}"
 		          shortcut = "Control|Shift|I"
 		          class = "ICSharpCode.SharpDevelop.Editor.Commands.ReformatSelection" />
 	</Path>
@@ -2373,11 +2373,11 @@
 	
 	<Path name="/SharpDevelop/Pads/CommonConsole/ToolBar">
 		<ToolbarItem id = "ClearConsole"
-		             tooltip = "Clear console"
+		             tooltip = "${res:AddIns.Debugger.Console.ClearConsole}"
 		             class = "ICSharpCode.SharpDevelop.Gui.ClearConsoleCommand"
 		             icon = "OutputPad.Toolbar.ClearOutputWindow" />
 		<ToolbarItem id = "DeleteHistory"
-		             tooltip = "Delete history"
+		             tooltip = "${res:AddIns.Debugger.Console.DeleteHistory}"
 		             class = "ICSharpCode.SharpDevelop.Gui.DeleteHistoryCommand"
 		             icon = "Icons.16x16.DeleteHistory" />
 		<ToolbarItem type="Separator" />
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 61a29f8d26..f566fed43b 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -444,8 +444,8 @@
       <DependentUpon>SelectStylePanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml.cs">
-      <DependentUpon>TaskListOptionsl.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsPanel.xaml.cs">
+      <DependentUpon>TaskListOptionsPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.xaml.cs">
@@ -901,7 +901,7 @@
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" />
-    <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildAdvanced.xaml" />
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsl.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsPanel.xaml
similarity index 77%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsl.xaml
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsPanel.xaml
index 7a446a4a80..57a7a87068 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsl.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsPanel.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <gui:OptionPanel
-	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"
+	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListOptionsPanel"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop"
@@ -9,7 +9,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels">
 	<GroupBox
-		Header="Comment Tags">
+		Header="{core:Localize Dialog.Options.IDEOptions.TaskListOptions.CommentTagsGroupBox}">
 		<Grid
 			Margin="5">
 			<Grid.RowDefinitions>
@@ -31,7 +31,7 @@
 				<ColumnDefinition></ColumnDefinition>
 			</Grid.ColumnDefinitions>
 			<TextBlock
-				Text="Token List"></TextBlock>
+				Text="{core:Localize Dialog.Options.IDEOptions.TaskListOptions.TokenListLabel}"></TextBlock>
 			<ListView
 				x:Name="listView"
 				Margin="5,0,5,5"
@@ -39,7 +39,7 @@
 				Grid.RowSpan="6"
 				SelectionChanged="ListView_SelectionChanged"></ListView>
 			<TextBlock
-				Text="Name"
+				Text="{core:Localize Dialog.Options.IDEOptions.TaskListOptions.NameLabel}"
 				Margin="5,0,0,0"
 				Grid.Column="1"></TextBlock>
 			<TextBox
@@ -48,14 +48,14 @@
 				Grid.Column="1"
 				Grid.Row="1"></TextBox>
 			<Button
-				Content="Add"
+				Content="{core:Localize Global.AddButtonText}"
 				Click="AddButton_Click"
 				Margin="5,2,5, 3"
 				Grid.Row="3"
 				Grid.Column="1"></Button>
 			<Button
 				x:Name="changeBtn"
-				Content="Change"
+				Content="{core:Localize Global.ChangeButtonText}"
 				IsEnabled="False"
 				Click="ChangeBtn_Click"
 				Grid.Row="4"
@@ -65,7 +65,7 @@
 				x:Name="removeBtn"
 				Click="RemoveBtn_Click"
 				Margin="5,2,5,5"
-				Content="Remove"
+				Content="{core:Localize Global.RemoveButtonText}"
 				Grid.Row="5"
 				Grid.Column="1"
 				IsEnabled="False"></Button>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsl.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsPanel.xaml.cs
similarity index 95%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsl.xaml.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsPanel.xaml.cs
index 556097c23e..eaa9ef9231 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsl.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListOptionsPanel.xaml.cs
@@ -26,11 +26,11 @@ using ICSharpCode.SharpDevelop.Parser;
 namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 {
 	/// <summary>
-	/// Interaction logic for TaskListXaml.xaml
+	/// Interaction logic for TaskListOptionsPanel.xaml
 	/// </summary>
-	public partial class TaskListXaml : OptionPanel
+	public partial class TaskListOptionsPanel : OptionPanel
 	{
-		public TaskListXaml()
+		public TaskListOptionsPanel()
 		{
 			InitializeComponent();
 			foreach (var token in SD.ParserService.TaskListTokens) {
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildOutput.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildOutput.xaml
index 1db97de6a2..f085da549e 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildOutput.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildOutput.xaml
@@ -51,28 +51,28 @@
 		<Label Grid.Row="3" Grid.Column="1" Margin="3,0,3,0"
 		       HorizontalAlignment="Right"
 		       Content="{core:Localize Dialog.ProjectOptions.Build.DebugInfo}"></Label>
-					
-					<ComboBox Grid.Row="3" Grid.Column="2" Width="150"
-					          VerticalAlignment="Center"
-					          HorizontalAlignment="Left"
-					          SelectedValue="{Binding Path=DebugType.Value}"
-					          sd:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
-					
-					<Label Grid.Row="4" Grid.Column="1" Margin="3,0,3,0"
-					       HorizontalAlignment="Right"
-					       Content="{core:Localize Dialog.ProjectOptions.Build.TargetFramework}"></Label>
-					
-					<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2">
-						
-						<ComboBox x:Name="targetFrameworkComboBox" Width="200" Margin="0,0,3,0"
-						          VerticalAlignment="Center"
-						          IsEnabled="False"></ComboBox>
-						
-						<Button Margin="3,0,3,0" VerticalAlignment="Center"
-							Content="Change"
-							Command="{Binding UpdateProjectCommand}"
-							Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
-					</StackPanel>
-					
+		
+		<ComboBox Grid.Row="3" Grid.Column="2" Width="150"
+		          VerticalAlignment="Center"
+		          HorizontalAlignment="Left"
+		          SelectedValue="{Binding Path=DebugType.Value}"
+		          sd:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
+		
+		<Label Grid.Row="4" Grid.Column="1" Margin="3,0,3,0"
+		       HorizontalAlignment="Right"
+		       Content="{core:Localize Dialog.ProjectOptions.Build.TargetFramework}"></Label>
+		
+		<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2">
+			
+			<ComboBox x:Name="targetFrameworkComboBox" Width="200" Margin="0,0,3,0"
+			          VerticalAlignment="Center"
+			          IsEnabled="False"></ComboBox>
+			
+			<Button Margin="3,0,3,0" VerticalAlignment="Center"
+			        Content="{core:Localize Global.ChangeButtonText}"
+			        Command="{Binding UpdateProjectCommand}"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
+		</StackPanel>
+	
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectCustomToolOptionsPanel.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectCustomToolOptionsPanel.xaml
index ebc9aa76a9..be82f205b4 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectCustomToolOptionsPanel.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectCustomToolOptionsPanel.xaml
@@ -17,12 +17,12 @@
 		<CheckBox
 			Margin="10, 20, 10, 5"
 			IsChecked="{Binding RunCustomToolOnBuild}"
-			Content="Run on Build" />
+			Content="{core:Localize Dialog.ProjectOptions.CustomTool.RunOnBuild}" />
 		
 		<Label
 			Margin="5, 5, 5, 0"
 			Grid.Row="1"
-			Content="Filenames:" />
+			Content="{core:Localize Dialog.ProjectOptions.CustomTool.Filenames}" />
 		
 		<TextBox
 			Margin="10, 0"
diff --git a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
index fa1c32ad20..2574b52af3 100644
--- a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
@@ -266,13 +266,13 @@ namespace ICSharpCode.Core.Presentation
 			string text = KeyCodeConversion.KeyToUnicode(kg.Key.ToKeys());
 			if (text != null && !text.Any(ch => char.IsWhiteSpace(ch))) {
 				if ((kg.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-					text = "Alt+" + text;
+					text = StringParser.Format("${res:Global.Shortcuts.Alt}+{0}", text);
 				if ((kg.Modifiers & ModifierKeys.Shift) == ModifierKeys.Shift)
-					text = "Shift+" + text;
+					text = StringParser.Format("${res:Global.Shortcuts.Shift}+{0}", text);
 				if ((kg.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
-					text = "Ctrl+" + text;
+					text = StringParser.Format("${res:Global.Shortcuts.Ctrl}+{0}", text);
 				if ((kg.Modifiers & ModifierKeys.Windows) == ModifierKeys.Windows)
-					text = "Win+" + text;
+					text = StringParser.Format("${res:Global.Shortcuts.Win}+{0}", text);
 				return text;
 			}
 			return old;