Application and Signing project options panels now use the translation database.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@488 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@@ -35,25 +35,25 @@
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/C#">
 		<DialogPanel id    = "Application"
-		             label = "Application"
+		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
 		<DialogPanel id    = "ReferencePaths"
-		             label = "Reference Paths"
+		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
 		<DialogPanel id    = "Signing"
-		             label = "Signing"
+		             label = "${res:Dialog.ProjectOptions.Signing}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
 		<DialogPanel id    = "BuildEvents"
-		             label = "Build Events"
+		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
 		<DialogPanel id    = "BuildOptions"
-		             label = "Build"
+		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "CSharpBinding.OptionPanels.BuildOptions"/>
 		<DialogPanel id    = "DebugOptions"
-		             label = "Debug"
+		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
 		<DialogPanel id    = "Publish"
-		             label = "Publish"
+		             label = "${res:Dialog.ProjectOptions.Publish}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
 	</Path>
 	

src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin

@@ -30,26 +30,14 @@
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/ILAsm">
 		<DialogPanel id    = "Application"
-		             label = "Application"
+		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
-		<!--<DialogPanel id    = "ReferencePaths"
-		             label = "Reference Paths"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>-->
-		<!--<DialogPanel id    = "Signing"
-		             label = "Signing"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>-->
 		<DialogPanel id    = "BuildEvents"
-		             label = "Build Events"
+		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<!--<DialogPanel id    = "BuildOptions"
-		             label = "Build"
-		             class = "ICSharpCode.ILAsmBinding.BuildOptions"/>-->
 		<DialogPanel id    = "DebugOptions"
-		             label = "Debug"
+		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<!--<DialogPanel id    = "Publish"
-		             label = "Publish"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>-->
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/LanguageBindings">

src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@@ -31,25 +31,25 @@
 
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/VBNet">
 		<DialogPanel id    = "Application"
-		             label = "Application"
+		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
 		<DialogPanel id    = "ReferencePaths"
-		             label = "Reference Paths"
+		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
 		<DialogPanel id    = "Signing"
-		             label = "Signing"
+		             label = "${res:Dialog.ProjectOptions.Signing}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
 		<DialogPanel id    = "BuildEvents"
-		             label = "Build Events"
+		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
 		<DialogPanel id    = "BuildOptions"
-		             label = "Build"
+		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "VBNetBinding.OptionPanels.BuildOptions"/>
 		<DialogPanel id    = "DebugOptions"
-		             label = "Debug"
+		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
 		<DialogPanel id    = "Publish"
-		             label = "Publish"
+		             label = "${res:Dialog.ProjectOptions.Publish}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
 	</Path>
 

src/Main/Base/Project/Resources/ProjectOptions/ApplicationSettings.xfrm

@@ -1,184 +1,185 @@
 <Components version="1.0">
   <System.Windows.Forms.UserControl>
     <Name value="XmlUserControl1" />
-    <DockPadding value="" />
     <ClientSize value="{Width=456, Height=364}" />
     <Controls>
       <System.Windows.Forms.Button>
         <Name value="win32ResourceFileBrowseButton" />
         <Location value="{X=408,Y=208}" />
-        <Size value="{Width=40, Height=21}" />
         <Text value="..." />
+        <Size value="{Width=40, Height=21}" />
         <Anchor value="Top, Right" />
         <TabIndex value="14" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.ComboBox>
         <Name value="win32ResourceFileComboBox" />
-        <Anchor value="Top, Left, Right" />
         <TabIndex value="13" />
-        <Location value="{X=8,Y=208}" />
+        <Anchor value="Top, Left, Right" />
         <Size value="{Width=392, Height=21}" />
+        <FormattingEnabled value="True" />
+        <Location value="{X=8,Y=208}" />
       </System.Windows.Forms.ComboBox>
       <System.Windows.Forms.Label>
         <Name value="label9" />
-        <Text value="Win32 R&amp;esource File:" />
+        <Location value="{X=8,Y=192}" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.Win32Resource}" />
         <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="12" />
         <Size value="{Width=436, Height=16}" />
