diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index 5b7d05b7bc..9c4b48eb3a 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -8434,4 +8434,10 @@ Press Esc to cancel this operation.</value>
   <data name="Dialog.ProjectOptions.AssemblyInfo.NewGUID" xml:space="preserve">
     <value>New GUID</value>
   </data>
+  <data name="Dialog.ProjectOptions.AssemblyInfo.IncorrectValue" xml:space="preserve">
+    <value>One of the assembly info values is incorrect.</value>
+  </data>
+  <data name="Dialog.ProjectOptions.AssemblyInfo.None" xml:space="preserve">
+    <value>None</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
index 7fc74b9e4c..209fc08f7a 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
 	d:DataContext="{d:DesignInstance Type={x:Type optionPanels:AssemblyInfoViewModel}}">
 	<ScrollViewer VerticalScrollBarVisibility="Auto">
-		<Grid>
+		<Grid x:Name="RootGrid">
 			<Grid.Resources>
 				<Style TargetType="{x:Type Label}">
 					<Setter Property="VerticalAlignment" Value="Center"/>
@@ -18,7 +18,7 @@
 					<Setter Property="Height" Value="20"/>
 					<Setter Property="Margin" Value="4"/>
 					<Setter Property="VerticalAlignment" Value="Center"/>
-                    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
+					<Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
 				</Style>
 				<Style TargetType="{x:Type ComboBox}">
 					<Setter Property="Height" Value="20"/>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs
index 66c1777fa3..4506a53d74 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs
@@ -23,8 +23,8 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 
 			Languages = new Dictionary<string, string>();
 			Languages.Add(
-				NONE_LANGUAGE_CODE, 
-				string.Format("({0})", StringParser.Parse("${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.IndentStyle.None}")));
+				NONE_LANGUAGE_CODE,
+				string.Format("({0})", StringParser.Parse("${res:Dialog.ProjectOptions.AssemblyInfo.None}")));
 
 			Languages.AddRange(cultures.ToDictionary(x => x.Name, x => x.DisplayName).Distinct().OrderBy(x => x.Value));
 		}