Merge f05e94fb71 into 3f3ae2a5d4

data/resources/StringResources.cz.resx

@@ -6425,4 +6425,7 @@ Došlo k chybě při spuštění:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Odkomentovat oblast</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.de.resx

@@ -7893,4 +7893,7 @@ Fehler beim Starten:
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Kommentar entfernen</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.es-mx.resx

@@ -7950,4 +7950,7 @@ Error al iniciar:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Descomentar región</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.es.resx

@@ -7808,4 +7808,7 @@ Error mientras se iniciaba:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Descomentar Región</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.fi.resx

@@ -5645,4 +5645,7 @@ Työkalusarja, joka rakentaa Windows asennuspaketteja XML-lähdekoodilla. Sarja
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Kommentti valinta</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.fr.resx

@@ -8035,4 +8035,7 @@ Erreur lors du démarrage:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Partie non commentée</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.hu.resx

@@ -5071,4 +5071,7 @@ Hiba az indításkor:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Megjegyzésből ki</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.it.resx

@@ -8059,4 +8059,7 @@ Errore durante l'avvio:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Rimuovi commento dalla zona</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.jp.resx

@@ -5093,4 +5093,7 @@ SharpDevelop 2??????????????????:?????????????????????????????????????????????
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>選択範囲を非コメント化</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.kr.resx

@@ -6254,4 +6254,7 @@ SharpDevelop 2는 리소스를 다른 방법으로 컴파일합니다: 리소스
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>이 부분의 주석 해제</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.nl.resx

@@ -7774,4 +7774,7 @@ Startfout:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Regiocommentaar verwijderen</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.no.resx

@@ -7039,4 +7039,7 @@ SharpDevelop 2 kompilerer ressurser annerledes: ressursnavnet er ikke bare filna
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Fjern kommentarer</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.pl.resx

@@ -5653,4 +5653,7 @@ Błąd podczas uruchamiania:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Odkomentuj region</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.pt-br.resx

@@ -6217,4 +6217,7 @@ Use somente letras, dígitos, espaço, "." ou "_" são permitidos.</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Desfazer comentário</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.pt.resx

@@ -5837,4 +5837,7 @@ O erro no início foi:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Desfazer comentário</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2013; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.resx

@@ -8446,4 +8446,7 @@ Press Esc to cancel this operation.</value>
   <data name="ICSharpCode.WpfDesign.AddIn.Options.EnableAppXamlParsing" xml:space="preserve">
     <value>Enable App.xaml parsing</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.ro.resx

@@ -3792,4 +3792,7 @@ Eroare la pornire:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Regiune necomentată</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.ru.resx

@@ -7935,4 +7935,7 @@ SharpDevelop 2 иначе компилировал ресурсы: имя рес
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Раскомментировать</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.se.resx

@@ -5968,4 +5968,7 @@ Resursfilerna har därför bytt namn/flyttats enligt ovan.</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Avkommentera region</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.tr.resx

@@ -7926,4 +7926,7 @@ Başlatma hatası:</value>
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>Bölgeyi yorumlama</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

data/resources/StringResources.zh.resx

@@ -7232,4 +7232,7 @@ SharpDevelop 编译资源时发现不对应：资源名称不是文件名，而
   <data name="XML.TextAreaContextMenu.UncommentSelection" xml:space="preserve">
     <value>设为非注释区</value>
   </data>
+  <data name="MainWindow.ProjectAndDialogName" xml:space="preserve">
+    <value>${ProjectName} &#x2014; SharpDevelop</value>
+  </data>
 </root>

src/Main/SharpDevelop/Workbench/WpfWorkbench.cs

@@ -209,7 +209,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 		void SetProjectTitle(object sender, Project.ProjectEventArgs e)
 		{
 			if (e.Project != null) {
-				Title = e.Project.Name + " - " + ResourceService.GetString("MainWindow.DialogName");
+				Title = StringParser.Parse("${res:MainWindow.ProjectAndDialogName}", new StringTagPair("ProjectName", e.Project.Name));
 			} else {
 				Title = ResourceService.GetString("MainWindow.DialogName");
 			}
@@ -259,6 +259,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 		
 		void OnLanguageChanged(object sender, EventArgs e)
 		{
+			SetProjectTitle(sender, new ProjectEventArgs(SD.ProjectService.CurrentProject));
 			MenuService.UpdateText(mainMenu.ItemsSource);
 			UpdateFlowDirection();
 		}