-        <Location value="{X=8,Y=192}" />
+        <TabIndex value="12" />
+        <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.Label>
       <System.Windows.Forms.Button>
         <Name value="applicationIconBrowseButton" />
         <Location value="{X=408,Y=160}" />
-        <Size value="{Width=40, Height=21}" />
         <Text value="..." />
+        <Size value="{Width=40, Height=21}" />
         <Anchor value="Top, Right" />
         <TabIndex value="11" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.GroupBox>
         <Name value="groupBox1" />
-        <TabIndex value="15" />
         <Location value="{X=8,Y=236}" />
-        <Anchor value="Top, Left, Right" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ProjectInformation}" />
         <Size value="{Width=440, Height=112}" />
-        <Text value="Project Information" />
+        <TabIndex value="15" />
+        <Anchor value="Top, Left, Right" />
         <Controls>
           <System.Windows.Forms.TextBox>
             <Name value="outputNameTextBox" />
-            <ReadOnly value="True" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="5" />
-            <Location value="{X=112,Y=80}" />
+            <Anchor value="Top, Left, Right" />
+            <ReadOnly value="True" />
             <Size value="{Width=320, Height=21}" />
-            <Text value="" />
+            <Location value="{X=112,Y=80}" />
           </System.Windows.Forms.TextBox>
           <System.Windows.Forms.Label>
             <Name value="label8" />
-            <Text value="Output Name:" />
+            <Location value="{X=8,Y=80}" />
+            <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.OutputName}" />
             <TextAlign value="MiddleRight" />
+            <Size value="{Width=100, Height=23}" />
             <TabIndex value="4" />
-            <Location value="{X=8,Y=80}" />
           </System.Windows.Forms.Label>
           <System.Windows.Forms.TextBox>
             <Name value="projectFileTextBox" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="3" />
-            <Location value="{X=112,Y=56}" />
+            <Anchor value="Top, Left, Right" />
             <Size value="{Width=320, Height=21}" />
-            <Text value="" />
+            <Location value="{X=112,Y=56}" />
           </System.Windows.Forms.TextBox>
           <System.Windows.Forms.Label>
             <Name value="label7" />
-            <Text value="Project &amp;File:" />
+            <Location value="{X=8,Y=52}" />
+            <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ProjectFile}" />
             <TextAlign value="MiddleRight" />
+            <Size value="{Width=100, Height=23}" />
             <TabIndex value="2" />
-            <Location value="{X=8,Y=52}" />
           </System.Windows.Forms.Label>
           <System.Windows.Forms.TextBox>
             <Name value="projectFolderTextBox" />
-            <ReadOnly value="True" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="1" />
-            <Location value="{X=112,Y=28}" />
+            <Anchor value="Top, Left, Right" />
+            <ReadOnly value="True" />
             <Size value="{Width=320, Height=21}" />
-            <Text value="" />
+            <Location value="{X=112,Y=28}" />
           </System.Windows.Forms.TextBox>
           <System.Windows.Forms.Label>
             <Name value="label6" />
-            <Text value="Project Folder:" />
+            <Location value="{X=8,Y=24}" />
+            <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ProjectFolder}" />
             <TextAlign value="MiddleRight" />
+            <Size value="{Width=100, Height=23}" />
             <TabIndex value="0" />
-            <Location value="{X=8,Y=24}" />
           </System.Windows.Forms.Label>
         </Controls>
       </System.Windows.Forms.GroupBox>
       <System.Windows.Forms.PictureBox>
         <Name value="applicationIconPictureBox" />
-        <Size value="{Width=48, Height=48}" />
         <Location value="{X=8,Y=140}" />
+        <Size value="{Width=48, Height=48}" />
         <SizeMode value="StretchImage" />
       </System.Windows.Forms.PictureBox>
       <System.Windows.Forms.ComboBox>
         <Name value="applicationIconComboBox" />
-        <Anchor value="Top, Left, Right" />
         <TabIndex value="10" />
-        <Location value="{X=64,Y=160}" />
+        <Anchor value="Top, Left, Right" />
         <Size value="{Width=336, Height=21}" />
+        <FormattingEnabled value="True" />
+        <Location value="{X=64,Y=160}" />
       </System.Windows.Forms.ComboBox>
       <System.Windows.Forms.Label>
         <Name value="label5" />
