Merge branch 'master' of https://github.com/icsharpcode/SharpDevelop

data/resources/StringResources.de.resx

@@ -229,6 +229,152 @@ Laden Sie ein AddIn aus dem Internet herunter, klicken Sie auf "AddIn installier
   <data name="AddInManager.UnknownFileFormat" xml:space="preserve">
     <value>Unbekanntes Dateiformat:</value>
   </data>
+  <data name="AddInManager2.AddInsView.InstallFromArchive" xml:space="preserve">
+    <value>Aus Archiv installieren...</value>
+  </data>
+  <data name="AddInManager2.AddInsView.Repository" xml:space="preserve">
+    <value>Repository:</value>
+  </data>
+  <data name="AddInManager2.AddInsView.Search" xml:space="preserve">
+    <value>Suche:</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPreinstalledAddIns" xml:space="preserve">
+    <value>Vorinstallierte AddIns anzeigen</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPrereleaseAddIns" xml:space="preserve">
+    <value>Prereleases anzeigen</value>
+  </data>
+  <data name="AddInManager2.CannotRemoveAddInManager" xml:space="preserve">
+    <value>Sie können den AddInManager nicht deinstallieren. Er wird für die Wiederinstallation von AddIns benötigt!</value>
+  </data>
+  <data name="AddInManager2.DefaultRepository" xml:space="preserve">
+    <value>SharpDevelop AddIn Repository</value>
+  </data>
+  <data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
+    <value>Erstellt von:</value>
+  </data>
+  <data name="AddInManager2.Details.Dependencies" xml:space="preserve">
+    <value>Abhängigkeiten:</value>
+  </data>
+  <data name="AddInManager2.Details.DownloadCount" xml:space="preserve">
+    <value>Downloads:</value>
+  </data>
+  <data name="AddInManager2.Details.FileName" xml:space="preserve">
+    <value>Dateiname:</value>
+  </data>
+  <data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
+    <value>Installierte Version:</value>
+  </data>
+  <data name="AddInManager2.Details.LastUpdated" xml:space="preserve">
+    <value>Zuletzt aktualisiert:</value>
+  </data>
+  <data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
+    <value>Weitere Informationen</value>
+  </data>
+  <data name="AddInManager2.Details.NewVersion" xml:space="preserve">
+    <value>Neue Version:</value>
+  </data>
+  <data name="AddInManager2.Details.Rating" xml:space="preserve">
+    <value>Bewertung:</value>
+  </data>
+  <data name="AddInManager2.Details.ReportAbuse" xml:space="preserve">
+    <value>Missbrauch melden</value>
+  </data>
+  <data name="AddInManager2.Details.Version" xml:space="preserve">
+    <value>Version:</value>
+  </data>
+  <data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
+    <value>Lizenzvereinbarungen anzeigen</value>
+  </data>
+  <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
+    <value>Folgende installierte AddIns hängen von "{0}" ab:
+
+{1}
+
+Sie werden nicht mehr funktionieren nachdem dieses AddIn deaktiviert wurde! Sind Sie sicher, dass Sie fortfahren möchten?</value>
+  </data>
+  <data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
+    <value>Das Paket "{0}" benötigt noch mindestens ein zusätzliches Paket:
+
+{1}
+
+Die Anwendung wird versuchen diese auch herunterzuladen und zu installieren. Wollen Sie fortfahren?</value>
+  </data>
+  <data name="AddInManager2.InvalidPackage" xml:space="preserve">
+    <value>Das gewählte Paket enthält kein gültiges SharpDevelop AddIn.</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
+    <value>&amp;Akzeptieren</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
+    <value>A&amp;blehnen</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Package" xml:space="preserve">
+    <value>Mit einem Klick auf "Akzeptieren" stimmen Sie den Lizenzbedingungen des oben angegebenen Paketes zu.
+Wenn Sie den Lizenzbedingungen nicht zustimmen, klicken Sie auf "Ablehnen".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Packages" xml:space="preserve">
+    <value>Mit einem Klick auf "Akzeptieren" stimmen Sie den Lizenzbedingungen der oben angegebenen Pakete zu.
+Wenn Sie den Lizenzbedingungen nicht zustimmen, klicken Sie auf "Ablehnen".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Package" xml:space="preserve">
+    <value>Das folgende Paket hat eine Klicken-um-zu-akzeptieren-Lizenz:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
+    <value>Die folgenden Pakete haben eine Klicken-um-zu-akzeptieren-Lizenz:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Title" xml:space="preserve">
+    <value>Lizenzvereinbarungen</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
+    <value>Hinzufügen</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
+    <value>Nach unten</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveUp" xml:space="preserve">
+    <value>Nach oben</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
+    <value>Name:</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Remove" xml:space="preserve">
+    <value>Entfernen</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Source" xml:space="preserve">
+    <value>Quelle:</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
+    <value>AddIns</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
+    <value>Quellen</value>
+  </data>
+  <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
+    <value>Folgende installierte AddIns hängen von "{0}" ab:
+
+{1}
+
+Sie werden nicht mehr funktionieren, nachdem dieses AddIn entfernt wurde! Sind Sie sicher, dass Sie fortfahren möchten?</value>
+  </data>
+  <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
+    <value>SharpDevelop AddIns|*.sdaddin;*.addin|Alle Dateien|*.*</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
+    <value>Klicken Sie hier um die Updates zu sehen.</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
+    <value>Updates für SharpDevelop sind verfügbar</value>
+  </data>
+  <data name="AddInManager2.Views.Available" xml:space="preserve">
+    <value>Verfügbar</value>
+  </data>
+  <data name="AddInManager2.Views.Installed" xml:space="preserve">
+    <value>Installiert</value>
+  </data>
+  <data name="AddInManager2.Views.Updates" xml:space="preserve">
+    <value>Updates</value>
+  </data>
   <data name="AddIns.AvalonEdit.InconsistentNewlines.Description" xml:space="preserve">
     <value>Diese Datei enthält inkonsistente Zeilenenden.</value>
   </data>
@@ -269,11 +415,14 @@ Laden Sie ein AddIn aus dem Internet herunter, klicken Sie auf "AddIn installier
     <value>Hilfebibliothek</value>
   </data>
   <data name="AddIns.HelpViewer.HelpModeLabel" xml:space="preserve">
-    <value>Hilfetyp</value>
+    <value>Hilfetyp wählen</value>
   </data>
   <data name="AddIns.HelpViewer.HLMNoActiveCatalogError" xml:space="preserve">
     <value>Help Library Manager kann nicht gestartet werden, weil kein Hilfekatalog installiert oder ausgewählt wurde. Bitte überprüfen Sie die Hilfeeinstellungen (siehe Extras &gt; Optionen... &gt; Tools &gt; Microsoft Help Viewer).</value>
   </data>
+  <data name="AddIns.HelpViewer.HLMNotAvailableDownloadWinSDK" xml:space="preserve">
+    <value>Der Help Library Manager wurde nicht gefunden. Um die Hilfe von SharpDevelop nutzen zu können, laden Sie bitte das Windows SDK 7.1 von Microsoft herunter und installieren Sie es.</value>
+  </data>
   <data name="AddIns.HelpViewer.HLMNotFound" xml:space="preserve">
     <value>Help Library Manager wurde nicht gefunden. Bitte stellen Sie sicher, dass es korrekt installiert wurde.</value>
   </data>
@@ -302,7 +451,7 @@ Laden Sie ein AddIn aus dem Internet herunter, klicken Sie auf "AddIn installier
     <value>Hilfe anzeigen</value>
   </data>
   <data name="AddIns.HelpViewer.UseExternalHelp" xml:space="preserve">
-    <value>Externe Hilfe verwenden</value>
+    <value>Externen Hilfebetrachter verwenden</value>
   </data>
   <data name="AddIns.HelpViewer.UseOfflineHelpLabel" xml:space="preserve">
     <value>Ich möchte die lokale Hilfe verwenden</value>
@@ -1504,9 +1653,18 @@ Beispiele: "120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.HighlightingEditor.Import" xml:space="preserve">
     <value>Hervorhebungsfarben importieren</value>
   </data>
+  <data name="Dialog.HighlightingEditor.NotSupportedMessage" xml:space="preserve">
+    <value>Diese Version der Einstellungen wird nicht unterstützt!</value>
+  </data>
+  <data name="Dialog.HighlightingEditor.OverwriteCustomizationsMessage" xml:space="preserve">
+    <value>Hiermit werden alle benutzerdefinierten Farben zurückgesetzt und die gewählten Einstellungen importiert. Wollen Sie fortfahren?</value>
+  </data>
   <data name="Dialog.HighlightingEditor.Properties.Value" xml:space="preserve">
     <value>Wert</value>
   </data>
+  <data name="Dialog.HighlightingEditor.ResetAll" xml:space="preserve">
+    <value>Alle auf Standard zurücksetzen</value>
+  </data>
   <data name="Dialog.HighlightingEditor.SampleText" xml:space="preserve">
     <value>Beispieltext</value>
   </data>
@@ -1800,7 +1958,7 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
     <value>Code-Completion Detail-Einstellungen</value>
   </data>
   <data name="Dialog.Options.IDEOptions.CodeCompletion.LanguageDependend" xml:space="preserve">
-    <value>Die folgenden Einstellungen sind sprach-abhängig; einige sind nicht in allen Programmiersprachen verfügbar.</value>
+    <value>Die folgenden Einstellungen sind sprachabhängig; einige sind nicht in allen Programmiersprachen verfügbar.</value>
   </data>
   <data name="Dialog.Options.IDEOptions.CodeCompletion.MainOption" xml:space="preserve">
     <value>Mit der folgenden Einstellung kann Code Completion komplett deaktiviert werden:</value>
@@ -1862,6 +2020,18 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Debugger</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Abfrage für Argumente und Arbeitsverzeichnis beim Start der ausführbaren Datei anzeigen.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Auf erster Anweisung des Programmes anhalten.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
+    <value>Decompiler aktivieren</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.EnableEditAndContinue" xml:space="preserve">
+    <value>Bearbeiten und Fortfahren (EnC) aktivieren</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Exceptions" xml:space="preserve">
     <value>Ausnahmen</value>
   </data>
@@ -1892,12 +2062,21 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
   <data name="Dialog.Options.IDEOptions.Debugging.Stepping.StepOverSingleLineProperties" xml:space="preserve">
     <value>Über einzeilige Properties springen</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.SuppressJITOptimization" xml:space="preserve">
+    <value>JIT-Optimierung unterdrücken</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.SuppressNGENOptimization" xml:space="preserve">
+    <value>NGEN-Optimierung unterdrücken</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols" xml:space="preserve">
     <value>Symbole</value>
   </data>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Symbol- und Quellcodepfade:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Debuggen ohne Quellcode</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;Header</value>
   </data>
@@ -2351,6 +2530,12 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.Any" xml:space="preserve">
     <value>Jeder Prozessor</value>
   </data>
+  <data name="Dialog.ProjectOptions.Build.TargetCPU.Any32" xml:space="preserve">
+    <value>Beliebige CPU (32-bit bevorzugt)</value>
+  </data>
+  <data name="Dialog.ProjectOptions.Build.TargetCPU.Any64" xml:space="preserve">
+    <value>Beliebige CPU (64-bit bevorzugt)</value>
+  </data>
   <data name="Dialog.ProjectOptions.Build.TargetCPU.Itanium" xml:space="preserve">
     <value>Intel 64-bit Itanium Prozessor</value>
   </data>
@@ -2711,6 +2896,9 @@ Sie können die Einstellungen auch in einer .user-Datei anstelle der Projektdate
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>Hin&amp;zufügen</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Fortgeschritten</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Zurück</value>
   </data>
@@ -3571,6 +3759,12 @@ wurde außerhalb der Applikation geändert. Wollen Sie die Datei neu laden?</val
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
     <value>Inkrementelle Suche (rückwärts):</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
+    <value>{0} ist keine gültige .NET Assembly.</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
+    <value>Auf {0} kann nicht zugegriffen werden oder es existiert nicht mehr.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
     <value>Fehler beim Laden der Code-Completion-Informationen für ${Assembly} aus ${Filename}:</value>
   </data>
@@ -4448,6 +4642,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
     <value>.NET Framework-Erweiterung</value>
   </data>
