From 7e2b380bbf92975721061071a5c745133555cfef Mon Sep 17 00:00:00 2001 From: h-h-h-h Date: Fri, 18 Sep 2015 00:30:52 +0200 Subject: [PATCH 1/2] Window title separators as em dash or en dash established --- data/resources/StringResources.cz.resx | 3 +++ data/resources/StringResources.de.resx | 3 +++ data/resources/StringResources.es-mx.resx | 3 +++ data/resources/StringResources.es.resx | 3 +++ data/resources/StringResources.fi.resx | 3 +++ data/resources/StringResources.fr.resx | 3 +++ data/resources/StringResources.hu.resx | 3 +++ data/resources/StringResources.it.resx | 3 +++ data/resources/StringResources.jp.resx | 3 +++ data/resources/StringResources.kr.resx | 3 +++ data/resources/StringResources.nl.resx | 3 +++ data/resources/StringResources.no.resx | 3 +++ data/resources/StringResources.pl.resx | 3 +++ data/resources/StringResources.pt-br.resx | 3 +++ data/resources/StringResources.pt.resx | 3 +++ data/resources/StringResources.resx | 3 +++ data/resources/StringResources.ro.resx | 3 +++ data/resources/StringResources.ru.resx | 3 +++ data/resources/StringResources.se.resx | 3 +++ data/resources/StringResources.tr.resx | 3 +++ data/resources/StringResources.zh.resx | 3 +++ src/Main/SharpDevelop/Workbench/WpfWorkbench.cs | 3 ++- 22 files changed, 65 insertions(+), 1 deletion(-) diff --git a/data/resources/StringResources.cz.resx b/data/resources/StringResources.cz.resx index 6d188dad77b..b4165727a1b 100644 --- a/data/resources/StringResources.cz.resx +++ b/data/resources/StringResources.cz.resx @@ -6425,4 +6425,7 @@ Došlo k chybě při spuštění: Odkomentovat oblast + + — + \ No newline at end of file diff --git a/data/resources/StringResources.de.resx b/data/resources/StringResources.de.resx index 026bebfe3ba..119975bb37f 100644 --- a/data/resources/StringResources.de.resx +++ b/data/resources/StringResources.de.resx @@ -7893,4 +7893,7 @@ Fehler beim Starten: Kommentar entfernen + + – + \ No newline at end of file diff --git a/data/resources/StringResources.es-mx.resx b/data/resources/StringResources.es-mx.resx index 88cfab51aba..18e8bb40fbb 100644 --- a/data/resources/StringResources.es-mx.resx +++ b/data/resources/StringResources.es-mx.resx @@ -7950,4 +7950,7 @@ Error al iniciar: Descomentar región + + — + \ No newline at end of file diff --git a/data/resources/StringResources.es.resx b/data/resources/StringResources.es.resx index c3886f0541a..c0e681cadde 100644 --- a/data/resources/StringResources.es.resx +++ b/data/resources/StringResources.es.resx @@ -7808,4 +7808,7 @@ Error mientras se iniciaba: Descomentar Región + + — + \ No newline at end of file diff --git a/data/resources/StringResources.fi.resx b/data/resources/StringResources.fi.resx index 8a9ca88ef8d..b8ee54a8e72 100644 --- a/data/resources/StringResources.fi.resx +++ b/data/resources/StringResources.fi.resx @@ -5645,4 +5645,7 @@ Työkalusarja, joka rakentaa Windows asennuspaketteja XML-lähdekoodilla. Sarja Kommentti valinta + + — + \ No newline at end of file diff --git a/data/resources/StringResources.fr.resx b/data/resources/StringResources.fr.resx index 5e2fc361d7a..dfb40f0687c 100644 --- a/data/resources/StringResources.fr.resx +++ b/data/resources/StringResources.fr.resx @@ -8035,4 +8035,7 @@ Erreur lors du démarrage: Partie non commentée + + — + \ No newline at end of file diff --git a/data/resources/StringResources.hu.resx b/data/resources/StringResources.hu.resx index fa97baf6fda..068da4646ba 100644 --- a/data/resources/StringResources.hu.resx +++ b/data/resources/StringResources.hu.resx @@ -5071,4 +5071,7 @@ Hiba az indításkor: Megjegyzésből ki + + — + \ No newline at end of file diff --git a/data/resources/StringResources.it.resx b/data/resources/StringResources.it.resx index cfd311c3e36..3b6e9c27133 100644 --- a/data/resources/StringResources.it.resx +++ b/data/resources/StringResources.it.resx @@ -8056,4 +8056,7 @@ Errore durante l'avvio: Rimuovi commento dalla zona + + — + \ No newline at end of file diff --git a/data/resources/StringResources.jp.resx b/data/resources/StringResources.jp.resx index 23223756be1..d3eb15f0892 100644 --- a/data/resources/StringResources.jp.resx +++ b/data/resources/StringResources.jp.resx @@ -5093,4 +5093,7 @@ SharpDevelop 2??????????????????:????????????????????????????????????????????? 選択範囲を非コメント化 + + — + \ No newline at end of file diff --git a/data/resources/StringResources.kr.resx b/data/resources/StringResources.kr.resx index 7808cfdd228..364f45c84c0 100644 --- a/data/resources/StringResources.kr.resx +++ b/data/resources/StringResources.kr.resx @@ -6254,4 +6254,7 @@ SharpDevelop 2는 리소스를 다른 방법으로 컴파일합니다: 리소스 이 부분의 주석 해제 + + — + \ No newline at end of file diff --git a/data/resources/StringResources.nl.resx b/data/resources/StringResources.nl.resx index a5f7c2f4aed..810250058fe 100644 --- a/data/resources/StringResources.nl.resx +++ b/data/resources/StringResources.nl.resx @@ -7774,4 +7774,7 @@ Startfout: Regiocommentaar verwijderen + + — + \ No newline at end of file diff --git a/data/resources/StringResources.no.resx b/data/resources/StringResources.no.resx index 41a19068c00..9c8f85ffdbb 100644 --- a/data/resources/StringResources.no.resx +++ b/data/resources/StringResources.no.resx @@ -7039,4 +7039,7 @@ SharpDevelop 2 kompilerer ressurser annerledes: ressursnavnet er ikke bare filna Fjern kommentarer + + — + \ No newline at end of file diff --git a/data/resources/StringResources.pl.resx b/data/resources/StringResources.pl.resx index ed874cd0aa9..11e731a198e 100644 --- a/data/resources/StringResources.pl.resx +++ b/data/resources/StringResources.pl.resx @@ -5653,4 +5653,7 @@ Błąd podczas uruchamiania: Odkomentuj region + + — + \ No newline at end of file diff --git a/data/resources/StringResources.pt-br.resx b/data/resources/StringResources.pt-br.resx index fdb9ec7c3c0..dacd15ee115 100644 --- a/data/resources/StringResources.pt-br.resx +++ b/data/resources/StringResources.pt-br.resx @@ -6217,4 +6217,7 @@ Use somente letras, dígitos, espaço, "." ou "_" são permitidos. Desfazer comentário + + — + \ No newline at end of file diff --git a/data/resources/StringResources.pt.resx b/data/resources/StringResources.pt.resx index 5712762704e..dad71cd0c60 100644 --- a/data/resources/StringResources.pt.resx +++ b/data/resources/StringResources.pt.resx @@ -5837,4 +5837,7 @@ O erro no início foi: Desfazer comentário + + — + \ No newline at end of file diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index d9f7fd02b78..90944766bf8 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -8446,4 +8446,7 @@ Press Esc to cancel this operation. Enable App.xaml parsing + + — + \ No newline at end of file diff --git a/data/resources/StringResources.ro.resx b/data/resources/StringResources.ro.resx index 8b5383444c9..deafe2502fc 100644 --- a/data/resources/StringResources.ro.resx +++ b/data/resources/StringResources.ro.resx @@ -3792,4 +3792,7 @@ Eroare la pornire: Regiune necomentată + + — + \ No newline at end of file diff --git a/data/resources/StringResources.ru.resx b/data/resources/StringResources.ru.resx index 8afb53be2d1..eecf1a80c0d 100644 --- a/data/resources/StringResources.ru.resx +++ b/data/resources/StringResources.ru.resx @@ -7935,4 +7935,7 @@ SharpDevelop 2 иначе компилировал ресурсы: имя рес Раскомментировать + + — + \ No newline at end of file diff --git a/data/resources/StringResources.se.resx b/data/resources/StringResources.se.resx index c76935ead91..2b3efd40982 100644 --- a/data/resources/StringResources.se.resx +++ b/data/resources/StringResources.se.resx @@ -5968,4 +5968,7 @@ Resursfilerna har därför bytt namn/flyttats enligt ovan. Avkommentera region + + — + \ No newline at end of file diff --git a/data/resources/StringResources.tr.resx b/data/resources/StringResources.tr.resx index bc6416fde2b..a9a3730742f 100644 --- a/data/resources/StringResources.tr.resx +++ b/data/resources/StringResources.tr.resx @@ -7926,4 +7926,7 @@ Başlatma hatası: Bölgeyi yorumlama + + — + \ No newline at end of file diff --git a/data/resources/StringResources.zh.resx b/data/resources/StringResources.zh.resx index 32296edf17f..7e77612d5b0 100644 --- a/data/resources/StringResources.zh.resx +++ b/data/resources/StringResources.zh.resx @@ -7232,4 +7232,7 @@ SharpDevelop 编译资源时发现不对应：资源名称不是文件名，而 设为非注释区 + + — + \ No newline at end of file diff --git a/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs b/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs index 2dab2229653..d313db685ce 100644 --- a/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs +++ b/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs @@ -209,7 +209,7 @@ void OnRequestNavigate(object sender, RequestNavigateEventArgs e) void SetProjectTitle(object sender, Project.ProjectEventArgs e) { if (e.Project != null) { - Title = e.Project.Name + " - " + ResourceService.GetString("MainWindow.DialogName"); + Title = e.Project.Name + ResourceService.GetString("Global.WindowTitlePartsSeparator") + ResourceService.GetString("MainWindow.DialogName"); } else { Title = ResourceService.GetString("MainWindow.DialogName"); } @@ -259,6 +259,7 @@ void UpdateMenu() void OnLanguageChanged(object sender, EventArgs e) { + SetProjectTitle(sender, new ProjectEventArgs(SD.ProjectService.CurrentProject)); MenuService.UpdateText(mainMenu.ItemsSource); UpdateFlowDirection(); } From f05e94fb715ec7f091f5ea07317cae123ba2b9c0 Mon Sep 17 00:00:00 2001 From: h-h-h-h Date: Sun, 20 Sep 2015 00:31:06 +0200 Subject: [PATCH 2/2] Changed approach with different resource key --- data/resources/StringResources.cz.resx | 4 ++-- data/resources/StringResources.de.resx | 4 ++-- data/resources/StringResources.es-mx.resx | 4 ++-- data/resources/StringResources.es.resx | 4 ++-- data/resources/StringResources.fi.resx | 4 ++-- data/resources/StringResources.fr.resx | 4 ++-- data/resources/StringResources.hu.resx | 4 ++-- data/resources/StringResources.it.resx | 4 ++-- data/resources/StringResources.jp.resx | 4 ++-- data/resources/StringResources.kr.resx | 4 ++-- data/resources/StringResources.nl.resx | 4 ++-- data/resources/StringResources.no.resx | 4 ++-- data/resources/StringResources.pl.resx | 4 ++-- data/resources/StringResources.pt-br.resx | 4 ++-- data/resources/StringResources.pt.resx | 4 ++-- data/resources/StringResources.resx | 4 ++-- data/resources/StringResources.ro.resx | 4 ++-- data/resources/StringResources.ru.resx | 4 ++-- data/resources/StringResources.se.resx | 4 ++-- data/resources/StringResources.tr.resx | 4 ++-- data/resources/StringResources.zh.resx | 4 ++-- src/Main/SharpDevelop/Workbench/WpfWorkbench.cs | 2 +- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/data/resources/StringResources.cz.resx b/data/resources/StringResources.cz.resx index b4165727a1b..bc32253ae99 100644 --- a/data/resources/StringResources.cz.resx +++ b/data/resources/StringResources.cz.resx @@ -6425,7 +6425,7 @@ Došlo k chybě při spuštění: Odkomentovat oblast - - — + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.de.resx b/data/resources/StringResources.de.resx index 119975bb37f..eb73bcba16f 100644 --- a/data/resources/StringResources.de.resx +++ b/data/resources/StringResources.de.resx @@ -7893,7 +7893,7 @@ Fehler beim Starten: Kommentar entfernen - - – + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.es-mx.resx b/data/resources/StringResources.es-mx.resx index 18e8bb40fbb..69165e3c9a7 100644 --- a/data/resources/StringResources.es-mx.resx +++ b/data/resources/StringResources.es-mx.resx @@ -7950,7 +7950,7 @@ Error al iniciar: Descomentar región - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.es.resx b/data/resources/StringResources.es.resx index c0e681cadde..53967a6aae1 100644 --- a/data/resources/StringResources.es.resx +++ b/data/resources/StringResources.es.resx @@ -7808,7 +7808,7 @@ Error mientras se iniciaba: Descomentar Región - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.fi.resx b/data/resources/StringResources.fi.resx index b8ee54a8e72..c1041585d15 100644 --- a/data/resources/StringResources.fi.resx +++ b/data/resources/StringResources.fi.resx @@ -5645,7 +5645,7 @@ Työkalusarja, joka rakentaa Windows asennuspaketteja XML-lähdekoodilla. Sarja Kommentti valinta - - — + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.fr.resx b/data/resources/StringResources.fr.resx index dfb40f0687c..e3897ea7bc8 100644 --- a/data/resources/StringResources.fr.resx +++ b/data/resources/StringResources.fr.resx @@ -8035,7 +8035,7 @@ Erreur lors du démarrage: Partie non commentée - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.hu.resx b/data/resources/StringResources.hu.resx index 068da4646ba..12b74075829 100644 --- a/data/resources/StringResources.hu.resx +++ b/data/resources/StringResources.hu.resx @@ -5071,7 +5071,7 @@ Hiba az indításkor: Megjegyzésből ki - - — + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.it.resx b/data/resources/StringResources.it.resx index 3b6e9c27133..6aba0b7d5db 100644 --- a/data/resources/StringResources.it.resx +++ b/data/resources/StringResources.it.resx @@ -8056,7 +8056,7 @@ Errore durante l'avvio: Rimuovi commento dalla zona - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.jp.resx b/data/resources/StringResources.jp.resx index d3eb15f0892..3a20fc42175 100644 --- a/data/resources/StringResources.jp.resx +++ b/data/resources/StringResources.jp.resx @@ -5093,7 +5093,7 @@ SharpDevelop 2??????????????????:????????????????????????????????????????????? 選択範囲を非コメント化 - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.kr.resx b/data/resources/StringResources.kr.resx index 364f45c84c0..9c7f0965346 100644 --- a/data/resources/StringResources.kr.resx +++ b/data/resources/StringResources.kr.resx @@ -6254,7 +6254,7 @@ SharpDevelop 2는 리소스를 다른 방법으로 컴파일합니다: 리소스 이 부분의 주석 해제 - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.nl.resx b/data/resources/StringResources.nl.resx index 810250058fe..025bc7ea9b0 100644 --- a/data/resources/StringResources.nl.resx +++ b/data/resources/StringResources.nl.resx @@ -7774,7 +7774,7 @@ Startfout: Regiocommentaar verwijderen - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.no.resx b/data/resources/StringResources.no.resx index 9c8f85ffdbb..244c69c5764 100644 --- a/data/resources/StringResources.no.resx +++ b/data/resources/StringResources.no.resx @@ -7039,7 +7039,7 @@ SharpDevelop 2 kompilerer ressurser annerledes: ressursnavnet er ikke bare filna Fjern kommentarer - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.pl.resx b/data/resources/StringResources.pl.resx index 11e731a198e..e9365f61001 100644 --- a/data/resources/StringResources.pl.resx +++ b/data/resources/StringResources.pl.resx @@ -5653,7 +5653,7 @@ Błąd podczas uruchamiania: Odkomentuj region - - — + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.pt-br.resx b/data/resources/StringResources.pt-br.resx index dacd15ee115..61cc795e642 100644 --- a/data/resources/StringResources.pt-br.resx +++ b/data/resources/StringResources.pt-br.resx @@ -6217,7 +6217,7 @@ Use somente letras, dígitos, espaço, "." ou "_" são permitidos. Desfazer comentário - - — + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.pt.resx b/data/resources/StringResources.pt.resx index dad71cd0c60..cde6f3cc1c4 100644 --- a/data/resources/StringResources.pt.resx +++ b/data/resources/StringResources.pt.resx @@ -5837,7 +5837,7 @@ O erro no início foi: Desfazer comentário - - — + + ${ProjectName} – SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index 90944766bf8..ca6ceba0e9e 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -8446,7 +8446,7 @@ Press Esc to cancel this operation. Enable App.xaml parsing - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.ro.resx b/data/resources/StringResources.ro.resx index deafe2502fc..134153a17c0 100644 --- a/data/resources/StringResources.ro.resx +++ b/data/resources/StringResources.ro.resx @@ -3792,7 +3792,7 @@ Eroare la pornire: Regiune necomentată - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.ru.resx b/data/resources/StringResources.ru.resx index eecf1a80c0d..86b73158b09 100644 --- a/data/resources/StringResources.ru.resx +++ b/data/resources/StringResources.ru.resx @@ -7935,7 +7935,7 @@ SharpDevelop 2 иначе компилировал ресурсы: имя рес Раскомментировать - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.se.resx b/data/resources/StringResources.se.resx index 2b3efd40982..00e45ac737c 100644 --- a/data/resources/StringResources.se.resx +++ b/data/resources/StringResources.se.resx @@ -5968,7 +5968,7 @@ Resursfilerna har därför bytt namn/flyttats enligt ovan. Avkommentera region - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.tr.resx b/data/resources/StringResources.tr.resx index a9a3730742f..2908d0e7859 100644 --- a/data/resources/StringResources.tr.resx +++ b/data/resources/StringResources.tr.resx @@ -7926,7 +7926,7 @@ Başlatma hatası: Bölgeyi yorumlama - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/data/resources/StringResources.zh.resx b/data/resources/StringResources.zh.resx index 7e77612d5b0..26c278581c8 100644 --- a/data/resources/StringResources.zh.resx +++ b/data/resources/StringResources.zh.resx @@ -7232,7 +7232,7 @@ SharpDevelop 编译资源时发现不对应：资源名称不是文件名，而 设为非注释区 - - — + + ${ProjectName} — SharpDevelop \ No newline at end of file diff --git a/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs b/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs index d313db685ce..fac30ff6ed1 100644 --- a/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs +++ b/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs @@ -209,7 +209,7 @@ void OnRequestNavigate(object sender, RequestNavigateEventArgs e) void SetProjectTitle(object sender, Project.ProjectEventArgs e) { if (e.Project != null) { - Title = e.Project.Name + ResourceService.GetString("Global.WindowTitlePartsSeparator") + ResourceService.GetString("MainWindow.DialogName"); + Title = StringParser.Parse("${res:MainWindow.ProjectAndDialogName}", new StringTagPair("ProjectName", e.Project.Name)); } else { Title = ResourceService.GetString("MainWindow.DialogName"); }