-        <Text value="Application i&amp;con:" />
+        <Location value="{X=64,Y=144}" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ApplicationIcon}" />
         <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="9" />
         <Size value="{Width=384, Height=16}" />
-        <Location value="{X=64,Y=144}" />
+        <TabIndex value="9" />
+        <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.Label>
       <System.Windows.Forms.ComboBox>
         <Name value="startupObjectComboBox" />
-        <Anchor value="Top, Left, Right" />
         <TabIndex value="7" />
-        <Location value="{X=160,Y=112}" />
+        <Anchor value="Top, Left, Right" />
         <Size value="{Width=288, Height=21}" />
+        <FormattingEnabled value="True" />
+        <Location value="{X=160,Y=112}" />
       </System.Windows.Forms.ComboBox>
       <System.Windows.Forms.Label>
         <Name value="label4" />
-        <Text value="&amp;Startup object:" />
+        <Location value="{X=160,Y=96}" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.StartupObject}" />
         <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="6" />
         <Size value="{Width=288, Height=16}" />
-        <Location value="{X=160,Y=96}" />
+        <TabIndex value="6" />
+        <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.Label>
       <System.Windows.Forms.ComboBox>
         <Name value="outputTypeComboBox" />
         <TabIndex value="5" />
-        <Location value="{X=8,Y=112}" />
         <Size value="{Width=136, Height=21}" />
+        <FormattingEnabled value="True" />
         <DropDownStyle value="DropDownList" />
+        <Location value="{X=8,Y=112}" />
       </System.Windows.Forms.ComboBox>
       <System.Windows.Forms.Label>
         <Name value="label3" />
-        <Text value="&amp;Output type:" />
+        <Location value="{X=8,Y=96}" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.OutputType}" />
         <TextAlign value="BottomLeft" />
-        <TabIndex value="4" />
         <Size value="{Width=136, Height=16}" />
-        <Location value="{X=8,Y=96}" />
+        <TabIndex value="4" />
       </System.Windows.Forms.Label>
       <System.Windows.Forms.TextBox>
         <Name value="rootNamespaceTextBox" />
-        <Anchor value="Top, Left, Right" />
         <TabIndex value="3" />
-        <Location value="{X=8,Y=68}" />
+        <Anchor value="Top, Left, Right" />
         <Size value="{Width=440, Height=21}" />
-        <Text value="" />
+        <Location value="{X=8,Y=68}" />
       </System.Windows.Forms.TextBox>
       <System.Windows.Forms.Label>
         <Name value="label2" />
-        <Text value="&amp;Root namespace:" />
+        <Location value="{X=8,Y=52}" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.RootNamespace}" />
         <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="2" />
         <Size value="{Width=440, Height=16}" />
-        <Location value="{X=8,Y=52}" />
+        <TabIndex value="2" />
+        <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.Label>
       <System.Windows.Forms.TextBox>
         <Name value="assemblyNameTextBox" />
-        <Anchor value="Top, Left, Right" />
         <TabIndex value="1" />
-        <Location value="{X=8,Y=24}" />
+        <Anchor value="Top, Left, Right" />
         <Size value="{Width=440, Height=21}" />
-        <Text value="" />
+        <Location value="{X=8,Y=24}" />
       </System.Windows.Forms.TextBox>
       <System.Windows.Forms.Label>
         <Name value="label1" />
-        <Text value="Assembly &amp;name:" />
+        <Location value="{X=8,Y=8}" />
+        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.AssemblyName}" />
         <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="0" />
         <Size value="{Width=440, Height=16}" />
-        <Location value="{X=8,Y=8}" />
+        <TabIndex value="0" />
+        <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.Label>
     </Controls>
   </System.Windows.Forms.UserControl>

src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm

@@ -6,7 +6,7 @@
       <System.Windows.Forms.GroupBox>
         <Name value="clickOnceGroupBox" />
         <Location value="{X=3,Y=156}" />
-        <Text value="ClickOnce signing" />
+        <Text value="${res:Dialog.ProjectOptions.Signing.ClickOnce}" />
         <Size value="{Width=368, Height=48}" />
         <TabIndex value="2" />
         <Anchor value="Top, Left, Right" />