+  <data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
+    <value>WiX ist nicht installiert. Bitte laden Sie WiX von http://wixtoolset.org/ herunter.</value>
+  </data>
   <data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
     <value>Keine Unterschiede gefunden.</value>
   </data>
@@ -4469,6 +4666,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
     <value>Visual Studio-Erweiterung</value>
   </data>
+  <data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
+    <value>WPF Designer Miniaturansicht</value>
+  </data>
   <data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
     <value>Kopieren</value>
   </data>
@@ -4769,6 +4969,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Lesezeichen</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Zum Arbeitsbereich hinzufügen</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Zurück</value>
   </data>
@@ -4808,9 +5011,21 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>Keine Suchergebnisse gefunden.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Assembly öffnen</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Assembly aus Datei öffnen...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Assembly aus GAC öffnen...</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Suche nach Klassenname</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Arbeitsbereich {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Klassen</value>
   </data>
@@ -4895,6 +5110,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.Conditional.Breakpoints.DisableBreakpoint" xml:space="preserve">
     <value>Haltepunkt deaktivieren</value>
   </data>
+  <data name="MainWindow.Windows.Debug.Conditional.Breakpoints.EditCondition" xml:space="preserve">
+    <value>Bedingung bearbeiten...</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Conditional.Breakpoints.EnableBreakpoint" xml:space="preserve">
     <value>Haltepunkt aktivieren</value>
   </data>
@@ -4916,6 +5134,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Konsole</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Ausführbare Datei debuggen</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Unterbrechen</value>
   </data>
@@ -5273,6 +5494,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.In" xml:space="preserve">
     <value>in</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;Kein Projekt&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} Ergebnisse</value>
   </data>
@@ -5288,6 +5512,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Pro Datei</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Pro Projekt</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Pro Projekt und Datei</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Wähle Darstellungsmodus</value>
   </data>
@@ -5408,6 +5638,21 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="PortableLibrary.CouldNotFindTools" xml:space="preserve">
     <value>Konnte die Portable Class Library Tools nicht finden.</value>
   </data>
+  <data name="PortableLibrary.PortableSubset" xml:space="preserve">
+    <value>.NET Portable Teilmenge</value>
+  </data>
+  <data name="PortableLibrary.SelectAtLeastTwoFrameworks" xml:space="preserve">
+    <value>Zwei oder mehr Frameworks müssen gewählt werden.</value>
+  </data>
+  <data name="PortableLibrary.SelectedProfile" xml:space="preserve">
+    <value>Ausgewähltes Profil:</value>
+  </data>
+  <data name="PortableLibrary.SelectProfileDialog.Title" xml:space="preserve">
+    <value>Profil für portable Bibliothek auswählen</value>
+  </data>
+  <data name="PortableLibrary.ToolsInstallationHelp" xml:space="preserve">
+    <value>Um die Portable Class Library Tools ohne Visual Studio zu installieren, laden Sie die Datei (PortableLibraryTools.exe) auf Ihren Computer herunter und führen das Installationsprogramm von der Kommandozeile aus. Geben Sie zusätzlich den /buildmachine Schalter auf der Kommandozeile an.</value>
+  </data>
   <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
     <value>Alle Knoten einklappen</value>
   </data>
@@ -5708,6 +5953,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
     <value>Ressourcen-Codegenerator: Es konnte keine Ressourcen-Eigenschaft für die Ressource '{0}' erzeugt werden.</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
+    <value>Kommentar</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
     <value>Inhalt</value>
   </data>
@@ -5720,6 +5968,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
     <value>Kopiere Resourcenname</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
+    <value>Kommentar bearbeiten</value>
+  </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
+    <value>Einen neuen Text für den Ressourcen-Kommentar eingeben:</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
     <value>&amp;Umbenennen</value>
   </data>
@@ -5736,6 +5990,9 @@ Bitte einen anderen verwenden.</value>
   <data name="SharpDevelop.FileFilter.AllFiles" xml:space="preserve">
     <value>Alle Dateien (*.*)</value>
   </data>
+  <data name="SharpDevelop.FileFilter.AllKnownFiles" xml:space="preserve">
+    <value>Alle bekannten Dateierweiterungen</value>
+  </data>
   <data name="SharpDevelop.FileFilter.AssemblyFiles" xml:space="preserve">
     <value>Assemblydateien (*.exe;*.dll)</value>
   </data>
@@ -5919,6 +6176,9 @@ Bitte einen anderen verwenden.</value>
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Überschreibunden von ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Teile von ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>Referenzen auf ${Name}</value>
   </data>
@@ -6684,6 +6944,12 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht
   <data name="Templates.Project.GtkSharpProject.Name" xml:space="preserve">
     <value>Gtk#-Anwendung</value>
   </data>
+  <data name="Templates.Project.PortableLibrary.Description" xml:space="preserve">
+    <value>Bibliothek, die auf Windows, Silverlight, Windows Phone und Xbox verwendet werden kann.</value>
+  </data>
+  <data name="Templates.Project.PortableLibrary.Name" xml:space="preserve">
+    <value>Portable Klassenbibliothek</value>
+  </data>
   <data name="Templates.Project.PRISMApplicationSmallUnity.Description" xml:space="preserve">
     <value>Erstellt eine einfache PRISM-Anwendung mit Bootstrapper und Infrastruktur.</value>
   </data>

data/resources/StringResources.es-mx.resx

@@ -229,6 +229,152 @@ Descargue un complemento de Internet, luego haga clic en "Instalar AddIn" y sele
   <data name="AddInManager.UnknownFileFormat" xml:space="preserve">
     <value>Formato de archivo desconocido:</value>
   </data>
+  <data name="AddInManager2.AddInsView.InstallFromArchive" xml:space="preserve">
+    <value>Instalar desde archivo...</value>
+  </data>
+  <data name="AddInManager2.AddInsView.Repository" xml:space="preserve">
+    <value>Repositorio:</value>
+  </data>
+  <data name="AddInManager2.AddInsView.Search" xml:space="preserve">
+    <value>Búsqueda:</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPreinstalledAddIns" xml:space="preserve">
+    <value>Mostrar complementos instalados</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPrereleaseAddIns" xml:space="preserve">
+    <value>Mostrar versiones preliminares</value>
+  </data>
+  <data name="AddInManager2.CannotRemoveAddInManager" xml:space="preserve">
+    <value>No puede desinstalar el Administrador de Complementos porque lo necesita para re-instalar complementos!</value>
+  </data>
+  <data name="AddInManager2.DefaultRepository" xml:space="preserve">
+    <value>Repositorio de Complementos de SharpDevelop</value>
+  </data>
+  <data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
+    <value>Creado Por:</value>
+  </data>
+  <data name="AddInManager2.Details.Dependencies" xml:space="preserve">
+    <value>Dependencias:</value>
+  </data>
+  <data name="AddInManager2.Details.DownloadCount" xml:space="preserve">
+    <value>Descargas:</value>
+  </data>
+  <data name="AddInManager2.Details.FileName" xml:space="preserve">
+    <value>Nombre de archivo:</value>
+  </data>
+  <data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
+    <value>Versión instalada:</value>
+  </data>
+  <data name="AddInManager2.Details.LastUpdated" xml:space="preserve">
+    <value>Última actualización:</value>
+  </data>
+  <data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
+    <value>Más información</value>
+  </data>
+  <data name="AddInManager2.Details.NewVersion" xml:space="preserve">
+    <value>Nueva versión:</value>
+  </data>
+  <data name="AddInManager2.Details.Rating" xml:space="preserve">
+    <value>Clasificación:</value>
+  </data>
+  <data name="AddInManager2.Details.ReportAbuse" xml:space="preserve">
+    <value>Reportar abuso</value>
+  </data>
+  <data name="AddInManager2.Details.Version" xml:space="preserve">
+    <value>Versión:</value>
+  </data>
+  <data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
+    <value>Ver Términos de Licencia</value>
+  </data>
+  <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
+    <value>Los siguientes complementos instalados dependen de "{0}":
+
+{1}
+
+Dejarán de funcionar después de deshabilitar este complemento! ¿Está seguro que quiere continuar?</value>
+  </data>
+  <data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
+    <value>El paquete "{0}" necesita por lo menos un paquete adicional:
+
+{1}
+
+La aplicación tratará de descargar e instalarlos. ¿Quiere continuar?</value>
+  </data>
+  <data name="AddInManager2.InvalidPackage" xml:space="preserve">
+    <value>El paquete seleccionado no contiene un complemento SharpDevelop válido.</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
+    <value>&amp;Aceptar</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
+    <value>&amp;Rechazar</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Package" xml:space="preserve">
+    <value>Al hacer clic en "Aceptar" usted está de acuerdo con los términos de licencia para el paquete listado arriba.
+Si usted no está de acuerdo con los términos de licencia haga clic en "Rechazar".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Packages" xml:space="preserve">
+    <value>Al hacer clic en "Aceptar" usted está de acuerdo con los términos de licencia para los paquetes listados arriba.
+Si usted no está de acuerdo con los términos de licencia haga clic en "Rechazar".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Package" xml:space="preserve">
+    <value>El siguiente paquete requiere una licencia del tipo clic para aceptar:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
+    <value>Los siguientes paquetes requieren una licencia del tipo clic para aceptar:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Title" xml:space="preserve">
+    <value>Contrato de Licencia</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
+    <value>Agregar</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
+    <value>Abajo</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveUp" xml:space="preserve">
+    <value>Arriba</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
+    <value>Nombre:</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Remove" xml:space="preserve">
+    <value>Eliminar</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Source" xml:space="preserve">
+    <value>Fuente:</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
+    <value>Complementos</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
+    <value>Repositorios</value>
+  </data>
+  <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
+    <value>Los siguientes complementos instalados dependen de "{0}":
+
+{1}
+
+Dejarán de funcionar después de desinstalar este complemento! ¿Esta seguro de que quiere continuar?</value>
+  </data>
+  <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
+    <value>Complementos de SharpDevelop|*.sdaddin;*.addin|Todos los archivos|*.*</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
+    <value>Clic aquí para ver las actualizaciones.</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
+    <value>Se encuentran disponibles actualizaciones de SharpDevelop</value>
+  </data>
+  <data name="AddInManager2.Views.Available" xml:space="preserve">
+    <value>Disponible</value>
+  </data>
+  <data name="AddInManager2.Views.Installed" xml:space="preserve">
+    <value>Instalado</value>
+  </data>
+  <data name="AddInManager2.Views.Updates" xml:space="preserve">
+    <value>Actualizaciones</value>
+  </data>
   <data name="AddIns.AvalonEdit.InconsistentNewlines.Description" xml:space="preserve">
     <value>Este archivo contiene finales de línea inconsistentes.</value>
   </data>
@@ -1873,6 +2019,12 @@ Ejemplo: "120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Depuración</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Preguntar por argumentos y directorio de trabajo al iniciar el ejecutable.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Detenerse en la primera línea de ejecución.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
     <value>Habilitar decompilador</value>
   </data>
@@ -1921,6 +2073,9 @@ Ejemplo: "120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Rutas de símbolos y código fuente:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Sin Depuración de Código</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;Encabezado</value>
   </data>
@@ -2733,15 +2888,15 @@ También puede elegir guardar la opción en el archivo .user en lugar de en el a
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Código</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Avanzado</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Abortar</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>&amp;Agregar</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Avanzado</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Atrás</value>
   </data>
@@ -3596,6 +3751,12 @@ ha sido cambiado de manera externa. ¿Desea recargarlo?</value>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
     <value>Invertir Búsqueda Incremental:</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
+    <value>{0} no es un ensamblado .NET válido.</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
+    <value>{0} no es accesible o ya no existe.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
     <value>Error cargando información de completación de código para ${Assembly} desde ${Filename}:</value>
   </data>
@@ -4472,6 +4633,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
     <value>Extensión .NET Framework</value>
   </data>
+  <data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
+    <value>WiX no está instalado. Por favor descargue WiX de http://wixtoolset.org/</value>
+  </data>
   <data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
     <value>No se encontraron diferencias.</value>
   </data>
@@ -4493,6 +4657,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
     <value>Extensión Visual Studio</value>
   </data>
+  <data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
+    <value>Diseñador WPF para vista en miniatura</value>
+  </data>
   <data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
     <value>Copiar</value>
   </data>
