From cbf373e687ed6e2b0fdc0c986694c41eda5d44d8 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Mon, 27 Sep 2010 18:11:06 +0200
Subject: [PATCH] Fix SD-1687: Add UpgradeView strings to translation DB

---
 data/resources/StringResources.resx           | 41 ++++++++++++++++---
 .../Project/ICSharpCode.SharpDevelop.addin    |  2 +-
 .../Src/Project/Converter/UpgradeView.xaml    | 24 +++++------
 .../Src/Project/Converter/UpgradeView.xaml.cs | 17 ++++----
 .../Project/Converter/UpgradeViewContent.cs   |  4 +-
 5 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index c3561c9e85..49b771bc4a 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -3562,8 +3562,8 @@ You can also choose to store the setting in the .user-file instead of the projec
     <value>Retry</value>
   </data>
   <data name="Global.SelectAllButtonText" xml:space="preserve">
-    <value>Select All</value>
-    <comment>"Unselect All" translated into the local language.</comment>
+    <value>Select &amp;All</value>
+    <comment>selects all items in a list</comment>
   </data>
   <data name="Global.SmallIconToolTip" xml:space="preserve">
     <value>Small Icons</value>
@@ -4208,12 +4208,13 @@ Please configure the NAnt executable's location in the SharpDevelop Options.</va
   <data name="ICSharpCode.PythonBinding.SendSelectedTextToPythonConsole" xml:space="preserve">
     <value>Send to Python Console</value>
   </data>
-  <data name="ICSharpCode.PythonBinding.SendSelectedTextToPythonConsole" xml:space="preserve">
-    <value>Send to Python Console</value>
-  </data>
   <data name="ICSharpCode.PythonBinding.UnknownTypeName" xml:space="preserve">
     <value>Could not find type '{0}'. Are you missing an assembly reference?</value>
   </data>
+  <data name="ICSharpCode.Refactoring.NoClassOrOverridableSymbolUnderCursor" xml:space="preserve">
+    <value>The selected element is not a class or overridable member, so no derived symbols can be shown.</value>
+    <comment>Error message when using 'Search&gt;Find Derived Symbols' when it isn't applicable.</comment>
+  </data>
   <data name="ICSharpCode.RubyBinding.SendLineToRubyConsole" xml:space="preserve">
     <value>Send Line to Ruby Console</value>
   </data>
@@ -5021,6 +5022,36 @@ Only letters, digits, space, '.' or '_' are allowed.</value>
   <data name="ICSharpCode.SharpDevelop.LoadingFile" xml:space="preserve">
     <value>Loading ${Filename}...</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
+    <value>Convert selected &amp;projects to:</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeTargetFrameworkLabel" xml:space="preserve">
+    <value>Change &amp;target framework:</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeVersionGroupBoxHeader" xml:space="preserve">
+    <value>Change version of selected projects</value>
+    <comment>Title of group box that allows changing the version of the selected projects</comment>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.CompilerVersion" xml:space="preserve">
+    <value>Compiler Version</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ConvertButton" xml:space="preserve">
+    <value>&amp;Convert</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.DoNotChange" xml:space="preserve">
+    <value>&lt;do not change&gt;</value>
+    <comment>item in compiler version/target framework combo boxes that is used to indicate an ambiguous selection (several projects with different targets frameworks) and allows the user to change one of (compiler version, target framework) without changing the other</comment>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.TargetFramework" xml:space="preserve">
+    <value>Target Framework</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.Title" xml:space="preserve">
+    <value>Project Upgrade</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Project.UpgradeView.UpgradeFromPreviousVersionDescription" xml:space="preserve">
+    <value>This solution was created using a previous version of SharpDevelop.
+You might want to upgrade it so that you can use new language or framework features.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.Services.AmbienceService.AmbienceNotFoundError" xml:space="preserve">
     <value>Current ambience not found.
 Goto 'Options-&gt;Visual Style' and change the current language ambience.</value>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 4fc0ef783c..91468b0851 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1632,7 +1632,7 @@
 			</Condition>
 			<Condition name = "SolutionOpen" action="Disable">
 				<MenuItem id = "Upgrade"
-				          label = "Project Upgrade"
+				          label = "${res:ICSharpCode.SharpDevelop.Project.UpgradeView.Title}"
 				          class = "ICSharpCode.SharpDevelop.Project.Converter.ShowUpgradeView"/>
 			</Condition>
 			
diff --git a/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml b/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml
index 6db1792772..bc842050c8 100644
--- a/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml
+++ b/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml
@@ -14,13 +14,13 @@
 				Height="Auto" />
 		</Grid.RowDefinitions>
 		<TextBlock
+			Name="upgradeDescription"
+			Visibility="Collapsed"
 			Grid.Column="0"
 			Grid.Row="0"
 			TextWrapping="WrapWithOverflow"
-			Margin="8,8,8,4">
-			This solution was created using a previous version of SharpDevelop.
-			You might want to upgrade it so that you can use new language or framework features.
-		</TextBlock>
+			Margin="8,8,8,4"
+			Text="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.UpgradeFromPreviousVersionDescription}" />
 		<ListView
 			x:Name="listView"
 			core:SortableGridViewColumn.SortMode="Automatic"