@@ -23,7 +23,7 @@
       <System.Windows.Forms.GroupBox>
         <Name value="signingGroupBox" />
         <Location value="{X=3,Y=3}" />
-        <Text value="Strong name signing" />
+        <Text value="${res:Dialog.ProjectOptions.Signing.StrongName}" />
         <Size value="{Width=368, Height=147}" />
         <TabIndex value="1" />
         <Anchor value="Top, Left, Right" />
@@ -38,7 +38,7 @@
               <System.Windows.Forms.Label>
                 <Name value="label1" />
                 <Location value="{X=0,Y=77}" />
-                <Text value="When delay signed, the project will not run or be debuggable." />
+                <Text value="${res:Dialog.ProjectOptions.Signing.DelaySignWarning}" />
                 <Size value="{Width=354, Height=23}" />
                 <TabIndex value="10" />
                 <Anchor value="Top, Left, Right" />
@@ -46,8 +46,7 @@
               <System.Windows.Forms.CheckBox>
                 <Name value="delaySignOnlyCheckBox" />
                 <Location value="{X=0,Y=50}" />
-                <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
+                <Text value="${res:Dialog.ProjectOptions.Signing.DelaySignOnly}" />
-                <Text value="Dela&amp;y Sign only" />
                 <TabIndex value="8" />
                 <Size value="{Width=354, Height=24}" />
                 <Anchor value="Top, Left, Right" />
@@ -63,7 +62,7 @@
               <System.Windows.Forms.Label>
                 <Name value="label3" />
                 <Location value="{X=0,Y=1}" />
-                <Text value="Choose a strong name key file:" />
+                <Text value="${res:Dialog.ProjectOptions.Signing.ChooseKeyFile}" />
                 <Size value="{Width=354, Height=19}" />
                 <TabIndex value="9" />
                 <Anchor value="Top, Left, Right" />
@@ -71,10 +70,9 @@
               <System.Windows.Forms.Button>
                 <Name value="changePasswordButton" />
                 <Location value="{X=204,Y=22}" />
-                <Text value="Change Pass&amp;word..." />
+                <Text value="${res:Dialog.ProjectOptions.Signing.ChangePassword}" />
                 <Size value="{Width=150, Height=22}" />
                 <Anchor value="Top, Right" />
-                <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
                 <TabIndex value="2" />
               </System.Windows.Forms.Button>
             </Controls>
@@ -82,8 +80,7 @@
           <System.Windows.Forms.CheckBox>
             <Name value="signAssemblyCheckBox" />
             <Location value="{X=8,Y=20}" />
-            <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
+            <Text value="${res:Dialog.ProjectOptions.Signing.SignAssembly}" />
-            <Text value="Sign the &amp;assembly" />
             <TabIndex value="0" />
             <Size value="{Width=352, Height=24}" />
             <Anchor value="Top, Left, Right" />

src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs

@@ -293,6 +293,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				int val;
 				if (!int.TryParse(txt, style, NumberFormatInfo.InvariantInfo, out val)) {
 					textBox.Focus();
+					// TODO: Translate Please enter a valid number.
 					MessageService.ShowMessage("Please enter a valid number.");
 					return false;
 				}

src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Pad/Nodes/SearchRootNode.cs

@@ -9,6 +9,7 @@ using System;
 using System.Drawing;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.TextEditor.Document;
 
@@ -23,7 +24,7 @@ namespace SearchAndReplace
 		string             pattern;
 		int fileCount;
 		
-		public List<SearchResult> Results { 
+		public List<SearchResult> Results {
 			get {
 				return results;
 			}
@@ -37,23 +38,32 @@ namespace SearchAndReplace
 			this.fileCount = fileCount;
 			Text = GetText();
 		}
-		string GetText()
+		
+		public static string GetOccurencesString(int count)
 		{
-			if (results.Count == 1) {
+			if (count == 1) {
-				if (fileCount == 1) {
+				return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OneOccurrence}");
-					return "Occurrences of '" + pattern + "' (1 occurence in 1 file)";
-				} else {
-					return "Occurrences of '" + pattern + "' (1 occurence in " + fileCount + " files)";
-				}
 			} else {
-				if (fileCount == 1) {
+				return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OccurrencesCount}", new string[,] {{"Count", count.ToString()}});
-					return "Occurrences of '" + pattern + "' (" + results.Count + " occurences in 1 file)";
-				} else {
-					return "Occurrences of '" + pattern + "' (" + results.Count + " occurences in " + fileCount + " files)";
-				}
 			}
 		}
 		