@@ -4793,6 +4960,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Marcadores</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Agregar al área de trabajo</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Atrás</value>
   </data>
@@ -4832,9 +5002,21 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>No se encontraron resultados.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Abrir ensamblado</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Abrir ensamblado desde archivo...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Abrir ensamblado desde el GAC...</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Buscar en la Vista de Clases</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Área de Trabajo {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Clases</value>
   </data>
@@ -4943,6 +5125,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Consola</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Depurar ejecutable</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Pausar</value>
   </data>
@@ -5300,6 +5485,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.In" xml:space="preserve">
     <value>en</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;sin proyecto&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} ocurrencias</value>
   </data>
@@ -5315,6 +5503,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Por archivo</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Por proyecto</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Por proyecto y archivo</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Selecciona el modo de búsqueda de la lista</value>
   </data>
@@ -5750,6 +5944,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
     <value>Generador de recursos de código: No se pudo generar ninguna propiedad para el recurso '{0}'.</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
+    <value>Comentario</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
     <value>Contenido</value>
   </data>
@@ -5762,6 +5959,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
     <value>Copiar nombre de recurso</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
+    <value>Editar comentario</value>
+  </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
+    <value>Ingrese el nuevo texto para el comentario del recurso:</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
     <value>&amp;Renombrar</value>
   </data>
@@ -5963,6 +6166,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Overrides de ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Partes de ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>Referencias a ${Name}</value>
   </data>

data/resources/StringResources.es.resx

@@ -245,9 +245,100 @@ Descargue un complemento de Internet, luego haga clic en 'Instalar Complemento'
   <data name="AddInManager2.AddInsView.ShowPrereleaseAddIns" xml:space="preserve">
     <value>Mostrar versión preliminar</value>
   </data>
+  <data name="AddInManager2.CannotRemoveAddInManager" xml:space="preserve">
+    <value>No se puede desinstalar el Administrador de complementos, porque lo necesita para volver a instalar Complementos!</value>
+  </data>
+  <data name="AddInManager2.DefaultRepository" xml:space="preserve">
+    <value>Repositorio de Complementos de SharpDevelop</value>
+  </data>
+  <data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
+    <value>Creado por:</value>
+  </data>
+  <data name="AddInManager2.Details.Dependencies" xml:space="preserve">
+    <value>Dependencias:</value>
+  </data>
+  <data name="AddInManager2.Details.DownloadCount" xml:space="preserve">
+    <value>Descargas:</value>
+  </data>
+  <data name="AddInManager2.Details.FileName" xml:space="preserve">
+    <value>Nombre de archivo:</value>
+  </data>
   <data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
     <value>Versión instalada:</value>
   </data>
+  <data name="AddInManager2.Details.LastUpdated" xml:space="preserve">
+    <value>Última actualización:</value>
+  </data>
+  <data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
+    <value>Más información</value>
+  </data>
+  <data name="AddInManager2.Details.NewVersion" xml:space="preserve">
+    <value>Nueva versión:</value>
+  </data>
+  <data name="AddInManager2.Details.Rating" xml:space="preserve">
+    <value>Ranking:</value>
+  </data>
+  <data name="AddInManager2.Details.ReportAbuse" xml:space="preserve">
+    <value>Reportar abuso</value>
+  </data>
+  <data name="AddInManager2.Details.Version" xml:space="preserve">
+    <value>Versión:</value>
+  </data>
+  <data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
+    <value>Ver Términos de Licencia</value>
+  </data>
+  <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
+    <value>Los siguientes complementos instalados dependen de  "{0}":
+
+{1}
+
+Dejarán de funcionar luego de deshabilitar este complemento! ¿Esta seguro de querer continuar?</value>
+  </data>
+  <data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
+    <value>Paquete "{0}" necesita por lo menos un paquete adicional:
+
+{1}
+
+La aplicación tratará de descargarlos e instalarlos también. ¿Quiere continuar?</value>
+  </data>
+  <data name="AddInManager2.InvalidPackage" xml:space="preserve">
+    <value>El paquete seleccionado no contiene un complemento válido de SharpDevelop.</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
+    <value>&amp;Acepo</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
+    <value>&amp;No acepto</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Package" xml:space="preserve">
+    <value>Al hacer clic en "Acepto" usted acepta los términos de la licencia para el paquete listado arriba.
+Si usted no esta de acuerdo con los términos de la licencia haga clic en "No acepto".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Packages" xml:space="preserve">
+    <value>Al hacer clic en "Acepto", usted acepta los términos de la licencia para los paquetes listados arriba.
+Si no acepta los términos de la licencia haga clic en "No acepto".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Package" xml:space="preserve">
+    <value>El siguiente paquete requiere una licencia del tipo "clic para aceptar":</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
+    <value>El siguiente paquete requiere una licencia de tipo clic para aceptar:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Title" xml:space="preserve">
+    <value>Términos de Licencia</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
+    <value>Agregar</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
+    <value>Mover Abajo</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveUp" xml:space="preserve">
+    <value>Mover Arriba</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
+    <value>Nombre:</value>
+  </data>
   <data name="AddInManager2.OptionPanel.Remove" xml:space="preserve">
     <value>Remover</value>
   </data>
@@ -261,15 +352,21 @@ Descargue un complemento de Internet, luego haga clic en 'Instalar Complemento'
     <value>Repositorios</value>
   </data>
   <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
-    <value>Los siguientes AddIns instalados dependen de "{0}":
+    <value>Los siguientes Complementos instalados dependen de "{0}":
 
 {1}
 
-Dejarán de funcionar al remover este AddIn! ¿Quiere continuar?</value>
+Dejarán de funcionar al remover este Complemento! ¿Quiere continuar?</value>
   </data>
   <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
     <value>AddIns de SharpDevelop |*.sdaddin;*.addin|Todos los archivos|*.*</value>
   </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
+    <value>Clic aquí para ver las actualizaciones.</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
+    <value>Actualizaciones de SharpDevelop disponibles</value>
+  </data>
   <data name="AddInManager2.Views.Available" xml:space="preserve">
     <value>Disponibles</value>
   </data>
@@ -1919,6 +2016,12 @@ Para crear/manipular un objeto ActiveX/COM, arrastre una clase de un Control/Bib
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Depuración</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Preguntar por argumentos y directorio de trabajo al iniciar ejecutable.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Detener ejecución en la primera línea.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
     <value>Habilitar decompilador</value>
   </data>
@@ -1967,6 +2070,9 @@ Para crear/manipular un objeto ActiveX/COM, arrastre una clase de un Control/Bib
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Rutas de símbolos y código fuente:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Sin Depuración de Fuente</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;Encabezado</value>
   </data>
@@ -2783,15 +2889,15 @@ También puede escoger almacenar el parámetro de configuración en el archivo .
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Fuente</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Avanzado</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Abortar</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>&amp;Agregar</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Avanzado</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Atrás</value>
   </data>
@@ -3648,6 +3754,12 @@ ha sido modificado externamente. ¿Desea volver a cargarlo?</value>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
     <value>Invertir Búsqueda Incremental:</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
+    <value>{0} no es un ensamblado .NET válido.</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
+    <value>{0} no es accesible o ya no existe.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
     <value>Error cargando información de completación de código para ${Assembly} desde ${Filename}:</value>
   </data>
@@ -4527,6 +4639,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
     <value>Extensión .NET Framework</value>
   </data>
+  <data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
+    <value>WiX no está instalado. Por favor descargue WiX desde http://wixtoolset.org/</value>
+  </data>
   <data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
     <value>No se encontraron diferencias.</value>
   </data>
@@ -4548,6 +4663,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
     <value>Extensión Visual Studio</value>
   </data>
+  <data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
+    <value>Diseñador de Thumbnail WPF</value>
+  </data>
   <data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
     <value>Copiar</value>
   </data>
@@ -4848,6 +4966,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Marcadores</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Agregar al área de trabajo</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Atrás</value>
   </data>
@@ -4887,9 +5008,21 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>No se encontraron resultados.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Abre el ensamblado</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Abrir ensamblado desde archivo...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Abrir ensamblado del GAC...</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Buscar</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Área de trabajo {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Clases</value>
   </data>
@@ -4998,6 +5131,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Consola</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Depurar ejecutable</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Pausar</value>
   </data>
@@ -5355,6 +5491,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.In" xml:space="preserve">
     <value>en</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;sin proyecto&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} ocurrencias</value>
   </data>
@@ -5370,6 +5509,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Por archivo</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Por proyecto</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Por proyecto y archivo</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Seleccionar modo de búsqueda</value>
   </data>
@@ -5805,6 +5950,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
     <value>Generador de recursos de código: No se pudo generar ninguna propiedad para el recurso '{0}'.</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
+    <value>Comentar</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
     <value>Contenido</value>
   </data>
@@ -5817,6 +5965,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
     <value>Copiar nombre de recurso</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
+    <value>Editar comentario</value>
+  </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
+    <value>Ingrese el nuevo texto para el comentario del recurso:</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
     <value>&amp;Renombrar</value>
   </data>
@@ -6018,6 +6172,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Overrides de ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Partes de ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>Referencias a ${Name}</value>
   </data>

data/resources/StringResources.fr.resx

@@ -287,7 +287,7 @@ Téléchargez un AddIn depuis l'Internet, cliquez ensuite sur 'Installer un AddI
     <value>Voir le contrat de license</value>
   </data>
   <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
-    <value>Les Add-Ins installés suivant sont dépendant de "{0}"
+    <value>Les Add-Ins installés suivant sont dépendant de "{0}":
 
 {1}
 
@@ -351,7 +351,7 @@ Si vous ne le souhaitez pas, veuillez cliquer "Je décline".</value>
     <value>Dépots</value>
   </data>
   <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
-    <value>Les Add-Ins installés suivant sont dépendant de "{0}"
+    <value>Les Add-Ins installés suivant sont dépendants de "{0}":
 
 {1}
 
@@ -360,6 +360,12 @@ Ils ne fonctionneront plus si vous désinstallez cet Add-In! Souhaitez-vous cont
   <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
     <value>SharpDevelop Add-Ins|*.sdaddin;*.addin|Tous les fichiers|*.*</value>
   </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
+    <value>Cliquer pour voir les mises à jour.</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
+    <value>Des mises à jour sont disponibles</value>
+  </data>
   <data name="AddInManager2.Views.Available" xml:space="preserve">
     <value>Disponible</value>
   </data>
@@ -2009,6 +2015,12 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Déboguage en cours</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Demander des arguments et le répertoire de travail lors du lancement.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Arrêt sur la première ligne.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
     <value>Activer la décompilation</value>
   </data>
@@ -2057,6 +2069,9 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Chemins des symboles et du code source:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Sans débogguage du source</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;En-tête</value>
   </data>
@@ -2870,15 +2885,15 @@ Vous pouvez aussi choisir de stocker la configuration dans le fichier .user-file
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Source</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Avancé</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Stopper</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>&amp;Ajouter</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Avancé</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Retour</value>
   </data>
@@ -3732,6 +3747,12 @@ Toutes les modifications seront perdues.</value>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
     <value>Recherche incrémentale inversée:</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
+    <value>{0} n'est pas un assembly .NET valide.</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
+    <value>{0} n'est pas accessible ou n'existe plus.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
     <value>Impossible de charger les informations Intellisense pour ${Assembly} depuis ${Filename}:</value>
   </data>
@@ -4631,6 +4652,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
     <value>Extension Visual Studio</value>
   </data>
+  <data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
+    <value>Vignettes du Concepteur WPF</value>
+  </data>
   <data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
     <value>Copier</value>
   </data>
@@ -4931,6 +4955,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Marque-pages</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Ajouter au bureau</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Précédent</value>
   </data>
@@ -4970,9 +4997,21 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>Pas de résultats à la recherche.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Ouvrir l'assembly</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Ouvrir l'assembly depuis un fichier...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Ouvrir l'assembly depuis le GAC...</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Rechercher une classe</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Bureau {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Classes</value>
   </data>
@@ -5081,6 +5120,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Console</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Débogguer l'executable</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Break</value>
   </data>
@@ -5438,6 +5480,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.SearchResultPanel.In" xml:space="preserve">
     <value>dans</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;pas de projet&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} occurrences</value>
   </data>