@@ -34,7 +34,7 @@
 					<core:SortableGridViewColumn
 						x:Name="nameColumn"
 						SortBy="Name"
-						Header="Project">
+						Header="{core:Localize ICSharpCode.FiletypeRegisterer.Project}">
 						<GridViewColumn.CellTemplate>
 							<DataTemplate>
 								<CheckBox
@@ -45,15 +45,15 @@
 					</core:SortableGridViewColumn>
 					<core:SortableGridViewColumn
 						DisplayMemberBinding="{Binding CompilerVersionName}"
-						Header="Compiler Version" />
+						Header="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.CompilerVersion}" />
 					<core:SortableGridViewColumn
 						DisplayMemberBinding="{Binding TargetFrameworkName}"
-						Header="Target Framework" />
+						Header="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.TargetFramework}" />
 				</GridView>
 			</ListView.View>
 		</ListView>
 		<CheckBox
-			Content="Select _all"
+			Content="{core:Localize Global.SelectAllButtonText}"
 			Grid.Row="2"
 			Name="selectAllCheckBox"
 			Checked="SelectAllCheckBox_Checked"
@@ -66,7 +66,7 @@
 			HorizontalAlignment="Stretch"
 			VerticalAlignment="Stretch"
 			Margin="8,0,8,8"
-			Header="Change version of selected projects"
+			Header="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeVersionGroupBoxHeader}"
 			Name="conversionGroupBox">
 			<Grid
 				Margin="4">
@@ -85,7 +85,7 @@
 						Width="210" />
 				</Grid.ColumnDefinitions>
 				<Label
-					Content="Convert selected _projects to:"
+					Content="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel}"
 					Grid.Column="0"
 					Grid.Row="0"
 					Target="{Binding ElementName=newVersionComboBox}" />
@@ -97,7 +97,7 @@
 					Grid.Row="0"
 					Grid.Column="1" />
 				<Label
-					Content="Change _target framework:"
+					Content="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeTargetFrameworkLabel}"
 					Grid.Column="0"
 					Grid.Row="1"
 					Target="{Binding ElementName=newFrameworkComboBox}" />
@@ -112,7 +112,7 @@
 					Name="convertButton"
 					Style="{x:Static core:GlobalStyles.ButtonStyle}"
 					HorizontalAlignment="Center"
-					Content="_Convert"
+					Content="{core:Localize ICSharpCode.SharpDevelop.Project.UpgradeView.ConvertButton}"
 					Grid.Column="0"
 					Grid.ColumnSpan="2"
 					Grid.Row="2"
diff --git a/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml.cs b/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml.cs
index c2a8690347..471bce5c4b 100644
--- a/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml.cs
+++ b/src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml.cs
@@ -1,18 +1,14 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
-using ICSharpCode.Core.Presentation;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
+
+using ICSharpCode.Core.Presentation;
 
 namespace ICSharpCode.SharpDevelop.Project.Converter
 {
@@ -38,6 +34,11 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 			ListView_SelectionChanged(null, null);
 		}
 		
+		public bool UpgradeViewOpenedAutomatically {
+			get { return upgradeDescription.Visibility == Visibility.Visible; }
+			set { upgradeDescription.Visibility = value ? Visibility.Visible : Visibility.Collapsed; }
+		}
+		
 		public Solution Solution {
 			get { return solution; }
 		}
@@ -240,7 +241,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 		
 		sealed class UnchangedCompilerVersion : CompilerVersion
 		{
-			public UnchangedCompilerVersion() : base(new Version(0, 0), "<do not change>")
+			public UnchangedCompilerVersion() : base(new Version(0, 0), Core.StringParser.Parse("${res:ICSharpCode.SharpDevelop.Project.UpgradeView.DoNotChange}"))
 			{
 			}
 			
@@ -257,7 +258,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 		
 		sealed class UnchangedTargetFramework : TargetFramework
 		{
-			public UnchangedTargetFramework() : base(string.Empty, "<do not change>")
+			public UnchangedTargetFramework() : base(string.Empty, Core.StringParser.Parse("${res:ICSharpCode.SharpDevelop.Project.UpgradeView.DoNotChange}"))
 			{
 			}
 			
diff --git a/src/Main/Base/Project/Src/Project/Converter/UpgradeViewContent.cs b/src/Main/Base/Project/Src/Project/Converter/UpgradeViewContent.cs
index a81ce1b0b8..1ed87317ee 100644
--- a/src/Main/Base/Project/Src/Project/Converter/UpgradeViewContent.cs
+++ b/src/Main/Base/Project/Src/Project/Converter/UpgradeViewContent.cs
@@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 			var projects = solution.Projects.OfType<IUpgradableProject>().ToList();
 			if (projects.Count > 0 && projects.All(u => u.UpgradeDesired)) {
 				Core.AnalyticsMonitorService.TrackFeature(typeof(UpgradeView), "opened automatically");
-				Show(solution);
+				Show(solution).upgradeView.UpgradeViewOpenedAutomatically = true;
 			}
 		}
 		
@@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 		{
 			if (solution == null)
 				throw new ArgumentNullException("solution");
-			this.TitleName = "Project Upgrade";
+			SetLocalizedTitle("${res:ICSharpCode.SharpDevelop.Project.UpgradeView.Title}");
 			upgradeView = new UpgradeView(solution);
 		}