Merge branch 'csformatter'

Author: Rpinski

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs

@@ -59,7 +59,7 @@ public static void Initialize()
 			GlobalOptions = new CSharpFormattingOptionsPersistence(
 				SD.PropertyService.MainPropertiesContainer, new CSharpFormattingOptionsContainer()
 				{
-					DefaultText = "(global)" // TODO Localize!
+					DefaultText = StringParser.Parse("${CSharpBinding.Formatting.GlobalOptionReference}")
 				});
 			GlobalOptions.Load();
 
@@ -94,7 +94,7 @@ public static CSharpFormattingOptionsPersistence GetProjectOptions(IProject proj
 						csproject.ExtensionProperties,
 						new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
 						{
-							DefaultText = "(project)" // TODO Localize!
+							DefaultText = StringParser.Parse("${CSharpBinding.Formatting.ProjectOptionReference}")
 						});
 				}
 
@@ -111,7 +111,7 @@ static void SolutionOpened(object sender, SolutionEventArgs e)
 				e.Solution.GlobalPreferences,
 				new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer)
 				{
-					DefaultText = "(solution)" // TODO Localize!
+					DefaultText = StringParser.Parse("${CSharpBinding.Formatting.SolutionOptionReference}")
 				});
 		}
 

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs

@@ -67,7 +67,6 @@ static void OnOptionPropertyChanged(DependencyObject o, DependencyPropertyChange
 				if (container != null) {
 					if (container.Parent != null) {
 						// Add "default" entry in ComboBox
-						// TODO Add located resource, maybe context-bound, like "(solution)" or "(global)"!
 						comboBox.Items.Add(new ComboBoxItem {
 							Content = (container.Parent ?? container).DefaultText,
 							Tag = null

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml

@@ -300,7 +300,7 @@
 		<StackPanel DockPanel.Dock="Top" Orientation="Vertical">
 			<CheckBox
 				Name="autoFormattingCheckBox"
-				Content="Automatically format code"
+				Content="{core:Localize CSharpBinding.Formatting.AutoFormat}"
 				IsThreeState="True" IsChecked="{Binding AutoFormatting}"
 				Margin="0,0,0,10"
 				Visibility="Collapsed"/>
@@ -311,7 +311,7 @@
 					<ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 
-				<Button Grid.Column="0" Content="Reset to:" Click="ResetButton_Click" />
+				<Button Grid.Column="0" Content="{core:Localize CSharpBinding.Formatting.ResetTo}" Click="ResetButton_Click" />
 				<ComboBox Name="presetComboBox" Grid.Column="1" Margin="3,0,0,0" ItemsSource="{Binding Presets}" />
 			</Grid>
 		</StackPanel>

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml.cs

@@ -217,13 +217,12 @@ void ResetButton_Click(object sender, RoutedEventArgs e)
 					var presetFunc = presets[(string) selectedPresetItem.Tag];
 
 					// Ask user if he's sure to reset all previously defined settings
-					// TODO Localize messages!
 					if (presetFunc != null) {
-						if (SD.MessageService.AskQuestion("Are you sure that you want to reset all previously defined formatting options?")) {
+						if (SD.MessageService.AskQuestion("${CSharpBinding.Formatting.PresetOverwriteQuestion}")) {
 							OptionsContainer.Reset(presetFunc());
 						}
 					} else {
-						SD.MessageService.ShowWarning("No formatting preset selected!");
+						SD.MessageService.ShowWarning("${CSharpBinding.Formatting.NoPresetSelectedMessage}");
 					}
 				}
 			}

src/Main/SharpDevelop/Project/Solution.cs

@@ -535,7 +535,7 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
 			{
 				var treeNode = AddInTree.GetTreeNode("/SharpDevelop/Dialogs/SolutionFormattingOptionsDialog", false);
 				bool? result = ICSharpCode.SharpDevelop.Commands.OptionsCommand.ShowTreeOptions(
-					"Solution Formatting Options",
+					StringParser.Parse("${ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title}"),
 					treeNode);
 				if ((bool) result) {
 					// Formatting options have been changed, make solution dirty