@@ -5453,6 +5498,12 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Par fichier</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Par projet</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Par projet et fichier</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Sélectionnez le mode de recherche des listes</value>
   </data>
@@ -6110,6 +6161,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Surdéfinitions de ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Elements de ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>Réferences à ${Name}</value>
   </data>

data/resources/StringResources.it.resx

@@ -238,39 +238,92 @@ Scaricare un componente da internet, poi cliccare 'Install AddIn' e selezionare
   <data name="AddInManager2.AddInsView.Search" xml:space="preserve">
     <value>Cerca:</value>
   </data>
+  <data name="AddInManager2.AddInsView.ShowPreinstalledAddIns" xml:space="preserve">
+    <value>Visualizza AddIns preinstallati</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPrereleaseAddIns" xml:space="preserve">
+    <value>Visualizza prereleases</value>
+  </data>
+  <data name="AddInManager2.CannotRemoveAddInManager" xml:space="preserve">
+    <value>Non puoi disinstallare il gestore AddIn perché ti serve per reinstallare gli AddIns!</value>
+  </data>
+  <data name="AddInManager2.DefaultRepository" xml:space="preserve">
+    <value>Lista SharpDevelop AddIn</value>
+  </data>
   <data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
     <value>Creato da:</value>
   </data>
   <data name="AddInManager2.Details.Dependencies" xml:space="preserve">
     <value>Dipendenze:</value>
   </data>
+  <data name="AddInManager2.Details.DownloadCount" xml:space="preserve">
+    <value>Downloads:</value>
+  </data>
   <data name="AddInManager2.Details.FileName" xml:space="preserve">
     <value>Nome file:</value>
   </data>
   <data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
     <value>Versione installata:</value>
   </data>
+  <data name="AddInManager2.Details.LastUpdated" xml:space="preserve">
+    <value>Ultimo aggiornamento:</value>
+  </data>
   <data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
     <value>Più informazioni</value>
   </data>
   <data name="AddInManager2.Details.NewVersion" xml:space="preserve">
     <value>Nuova versione:</value>
   </data>
+  <data name="AddInManager2.Details.Rating" xml:space="preserve">
+    <value>Punteggio:</value>
+  </data>
+  <data name="AddInManager2.Details.ReportAbuse" xml:space="preserve">
+    <value>Segnala abuso</value>
+  </data>
   <data name="AddInManager2.Details.Version" xml:space="preserve">
     <value>Versione:</value>
   </data>
   <data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
     <value>Mostra i Termini di Licenza</value>
   </data>
+  <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
+    <value>I seguenti AddIns dipendono da "{0}":
+
+{1}
+
+Smetteranno di funzionare dopo aver disabilitato questo AddIn! Sei sicuro di voler continuare?</value>
+  </data>
+  <data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
+    <value>"{0}" richiede almeno un pacchetto aggiuntivo:
+
+{1}
+
+L'applicazione tenterà di scaricarlo e installarlo. Sei sicuro di voler continuare?</value>
+  </data>
+  <data name="AddInManager2.InvalidPackage" xml:space="preserve">
+    <value>Il pacchetto selezionato non contiene un AddIn per SharpDevelop valido.</value>
+  </data>
   <data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
     <value>&amp;Accetto</value>
   </data>
   <data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
     <value>&amp;Rifiuto</value>
   </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
+    <value>I seguenti pacchetti richiedono un clic per accettare la licenza:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Title" xml:space="preserve">
+    <value>Condizioni di Licenza</value>
+  </data>
   <data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
     <value>Aggiungi</value>
   </data>
+  <data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
+    <value>Sposta Giù</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveUp" xml:space="preserve">
+    <value>Sposta Su</value>
+  </data>
   <data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
     <value>Nome:</value>
   </data>
@@ -280,9 +333,28 @@ Scaricare un componente da internet, poi cliccare 'Install AddIn' e selezionare
   <data name="AddInManager2.OptionPanel.Source" xml:space="preserve">
     <value>Sorgente:</value>
   </data>
+  <data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
+    <value>AddIns</value>
+  </data>
   <data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
     <value>Repositories</value>
   </data>
+  <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
+    <value>I seguenti AddIns dipendono da "{0}":
+
+{1}
+
+Smetteranno di funzionare dopo la rimozione di questo AddIn! Sei sicuro di voler continuare?</value>
+  </data>
+  <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
+    <value>SharpDevelop AddIns|*.sdaddin;*.addin|All files|*.*</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
+    <value>Clicca qui per visualizzare gli aggiornamenti.</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
+    <value>Sono disponibili aggiornamenti per SharpDevelop</value>
+  </data>
   <data name="AddInManager2.Views.Available" xml:space="preserve">
     <value>Disponibile</value>
   </data>
@@ -1929,6 +2001,12 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Debugging</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Chiedi parametri e cartella di lavoro quando inizia l'esecuzione.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Ferma alla prima linea in esecuzione.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
     <value>Attiva decompilatore</value>
   </data>
@@ -1977,6 +2055,9 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Percorsi simboli e codice sorgente:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Debug Senza Sorgenti</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;Intestazione</value>
   </data>
@@ -2791,15 +2872,15 @@ Puoi anche scegliere di memorizzare le impostazioni in un file .user invece che
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Sorgente</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Avanzate</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>&amp;Aggiungi</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Avanzate</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Indietro</value>
   </data>
@@ -3658,6 +3739,12 @@ ${File}
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
     <value>Ricerca Incrementale Inversa:</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
+    <value>{0} non è un assembly .NET valido.</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
+    <value>{0} non è accessibile o non esiste più.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
     <value>Errore nel caricamento delle informazioni di completamento codice per ${Assembly} da ${Filename}:</value>
   </data>
@@ -4533,6 +4620,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
     <value>Estensione .NET Framework</value>
   </data>
+  <data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
+    <value>WiX non è installato. Per favore scarica WiX da http://wixtoolset.org/</value>
+  </data>
   <data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
     <value>Nessuna differenza trovata.</value>
   </data>
@@ -4554,6 +4644,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
     <value>Estensione Visual Studio</value>
   </data>
+  <data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
+    <value>Anteprima WPF Designer</value>
+  </data>
   <data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
     <value>Copia</value>
   </data>
@@ -4854,6 +4947,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Segnalibri</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Aggiungi allo spazio di lavoro</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Indietro</value>
   </data>
@@ -4893,9 +4989,21 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>Nessun risultato trovato.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Apri assembly</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Apri assembly da file...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Apri assembly dalla GAC...</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Ricerca nel visualizzatore di classi</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Spazio di lavoro {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Classi</value>
   </data>
@@ -5004,6 +5112,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Console</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Debug eseguibile</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Interrompi</value>
   </data>
@@ -5361,6 +5472,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.In" xml:space="preserve">
     <value>in</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;nessun progetto&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} occorrenze</value>
   </data>
@@ -5376,6 +5490,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Per file</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Per progetto</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Per progetto e file</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Seleziona la modalità di ricerca in lista</value>
   </data>
@@ -5811,6 +5931,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
     <value>Generatore del codice risorsa: nessuna proprietà  può essere generata per la risorsa '{0}'.</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
+    <value>Note</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
     <value>Contenuto</value>
   </data>
@@ -5826,6 +5949,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
     <value>Modifica descrizione</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
+    <value>Inserisci il nuovo testo per le note della risorsa:</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
     <value>&amp;Rinomina</value>
   </data>
@@ -5841,6 +5967,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="SharpDevelop.FileFilter.AllFiles" xml:space="preserve">
     <value>Tutti i file (*.*)</value>
   </data>
+  <data name="SharpDevelop.FileFilter.AllKnownFiles" xml:space="preserve">
+    <value>Estensioni file conosciute</value>
+  </data>
   <data name="SharpDevelop.FileFilter.AssemblyFiles" xml:space="preserve">
     <value>File di Assembly (*.exe;*.dll)</value>
   </data>
@@ -6024,6 +6153,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Overrides di ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Parti di ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>Riferimenti a ${Name}</value>
   </data>

data/resources/StringResources.nl.resx

@@ -290,7 +290,7 @@
 
 {1}
 
-Ze stoppen met werken als deze AddIn uitgeschakeld wordt. Wilt u doorgaan?</value>
+Ze stoppen met werken nadat deze AddIn wordt uitgeschakeld. Weet u zeker dat u wilt doorgaan?</value>
   </data>
   <data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
     <value>Package "{0}" heeft tenminste één toegevoegde package nodig:
@@ -353,7 +353,7 @@ Als u het niet eens bent met de licentie voorwaarden, klik dan de "Ik weiger" kn
 
 {1}
 
-Deze stoppen met werken na verwijderen van deze AddIn.</value>
+Deze stoppen met werken nadat deze AddIn wordt  verwijderd. Weet u zeker dat u wilt doorgaan?</value>
   </data>
   <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
     <value>SharpDevelop AddIns|*.sdaddin;*.addin|Alle bestanden|*.*</value>
@@ -2020,6 +2020,12 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging" xml:space="preserve">
     <value>Foutopsporing</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Vraag naar argumenten en werkmap bij starten uitvoerend bestand.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Breek op de eerste uitvoeringsregel.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
     <value>Decompiler inschakelen</value>
   </data>
@@ -2068,6 +2074,9 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Symbool- en broncodepaden:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Zonder broncode fout-opsporing.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;Koptekst</value>
   </data>
@@ -2879,15 +2888,15 @@ Er kan worden gekozen voor opslag van de instellingen in het .user bestand inpla
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Bron</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Uitgebreid</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Afbreken</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>&amp;Toevoegen</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Uitgebreid</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Terug</value>
   </data>
@@ -3740,6 +3749,12 @@ Noot: Dit beïnvloed eigen aangepaste opmaak niet.</value>
   <data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
     <value>Omgekeerd aanvullend zoeken:</value>
   </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
+    <value>{0} is ongeldig als .NET assembly</value>
+  </data>
+  <data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
+    <value>{0} is niet toegankelijk of bestaat niet meer.</value>
+  </data>
   <data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
     <value>Fout bij laden van code-completering informatie voor ${Assembly} van ${Filename}:</value>
   </data>
@@ -4638,6 +4653,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
     <value>Visual Studio extensie</value>
   </data>
+  <data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
+    <value>WPF ontwerper thumbnail overzicht</value>
+  </data>
   <data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
     <value>Kopieëren</value>
   </data>
@@ -4938,6 +4956,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Bladwijzers</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Toevoegen aan werkruimte</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Vorige</value>
   </data>
@@ -4977,9 +4998,24 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>Géén zoekresultaten gevonden.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Open assembly...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Open assembly vanuit bestand...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Assembly openen vanuit GAK...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenInClassBrowser" xml:space="preserve">
+    <value>Open in de klasse  bladeraar</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Zoeken in Klassen Overzicht</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Werkruimte {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Klassen Overzicht</value>
   </data>
@@ -5088,6 +5124,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Console</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Fout-opsporen in uitvoerend bestand</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Onderbreken</value>
   </data>
@@ -5445,6 +5484,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.SearchResultPanel.In" xml:space="preserve">
     <value>in</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;geen project&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} resultaten</value>
   </data>
@@ -5460,6 +5502,12 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Per bestand</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Per project</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Per project en bestand</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Selecteer de zoeklijst modus</value>
   </data>
@@ -6117,6 +6165,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Overschrijvingen van $(Name)</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Delen van ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>Referenties met ${Name}</value>
   </data>

data/resources/StringResources.resx

@@ -287,7 +287,7 @@ Download an AddIn from the Internet, then click 'Install AddIn' and choose the d
     <value>View License Terms</value>
   </data>
   <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
-    <value>Following installed AddIns are dependent from "{0}":
+    <value>Following installed AddIns are depending on "{0}":
 
 {1}
 
@@ -329,6 +329,9 @@ If you do not agree to the license terms click "I Decline".</value>
   <data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
     <value>Add</value>
   </data>
+  <data name="AddInManager2.OptionPanel.AutoCheckForUpdates" xml:space="preserve">
+    <value>Automatically check for updates</value>
+  </data>
   <data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
     <value>Move Down</value>
   </data>
@@ -347,11 +350,14 @@ If you do not agree to the license terms click "I Decline".</value>
   <data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
     <value>AddIns</value>
   </data>