+		public static string GetFileCountString(int count)
+		{
+			if (count == 1) {
+				return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OneFile}");
+			} else {
+				return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.FileCount}", new string[,] {{"Count", count.ToString()}});
+			}
+		}
+		
+		string GetText()
+		{
+			return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OccurrencesOf}",
+			                          new string[,] {{ "Pattern", pattern }})
+				+ " (" + GetOccurencesString(results.Count) + " in " + GetFileCountString(fileCount) + ")";
+		}
+		
 		protected override int MeasureItemWidth(DrawTreeNodeEventArgs e)
 		{
 			return MeasureTextWidth(e.Graphics, GetText(), BoldFont);

src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Pad/SearchResultPanelToolbarCommands.cs

@@ -76,20 +76,22 @@ namespace SearchAndReplace
 			dropDownButton.DropDownItems.Clear();
 			foreach (SearchAllFinishedEventArgs args in SearchReplaceInFilesManager.LastSearches) {
 				ToolStripItem newItem = new ToolStripMenuItem();
-				newItem.Text = "Occurrences of '" +  args.Pattern + "' (" + args.Results.Count + " occurences)";
+				newItem.Text = StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OccurrencesOf}",
+				                                  new string[,] {{ "Pattern", args.Pattern }})
+					+ " (" + SearchRootNode.GetOccurencesString(args.Results.Count) + ")";
 				newItem.Tag  = args;
 				newItem.Click += new EventHandler(SwitchSearchResults);
 				dropDownButton.DropDownItems.Add(newItem);
 			}
 			dropDownButton.DropDownItems.Add(new ToolStripSeparator());
 			ToolStripItem clearHistoryItem = new ToolStripMenuItem();
-			clearHistoryItem.Text = "<Clear History>";
+			clearHistoryItem.Text = StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.ClearHistory}");
 			clearHistoryItem.Click += new EventHandler(ClearHistory);
 			dropDownButton.DropDownItems.Add(clearHistoryItem);
 			dropDownButton.Enabled = IsEnabled;
 		}
 		
-		protected override void OnOwnerChanged(EventArgs e) 
+		protected override void OnOwnerChanged(EventArgs e)
 		{
 			base.OnOwnerChanged(e);
 			dropDownButton = (ToolBarDropDownButton)Owner;
@@ -121,19 +123,19 @@ namespace SearchAndReplace
 		void GenerateDropDownItems()
 		{
 			ToolStripItem newItem = new ToolStripMenuItem();
-			newItem.Text = "Per file";
+			newItem.Text = StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.PerFile}");
 			newItem.Tag  = SearchResultPanelViewMode.PerFile;
 			newItem.Click += new EventHandler(SetViewMode);
 			dropDownButton.DropDownItems.Add(newItem);
 			
 			newItem = new ToolStripMenuItem();
-			newItem.Text = "Flat";
+			newItem.Text = StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.Flat}");
 			newItem.Tag  = SearchResultPanelViewMode.Flat;
 			newItem.Click += new EventHandler(SetViewMode);
 			dropDownButton.DropDownItems.Add(newItem);
 		}
 		
-		protected override void OnOwnerChanged(EventArgs e) 
+		protected override void OnOwnerChanged(EventArgs e)
 		{
 			base.OnOwnerChanged(e);
 			dropDownButton = (ToolBarDropDownButton)Owner;

src/Main/Core/Project/Src/Services/PropertyService/Properties.cs

@@ -268,7 +268,12 @@ namespace ICSharpCode.Core
 				o = arr;
 				properties[property] = o; // store for future look up
 			}
-			return (T)o;
+			try {
+				return (T)o;
+			} catch (NullReferenceException) {
+				// can happen when configuration is invalid -> o is null and a value type is expected
+				return defaultValue;
+			}
 		}
 		
 		protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)