+  <data name="AddInManager2.OptionPanel.Tree.General" xml:space="preserve">
+    <value>General</value>
+  </data>
   <data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
     <value>Repositories</value>
   </data>
   <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
-    <value>Following installed AddIns are dependent from "{0}":
+    <value>Following installed AddIns are depending on "{0}":
 
 {1}
 
@@ -420,12 +426,15 @@ They will stop working after removing this AddIn! Are you sure you want to conti
     <value>Help Library</value>
   </data>
   <data name="AddIns.HelpViewer.HelpModeLabel" xml:space="preserve">
-    <value>Help Mode</value>
+    <value>Set Help Preference</value>
   </data>
   <data name="AddIns.HelpViewer.HLMNoActiveCatalogError" xml:space="preserve">
     <value>Cannot launch Help Library Manager, because there is no help catalog installed/selected. Please check your help settings (see Tools &gt; Options &gt; Tools &gt; Microsoft Help Viewer).</value>
     <comment>Error message when there is no help catalog active</comment>
   </data>
+  <data name="AddIns.HelpViewer.HLMNotAvailableDownloadWinSDK" xml:space="preserve">
+    <value>The Help Library Manager was not found. In order to use SharpDevelop's help feature please download and install Microsoft's Windows SDK 7.1.</value>
+  </data>
   <data name="AddIns.HelpViewer.HLMNotFound" xml:space="preserve">
     <value>Help Library Manager was not found. Please check if it was installed correctly.</value>
   </data>
@@ -454,7 +463,7 @@ They will stop working after removing this AddIn! Are you sure you want to conti
     <value>Show Help</value>
   </data>
   <data name="AddIns.HelpViewer.UseExternalHelp" xml:space="preserve">
-    <value>Use external help</value>
+    <value>Use external help viewer</value>
   </data>
   <data name="AddIns.HelpViewer.UseOfflineHelpLabel" xml:space="preserve">
     <value>I want to use local help</value>
@@ -2079,6 +2088,12 @@ Do you want to add the new file to the project ${CurrentProjectName}?</value>
     <value>Debugging</value>
     <comment>The root node in the options dialog</comment>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.AskForArguments" xml:space="preserve">
+    <value>Ask for arguments and working directory on executable launch.</value>
+  </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.BreakAtBeginning" xml:space="preserve">
+    <value>Break at first line of execution.</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.Debugging.EnableDecompiler" xml:space="preserve">
     <value>Enable decompiler</value>
   </data>
@@ -2127,6 +2142,9 @@ Do you want to add the new file to the project ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption" xml:space="preserve">
     <value>Symbol and source code paths:</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Debugging.WithoutSource" xml:space="preserve">
+    <value>Without Source Debugging</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.EditStandardHeaderPanel.HeaderLabel" xml:space="preserve">
     <value>&amp;Header</value>
   </data>
@@ -2958,15 +2976,15 @@ You can also choose to store the setting in the .user-file instead of the projec
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Source</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Advanced</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Abort</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>&amp;Add</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Advanced</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Back</value>
   </data>
@@ -5225,6 +5243,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
   <data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
     <value>Bookmarks</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.AddToWorkspace" xml:space="preserve">
+    <value>Add to workspace</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.BackButton.ToolTip" xml:space="preserve">
     <value>Back</value>
   </data>
@@ -5264,9 +5285,24 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
   <data name="MainWindow.Windows.ClassBrowser.NoResultsFound" xml:space="preserve">
     <value>No search results found.</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyButton.ToolTip" xml:space="preserve">
+    <value>Open assembly</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromFile" xml:space="preserve">
+    <value>Open assembly from file...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenAssemblyFromGAC" xml:space="preserve">
+    <value>Open assembly from GAC...</value>
+  </data>
+  <data name="MainWindow.Windows.ClassBrowser.OpenInClassBrowser" xml:space="preserve">
+    <value>Open in Class Browser</value>
+  </data>
   <data name="MainWindow.Windows.ClassBrowser.SearchButton.ToolTip" xml:space="preserve">
     <value>Class View Search</value>
   </data>
+  <data name="MainWindow.Windows.ClassBrowser.Workspace" xml:space="preserve">
+    <value>Workspace {0}</value>
+  </data>
   <data name="MainWindow.Windows.ClassScoutLabel" xml:space="preserve">
     <value>Classes</value>
   </data>
@@ -5378,6 +5414,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
   <data name="MainWindow.Windows.Debug.Console" xml:space="preserve">
     <value>Console</value>
   </data>
+  <data name="MainWindow.Windows.Debug.DebugExecutable" xml:space="preserve">
+    <value>Debug executable</value>
+  </data>
   <data name="MainWindow.Windows.Debug.ExceptionForm.Break" xml:space="preserve">
     <value>Break</value>
     <comment>Button.
@@ -5763,6 +5802,9 @@ Shows the full callstack of the error.</comment>
     <value>in</value>
     <comment>used like this: occurrences IN files</comment>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.NoProject" xml:space="preserve">
+    <value>&lt;no project&gt;</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.OccurrencesCount" xml:space="preserve">
     <value>${Count} occurrences</value>
   </data>
@@ -5778,6 +5820,12 @@ Shows the full callstack of the error.</comment>
   <data name="MainWindow.Windows.SearchResultPanel.PerFile" xml:space="preserve">
     <value>Per file</value>
   </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProject" xml:space="preserve">
+    <value>Per project</value>
+  </data>
+  <data name="MainWindow.Windows.SearchResultPanel.PerProjectAndFile" xml:space="preserve">
+    <value>Per project and file</value>
+  </data>
   <data name="MainWindow.Windows.SearchResultPanel.SelectViewMode.ToolTip" xml:space="preserve">
     <value>Select search list mode</value>
   </data>
@@ -6469,6 +6517,9 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="SharpDevelop.Refactoring.OverridesOf" xml:space="preserve">
     <value>Overrides of ${Name}</value>
   </data>
+  <data name="SharpDevelop.Refactoring.PartsOfClass" xml:space="preserve">
+    <value>Parts of ${Name}</value>
+  </data>
   <data name="SharpDevelop.Refactoring.ReferencesTo" xml:space="preserve">
     <value>References to ${Name}</value>
     <comment>Title for search results for references</comment>

data/resources/StringResources.tr.resx

@@ -2732,15 +2732,15 @@ Ayrıca bir ayarı proje dosyası yerine kullanıcı dosyası(.user-file) içind
   <data name="FormsDesigner.DesignTabPages.SourceTabPage" xml:space="preserve">
     <value>Kaynak</value>
   </data>
-  <data name="Gloabl.Advanced" xml:space="preserve">
-    <value>Gelişmiş</value>
-  </data>
   <data name="Global.AbortButtonText" xml:space="preserve">
     <value>Başarısız</value>
   </data>
   <data name="Global.AddButtonText" xml:space="preserve">
     <value>Ekle</value>
   </data>
+  <data name="Global.Advanced" xml:space="preserve">
+    <value>Gelişmiş</value>
+  </data>
   <data name="Global.BackButtonText" xml:space="preserve">
     <value>&lt; Geri</value>
   </data>

src/AddIns/Misc/HelpViewer/HelpViewer.addin

@@ -20,30 +20,34 @@
 		<BrowserSchemeExtension id = "http" class = "MSHelpSystem.BrowserScheme"/>
 	</Path>
 
-	<Path name="/SharpDevelop/Pads/ErrorList/TaskContextMenu">
+	<Path name = "/SharpDevelop/Pads/ErrorList/TaskContextMenu">
-		<MenuItem id = "Help3ShowErrorHelp" label = "${res:AddIns.HelpViewer.ShowErrorHelpTitle}" class = "MSHelpSystem.Commands.ShowErrorHelpCommand" />
+		<MenuItem id    = "Help3ShowErrorHelp"
+		          label = "${res:AddIns.HelpViewer.ShowErrorHelpTitle}"
+		          class = "MSHelpSystem.Commands.ShowErrorHelpCommand" />
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<OptionPanel id = "Help3Options" label = "${res:AddIns.HelpViewer.MicrosoftHelpViewerTitle}" class = "MSHelpSystem.Help3OptionsPanel" />
+		<OptionPanel id    = "Help3Options"
+		             label = "${res:AddIns.HelpViewer.MicrosoftHelpViewerTitle}"
+		             class = "MSHelpSystem.Help3OptionsPanel" />
 	</Path>
 
-	<Path name = "/SharpDevelop/Workbench/Pads">
+	<Path name                 = "/SharpDevelop/Workbench/Pads">
-		<Pad id       = "Help3TocPad"
+		<Pad id                = "Help3TocPad"
-		     category = "Help3"
+		     category          = "Help3"
-		     title    = "${res:AddIns.HelpViewer.ContentsPadTitle}"
+		     title             = "${res:AddIns.HelpViewer.ContentsPadTitle}"
-		     icon     = "HtmlHelp2.16x16.Toc"
+		     icon              = "HtmlHelp2.16x16.Toc"
-		     class    = "MSHelpSystem.Controls.Help3TocPad"
+		     class             = "MSHelpSystem.Controls.Help3TocPad"
-		     defaultPosition = "Right, Hidden" />
+		     defaultPosition   = "Right, Hidden" />
-		<Pad id       = "Help3TocPad"
+		<Pad id                = "Help3SearchPad"
-		     category = "Help3"
+		     category          = "Help3"
-		     title    = "${res:AddIns.HelpViewer.SearchPadTitle}"
+		     title             = "${res:AddIns.HelpViewer.SearchPadTitle}"
-		     icon     = "HtmlHelp2.16x16.Search"
+		     icon              = "HtmlHelp2.16x16.Search"
-		     class    = "MSHelpSystem.Controls.Help3SearchPad"
+		     class             = "MSHelpSystem.Controls.Help3SearchPad"
-		     defaultPosition = "Right, Hidden" />	
+		     defaultPosition   = "Right, Hidden" />	
 	</Path>
 
-	<Path name = "/SharpDevelop/Workbench/MainMenu/Help">
+	<Path name                 = "/SharpDevelop/Workbench/MainMenu/Help">
 		<MenuItem id           = "Help3DisplayContentCommand"
 		          class        = "MSHelpSystem.Commands.DisplayContent"
 		          label        = "${res:AddIns.HelpViewer.DisplayContentsCommand}"

src/AddIns/Misc/HelpViewer/HelpViewer.csproj

@@ -67,6 +67,7 @@
     </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="Source\BrowserScheme.cs" />
+    <Compile Include="Source\Controls\HelpLibraryManagerNotFound.cs" />
     <Compile Include="Source\Controls\Pads.cs" />
     <Compile Include="Source\Controls\SearchPadControl.xaml.cs">
       <DependentUpon>SearchPadControl.xaml</DependentUpon>
@@ -81,7 +82,7 @@
     <Compile Include="Source\Core\Help3Catalog.cs" />
     <Compile Include="Source\Core\Help3Environment.cs" />
     <Compile Include="Source\Core\Help3Service.cs" />
-    <None Include="Source\Core\HelpLibraryManager.cs" />
+    <Compile Include="Source\Core\HelpLibraryManager.cs" />
     <Compile Include="Source\Core\HelpLibraryAgent.cs" />
     <Compile Include="Source\Help3OptionsPanel.xaml.cs">
       <DependentUpon>Help3OptionsPanel.xaml</DependentUpon>
@@ -121,6 +122,11 @@
       <Name>ICSharpCode.Core.Presentation</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
+      <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
+      <Name>ICSharpCode.Core.WinForms</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/AddIns/Misc/HelpViewer/Source/Commands.cs

@@ -6,12 +6,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using Microsoft.Win32;
-using MSHelpSystem.Core;
-using MSHelpSystem.Controls;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
+using MSHelpSystem.Controls;
+using MSHelpSystem.Core;
 
 namespace MSHelpSystem.Commands
 {
@@ -30,13 +29,13 @@ namespace MSHelpSystem.Commands
 					return;
 
 				if (Help3Environment.IsHelp3ProtocolRegistered) {
-					LoggingService.Debug(string.Format("Help 3.0: Getting description of \"{0}\"", code));
+					LoggingService.Debug(string.Format("HelpViewer: Getting description of \"{0}\"", code));
 					if (Help3Environment.IsLocalHelp)
 						DisplayHelp.Keywords(code);
 					else
 						DisplayHelp.ContextualHelp(code);
 				} else {
-					LoggingService.Error("Help 3.0: Help system ist not initialized");
+					LoggingService.Error("HelpViewer: Help system ist not initialized");
 				}
 			}
 		}
@@ -46,6 +45,12 @@ namespace MSHelpSystem.Commands
 	{
 		public override void Run()
 		{
+			if (!Help3Environment.IsHelp3ProtocolRegistered) {
+				using (HelpLibraryManagerNotFoundForm form = new HelpLibraryManagerNotFoundForm()) {
+					form.ShowDialog(WorkbenchSingleton.MainWin32Window);
+				}
+				return;
+			}
 			if (Help3Service.Config.ExternalHelp) DisplayHelp.Catalog();
 			else {
 				PadDescriptor toc = WorkbenchSingleton.Workbench.GetPad(typeof(Help3TocPad));
@@ -58,6 +63,12 @@ namespace MSHelpSystem.Commands
 	{
 		public override void Run()
 		{
+			if (!Help3Environment.IsHelp3ProtocolRegistered) {
+				using (HelpLibraryManagerNotFoundForm form = new HelpLibraryManagerNotFoundForm()) {
+					form.ShowDialog(WorkbenchSingleton.MainWin32Window);
+				}
+				return;
+			}
 			PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(Help3SearchPad));
 			if (search != null) search.BringPadToFront();
 		}
@@ -67,22 +78,13 @@ namespace MSHelpSystem.Commands
 	{
 		public override void Run()
 		{
-			string path;
+			if (string.IsNullOrEmpty(HelpLibraryManager.Manager)) {
-			if (!RegistryService.GetRegistryValue(RegistryHive.LocalMachine, @"SOFTWARE\Microsoft\Help\v1.0",
+				using (HelpLibraryManagerNotFoundForm form = new HelpLibraryManagerNotFoundForm()) {
-			                                      "AppRoot", RegistryValueKind.String, out path)) {
+					form.ShowDialog(WorkbenchSingleton.MainWin32Window);
-				MessageService.ShowError("${res:AddIns.HelpViewer.HLMNotFound}");
+				}
-				return;
-			}
-			path = Path.Combine(path, "HelpLibManager.exe");
-			if (!File.Exists(path)) {
-				MessageService.ShowError("${res:AddIns.HelpViewer.HLMNotFound}");
-				return;
-			}
-			if (string.IsNullOrEmpty(Help3Service.Config.ActiveCatalogId)) {
-				MessageService.ShowError("${res:AddIns.HelpViewer.HLMNoActiveCatalogError}");
 				return;
 			}
-			Process.Start(path, string.Format("/product {0} /version {1} /locale {2}", Help3Service.Config.ActiveCatalogId.Split('/')));
+			HelpLibraryManager.Start();
 		}
 	}
 }

src/AddIns/Misc/HelpViewer/Source/Controls/HelpLibraryManagerNotFound.cs

@@ -0,0 +1,21 @@
+// 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 System;
+using System.Diagnostics;
+using System.Windows.Forms;
+using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
+using ICSharpCode.SharpDevelop.Gui;
+
+namespace MSHelpSystem.Controls
+{
+	public class HelpLibraryManagerNotFoundForm : ToolNotFoundDialog
+	{
+		public HelpLibraryManagerNotFoundForm()
+			: base(StringParser.Parse("${res:AddIns.HelpViewer.HLMNotAvailableDownloadWinSDK}"),
+			       "http://www.microsoft.com/en-us/download/details.aspx?id=8279", null)
+		{
+		}
+	}
+}

src/AddIns/Misc/HelpViewer/Source/Controls/SearchPadControl.xaml

@@ -1,7 +1,8 @@
-<UserControl x:Class="MSHelpSystem.Controls.SearchPadControl"
+<?xml version="1.0" encoding="utf-8"?>
+<UserControl x:Class="MSHelpSystem.Controls.SearchPadControl"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
 	<StackPanel>
 		<TextBlock Text="{core:Localize AddIns.HelpViewer.SearchLookForLabel}" Margin="5,2,5,1" />
 		<ComboBox Name="searchCB" Margin="5,2,5,5" Padding="1" IsEnabled="False" IsEditable="True" PreviewKeyUp="SearchCBPreviewKeyUp" />

src/AddIns/Misc/HelpViewer/Source/Controls/TocEntry.cs

@@ -9,6 +9,7 @@ using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Web;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -35,14 +36,14 @@ namespace MSHelpSystem.Controls
 			client.DownloadStringCompleted += (_, e) =>
 			{
 				try {
-					LoggingService.Debug(string.Format("Help 3.0: title \"{0}\"", Title));
+					LoggingService.Debug(string.Format("HelpViewer: TocEntry \"{0}\" found", Title));
 					var children = XElement.Parse(e.Result);
 					Children     = children.Elements("topic")
-						.Select(link => new TocEntry(link.Attribute("id").Value) { Title = link.Element("title").Value })
+						.Select(link => new TocEntry(link.Attribute("id").Value) { Title = WebUtility.HtmlDecode(link.Element("title").Value) })
 						.ToArray();
 				} catch (TargetInvocationException ex) {
 					// Exception when fetching e.Result:
-					LoggingService.Warn(ex);
+					LoggingService.Error(ex.ToString());
 					this.children = defaultChild;
 				}
 				client.Dispose();
@@ -58,8 +59,7 @@ namespace MSHelpSystem.Controls
 
 		public IEnumerable Children
 		{
-			get
+			get {
-			{
 				if (Help3Service.ActiveCatalog != null) {
 					if (children == null && !client.IsBusy && HelpLibraryAgent.PortIsReady) {
 						client.DownloadStringAsync(new Uri(Help3Environment.GetHttpFromMsXHelp(string.Format(url, Help3Service.ActiveCatalog.AsMsXHelpParam, id))));
@@ -67,8 +67,7 @@ namespace MSHelpSystem.Controls
 				}
 				return children ?? defaultChild;
 			}
-			private set
+			private set {
-			{
 				children = value;
 				RaisePropertyChanged("Children");
 			}
@@ -81,5 +80,5 @@ namespace MSHelpSystem.Controls
 			System.ComponentModel.PropertyChangedEventHandler handler = PropertyChanged;
 			if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(name));
 		}
-  }
+  	}
 }

src/AddIns/Misc/HelpViewer/Source/Controls/TocPadControl.xaml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<UserControl
+<UserControl x:Class="MSHelpSystem.Controls.TocPadControl"
-	x:Class="MSHelpSystem.Controls.TocPadControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
 	<Grid>
 		<TreeView
 			Name="tocTreeView"

src/AddIns/Misc/HelpViewer/Source/Controls/TocPadControl.xaml.cs

@@ -35,7 +35,7 @@ namespace MSHelpSystem.Controls
 		{
 			string topicId = (string)tocTreeView.SelectedValue;
 			if (!string.IsNullOrEmpty(topicId)) {
-				LoggingService.Debug(string.Format("Help 3.0: [TOC] Calling page with Id \"{0}\"", topicId));
+				LoggingService.Debug(string.Format("HelpViewer: TocItemChanged to ID \"{0}\"", topicId));
 				DisplayHelp.Page(topicId);
 			}
 		}

src/AddIns/Misc/HelpViewer/Source/Core/DisplayHelp.cs

@@ -32,8 +32,7 @@ namespace MSHelpSystem.Core
 			if (Help3Service.ActiveCatalog == null) {
 				return false;
 			}
-			string helpCatalogUrl = string.Format(@"ms-xhelp://?method=page&id=-1&{0}", Help3Service.ActiveCatalog.AsMsXHelpParam);
+			string helpCatalogUrl = string.Concat("ms-xhelp://?method=page&id=-1&", Help3Service.ActiveCatalog.AsMsXHelpParam);
-			LoggingService.Debug(string.Format("Help 3.0: {0}", helpCatalogUrl));
 			DisplayLocalHelp(helpCatalogUrl);
 			return true;
 		}
@@ -53,8 +52,7 @@ namespace MSHelpSystem.Core
 			if (Help3Service.ActiveCatalog == null) {
 				return false;
 			}
-			string helpPageUrl = string.Format(@"ms-xhelp://?method=page&id={1}&{0}", Help3Service.ActiveCatalog.AsMsXHelpParam, pageId);
+			string helpPageUrl = string.Concat("ms-xhelp://?method=page&id=", pageId, "&", Help3Service.ActiveCatalog.AsMsXHelpParam);
-			LoggingService.Debug(string.Format("Help 3.0: {0}", helpPageUrl));
 			DisplayLocalHelp(helpPageUrl);
 			return true;
 		}
@@ -71,8 +69,7 @@ namespace MSHelpSystem.Core
 			if (Help3Service.ActiveCatalog == null) {				
 				return false;
 			}
-			string helpContextualUrl = string.Format(@"ms-xhelp://?method=f1&query={1}&{0}", Help3Service.ActiveCatalog.AsMsXHelpParam, contextual);
+			string helpContextualUrl = string.Concat("ms-xhelp://?method=f1&query=", contextual, "&", Help3Service.ActiveCatalog.AsMsXHelpParam);
-			LoggingService.Debug(string.Format("Help 3.0: {0}", helpContextualUrl));
 			DisplayLocalHelp(helpContextualUrl);
 			return true;
 		}
@@ -89,8 +86,7 @@ namespace MSHelpSystem.Core
 			if (Help3Service.ActiveCatalog == null) {
 				return false;
 			}
-			string helpSearchUrl = string.Format(@"ms-xhelp://?method=search&query={1}&{0}", Help3Service.ActiveCatalog.AsMsXHelpParam, searchWords.Replace(" ", "+"));
+			string helpSearchUrl = string.Concat("ms-xhelp://?method=search&query=", searchWords.Replace(" ", "+"), "&", Help3Service.ActiveCatalog.AsMsXHelpParam);
-			LoggingService.Debug(string.Format("Help 3.0: {0}", helpSearchUrl));
 			DisplayLocalHelp(helpSearchUrl);
 			return true;
 		}
@@ -110,8 +106,7 @@ namespace MSHelpSystem.Core
 			if (Help3Service.ActiveCatalog == null) {
 				return false;
 			}
-			string helpKeywordsUrl = string.Format(@"ms-xhelp://?method=keywords&query={1}&{0}", Help3Service.ActiveCatalog.AsMsXHelpParam, keywords.Replace(" ", "+"));
+			string helpKeywordsUrl = string.Concat("ms-xhelp://?method=keywords&query=", keywords.Replace(" ", "+"), "&", Help3Service.ActiveCatalog.AsMsXHelpParam);
-			LoggingService.Debug(string.Format("Help 3.0: {0}", helpKeywordsUrl));
 			DisplayLocalHelp(helpKeywordsUrl);
 			return true;
 		}
@@ -132,8 +127,7 @@ namespace MSHelpSystem.Core
 				HelpLibraryAgent.Start();
 				Thread.Sleep(0x3e8);
 			}
-			string helpUrl = string.Format(@"{0}{1}{2}",
+			string helpUrl = string.Concat(arguments, ProjectLanguages.CurrentLanguageAsHttpParam, (embedded)?"&embedded=true":string.Empty);
-			                               arguments, ProjectLanguages.GetCurrentLanguageAsHttpParam(), (embedded)?"&embedded=true":string.Empty);
 
 			if (Help3Service.Config.ExternalHelp) {
 				DisplayHelpWithShellExecute(helpUrl);
@@ -141,7 +135,7 @@ namespace MSHelpSystem.Core
 			}
 			BrowserPane browser = ActiveHelp3Browser();
 			if (browser != null) {
-				LoggingService.Info(string.Format("Help 3.0: Navigating to {0}", helpUrl));
+				LoggingService.Info(string.Format("HelpViewer: DisplayLocalHelp calls \"{0}\"", helpUrl));
 				browser.Navigate(Help3Environment.GetHttpFromMsXHelp(helpUrl));
 				browser.WorkbenchWindow.SelectWindow();
 			}
@@ -161,7 +155,7 @@ namespace MSHelpSystem.Core
 				p.WaitForInputIdle();
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 		}
 
@@ -170,7 +164,7 @@ namespace MSHelpSystem.Core
 			if (string.IsNullOrEmpty(keyword)) {
 				throw new ArgumentNullException("keyword");
 			}
-			string msdnUrl = string.Format(@"http://msdn.microsoft.com/library/{0}.aspx", keyword);
+			string msdnUrl = string.Concat("http://msdn.microsoft.com/library/", keyword, ".aspx");
 
 			if (Help3Service.Config.ExternalHelp) {
 				DisplayHelpWithShellExecute(msdnUrl);
@@ -178,7 +172,7 @@ namespace MSHelpSystem.Core
 			}
 			BrowserPane browser = ActiveHelp3Browser();
 			if (browser != null) {
-				LoggingService.Info(string.Format("Help 3.0: Navigating to {0}", msdnUrl));
+				LoggingService.Info(string.Format("HelpViewer: DisplayHelpOnMSDN calls \"{0}\"", msdnUrl));
 				browser.Navigate(msdnUrl);
 				browser.WorkbenchWindow.SelectWindow();
 			}
@@ -189,10 +183,10 @@ namespace MSHelpSystem.Core
 			if (string.IsNullOrEmpty(searchWords)) {
 				throw new ArgumentNullException("searchWords");
 			}
-			string msdnUrl = string.Format(@"http://social.msdn.microsoft.com/Search/{0}/?query={1}&ac=3", CultureInfo.CurrentUICulture.ToString(), searchWords.Replace(" ", "+"));
+			string msdnUrl = string.Concat("http://social.msdn.microsoft.com/Search/", CultureInfo.CurrentUICulture.ToString(), "/?query=", searchWords.Replace(" ", "+"), "&ac=3");
 			BrowserPane browser = ActiveHelp3Browser();
 			if (browser != null) {
-				LoggingService.Info(string.Format("Help 3.0: Navigating to {0}", msdnUrl));
+				LoggingService.Info(string.Format("HelpViewer: DisplaySearchOnMSDN calls \"{0}\"", msdnUrl));
 				browser.Navigate(msdnUrl);
 				browser.WorkbenchWindow.SelectWindow();
 			}

src/AddIns/Misc/HelpViewer/Source/Core/Help3Environment.cs

@@ -18,8 +18,7 @@ namespace MSHelpSystem.Core
 		
 		public static bool IsHelp3ProtocolRegistered
 		{
-			get
+			get {
-			{
 				try {
 					RegistryKey hkcr = RegistryKey.OpenBaseKey(RegistryHive.ClassesRoot, RegistryView.Registry64).OpenSubKey(@"MS-XHelp\shell\open\command", false);
 					string helpLibAgent = (string)hkcr.GetValue("", string.Empty);
@@ -27,7 +26,7 @@ namespace MSHelpSystem.Core
 					return (!string.IsNullOrEmpty(helpLibAgent));
 				}
 				catch (Exception ex) {
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}
 				return false;
 			}
@@ -35,8 +34,7 @@ namespace MSHelpSystem.Core
 
 		public static bool IsLocalStoreInitialized
 		{
-			get
+			get {
-			{
 				string localStore = LocalStore;
 				return (!string.IsNullOrEmpty(localStore) && Directory.Exists(localStore));
 			}
@@ -44,8 +42,7 @@ namespace MSHelpSystem.Core
 
 		public static string LocalStore
 		{
-			get
+			get {
-			{
 				try {
 					RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\Help\v1.0", false);
 					string localStore = (string)hklm.GetValue("LocalStore", string.Empty);
@@ -53,7 +50,7 @@ namespace MSHelpSystem.Core
 					return localStore;
 				}
 				catch (Exception ex) {
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}
 				return string.Empty;
 			}
@@ -66,8 +63,7 @@ namespace MSHelpSystem.Core
 
 		public static string AppRoot
 		{
-			get
+			get {
-			{
 				try {
 					RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\Help\v1.0", false);
 					string appRoot = (string)hklm.GetValue("AppRoot", string.Empty);
@@ -75,7 +71,7 @@ namespace MSHelpSystem.Core
 					return appRoot;
 				}
 				catch (Exception ex) {
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}
 				return string.Empty;
 			}
@@ -83,8 +79,7 @@ namespace MSHelpSystem.Core
 
 		public static string ManifestFolder
 		{
-			get
+			get {
-			{
 				string manifestFolder = LocalStore;
 				if (string.IsNullOrEmpty(manifestFolder)) return string.Empty;
 				manifestFolder = System.IO.Path.Combine(manifestFolder, "manifest");
@@ -95,7 +90,7 @@ namespace MSHelpSystem.Core
 
 		public static bool IsLocalHelp
 		{
-			get { 	return HelpClientWatcher.IsLocalHelp; }
+			get { return HelpClientWatcher.IsLocalHelp; }
 		}
 		
 		public static string GetHttpFromMsXHelp(string helpUrl)

src/AddIns/Misc/HelpViewer/Source/Core/Help3Service.cs

@@ -37,8 +37,7 @@ namespace MSHelpSystem.Core
 		static void UpdateCatalogs()
 		{
 			catalogs.Clear();
-			if (Help3Environment.IsHelp3ProtocolRegistered && !string.IsNullOrEmpty(Help3Environment.ManifestFolder))
+			if (Help3Environment.IsHelp3ProtocolRegistered && !string.IsNullOrEmpty(Help3Environment.ManifestFolder)) {
-			{
 				try {
 					DirectoryInfo folder = new DirectoryInfo(Help3Environment.ManifestFolder);
 					FileInfo[] files = folder.GetFiles(@"queryManifest*.xml");
@@ -58,10 +57,10 @@ namespace MSHelpSystem.Core
 							);
 						}
 					}
-					LoggingService.Debug(string.Format("Help 3.0: {0} {1} loaded", catalogs.Count, (catalogs.Count == 1)?"catalog":"catalogs"));
+					LoggingService.Debug(string.Format("HelpViewer: {0} {1} loaded", catalogs.Count, (catalogs.Count == 1)?"catalog":"catalogs"));
 				}
 				catch (Exception ex) {
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}				
 			}
 			OnCatalogsUpdated(EventArgs.Empty);
@@ -94,8 +93,7 @@ namespace MSHelpSystem.Core
 
 		public static ReadOnlyCollection<Help3Catalog> Items
 		{
-			get
+			get {
-			{
 				ReadOnlyCollection<Help3Catalog> c = new ReadOnlyCollection<Help3Catalog>(catalogs);
 				return c;
 			}
@@ -133,12 +131,10 @@ namespace MSHelpSystem.Core
 
 		public static string ActiveCatalogId
 		{
-			get
+			get {
-			{
 				return config.ActiveCatalogId;
 			}
-			set
+			set {
-			{
 				config.ActiveCatalogId = value;
 				OnCatalogChanged(EventArgs.Empty);
 			}
@@ -167,10 +163,10 @@ namespace MSHelpSystem.Core
 				TextReader file = new StreamReader(configFile);
 				config = (Help3Configuration)serialize.Deserialize(file);
 				file.Close();
-				LoggingService.Info("Help 3.0: Configuration successfully loaded");
+				LoggingService.Info("HelpViewer: Configuration successfully loaded");
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			OnConfigurationUpdated(EventArgs.Empty);
 		}
@@ -183,10 +179,10 @@ namespace MSHelpSystem.Core
 				TextWriter file = new StreamWriter(configFile);
 				serialize.Serialize(file, config);
 				file.Close();
-				LoggingService.Info("Help 3.0: Configuration successfully saved");
+				LoggingService.Info("HelpViewer: Configuration successfully saved");
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			OnConfigurationUpdated(EventArgs.Empty);
 		}
@@ -201,19 +197,19 @@ namespace MSHelpSystem.Core
 
 		static void OnCatalogsUpdated(EventArgs e)
 		{
-			LoggingService.Debug("Help 3.0: \"OnCatalogsUpdated\" event raised");
+			LoggingService.Debug("HelpViewer: OnCatalogsUpdated event raised");
 			if (CatalogsUpdated != null) CatalogsUpdated(null, e);
 		}
 
 		static void OnCatalogChanged(EventArgs e)
 		{
-			LoggingService.Debug("Help 3.0: \"OnCatalogChanged\" event raised");
+			LoggingService.Debug("HelpViewer: OnCatalogChanged event raised");
 			if (CatalogChanged != null) CatalogChanged(null, e);
 		}
 
 		static void OnConfigurationUpdated(EventArgs e)
 		{
-			LoggingService.Debug("Help 3.0: \"OnConfigurationUpdated\" event raised");
+			LoggingService.Debug("HelpViewer: OnConfigurationUpdated event raised");
 			if (ConfigurationUpdated != null) ConfigurationUpdated(null, e);
 		}
 		

src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryAgent.cs

@@ -19,29 +19,26 @@ namespace MSHelpSystem.Core
 
 		public static bool IsRunning
 		{
-			get
+			get {
-			{
 				Process[] agents = Process.GetProcessesByName("HelpLibAgent");
-				LoggingService.Debug(string.Format("Help 3.0: {0} {1} of HelpLibraryAgent.exe found", agents.Length, (agents.Length == 1)?"process":"processes"));
+				LoggingService.Debug(string.Format("HelpViewer: {0} HelpLibraryAgent {1} found", agents.Length, (agents.Length == 1)?"process":"processes"));
 				return agents.Length > 0;
 			}
 		}
 
 		public static string Agent
 		{
-			get
+			get {
-			{
 				if (string.IsNullOrEmpty(Help3Environment.AppRoot)) return string.Empty;
 				string agent = Path.Combine(Help3Environment.AppRoot, "HelpLibAgent.exe");
-				LoggingService.Debug(string.Format("Help 3.0: Help library agent is \"{0}\"", agent));
+				LoggingService.Debug(string.Format("HelpViewer: HelpLibraryAgent is \"{0}\"", agent));
 				return (File.Exists(agent)) ? agent : string.Empty;
 			}
 		}
 
 		public static int PortNumber
 		{
-			get
+			get {
-			{
 				try {
 					RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\Help\v1.0", false);
 					string port = (string)hklm.GetValue("AgentPort", "47873");
@@ -49,7 +46,7 @@ namespace MSHelpSystem.Core
 					return Convert.ToInt32(port);
 				}
 				catch (Exception ex) {
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}
 				return 47873; // This is the DEFAULT port number!
 			}
@@ -57,8 +54,7 @@ namespace MSHelpSystem.Core
 
 		public static bool PortIsReady
 		{
-			get
+			get {
-			{
 				try {
 					Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 					socket.Connect(IPAddress.Parse("127.0.0.1"), PortNumber);
@@ -68,10 +64,10 @@ namespace MSHelpSystem.Core
 				}
 				catch (SocketException ex) {
 					if (ex.ErrorCode == 10061) {
-						LoggingService.Debug("Help 3.0: Port is available but not ready");
+						LoggingService.Debug("HelpViewer: Port is available but not ready");
 						return true;
 					}
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}
 				return false;
 			}
@@ -79,19 +75,17 @@ namespace MSHelpSystem.Core
 
 		public static int ProcessId
 		{
-			get
+			get {
-			{
 				Process[] agents = Process.GetProcessesByName("HelpLibAgent");
 				int processId = (agents.Length > 0) ? agents[0].Id:0;
-				LoggingService.Debug(string.Format("Help 3.0: Help library agent has the process ID \"{0}\"", processId));
+				LoggingService.Debug(string.Format("HelpViewer: HelpLibraryAgent has process ID \"{0}\"", processId));
 				return processId;
 			}
 		}
 
 		public static string CurrentViewer
 		{
-			get
+			get {
-			{
 				string viewer = string.Empty;
 				try {
 					RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\Help\v1.0", false);
@@ -107,9 +101,9 @@ namespace MSHelpSystem.Core
 					}
 				}
 				catch (Exception ex) {
-					LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+					LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 				}
-				LoggingService.Debug(string.Format("Help 3.0: Default viewer is \"{0}\"", viewer));
+				LoggingService.Debug(string.Format("HelpViewer: Default viewer is \"{0}\"", viewer));
 				return viewer;
 			}
 		}
@@ -121,11 +115,11 @@ namespace MSHelpSystem.Core
 			try {
 				Process p = Process.Start(Agent);
 				p.WaitForInputIdle();
-				LoggingService.Info("Help 3.0: Help library agent started");
+				LoggingService.Info("HelpViewer: HelpLibraryAgent started");
 				return IsRunning;
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			return false;
 		}
@@ -144,10 +138,10 @@ namespace MSHelpSystem.Core
 					agent.Kill();
 					if (waitForExit) agent.WaitForExit();
 				}
-				LoggingService.Debug(string.Format("Help 3.0: {0} {1} of HelpLibraryAgent.exe stopped", agents.Length, (agents.Length == 1)?"process":"processes"));
+				LoggingService.Debug(string.Format("HelpViewer: {0} HelpLibraryAgent {1} stopped", agents.Length, (agents.Length == 1)?"process":"processes"));
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}			
 			return true;
 		}

src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryManager.cs

@@ -18,21 +18,19 @@ namespace MSHelpSystem.Core
 
 		public static bool IsRunning
 		{
-			get
+			get {
-			{
 				Process[] managers = Process.GetProcessesByName("HelpLibManager");
-				LoggingService.Debug(string.Format("Help 3.0: {0} {1} of HelpLibraryManager.exe found", managers.Length, (managers.Length == 1)?"process":"processes"));
+				LoggingService.Debug(string.Format("HelpViewer: {0} HelpLibraryManager {1} found", managers.Length, (managers.Length == 1)?"process":"processes"));
 				return managers.Length > 0;				
 			}
 		}
 
 		public static string Manager
 		{
-			get
+			get {
-			{
 				if (string.IsNullOrEmpty(Help3Environment.AppRoot)) return string.Empty;
 				string manager = Path.Combine(Help3Environment.AppRoot, "HelpLibManager.exe");
-				LoggingService.Debug(string.Format("Help 3.0: Help library manager is \"{0}\"", manager));
+				LoggingService.Debug(string.Format("HelpViewer: HelpLibraryManager is \"{0}\"", manager));
 				return (File.Exists(manager)) ? manager : string.Empty;
 			}
 		}
@@ -61,7 +59,7 @@ namespace MSHelpSystem.Core
 			string brandingSwitch = (!string.IsNullOrEmpty(brandingPackage)) ? string.Format("/brandingPackage \"{0}\"", brandingPackage):"";
 			string arguments = string.Format("/product {0} /version {1} /locale {2} /content \"{3}\" {4}", productCode, productVersion, locale, Help3Environment.BuildLocalStoreFolder, brandingSwitch);
 
-			LoggingService.Debug(string.Format("Help 3.0: Initializing local store with \"{0}\"", arguments));
+			LoggingService.Debug(string.Format("HelpViewer: Initializing local store with \"{0}\"", arguments));
 			HelpLibManagerProcessRunner(arguments);
 		}
 
@@ -88,7 +86,7 @@ namespace MSHelpSystem.Core
 			string brandingSwitch = (!string.IsNullOrEmpty(brandingPackage)) ? string.Format("/brandingPackage \"{0}\"", brandingPackage):"";
 			string arguments = string.Format("/product {0} /version {1} /locale {2} /sourceMedia \"{3}\" {4} {5}", productCode, productVersion, locale, sourceMedia, initLS, brandingSwitch);
 
-			LoggingService.Debug(string.Format("Help 3.0: Installing local help documents with \"{0}\"", arguments));
+			LoggingService.Debug(string.Format("HelpViewer: Installing local help documents with \"{0}\"", arguments));
 			HelpLibManagerProcessRunner(arguments);
 		}
 
@@ -114,7 +112,7 @@ namespace MSHelpSystem.Core
 			string brandingSwitch = (!string.IsNullOrEmpty(brandingPackage)) ? string.Format("/brandingPackage \"{0}\"", brandingPackage):"";
 			string arguments = string.Format("/product {0} /version {1} /locale {2} /sourceWeb \"{3}\" {4} {5}", productCode, productVersion, locale, sourceWeb, initLS, brandingSwitch);
 
-			LoggingService.Debug(string.Format("Help 3.0: Installing help documents from web with \"{0}\"", arguments));
+			LoggingService.Debug(string.Format("HelpViewer: Installing help documents from web with \"{0}\"", arguments));
 			HelpLibManagerProcessRunner(arguments);
 		}
 
@@ -136,7 +134,7 @@ namespace MSHelpSystem.Core
 
 			string arguments = string.Format("/product {0} /version {1} /locale {2} /vendor \"{3}\" /productName \"{4}\" /mediaBookList {5} /uninstall", productCode, productVersion, locale, vendor, productName, mediaBookList);
 
-			LoggingService.Debug(string.Format("Help 3.0: Uninstalling help documents with \"{0}\"", arguments));
+			LoggingService.Debug(string.Format("HelpViewer: Uninstalling help documents with \"{0}\"", arguments));
 			HelpLibManagerProcessRunner(arguments);
 		}
 		                                         
@@ -166,13 +164,17 @@ namespace MSHelpSystem.Core
 				return p.ExitCode;
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			return -1;
 		}
 
-
 		public static bool Start()
+		{
+			return Start(false);
+		}
+
+		public static bool Start(bool runPrivileged)
 		{
 			if (IsRunning) return true;
 			if (string.IsNullOrEmpty(Manager)) {
@@ -186,16 +188,16 @@ namespace MSHelpSystem.Core
 			psi.WorkingDirectory = Help3Environment.AppRoot;
 			psi.Arguments = Help3Service.ActiveCatalog.AsCmdLineParam;
 			psi.UseShellExecute = true;
-			psi.Verb = "runas";
+			if (runPrivileged) psi.Verb = "runas";
 			psi.WindowStyle = ProcessWindowStyle.Normal;
 			try {
 				Process p = Process.Start(psi);
 				p.WaitForInputIdle();
-				LoggingService.Info("Help 3.0: Help library manager started");
+				LoggingService.Info("HelpViewer: HelpLibraryManager started");
 				return IsRunning;
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			return false;
 		}
@@ -214,10 +216,10 @@ namespace MSHelpSystem.Core
 					manager.Kill();
 					if (waitForExit) manager.WaitForExit();
 				}
-				LoggingService.Debug(string.Format("Help 3.0: {0} {1} of HelpLibraryManager.exe stopped", managers.Length, (managers.Length == 1)?"process":"processes"));
+				LoggingService.Debug(string.Format("HelpViewer: {0} HelpLibraryManager {1} stopped", managers.Length, (managers.Length == 1)?"process":"processes"));
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}			
 			return true;
 		}

src/AddIns/Misc/HelpViewer/Source/Help3OptionsPanel.xaml.cs

@@ -49,22 +49,22 @@ namespace MSHelpSystem
 
 		void Help3OfflineModeClicked(object sender, RoutedEventArgs e)
 		{
-			LoggingService.Info("Help 3.0: Setting help mode to \"offline\"");
 			Help3Service.Config.OfflineMode = true;
 			help3Catalogs.IsEnabled = (help3Catalogs.Items.Count > 1 && Help3Service.Config.OfflineMode);
+			LoggingService.Info("HelpViewer: Help mode set to \"offline\"");
 		}
 
 		void Help3OnlineModeClicked(object sender, RoutedEventArgs e)
 		{
-			LoggingService.Info("Help 3.0: Setting help mode to \"online\"");
 			Help3Service.Config.OfflineMode = false;
 			help3Catalogs.IsEnabled = false;
+			LoggingService.Info("HelpViewer: Help mode set to \"online\"");
 		}
 
 		void Help3UseExternalHelpClicked(object sender, RoutedEventArgs e)
 		{
 			Help3Service.Config.ExternalHelp = (bool)externalHelp.IsChecked;
-			LoggingService.Info(string.Format("Help 3.0: {0} external help", (Help3Service.Config.ExternalHelp)?"Enabling":"Disabling"));
+			LoggingService.Info(string.Format("HelpViewer: External help viewer {0}", (Help3Service.Config.ExternalHelp)?"enabled":"disabled"));
 		}
 
 		public override bool SaveOptions()

src/AddIns/Misc/HelpViewer/Source/Helper/HelpClientWatcher.cs

@@ -97,7 +97,7 @@ namespace MSHelpSystem.Helper
 				}
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			return "offline";
 		}
@@ -105,7 +105,7 @@ namespace MSHelpSystem.Helper
 		static void SetHelpMode()
 		{
 			clientFileChanged.EnableRaisingEvents = false;
-			LoggingService.Info(string.Format("Help 3.0: Trying to set Help mode to \"{0}\"", helpMode));
+			LoggingService.Info(string.Format("HelpViewer: Trying to set help mode to \"{0}\"", helpMode));
 
 			Configuration config = null;
 			try {
@@ -136,7 +136,7 @@ namespace MSHelpSystem.Helper
 				}
 			}
 			catch (Exception ex) {
-				LoggingService.Error(string.Format("Help 3.0: {0}", ex.ToString()));
+				LoggingService.Error(string.Format("HelpViewer: {0}", ex.ToString()));
 			}
 			clientFileChanged.EnableRaisingEvents = true;
 		}

src/AddIns/Misc/HelpViewer/Source/Helper/ProjectLanguages.cs

@@ -23,33 +23,39 @@ namespace MSHelpSystem.Helper
 			Dictionary<string, string> result = new Dictionary<string, string>();
 			result.Add("C++", "C%2B%2B");
 			result.Add("C#", "CSharp");
+			result.Add("F#", "FSharp");
 			result.Add("VBNet", "VB");
 			return result;
 		}
 
 		#endregion
 
-		public static string GetCurrentLanguage()
+		public static string CurrentLanguage
 		{
-			string output = string.Empty;
+			get {
-			if (ProjectService.CurrentProject != null) {
+				string output = string.Empty;
-				string devLang = ProjectService.CurrentProject.Language;
+
-				if (string.IsNullOrEmpty(devLang)) { throw new ArgumentNullException("devLang"); }
+				if (ProjectService.CurrentProject != null) {
-				output = devLang;
+					string devLang = ProjectService.CurrentProject.Language;
-
+					if (string.IsNullOrEmpty(devLang)) {
-				if (!languages.ContainsKey(devLang) || !languages.TryGetValue(devLang, out output)) {
+						throw new ArgumentNullException("devLang");
-					output = devLang;
+					}
+					if (!languages.ContainsKey(devLang) || !languages.TryGetValue(devLang, out output)) {
+						output = devLang;
+					}
+					LoggingService.Debug(string.Format("HelpViewer: Project language \"{0}\" formatted to \"{1}\"", devLang, output));
 				}
-				LoggingService.Debug(string.Format("Help 3.0: Project language \"{0}\" formatted to \"{1}\"", devLang, output));
+				return output.ToLower();
 			}
-			return output.ToLower();
 		}
 
-		public static string GetCurrentLanguageAsHttpParam()
+		public static string CurrentLanguageAsHttpParam
 		{
-			string devLang = GetCurrentLanguage();
+			get {
-			if (string.IsNullOrEmpty(devLang)) return string.Empty;
+				string devLang = CurrentLanguage;
-			else return string.Format("&category=DevLang%3a{0}", devLang);
+				if (string.IsNullOrEmpty(devLang)) return string.Empty;
+				else return string.Format("&category=DevLang%3a{0}", devLang);
+			}
 		}
 	}
 }

src/AddIns/Misc/HelpViewer/Source/MSHelp3Provider.cs

@@ -15,7 +15,7 @@ namespace MSHelpSystem
 			if (string.IsNullOrEmpty(fullTypeName)) {
 				throw new ArgumentNullException("fullTypeName");
 			}
-			LoggingService.Info(string.Format("Help 3.0: Calling \"TryShowHelp\" with {0}", fullTypeName));
+			LoggingService.Info(string.Format("HelpViewer: TryShowHelp calls \"{0}\"", fullTypeName));
 			return DisplayHelp.ContextualHelp(fullTypeName);
 		}
 
@@ -24,7 +24,7 @@ namespace MSHelpSystem
 			if (string.IsNullOrEmpty(keyword)) {
 				throw new ArgumentNullException("keyword");
 			}
-			LoggingService.Info(string.Format("Help 3.0: Calling \"TryShowHelpByKeyword\" with {0}", keyword));
+			LoggingService.Info(string.Format("HelpViewer: TryShowHelpByKeyword calls \"{0}\"", keyword));
 			DisplayHelp.Keywords(keyword);
 			return true;
 		}