Merge remote branch 'origin/reports' into 4.0

data/resources/StringResources.cz.resx

@@ -231,6 +231,9 @@
   <data name="AddIns.ClassDiagram.ShowClassDiagram" xml:space="preserve">
     <value>Ukázat diagram třídy</value>
   </data>
+  <data name="AddIns.Git.TortoiseGitRequired" xml:space="preserve">
+    <value>Pro spuštění tohoto příkazu musí být nainstalován TortoiseGit.</value>
+  </data>
   <data name="AddIns.HtmlHelp2.AddToFavorites" xml:space="preserve">
     <value>Přidat nápovědu k Oblíbeným.</value>
   </data>
@@ -1505,6 +1508,9 @@ Chcete přidat nový soubor do projektu ${CurrentProjectName}?</value>
   <data name="Dialog.NewFile.FillOutFirstMessage" xml:space="preserve">
     <value>K vytvoření tohoto souboru je nutné vyplnit některé dodatečné vlastnosti.</value>
   </data>
+  <data name="Dialog.NewFile.ReadOnlyProjectWarning" xml:space="preserve">
+    <value>Označený soubor {0} má nastaveny atributy pouze ke čtení. Soubor nebude do projektu vložen.</value>
+  </data>
   <data name="Dialog.NewFile.TemplateText" xml:space="preserve">
     <value>Š&amp;ablony:</value>
   </data>
@@ -6855,7 +6861,6 @@ Došlo k chybě při spuštění:</value>
     <value>Odkomentovat oblast</value>
   </data>
   <data name="_Internal.Bogus.Translation.Test1" xml:space="preserve">
-    <value>Tento resource není používán. Jeho účelem je testování kvality překladu a obsahuje 
+    <value>Tento zdroj není používán. Jeho účelem je testování kvality překladu a konce řádku</value>
-zlom řádku</value>
   </data>
 </root>

data/resources/StringResources.de.resx

@@ -6774,6 +6774,12 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht
   <data name="SharpReport.Toolbar.Functions.TodaysDate" xml:space="preserve">
     <value>Tagesdatum</value>
   </data>
+  <data name="SharpReport.Toolbar.GroupFooter" xml:space="preserve">
+    <value>Gruppenfuß</value>
+  </data>
+  <data name="SharpReport.Toolbar.GroupHeader" xml:space="preserve">
+    <value>Gruppenkopf</value>
+  </data>
   <data name="SharpReport.Toolbar.Image" xml:space="preserve">
     <value>Bild</value>
   </data>
@@ -6786,6 +6792,9 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht
   <data name="SharpReport.Toolbar.Rectangle" xml:space="preserve">
     <value>Rechteck</value>
   </data>
+  <data name="SharpReport.Toolbar.Table" xml:space="preserve">
+    <value>Tabelle</value>
+  </data>
   <data name="SharpReport.Toolbar.TextBox" xml:space="preserve">
     <value>Beschriftung</value>
   </data>
@@ -6822,6 +6831,21 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht
   <data name="SharpReport.Wizard.BaseSettings.ReportType" xml:space="preserve">
     <value>Reporttyp</value>
   </data>
+  <data name="SharpReport.Wizard.Layout.Column" xml:space="preserve">
+    <value>Gruppierung auswählen</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.Grouping" xml:space="preserve">
+    <value>Gruppierung</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.ListLayout" xml:space="preserve">
+    <value>Listenansicht</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.ReportLayout" xml:space="preserve">
+    <value>Reportansicht</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.TableLayout" xml:space="preserve">
+    <value>Tabellenansicht</value>
+  </data>
   <data name="SharpReport.Wizard.PullModel" xml:space="preserve">
     <value>Pull Datenmodell</value>
   </data>

data/resources/StringResources.es-mx.resx

@@ -6505,6 +6505,10 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="SharpDevelop.Solution.AllKnownProjectFormats" xml:space="preserve">
     <value>Todos los formatos de proyecto conocidos</value>
   </data>
+  <data name="SharpDevelop.Solution.CannotLoadOldSolution" xml:space="preserve">
+    <value>Esta versión de SharpDevelop no puede cargar proyectos creados usando Visual Studio .NET 2003 (o anterior).
+Intente usar SharpDevelop 3.2 para la converisón; o cree un nuevo proyecto y agregue los archivos fuente existentes.</value>
+  </data>
   <data name="SharpDevelop.Solution.CannotSave.IOException" xml:space="preserve">
     <value>No se pudo guardar {0}:\n{1}</value>
   </data>
@@ -7609,6 +7613,9 @@ Los archivos de recursos han sido renombrados/movidos convenientemente.</value>
   <data name="XML.MainMenu.FileMenu.New.File.Description" xml:space="preserve">
     <value>Abrir nuevo búfer</value>
   </data>
+  <data name="XML.MainMenu.FileMenu.New.Project" xml:space="preserve">
+    <value>&amp;Proyecto...</value>
+  </data>
   <data name="XML.MainMenu.FileMenu.New.Solution" xml:space="preserve">
     <value>&amp;Solución...</value>
   </data>

data/resources/StringResources.es.resx

@@ -6509,6 +6509,10 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
   <data name="SharpDevelop.Solution.AllKnownProjectFormats" xml:space="preserve">
     <value>Todos los formatos conocidos</value>
   </data>
+  <data name="SharpDevelop.Solution.CannotLoadOldSolution" xml:space="preserve">
+    <value>Esta versión de SharpDevelop no puede cargar proyectos creados usando Visual Studio .NET 2003 (o anterior).
+Intente usar SharpDevelop 3.2 para la converisón; o cree un nuevo proyecto y agregue los archivos fuente existentes.</value>
+  </data>
   <data name="SharpDevelop.Solution.CannotSave.IOException" xml:space="preserve">
     <value>No se pudo salvar {0}:\n{1}</value>
   </data>
@@ -7614,6 +7618,9 @@ Los archivos de recursos han sido renombrados o cambiados de ubicación de acuer
   <data name="XML.MainMenu.FileMenu.New.File.Description" xml:space="preserve">
     <value>Abrir búfer nuevo</value>
   </data>
+  <data name="XML.MainMenu.FileMenu.New.Project" xml:space="preserve">
+    <value>&amp;Proyecto...</value>
+  </data>
   <data name="XML.MainMenu.FileMenu.New.Solution" xml:space="preserve">
     <value>&amp;Solución...</value>
   </data>

data/resources/StringResources.fr.resx

@@ -5556,6 +5556,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.ExceptionHistory.Time" xml:space="preserve">
     <value>Heure</value>
   </data>
+  <data name="MainWindow.Windows.Debug.HideZoomControl" xml:space="preserve">
+    <value>Afficher/Cacher le zoom</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Local" xml:space="preserve">
     <value>Local</value>
   </data>
@@ -5631,6 +5634,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.ObjectGraph" xml:space="preserve">
     <value>Graphe d'objet</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ParallelStack" xml:space="preserve">
+    <value>Visualiser les processus</value>
+  </data>
   <data name="MainWindow.Windows.Debug.RunToCursor" xml:space="preserve">
     <value>Exécuter jusqu'au curseur</value>
   </data>
@@ -5679,6 +5685,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.Threads.ThreadSwitch" xml:space="preserve">
     <value>Changement de thread</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ToggleMethodView" xml:space="preserve">
+    <value>Basculer vers la vue "par méthodes"</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Watch" xml:space="preserve">
     <value>Espions</value>
   </data>
@@ -5925,6 +5934,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="OpenFileTabEventHandler.FileContainingFolderInExplorer" xml:space="preserve">
     <value>Ouvrir le répertoire dans l'explorateur</value>
   </data>
+  <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
+    <value>Réduire tous les noeuds</value>
+  </data>
   <data name="ProjectComponent.ContextMenu.AddExistingFiles" xml:space="preserve">
     <value>Ajouter fichiers existants</value>
   </data>

data/resources/StringResources.nl.resx

@@ -2740,6 +2740,9 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.CaretCheckBox" xml:space="preserve">
     <value>Toon cursor regel</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EnableAnimationsCheckBox" xml:space="preserve">
+    <value>Animatie mogelijk maken</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>&amp;EOL markeringen weergeven</value>
   </data>
@@ -5556,6 +5559,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.Debug.ExceptionHistory.Time" xml:space="preserve">
     <value>Tijd</value>
   </data>
+  <data name="MainWindow.Windows.Debug.HideZoomControl" xml:space="preserve">
+    <value>Toon/verberg zoom control</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Local" xml:space="preserve">
     <value>Locaal</value>
   </data>
@@ -5631,6 +5637,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.Debug.ObjectGraph" xml:space="preserve">
     <value>Object Graph</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ParallelStack" xml:space="preserve">
+    <value>Parallelle stapels</value>
+  </data>
   <data name="MainWindow.Windows.Debug.RunToCursor" xml:space="preserve">
     <value>Uitvoeren tot de cursor</value>
   </data>
@@ -5679,6 +5688,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="MainWindow.Windows.Debug.Threads.ThreadSwitch" xml:space="preserve">
     <value>Thread wissel</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ToggleMethodView" xml:space="preserve">
+    <value>Wissel methode weergave</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Watch" xml:space="preserve">
     <value>Observeren</value>
   </data>
@@ -5925,6 +5937,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="OpenFileTabEventHandler.FileContainingFolderInExplorer" xml:space="preserve">
     <value>Open de map met document in de Explorer</value>
   </data>
+  <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
+    <value>Alle knooppunten invouwen</value>
+  </data>
   <data name="ProjectComponent.ContextMenu.AddExistingFiles" xml:space="preserve">
     <value>Toevoegen bestaande bestanden</value>
   </data>

data/resources/StringResources.pt-br.resx

@@ -231,6 +231,9 @@
   <data name="AddIns.ClassDiagram.ShowClassDiagram" xml:space="preserve">
     <value>Mostrar Diagrama de Classes</value>
   </data>
+  <data name="AddIns.Git.TortoiseGitRequired" xml:space="preserve">
+    <value>TortoiseGit precisa ser instalado para executar essa ação.</value>
+  </data>
   <data name="AddIns.HelpViewer.ContentsPadTitle" xml:space="preserve">
     <value>Conteudo</value>
   </data>
@@ -715,6 +718,9 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
   <data name="AddIns.SourceAnalysis.CheckWithStyleCop" xml:space="preserve">
     <value>Verificar com StyleCop</value>
   </data>
+  <data name="AddIns.SourceAnalysis.Title" xml:space="preserve">
+    <value>Analise do Fonte</value>
+  </data>
   <data name="AddIns.Subversion.AddToIgnoreList" xml:space="preserve">
     <value>Adicionar a lista ignore.</value>
   </data>
@@ -940,6 +946,9 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
   <data name="AddIns.XamlBinding.Options.UseExtensionCompletion" xml:space="preserve">
     <value>Usar a extensão de conclusão de marcação</value>
   </data>
+  <data name="AddIns.XamlBinding.Options.UseHighlighting" xml:space="preserve">
+    <value>Usar destaques avançados</value>
+  </data>
   <data name="AvalonEdit.FileEncoding.EncodingCausesDataLoss" xml:space="preserve">
     <value>O arquivo não pode ser salvo com a codificação corrente ${encoding} sem perder dados</value>
   </data>
@@ -2471,7 +2480,7 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
     <value>&amp;Atualizar mudanças quando salvo</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.CreateBackupCopyCheckBox" xml:space="preserve">
-    <value>Sempre cri&amp;ar cópia de segurança</value>
+    <value>Usar arquivo &amp;temporario para salvar.</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.DefaultFileEncoding" xml:space="preserve">
     <value>Codificação padrão de arquivo:</value>
@@ -2489,7 +2498,7 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
     <value>&amp;Abrir configurações específicas de usuário com o documento</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton" xml:space="preserve">
-    <value>Macintosh</value>
+    <value>Macintosh (CR)</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.PanelName" xml:space="preserve">
     <value>Abrir/Salvar</value>
@@ -2498,13 +2507,13 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
     <value>Salvar</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.UnixRadioButton" xml:space="preserve">
-    <value>Unix</value>
+    <value>Unix (LF)</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.UseRecycleBin" xml:space="preserve">
     <value>Usar &amp;Lixeira quando deletar arquivos</value>
   </data>
   <data name="Dialog.Options.IDEOptions.LoadSaveOptions.WindowsRadioButton" xml:space="preserve">
-    <value>Windows</value>
+    <value>Windows (CRLF)</value>
   </data>
   <data name="Dialog.Options.IDEOptions.OutputPanel.Format" xml:space="preserve">
     <value>Formato</value>
@@ -2515,6 +2524,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Dialog.Options.IDEOptions.OutputPanel.WordWrap" xml:space="preserve">
     <value>Rolagem de palavra</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.Profiling" xml:space="preserve">
+    <value>Perfil</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.ProjectAndSolutionOptions.BuildAndRunGroupBox" xml:space="preserve">
     <value>Opções de Compilação e Execução</value>
   </data>
@@ -2713,9 +2725,15 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.BracketMatchingStyle.BeforeCaret" xml:space="preserve">
     <value>Antes do Circunflexo</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.CaretCheckBox" xml:space="preserve">
+    <value>Mostra linha do cursor</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Mostrar marcas de &amp;EOL</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
+    <value>Simbolos em destaque</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
     <value>Destacar &amp;chave correspondente</value>
   </data>
@@ -2845,6 +2863,18 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Dialog.ProjectOptions.ApplicationSettings.LocalizedStringFileLabel" xml:space="preserve">
     <value>String do arquivo localizado:</value>
   </data>
+  <data name="Dialog.ProjectOptions.ApplicationSettings.Manifest" xml:space="preserve">
+    <value>&amp;Manifest da aplicação</value>
+  </data>
+  <data name="Dialog.ProjectOptions.ApplicationSettings.Manifest.DoNotEmbedManifest" xml:space="preserve">
+    <value>Não embutir o manifest</value>
+  </data>
+  <data name="Dialog.ProjectOptions.ApplicationSettings.Manifest.EmbedDefault" xml:space="preserve">
+    <value>Embutir o manifest padrão</value>
+  </data>
+  <data name="Dialog.ProjectOptions.ApplicationSettings.Manifest.ManifestFiles" xml:space="preserve">
+    <value>Arquivos manifest</value>
+  </data>
   <data name="Dialog.ProjectOptions.ApplicationSettings.OutputName" xml:space="preserve">
     <value>Nome de Saída:</value>
   </data>
@@ -3145,6 +3175,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Dialog.Refactoring.ExtractInterface.AddInterfaceToClass" xml:space="preserve">
     <value>Adicionar interface para a classe</value>
   </data>
+  <data name="Dialog.Refactoring.ExtractInterface.GeneratedName" xml:space="preserve">
+    <value>Nome gerado</value>
+  </data>
   <data name="Dialog.Refactoring.ExtractInterface.IncludeComments" xml:space="preserve">
     <value>Incluir Comentarios</value>
   </data>
@@ -3157,6 +3190,18 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Dialog.Refactoring.ExtractInterface.SelectPublicMembers" xml:space="preserve">
     <value>Selecionar membros públicos</value>
   </data>
+  <data name="Dialog.Refactoring.IntroduceMethod.CreateNew" xml:space="preserve">
+    <value>Criar nova classe:</value>
+  </data>
+  <data name="Dialog.Refactoring.IntroduceMethod.Description" xml:space="preserve">
+    <value>O metodo não pode ser criado diretamente porque não há codigo fonte disponivel na classe. Favor selecionar a classe estatica onde o metodo será criado como uma extensão.</value>
+  </data>
+  <data name="Dialog.Refactoring.IntroduceMethod.Title" xml:space="preserve">
+    <value>Introduzir metodo</value>
+  </data>
+  <data name="Dialog.Refactoring.IntroduceMethod.UseExisting" xml:space="preserve">
+    <value>Usar classe existente:</value>
+  </data>
   <data name="Dialog.SelectReferenceDialog.BrowserTabPage" xml:space="preserve">
     <value>Navegador de Assembly .NET</value>
   </data>
@@ -3250,6 +3295,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="FileUtilityService.ErrorWhileSaving" xml:space="preserve">
     <value>Erro durante gravação</value>
   </data>
+  <data name="FileUtilityService.FileSizeTooBig" xml:space="preserve">
+    <value>O arquivo é muito grande para ser aberto.</value>
+  </data>
   <data name="FormsDesigner.DesignErrorPanel.ErrorText" xml:space="preserve">
     <value>Por favor corrija todos os erros do código fonte antes de modelar o formulário</value>
   </data>
@@ -3319,6 +3367,18 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Global.Folder" xml:space="preserve">
     <value>Pasta</value>
   </data>
+  <data name="Global.FontStyle" xml:space="preserve">
+    <value>Estilo do fonte</value>
+  </data>
+  <data name="Global.FontStyle.CustomColor" xml:space="preserve">
+    <value>Personalizar</value>
+  </data>
+  <data name="Global.FontStyle.SelectFont" xml:space="preserve">
+    <value>Selecionar fonte</value>
+  </data>
+  <data name="Global.FontStyle.Underline" xml:space="preserve">
+    <value>Traço baixo</value>
+  </data>
   <data name="Global.HelpButtonText" xml:space="preserve">
     <value>&amp;Ajuda</value>
   </data>
@@ -3376,6 +3436,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Global.PleaseWait" xml:space="preserve">
     <value>Por favor, aguarde...</value>
   </data>
+  <data name="Global.Preview" xml:space="preserve">
+    <value>Prever</value>
+  </data>
   <data name="Global.QuestionText" xml:space="preserve">
     <value>Questão</value>
   </data>
@@ -3395,7 +3458,7 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
     <value>Tentar de novo</value>
   </data>
   <data name="Global.SelectAllButtonText" xml:space="preserve">
-    <value>Selecionar todos</value>
+    <value>Selecion&amp;ar todos</value>
   </data>
   <data name="Global.SmallIconToolTip" xml:space="preserve">
     <value>Ícones Pequenos</value>
@@ -3424,6 +3487,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Gui.ProjectBrowser.Open" xml:space="preserve">
     <value>Abrir</value>
   </data>
+  <data name="Gui.ProjectBrowser.OpenFolderInExplorer" xml:space="preserve">
+    <value>Abrir diretorio no Explorer</value>
+  </data>
   <data name="Gui.ProjectBrowser.OpenWith" xml:space="preserve">
     <value>Abrir Com...</value>
   </data>
@@ -3448,6 +3514,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Gui.ProjectBrowser.OpenWith.Bindings.TextEditor" xml:space="preserve">
     <value>Editor de texto</value>
   </data>
+  <data name="Gui.ProjectBrowser.OpenWith.Bindings.TextEditorWithEncoding" xml:space="preserve">
+    <value>Editor de texto (escolher codificação)</value>
+  </data>
   <data name="Gui.ProjectBrowser.OpenWith.Bindings.WebBrowser" xml:space="preserve">
     <value>Navegador Web embutido</value>
   </data>
@@ -3490,6 +3559,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Hornung.ResourceToolkit.EditStringResourceDialog.KeyIsEmpty" xml:space="preserve">
     <value>Chave de recurso não pode ser vazia!</value>
   </data>
+  <data name="Hornung.ResourceToolkit.ErrorProcessingResourceFile" xml:space="preserve">
+    <value>Ocorreu um erro ao processar o arquivo de recursos na linha '{0}'.</value>
+  </data>
   <data name="Hornung.ResourceToolkit.FindMissingResourceKeys" xml:space="preserve">
     <value>Achar chaves de recursos perdidos</value>
   </data>
@@ -3508,21 +3580,60 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="Hornung.ResourceToolkit.ReferencesToMissingKeys" xml:space="preserve">
     <value>Referências para chaves de recursos perdidas</value>
   </data>
+  <data name="Hornung.ResourceToolkit.ReferencesToResource" xml:space="preserve">
+    <value>Referencias para ${ResourceKey} (em ${ResourceFileName})</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.RenameKeyDefinitionNotFoundWarning" xml:space="preserve">
+    <value>Não foi possivel encontrar e renomear a definição dessa chave de recurso.</value>
+  </data>
   <data name="Hornung.ResourceToolkit.RenameResourceText" xml:space="preserve">
     <value>Digite novo nome da chave de recurso</value>
   </data>
+  <data name="Hornung.ResourceToolkit.ResourceTypeNotSupported" xml:space="preserve">
+    <value>O recurso selecionado não é do tipo 'string' e não pode ser editado.</value>
+  </data>
   <data name="Hornung.ResourceToolkit.TextEditorContextMenu.AddResource" xml:space="preserve">
     <value>Adicionar este recurso</value>
   </data>
+  <data name="Hornung.ResourceToolkit.TextEditorContextMenu.EditResource" xml:space="preserve">
+    <value>Editar recurso</value>
+  </data>
   <data name="Hornung.ResourceToolkit.ToolsMenuLabel" xml:space="preserve">
     <value>Ferramentas de Recurso</value>
   </data>
   <data name="Hornung.ResourceToolkit.ToolTips.KeyNotFound" xml:space="preserve">
     <value>&lt;CHAVE NÃO ENCONTRADA&gt;</value>
   </data>
+  <data name="Hornung.ResourceToolkit.ToolTips.PlaceMessage" xml:space="preserve">
+    <value>Recurso em {0}:</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.ToolTips.TypeMessage" xml:space="preserve">
+    <value>Objeto do tipo {0}:</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.ToolTips.UnknownKey" xml:space="preserve">
+    <value>&lt;Desconhecido&gt;</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.UnusedResourceKeys.HideICSharpCodeCoreHostResourcesTitle" xml:space="preserve">
+    <value>Esconde os recursos de ICSharpCode.Core</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.UnusedResourceKeys.HideICSharpCodeCoreHostResourcesTooltip" xml:space="preserve">
+    <value>Quando selecionadas, as teclas dos recursos que estão contidas no arquivo de recurso do aplicativo ICSharpCode.Core, não estão listadas.</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.UnusedResourceKeys.NotFound" xml:space="preserve">
+    <value>Não foi encontrada na solução nenhuma tecla de recurso não utilizado.</value>
+  </data>
+  <data name="Hornung.ResourceToolkit.UnusedResourceKeys.Title" xml:space="preserve">
+    <value>Teclas de recursos não utilizados</value>
+  </data>
   <data name="Hornung.ResourceToolkit.Value" xml:space="preserve">
     <value>Valor</value>
   </data>
+  <data name="Hornung.ResourceToolkit.ValueLabel" xml:space="preserve">
+    <value>Valor do recurso:</value>
+  </data>
+  <data name="ICSharpCode.AvalonEdit.AddIn.SharpDevelopCompletionWindow.EmptyText" xml:space="preserve">
+    <value>Pressione Ctrl+Espaço para mostrar os itens de todos os namespaces</value>
+  </data>
   <data name="ICSharpCode.BooInterpreter" xml:space="preserve">
     <value>Tradutor Boo</value>
   </data>
@@ -3541,15 +3652,42 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="ICSharpCode.BooInterpreter.Debuggee.ToolTip" xml:space="preserve">
     <value>Executa comandos no programa depurado</value>
   </data>
+  <data name="ICSharpCode.Build.CannotFindFxCop" xml:space="preserve">
+    <value>O SharpDevelop não achou FxCop. Favor selecionar o diretório de instalação do FxCop nas opções do SharpDevelop.</value>
+  </data>
+  <data name="ICSharpCode.Build.CannotReadFxCopLogFile" xml:space="preserve">
+    <value>Não pode ler o arquivo de log do FxCop:</value>
+  </data>
   <data name="ICSharpCode.Build.MonoIsNotInstalled" xml:space="preserve">
     <value>Mono não está instalado.</value>
   </data>
+  <data name="ICSharpCode.Build.RunningCodeAnalysis" xml:space="preserve">
+    <value>Executando analise de codigo...</value>
+  </data>
+  <data name="ICSharpCode.Build.UnknownTargetMonoFrameworkVersion" xml:space="preserve">
+    <value>Desconhecida a versão do Mono Framework:</value>
+  </data>
   <data name="ICSharpCode.CodeAnalysis" xml:space="preserve">
     <value>Análise de Código</value>
   </data>
   <data name="ICSharpCode.CodeAnalysis.CheckWithFxCop" xml:space="preserve">
     <value>Verificar com FxCop</value>
   </data>
+  <data name="ICSharpCode.CodeAnalysis.IdeOptions.DirectoryDoesNotContainFxCop" xml:space="preserve">
+    <value>O diretorio selecionado não contem a instalação completa do FxCop.</value>
+  </data>
+  <data name="ICSharpCode.CodeAnalysis.IdeOptions.FindFxCopPath" xml:space="preserve">
+    <value>Selecione o caminho para o FxCop</value>
+  </data>
+  <data name="ICSharpCode.CodeAnalysis.IdeOptions.FxCopFoundInPath" xml:space="preserve">
+    <value>O FxCop foi encontrado no seguinte diretorio:</value>
+  </data>
+  <data name="ICSharpCode.CodeAnalysis.IdeOptions.FxCopNotFound" xml:space="preserve">
+    <value>O FxCop não foi encontrado. Para mostrar o SharpDevelop onde o FxCop está instalado, instale o FxCop e clique em 'Selecionar Caminho para FxCop'.</value>
+  </data>
+  <data name="ICSharpCode.CodeAnalysis.IdeOptions.FxCopPath" xml:space="preserve">
+    <value>Caminho para FxCop</value>
+  </data>
   <data name="ICSharpCode.CodeAnalysis.ProjectOptions.AddRemoveRuleAssembly" xml:space="preserve">
     <value>Adicionar/Remover regras de assembler.</value>
   </data>
@@ -3583,6 +3721,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="ICSharpCode.CodeAnalysis.RunningFxCopOn" xml:space="preserve">
     <value>Executando com FxCop</value>
   </data>
+  <data name="ICSharpCode.CodeAnalysis.SuppressMessage" xml:space="preserve">
+    <value>Suprimir mensagem</value>
+  </data>
   <data name="ICSharpCode.CodeCoverage.CodeCovered" xml:space="preserve">
     <value>Código Coberto</value>
   </data>
@@ -3637,6 +3778,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã
   <data name="ICSharpCode.CodeCoverage.ProjectOptionsPanel.ExcludeAttributes" xml:space="preserve">
     <value>Atributos excluidos</value>
   </data>
+  <data name="ICSharpCode.CodeCoverage.ProjectOptionsPanel.ExcludeListLabel" xml:space="preserve">
+    <value>Excluir</value>
+  </data>
   <data name="ICSharpCode.CodeCoverage.RunningCodeCoverage" xml:space="preserve">
     <value>Rodando cobertura de código...</value>
   </data>

data/resources/StringResources.pt.resx

@@ -289,6 +289,18 @@ Faça o download de um AddIn através da Internet, depois pressione 'Instalar Ad
   <data name="AddIns.HexEditor.Display.Elements" xml:space="preserve">
     <value>Elementos</value>
   </data>
+  <data name="AddIns.HexEditor.Display.Elements.Data" xml:space="preserve">
+    <value>Dados</value>
+  </data>
+  <data name="AddIns.HexEditor.Display.Elements.Offset" xml:space="preserve">
+    <value>Deslocamento</value>
+  </data>
+  <data name="AddIns.HexEditor.NumeralSystem" xml:space="preserve">
+    <value>Sistema numérico</value>
+  </data>
+  <data name="AddIns.HexEditor.SizeToFit" xml:space="preserve">
+    <value>Escalar para caber na largura actual</value>
+  </data>
   <data name="AddIns.HtmlHelp2.AddToFavorites" xml:space="preserve">
     <value>Adicionar para favoritos de Ajuda</value>
   </data>
@@ -455,6 +467,33 @@ Precisa de instalar o .NET Framework SDK para utilizar o sistema de ajuda.</valu
   <data name="AddIns.HtmlHelp2.UseCurrentProjectLanguageForSearch" xml:space="preserve">
     <value>Utilizar a linguagem de projecto actual</value>
   </data>
+  <data name="AddIns.Profiler.Commands.FindCallsOfSelected.TabTitle" xml:space="preserve">
+    <value>Resultado</value>
+  </data>
+  <data name="AddIns.Profiler.Commands.SetAsRoot.TabTitle" xml:space="preserve">
+    <value>Nós Juntos</value>
+  </data>
+  <data name="AddIns.Profiler.Commands.ShowFunctions.TabTitle" xml:space="preserve">
+    <value>Todas as funções para {0}</value>
+  </data>
+  <data name="AddIns.Profiler.DatabaseTooNewError" xml:space="preserve">
+    <value>O perfil de sessão SharpDevelop seleccionado foi criado por uma versão mais recente de SharpDevelop e assim não pode ser aberto.</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.FileNotFound" xml:space="preserve">
+    <value>Este projecto não pode ser iniciado porque o ficheiro executável não foi encontrado, assegure-se, por favor,de que o projecto e todas as suas dependências são construídas correctamente!</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.NoStartableProjectFound" xml:space="preserve">
+    <value>Nenhum projecto iniciável foi encontrado. Abortar...</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.CpuCyclesText" xml:space="preserve">
+    <value>Ciclos CPU:</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.ExecuteQueryText" xml:space="preserve">
+    <value>Executar inquérito</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.NameColumnText" xml:space="preserve">
+    <value>Nome</value>
+  </data>
   <data name="AddIns.SharpRefactoring.ExtractMethod" xml:space="preserve">
     <value>Extrair method</value>
   </data>

data/resources/StringResources.resx

@@ -2817,6 +2817,9 @@ system. I don't think that it needs translation.</comment>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.CaretCheckBox" xml:space="preserve">
     <value>Show caret line</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EnableAnimationsCheckBox" xml:space="preserve">
+    <value>Enable animations</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
     <value>Show &amp;end-of-line markers</value>
   </data>
@@ -5852,6 +5855,9 @@ Stop/terminate the debuggee.</comment>
   <data name="MainWindow.Windows.Debug.ExceptionHistory.Time" xml:space="preserve">
     <value>Time</value>
   </data>
+  <data name="MainWindow.Windows.Debug.HideZoomControl" xml:space="preserve">
+    <value>Show/Hide Zoom Control</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Local" xml:space="preserve">
     <value>Local</value>
   </data>
@@ -5937,6 +5943,9 @@ Shows the full callstack of the error.</comment>
   <data name="MainWindow.Windows.Debug.ObjectGraph" xml:space="preserve">
     <value>Object Graph</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ParallelStack" xml:space="preserve">
+    <value>Parallel Stacks</value>
+  </data>
   <data name="MainWindow.Windows.Debug.RunToCursor" xml:space="preserve">
     <value>Run to cursor</value>
   </data>
@@ -5985,6 +5994,9 @@ Shows the full callstack of the error.</comment>
   <data name="MainWindow.Windows.Debug.Threads.ThreadSwitch" xml:space="preserve">
     <value>Thread switch</value>
   </data>
+  <data name="MainWindow.Windows.Debug.ToggleMethodView" xml:space="preserve">
+    <value>Toggle Method View</value>
+  </data>
   <data name="MainWindow.Windows.Debug.Watch" xml:space="preserve">
     <value>Watch</value>
   </data>
@@ -6245,6 +6257,9 @@ Removed the end part of the original message ", reason '${Message}'" since this
     <value>Open Containing Folder In Explorer</value>
     <comment>String for the editor tab context menu that will open the directory in which a documents file is contained in Windows Explorer.</comment>
   </data>
+  <data name="ProjectBrowser.Toolbar.CollapseAll" xml:space="preserve">
+    <value>Collapse all nodes</value>
+  </data>
   <data name="ProjectComponent.ContextMenu.AddExistingFiles" xml:space="preserve">
     <value>Add existing files</value>
   </data>
@@ -7146,6 +7161,12 @@ The resources files have been renamed/moved accordingly.</value>
   <data name="SharpReport.Toolbar.Functions.TodaysDate" xml:space="preserve">
     <value>Today</value>
   </data>
+  <data name="SharpReport.Toolbar.GroupFooter" xml:space="preserve">
+    <value>GroupFooter</value>
+  </data>
+  <data name="SharpReport.Toolbar.GroupHeader" xml:space="preserve">
+    <value>GroupHeader</value>
+  </data>
   <data name="SharpReport.Toolbar.Image" xml:space="preserve">
     <value>Image</value>
   </data>
@@ -7158,6 +7179,9 @@ The resources files have been renamed/moved accordingly.</value>
   <data name="SharpReport.Toolbar.Rectangle" xml:space="preserve">
     <value>Rectangle</value>
   </data>
+  <data name="SharpReport.Toolbar.Table" xml:space="preserve">
+    <value>Table</value>
+  </data>
   <data name="SharpReport.Toolbar.TextBox" xml:space="preserve">
     <value>Label</value>
   </data>
@@ -7194,6 +7218,21 @@ The resources files have been renamed/moved accordingly.</value>
   <data name="SharpReport.Wizard.BaseSettings.ReportType" xml:space="preserve">
     <value>Report Type</value>
   </data>
+  <data name="SharpReport.Wizard.Layout.Column" xml:space="preserve">
+    <value>Select the GroupColumn</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.Grouping" xml:space="preserve">
+    <value>Grouping</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.ListLayout" xml:space="preserve">
+    <value>List Layout</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.ReportLayout" xml:space="preserve">
+    <value>Report layout</value>
+  </data>
+  <data name="SharpReport.Wizard.Layout.TableLayout" xml:space="preserve">
+    <value>Table Layout</value>
+  </data>
   <data name="SharpReport.Wizard.PullModel" xml:space="preserve">
     <value>Pull Data Model</value>
   </data>

data/resources/StringResources.ru.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="AddInManager.About" xml:space="preserve">
-    <value>О Менеджере Надстроек</value>
+    <value>О Менеджере Плагинов</value>
   </data>
   <data name="AddInManager.ActionCancelDeinstallation" xml:space="preserve">
     <value>Отменить удаление</value>
@@ -145,68 +145,68 @@
     <value>Обновить</value>
   </data>
   <data name="AddInManager.AddInDependencyFailed" xml:space="preserve">
-    <value>Для работы этого AddInа требуется другой AddIn. Установите его чтобы включить этот.</value>
+    <value>Для работы этого плагина нужен другой плагин. Установите его, чтобы включить этот.</value>
   </data>
   <data name="AddInManager.AddInDisabled" xml:space="preserve">
     <value>Отключен</value>
   </data>
   <data name="AddInManager.AddInEnabled" xml:space="preserve">
-    <value>Надстройка будет включена после перезапуска SharpDevelop</value>
+    <value>Плагин станет доступным после перезапуска SharpDevelop</value>
   </data>
   <data name="AddInManager.AddInInstalled" xml:space="preserve">
-    <value>Надстройка будет установлена после перезапуска SharpDevelop</value>
+    <value>Плагин будет установлен после перезапуска SharpDevelop</value>
   </data>
   <data name="AddInManager.AddInInstalledTwice" xml:space="preserve">
-    <value>Надстройка установлена дважды. Пожалуйста, удалите одну копию.</value>
+    <value>Установлены две копии плагина. Пожалуйста, удалите одну из копий.</value>
   </data>
   <data name="AddInManager.AddInMustHaveIdentity" xml:space="preserve">
-    <value>Эта Надстройка должна иметь &lt;Identity&gt; для использовании в Менеджере Надстроек</value>
+    <value>У этого плагина должен быть &lt;Identity&gt; для использовании в Менеджере Плагинов</value>
   </data>
   <data name="AddInManager.AddInRemoved" xml:space="preserve">
-    <value>Надстройка будет удалена после перезапуска SharpDevelop</value>
+    <value>Плагин будет удален после перезапуска SharpDevelop</value>
   </data>
   <data name="AddInManager.AddInUpdated" xml:space="preserve">
-    <value>Надстройка будет обновлена после перезапуска SharpDevelop</value>
+    <value>Плагин будет обновлен после перезапуска SharpDevelop</value>
   </data>
   <data name="AddInManager.AddInWillBeDisabled" xml:space="preserve">
-    <value>Надстройка будет отключена после перезапуска SharpDevelop</value>
+    <value>Плагин станет недоступным после перезапуска SharpDevelop</value>
   </data>
   <data name="AddInManager.CannotDisableAddInManager" xml:space="preserve">
-    <value>Вы не можете отключить Менеджер Надстроек. Он необходим для переподключения Надстроек!</value>
+    <value>Вы не можете отключить Менеджер Плагинов. Он необходим для переподключения Плагинов!</value>
   </data>
   <data name="AddInManager.CannotInstallIntoApplicationDirectory" xml:space="preserve">
-    <value>Надстройки внутри папки ${ProductName} не нужно устанавливать, они предустанавливаются автоматически.</value>
+    <value>Нельзя устанавливать плагины внутри папки ${ProductName}, так как они будут считаться предустановленными.</value>
   </data>
   <data name="AddInManager.DescriptionCancelDeinstallation" xml:space="preserve">
-    <value>Отменяет удаление выделеных Надстроек.</value>
+    <value>Отменяет удаление выделеных плагинов.</value>
   </data>
   <data name="AddInManager.DescriptionCancelInstall" xml:space="preserve">
-    <value>Отменяет установку выделенных Надстроек.</value>
+    <value>Отменяет установку выделенных плагинов.</value>
   </data>
   <data name="AddInManager.DescriptionCancelUpdate" xml:space="preserve">
-    <value>Отменяет обновление выделенных Надстроек.</value>
+    <value>Отменяет обновление выделенных плагинов.</value>
   </data>
   <data name="AddInManager.DescriptionDisable" xml:space="preserve">
-    <value>Выключает выбранные Надстройки</value>
+    <value>Отключает выбранные плагины.</value>
   </data>
   <data name="AddInManager.DescriptionEnable" xml:space="preserve">
-    <value>Включает выбранные Надстройки</value>
+    <value>Включает выбранные плагины.</value>
   </data>
   <data name="AddInManager.DescriptionInconsistentSelection" xml:space="preserve">
-    <value>Неправильное выделение, пожалуйста выделите Надстройки с одинаковым статусом.</value>
+    <value>Неправильное выделение, пожалуйста, выделите плагины с одинаковым статусом.</value>
   </data>
   <data name="AddInManager.FileAssociation" xml:space="preserve">
-    <value>Пакет установки Надстройки</value>
+    <value>Установочный пакет плагина</value>
   </data>
   <data name="AddInManager.FileFilter" xml:space="preserve">
-    <value>Надстройки SharpDevelop|*.addin;*.sdaddin|Все файлы|*.*</value>
+    <value>Плагины SharpDevelop|*.addin;*.sdaddin|Все файлы|*.*</value>
   </data>
   <data name="AddInManager.InstallButton" xml:space="preserve">
-    <value>Установить Надстройку</value>
+    <value>Установить плагин</value>
   </data>
   <data name="AddInManager.NoAddInsInstalled" xml:space="preserve">
-    <value>У вас нет установленных Надстроек.
+    <value>У Вас не установлено ни одного плагина.
-Вы можете скачать их из Интернета, потом нажать 'Установить Надстройку' и выбрать скачаный файл, чтобы установить его.</value>
+Скачайте их из Интернета, нажмите 'Установить плагин' и выберите скачаный файл, чтобы установить его.</value>
   </data>
   <data name="AddInManager.OpenWebsite" xml:space="preserve">
     <value>Открыть Web-сайт</value>
@@ -215,16 +215,16 @@
     <value>Опции</value>
   </data>
   <data name="AddInManager.RequiredBy" xml:space="preserve">
-    <value>Надстройки необходимы для:</value>
+    <value>Плагины необходимы для работы:</value>
   </data>
   <data name="AddInManager.RequiredDependencies" xml:space="preserve">
-    <value>Необходимые зависимости:</value>
+    <value>Требуемые для работы плагины:</value>
   </data>
   <data name="AddInManager.ShowPreinstalledAddIns" xml:space="preserve">
-    <value>Показать предустановленные Надстройки</value>
+    <value>Показать предустановленные плагины</value>
   </data>
   <data name="AddInManager.Title" xml:space="preserve">
-    <value>Менеджер Надстроек</value>
+    <value>Менеджер Плагинов</value>
   </data>
   <data name="AddInManager.UnknownFileFormat" xml:space="preserve">
     <value>Неизвестный формат файла:</value>

data/resources/StringResources.tr.resx

@@ -232,12 +232,69 @@
   <data name="AddIns.ClassDiagram.ShowClassDiagram" xml:space="preserve">
     <value>Sınıf Şemasını Göster</value>
   </data>
+  <data name="AddIns.Git.TortoiseGitRequired" xml:space="preserve">
+    <value>Bu işlemi gerçekleştirebilmek için TortoiseGit yüklü olmalıdır.</value>
+  </data>
+  <data name="AddIns.HelpViewer.ContentsPadTitle" xml:space="preserve">
+    <value>İçerikler</value>
+  </data>
+  <data name="AddIns.HelpViewer.DisplayContentsCommand" xml:space="preserve">
+    <value>İçeriği Göster</value>
+  </data>
+  <data name="AddIns.HelpViewer.DisplaySearchCommand" xml:space="preserve">
+    <value>Arama</value>
+  </data>
+  <data name="AddIns.HelpViewer.HelpLibraryRootTitle" xml:space="preserve">
+    <value>Yardım Kütüphanesi</value>
+  </data>
+  <data name="AddIns.HelpViewer.HelpModeLabel" xml:space="preserve">
+    <value>Yardım Modu</value>
+  </data>
+  <data name="AddIns.HelpViewer.InstalledHelpCatalogsLabel" xml:space="preserve">
+    <value>Yüklü Yardım Katalogları</value>
+  </data>
+  <data name="AddIns.HelpViewer.MicrosoftHelpViewerTitle" xml:space="preserve">
+    <value>Microsoft Yardım Görüntüleyici</value>
+  </data>
+  <data name="AddIns.HelpViewer.OfflineFeatureRequestMsg" xml:space="preserve">
+    <value>Çevrimiçi yardım modunda çevrimdışı bir özellik kullanmaya çalıştın. Bu özelliği kullanabilmek için yardım modunu değiştirmelisin.</value>
+  </data>
+  <data name="AddIns.HelpViewer.SearchDoSearchButton" xml:space="preserve">
+    <value>Ara</value>
+  </data>
+  <data name="AddIns.HelpViewer.SearchLookForLabel" xml:space="preserve">
+    <value>Ne için:</value>
+  </data>
+  <data name="AddIns.HelpViewer.SearchPadTitle" xml:space="preserve">
+    <value>Arama</value>
+  </data>
+  <data name="AddIns.HelpViewer.ShowErrorHelpTitle" xml:space="preserve">
+    <value>Yardımı Göster</value>
+  </data>
+  <data name="AddIns.HelpViewer.UseExternalHelp" xml:space="preserve">
+    <value>Harici yardımı kullan</value>
+  </data>
+  <data name="AddIns.HelpViewer.UseOfflineHelpLabel" xml:space="preserve">
+    <value>Yerel yardımı kullanmak istiyorum</value>
+  </data>
+  <data name="AddIns.HelpViewer.UseOnlineHelpLabel" xml:space="preserve">
+    <value>Çevrimiçi yardımı kullanmak istiyorum</value>
+  </data>
   <data name="AddIns.HexEditor.DefaultBytesPerLine" xml:space="preserve">
     <value>Tek satırdaki bayt</value>
   </data>
   <data name="AddIns.HexEditor.Display" xml:space="preserve">
     <value>Gösterim</value>
   </data>
+  <data name="AddIns.HexEditor.Display.Elements" xml:space="preserve">
+    <value>Nesneler</value>
+  </data>
+  <data name="AddIns.HexEditor.Display.Elements.Data" xml:space="preserve">
+    <value>Veri</value>
+  </data>
+  <data name="AddIns.HexEditor.Display.Elements.Offset" xml:space="preserve">
+    <value>Ofset</value>
+  </data>
   <data name="AddIns.HexEditor.NumeralSystem" xml:space="preserve">
     <value>Sayısal sistem</value>
   </data>
@@ -410,6 +467,87 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.<
   <data name="AddIns.HtmlHelp2.UseCurrentProjectLanguageForSearch" xml:space="preserve">
     <value>Şu anki proje dilini kullan</value>
   </data>
+  <data name="AddIns.Profiler.Commands.FindCallsOfSelected.TabTitle" xml:space="preserve">
+    <value>Sonuçlar</value>
+  </data>
+  <data name="AddIns.Profiler.Commands.SetAsRoot.TabTitle" xml:space="preserve">
+    <value>Birleşik Parçalar</value>
+  </data>
+  <data name="AddIns.Profiler.Commands.ShowFunctions.TabTitle" xml:space="preserve">
+    <value>{0} için olan tüm fonksiyonlar</value>
+  </data>
+  <data name="AddIns.Profiler.DatabaseTooNewError" xml:space="preserve">
+    <value>Seçili SharpDevelop profil oturumu yeni bir SharpDevelop sürümü ile oluşturulmuş ve açılamıyor.</value>
+  </data>
+  <data name="AddIns.Profiler.FileExtensionDescription" xml:space="preserve">
+    <value>SharpDevelop Profil Oturumu</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.FileNotFound" xml:space="preserve">
+    <value>Çalıştırılabilir dosya bulunamadığı için proje başlatılamadı, lütfen projenin kendisinin ve tüm bağlantılarının doğruluğundan emin olunuz.</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.NoStartableProjectFound" xml:space="preserve">
+    <value>Açılabilir bir proje bulunamadı. İptal ediliyor...</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.PreparingForAnalysis" xml:space="preserve">
+    <value>Analiz için hazırlanıyor...</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.RegisterFailed" xml:space="preserve">
+    <value>COM kayıt istemcisine profil kaydı girilemedi. Profilleme başlatılamıyor.</value>
+  </data>
+  <data name="AddIns.Profiler.Messages.UnregisterFailed" xml:space="preserve">
+    <value>COM kayıt istemcisinden profil kaydı silinemedi!</value>
+  </data>
+  <data name="AddIns.Profiler.MessageViewCategory" xml:space="preserve">
+    <value>Profil</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.CombineRecursiveCalls" xml:space="preserve">
+    <value>Yinelenen çağrıları birleştir.</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.DoNotProfileNetInternals" xml:space="preserve">
+    <value>İç .NET çağrılarını profilleme.</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.EnableDC" xml:space="preserve">
+    <value>Verileri sadece bu oturumun sonunda derle.</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.EnableDCAtStartup" xml:space="preserve">
+    <value>Verilerin derlenmesini hemen oturum açılınca başlat.</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.Header" xml:space="preserve">
+    <value>Veri Koleksiyonu</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription" xml:space="preserve">
+    <value>Geçici depolama dosyasının boyutu:</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.DataCollection.TrackEvents" xml:space="preserve">
+    <value>Olayları takip et</value>
+  </data>
+  <data name="AddIns.Profiler.Options.General.Title" xml:space="preserve">
+    <value>Genel</value>
+  </data>
+  <data name="AddIns.Profiler.Options.Title" xml:space="preserve">
+    <value>Profilleme</value>
+  </data>
+  <data name="AddIns.Profiler.ProfileExecutable.ErrorMessage" xml:space="preserve">
+    <value>Veri geçersiz, lütfen tekrar deneyin.</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilerControlWindow.CollectData" xml:space="preserve">
+    <value>Veri topla</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilerControlWindow.Shutdown" xml:space="preserve">
+    <value>Kapat</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.NameColumnText" xml:space="preserve">
+    <value>Ad</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.SearchLabelText" xml:space="preserve">
+    <value>Ara:</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.TimeSpentColumnText" xml:space="preserve">
+    <value>Geçen süre</value>
+  </data>
+  <data name="AddIns.Profiler.ProfilingView.TimeText" xml:space="preserve">
+    <value>Süre:</value>
+  </data>
   <data name="AddIns.SharpRefactoring.ExtractMethod" xml:space="preserve">
     <value>Çıkartma yöntemi</value>
   </data>
@@ -425,6 +563,12 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.<
   <data name="AddIns.SharpRefactoring.ExtractMethodNotSupported" xml:space="preserve">
     <value>{0} içinden çıkarım yöntemi desteklenmemektedir!</value>
   </data>
+  <data name="AddIns.SharpRefactoring.InsertCtor.VariableLabel" xml:space="preserve">
+    <value>Değişken</value>
+  </data>
+  <data name="AddIns.SharpRefactoring.OverrideEqualsGetHashCodeMethods.AddInterface" xml:space="preserve">
+    <value>Arayüz ekle {0}</value>
+  </data>
   <data name="AddIns.SourceAnalysis.CheckWithStyleCop" xml:space="preserve">
     <value>StyleCop ile Kontrol Et</value>
   </data>
@@ -530,6 +674,9 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.<
   <data name="AddIns.Subversion.UpdateToRevision" xml:space="preserve">
     <value>Kontrolü yenile</value>
   </data>
+  <data name="AddIns.UsageDataCollector.AcceptConfirmation" xml:space="preserve">
+    <value>Katılımınız için teşekkürler. İstediğiniz zaman SharpDevelop seçeneklerini kullanarak çıkabilirsiniz.</value>
+  </data>
   <data name="AddIns.UsageDataCollector.AcceptRadioButton" xml:space="preserve">
     <value>Katılmak istiyorum. Kullanım bilgilerini topla ve gönder</value>
   </data>

samples/SharpDevelopReports/src/ReportSamples.sln

@@ -1,9 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.5930
+# SharpDevelop 4.1.0.7014
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "..\..\..\src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,6 +22,14 @@ Global
 		{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|x86.ActiveCfg = Debug|x86
 		{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.Build.0 = Release|x86
 		{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.ActiveCfg = Release|x86
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|x86.Build.0 = Debug|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|x86.Build.0 = Release|Any CPU
+		{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs

@@ -98,9 +98,7 @@ namespace SharpReportSamples
 				this.RunContributors(reportName);
 			}
 			else if (s == "ContributorsListWithParameters"){
-				//this.V1_RunContributorsWithParameters(reportName);
+				this.RunContributorsWithParameters(reportName);
-//				this.V2_RunContributorsWithParameters(string fileName)
-				this.V3_RunContributorsWithParameters(reportName);
 			}
 			         
 			else if (s == "NoConnectionReport") {
@@ -221,7 +219,7 @@ namespace SharpReportSamples
 		}
 		
 		
-		private void V3_RunContributorsWithParameters(string fileName)
+		private void RunContributorsWithParameters(string fileName)
 		{
 			var model = ReportEngine.LoadReportModel(fileName);
 			ReportParameters parameters =  ReportEngine.LoadParameters(fileName);
@@ -231,10 +229,6 @@ namespace SharpReportSamples
 			
 			
 			List<Contributor> list = ContributorsReportData.CreateContributorsList();
-//			IDataManager dataManager = DataManager.CreateInstance(list,model.ReportSettings);
-			
-		
-			//IReportCreator creator = ReportEngine.CreatePageBuilder(model,eventLogger.EventLog,null);
 			
 			IReportCreator creator = ReportEngine.CreatePageBuilder(model,list,parameters);
 			
@@ -291,7 +285,7 @@ namespace SharpReportSamples
 			ReportModel model = ReportEngine.LoadReportModel(fileName);
 			IDataManager dataManager = DataManager.CreateInstance(eLog.EventLog,model.ReportSettings);
 			
-			this.previewControl1.SectionRendering += PushPrinting;
+//			this.previewControl1.SectionRendering += PushPrinting;
 			
 			this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
 		

samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj

@@ -32,8 +32,8 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
-    <Reference Include="ICSharpCode.Reports.Core">
+    <Reference Include="Irony">
-      <HintPath>..\..\..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dll</HintPath>
+      <HintPath>..\..\..\..\src\AddIns\Misc\Reports\Irony\obj\Debug\Irony.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -71,4 +71,10 @@
   <ItemGroup>
     <Folder Include="Resources" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj">
+      <Project>{4B2239FF-8FD6-431D-9D22-1B8049BA6917}</Project>
+      <Name>ICSharpCode.Reports.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs

@@ -2,13 +2,8 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Globalization;
-using System.Windows.Forms;
-
 using ICSharpCode.Core;
 using ICSharpCode.Reports.Core;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.Reports.Core.ReportViewer;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.Reports.Addin.Commands
@@ -16,8 +11,6 @@ namespace ICSharpCode.Reports.Addin.Commands
 	
 	public class AbstractPreviewCommand :AbstractCommand
 	{
-		ReportModel model;
-		ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer;
 		
 		public AbstractPreviewCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer)
 		{
@@ -28,31 +21,29 @@ namespace ICSharpCode.Reports.Addin.Commands
 				throw new ArgumentNullException("reportViewer");
 			}
 			
-			this.model = model;
+			this.Model = model;
-			this.reportViewer = reportViewer;
+			this.ReportViewer = reportViewer;
 		}
 		
 		
 		public override void Run()
 		{
-			CollectParametersCommand sql = new CollectParametersCommand(model);
+			CollectParametersCommand cmd = new CollectParametersCommand(Model);
-			sql.Run();
+			cmd.Run();
 		}
 		
 		
-		public ICSharpCode.Reports.Core.ReportViewer.PreviewControl ReportViewer {
+		public ICSharpCode.Reports.Core.ReportViewer.PreviewControl ReportViewer {get;private set;}
-			get { return reportViewer; }
+		
-		}
+		
+		public ReportModel Model {get;private set;}
 		
-		public ReportModel Model {
-			get { return this.model; }
-		}
 	}
 	
 	
-	public class AsyncFormsSheetPreviewCommand:AbstractPreviewCommand
+	public class FormSheetToReportViewerCommand:AbstractPreviewCommand
 	{
-		public AsyncFormsSheetPreviewCommand(ReportModel model,
+		public FormSheetToReportViewerCommand(ReportModel model,
 		                                     ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer)
 		{
 		}
@@ -65,10 +56,10 @@ namespace ICSharpCode.Reports.Addin.Commands
 	}
 	
 	
-	public class AsyncPullModelPreviewCommand:AbstractPreviewCommand
+	public class PullModelToReportViewerCommand:AbstractPreviewCommand
 	{
 		
-		public AsyncPullModelPreviewCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer)
+		public PullModelToReportViewerCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer)
 		{
 		}
 		
@@ -81,9 +72,9 @@ namespace ICSharpCode.Reports.Addin.Commands
 	}
 	
 	
-	public class AsyncPushModelPreviewCommand:AbstractPreviewCommand
+	public class PushModelToReportViewerCommand:AbstractPreviewCommand
 	{
-		public AsyncPushModelPreviewCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer)
+		public PushModelToReportViewerCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer)
 		{
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@@ -5,13 +5,20 @@ using System;
 using System.Collections;
 using System.ComponentModel.Design;
 using System.ComponentModel.Design.Serialization;
+using System.Data;
 using System.Drawing.Design;
+using System.Drawing.Printing;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
+using ICSharpCode.Reports.Addin.Commands;
 using ICSharpCode.Reports.Addin.Designer;
+using ICSharpCode.Reports.Core;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
+using ICSharpCode.Reports.Core.Exporter;
+using ICSharpCode.Reports.Core.Exporter.ExportRenderer;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -185,21 +192,11 @@ namespace ICSharpCode.Reports.Addin
 				LoggingService.Debug("FormsDesigner loaded, setting ActiveDesignSurface to " + this.designSurface.ToString());
 				designSurfaceManager.ActiveDesignSurface = this.designSurface;
 				this.UpdatePropertyPad();
-			} else {
-				// This method can not only be called during initialization,
-				// but also when the designer reloads itself because of
-				// a language change.
-				// When a load error occurs there, we are not somewhere
-				// below the Load method which handles load errors.
-				// That is why we create an error text box here anyway.
-				
-				
-//				TextBox errorTextBox = new TextBox() { Multiline=true, ScrollBars=ScrollBars.Both, ReadOnly=true, BackColor=SystemColors.Window, Dock=DockStyle.Fill };
-//				errorTextBox.Text = String.Concat(this.LoadErrorHeaderText, FormatLoadErrors(designSurface));
-//				this.UserContent = errorTextBox;
 			}
 		}
 		
+		
+		
 		private void CreatePanel ()
 		{
 			this.panel = new Panel();
@@ -220,10 +217,6 @@ namespace ICSharpCode.Reports.Addin
 		{
 			LoggingService.Debug("Forms designer: DesignerLoader unloading...");
 			this.unloading = true;
-//			if (!this.disposing) {
-//				this.UserContent = this.pleaseWaitLabel;
-//				Application.DoEvents();
-//			}
 		}
 		
 		
@@ -284,7 +277,6 @@ namespace ICSharpCode.Reports.Addin
 			this.MakeDirty();
 			ReportExplorerPad explorerPad = CheckReportExplorer();
 			IComponentChangeService change = Host.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
-//			change.OnComponentChanged(explorerPad.ReportModel.ReportSettings.SortColumnsCollection, null, null, null);
 			change.OnComponentChanged(explorerPad, null, null, null);
 		}
 		
@@ -557,13 +549,44 @@ namespace ICSharpCode.Reports.Addin
 		
 		#region IPrintable
 		
-		public System.Drawing.Printing.PrintDocument PrintDocument {
+		
+		public PrintDocument PrintDocument
+		{
 			get {
-				ICSharpCode.Reports.Core.ReportModel model = this.loader.CreateRenderableModel();
+				ReportModel model = loader.CreateRenderableModel();
-				StandartPreviewManager reportManager = new StandartPreviewManager();
+				IReportCreator reportCreator = null;
-				ICSharpCode.Reports.Core.AbstractRenderer r = reportManager.CreateRenderer (model);
+				var  paramCmd = new CollectParametersCommand(model);
-				r.ReportDocument.PrintController = new ICSharpCode.Reports.Core.ExtendedPrintController(new System.Drawing.Printing.PreviewPrintController());
+				paramCmd.Run();
-				return r.ReportDocument;
+				switch (model.DataModel) {
+						case GlobalEnums.PushPullModel.FormSheet :
+						{
+							reportCreator = FormPageBuilder.CreateInstance(model);
+							break;
+						}
+						case GlobalEnums.PushPullModel.PullData:
+						{
+							IDataManager dataManager = DataManagerFactory.CreateDataManager(model,(ReportParameters)null);
+							reportCreator = DataPageBuilder.CreateInstance(model,dataManager);
+							break;
+						}
+						case GlobalEnums.PushPullModel.PushData:{
+							var cmd = new ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand();
+							cmd.Run();
+							DataSet ds = cmd.DataSet;
+							IDataManager dataManager = DataManagerFactory.CreateDataManager(model,ds.Tables[0]);
+							reportCreator = DataPageBuilder.CreateInstance(model,dataManager);
+							break;
+						}
+					default:
+						throw new InvalidReportModelException();
+				}
+				
+				reportCreator.BuildExportList();
+				PrintRenderer printer = PrintRenderer.CreateInstance(reportCreator.Pages);
+				printer.Start();
+				printer.RenderOutput();
+				printer.End();
+				return printer.PrintDocument;
 			}
 		}
 	

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs

@@ -20,7 +20,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		public LayoutPanel()
 		{
-		base.EnableFinish = true;
+			base.EnableFinish = true;
 			base.EnableCancel = true;
 			base.EnableNext = true;
 			base.Refresh();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs

@@ -32,38 +32,50 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		private void InitializeComponent()
 		{
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
 			this.comboBox1 = new System.Windows.Forms.ComboBox();
 			this.checkBox1 = new System.Windows.Forms.CheckBox();
 			this.radioTableLayout = new System.Windows.Forms.RadioButton();
 			this.radioListLayout = new System.Windows.Forms.RadioButton();
 			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// groupBox1
 			// 
-			this.groupBox1.Controls.Add(this.comboBox1);
+			this.groupBox1.Controls.Add(this.groupBox2);
 			this.groupBox1.Controls.Add(this.checkBox1);
 			this.groupBox1.Controls.Add(this.radioTableLayout);
 			this.groupBox1.Controls.Add(this.radioListLayout);
 			this.groupBox1.Location = new System.Drawing.Point(17, 18);
 			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(232, 205);
+			this.groupBox1.Size = new System.Drawing.Size(232, 242);
 			this.groupBox1.TabIndex = 2;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Report Layout";
 			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.comboBox1);
+			this.groupBox2.Location = new System.Drawing.Point(55, 146);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(200, 64);
+			this.groupBox2.TabIndex = 6;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = "groupBox2";
+			this.groupBox2.Visible = false;
+			// 
 			// comboBox1
 			// 
 			this.comboBox1.FormattingEnabled = true;
-			this.comboBox1.Location = new System.Drawing.Point(64, 160);
+			this.comboBox1.Location = new System.Drawing.Point(6, 28);
 			this.comboBox1.Name = "comboBox1";
 			this.comboBox1.Size = new System.Drawing.Size(121, 21);
-			this.comboBox1.TabIndex = 5;
+			this.comboBox1.TabIndex = 6;
-			this.comboBox1.Visible = false;
 			// 
 			// checkBox1
 			// 
-			this.checkBox1.Location = new System.Drawing.Point(64, 116);
+			this.checkBox1.Location = new System.Drawing.Point(64, 106);
 			this.checkBox1.Name = "checkBox1";
 			this.checkBox1.Size = new System.Drawing.Size(104, 24);
 			this.checkBox1.TabIndex = 4;
@@ -97,10 +109,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.Controls.Add(this.groupBox1);
 			this.Name = "LayoutPanelControl";
-			this.Size = new System.Drawing.Size(270, 252);
+			this.Size = new System.Drawing.Size(331, 284);
 			this.groupBox1.ResumeLayout(false);
+			this.groupBox2.ResumeLayout(false);
 			this.ResumeLayout(false);
 		}
+		private System.Windows.Forms.GroupBox groupBox2;
 		private System.Windows.Forms.CheckBox checkBox1;
 		private System.Windows.Forms.ComboBox comboBox1;
 		private System.Windows.Forms.RadioButton radioTableLayout;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs

@@ -5,6 +5,8 @@ using System;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
+
+using ICSharpCode.Core;
 using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin.ReportWizard
@@ -22,6 +24,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		public LayoutPanelControl()
 		{
 			InitializeComponent();
+			groupBox1.Text = ResourceService.GetString("SharpReport.Wizard.Layout.ReportLayout");
+			radioListLayout.Text = ResourceService.GetString("SharpReport.Wizard.Layout.ListLayout");
+			radioTableLayout.Text = ResourceService.GetString("SharpReport.Wizard.Layout.TableLayout");
+			groupBox2.Text = ResourceService.GetString("SharpReport.Wizard.Layout.Column");
+			checkBox1.Text = ResourceService.GetString("SharpReport.Wizard.Layout.Grouping");
 		}
 		
 		
@@ -49,6 +56,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			}
 		}
 		
+		
 		public GlobalEnums.ReportLayout ReportLayout {
 			get {
 				GetLayout();
@@ -61,7 +69,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		void CheckBox1CheckedChanged(object sender, System.EventArgs e)
 		{
-			comboBox1.Visible = checkBox1.Checked;
+			//comboBox1.Visible = checkBox1.Checked;
+			this.groupBox2.Visible = checkBox1.Checked;
 		}
 		
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs

@@ -28,7 +28,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		private System.Windows.Forms.Label label3;
 		private bool firstDrag;
 		private string connectionString;
-		private CommandType commandType;
+//		private CommandType commandType;
 		private ReportStructure reportStructure;
 		private Properties customizer;		
 		private IDatabaseObjectBase currentNode;
@@ -60,7 +60,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			base.EnableCancel = true;
 			this.firstDrag = true;
 			base.IsLastPanel = false;
-			commandType = CommandType.Text;
+			//commandType = CommandType.Text;
 			this.txtSqlString.Enabled = false;
 
             this.databasesTreeHost = new ElementHost() { Dock = DockStyle.Fill };
@@ -90,12 +90,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			}
 			
 			if (message == DialogMessage.Next) {
-				
-				
-				commandType = CommandType.Text;
-				
 				customizer.Set("SqlString", this.txtSqlString.Text.Trim());
-				reportStructure.CommandType = commandType;
+				//reportStructure.CommandType = commandType;
 				reportStructure.SqlString = this.txtSqlString.Text.Trim();
 				reportStructure.ConnectionString = connectionString;
 				base.EnableFinish = true;
@@ -124,6 +120,9 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
             {
                 string draggedFormat = e.Data.GetFormats()[0];
                 
+                String str = String.Format("drag {0}",draggedFormat);
+                System.Diagnostics.Trace.WriteLine(str);
+
                 Type draggedType = null;
 
                 // I'm doing this ugly thing because we are checking if the IDatabaseObjectBase is implemented,
@@ -173,9 +172,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
                     // we insert Select * from.... otherwise we have to scan
                     //the whole string for incorrect columnNames
                     this.txtSqlString.Clear();
-                    //					AbstractSharpQuerySchemaClass tbl = (AbstractSharpQuerySchemaClass)this.currentNode.SchemaClass;
                     this.txtSqlString.Text = "SELECT * FROM " + (draggedObject as ICSharpCode.Data.Core.Interfaces.ITable).Name;
-
+                    reportStructure.CommandType = CommandType.Text;
                     break;
 
                 case NodeType.ColumnImage:
@@ -184,9 +182,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
                     {
                         this.txtSqlString.AppendText("SELECT ");
                         this.txtSqlString.AppendText(colName);
-
                     }
-                    //FxCop : http://msdn.microsoft.com/library/bb386042(VS.100).aspx
+            
                     else if (this.txtSqlString.Text.ToUpper(CultureInfo.InvariantCulture).IndexOf("where", StringComparison.OrdinalIgnoreCase) > 0)
                     {
                         this.txtSqlString.AppendText(colName + " = ?");
@@ -196,6 +193,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
                         this.txtSqlString.AppendText(", ");
                         this.txtSqlString.AppendText(colName);
                     }
+                    reportStructure.CommandType = CommandType.Text;
                     break;
 
                 case NodeType.ProcedureImage:
@@ -204,7 +202,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
                     // we can't use the dragobject because it returns an string like 'EXECUTE ProcName'
                     IProcedure procedure = draggedObject as IProcedure;
                     this.txtSqlString.Text = "EXECUTE " + procedure.Name;
-
+                   reportStructure.CommandType = CommandType.StoredProcedure;
 //                    reportStructure.SharpQueryProcedure = new SharpQueryProcedure(new SharpQuery.Connection.OLEDBConnectionWrapper(this.connectionString), procedure.Parent.Name, procedure.SchemaName, string.Empty, procedure.Name);
                     break;
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs

@@ -50,6 +50,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		#endregion
 		
+		
 		#region Fill data
 		
 		private DataSet FillGrid() 
@@ -62,7 +63,23 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			                      model.ReportSettings.CommandText);
 			DataSet dataSet = ResultPanel.CreateDataSet ();
 			
-			this.txtSqlString.Text = model.ReportSettings.CommandText;
+			
+			switch (model.ReportSettings.CommandType) {
+				case CommandType.Text:
+						this.txtSqlString.Text = model.ReportSettings.CommandText;
+						dataSet = BuildFromSqlString();
+					break;
+				case CommandType.StoredProcedure:
+					MessageService.ShowError("Stored Procedures are not suppurted at the moment");
+					break;
+				case CommandType.TableDirect:
+					MessageService.ShowError("TableDirect is not suppurted at the moment");
+					break;
+				default:
+					throw new Exception("Invalid value for CommandType");
+			}
+			
+			
 			if (model.ReportSettings.CommandType == CommandType.StoredProcedure){
 				/*
 				if (reportStructure.SharpQueryProcedure == null) {
@@ -81,10 +98,10 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			}
 			
 			// from here we create from an SqlString like "Select...."
-			if (model.ReportSettings.CommandType == CommandType.Text){
+//			if (model.ReportSettings.CommandType == CommandType.Text){
-				this.txtSqlString.Text = model.ReportSettings.CommandText;
+//				this.txtSqlString.Text = model.ReportSettings.CommandText;
-				dataSet = BuildFromSqlString();
+//				dataSet = BuildFromSqlString();
-			}
+//			}
 			return dataSet;
 		}
 		
@@ -247,6 +264,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		#endregion
 		
+		
 		#region overrides
 		
 		public override bool ReceiveDialogMessage(DialogMessage message)
@@ -257,9 +275,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			}
 			if (message == DialogMessage.Activated) 
 			{
-				this.model = reportStructure.CreateAndFillReportModel();
+				ShowData();
-				this.resultDataSet =  FillGrid();
-				SetupGrid ();
 				base.EnableNext = true;
 				base.EnableFinish = true;
 				
@@ -281,6 +297,17 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		}
 		
 		
+		void ShowData()
+		{
+			this.model = reportStructure.CreateAndFillReportModel();
+			this.resultDataSet =  FillGrid();
+			if (resultDataSet.Tables.Count > 0) {
+				SetupGrid ();
+			}
+			
+		}
+		
+		
 		private void SetupGrid()
 		{
 			if (this.resultDataSet != null) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs

@@ -50,15 +50,15 @@ namespace ICSharpCode.Reports.Addin
 			AbstractPreviewCommand cmd = null;
 			switch (model.DataModel) {
 					case GlobalEnums.PushPullModel.FormSheet : {
-						cmd = new AsyncFormsSheetPreviewCommand (model,control);
+						cmd = new FormSheetToReportViewerCommand (model,control);
 						break;
 					}
 					case GlobalEnums.PushPullModel.PullData:{
-						cmd = new AsyncPullModelPreviewCommand(model,control);					
+						cmd = new PullModelToReportViewerCommand(model,control);					
 						break;
 					}
 					case GlobalEnums.PushPullModel.PushData:{
-						cmd = new AsyncPushModelPreviewCommand(model,control);						
+						cmd = new PushModelToReportViewerCommand(model,control);						
 						break;
 					}
 				default:

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs

@@ -15,6 +15,9 @@ using ICSharpCode.SharpDevelop.Widgets.SideBar;
 namespace ICSharpCode.Reports.Addin
 {
 	
+	//http://developer.sharpdevelop.net/corsavy/translation/default.asp
+	
+	
 	internal sealed class ReportingSideTabProvider
 	{
 		
@@ -61,39 +64,41 @@ namespace ICSharpCode.Reports.Addin
 			tb.Bitmap = WinFormsResourceService.GetIcon("Icons.16.16.SharpReport.Textbox").ToBitmap();
 			sideTab.Items.Add(new SideTabItemDesigner(tb));	
 			
-			// Row
+		
-			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseRowItem));
-			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
-			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow");
-			sideTab.Items.Add(new SideTabItemDesigner(tb));
 			
 		
 			//GroupHeader
 			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.GroupHeader));
-			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
+			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.NameSpace");
-			tb.DisplayName = "GroupHeader";
+			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.GroupHeader");
 			sideTab.Items.Add(new SideTabItemDesigner(tb));
 			
 			
 			//GroupFooter
 			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.GroupFooter));
-			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
+			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.NameSpace");
-			tb.DisplayName = "GroupFooter";
+			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.GroupFooter");
 			sideTab.Items.Add(new SideTabItemDesigner(tb));
 			
+			// Row
+			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseRowItem));
+			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
+			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow");
+			sideTab.Items.Add(new SideTabItemDesigner(tb));
 			
 			//BaseTable
+//			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
 			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
 			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseTableItem));
-			tb.DisplayName ="Table";
+			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.Table");
 			sideTab.Items.Add(new SideTabItemDesigner(tb));	
 			
 			
-			
-			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
 			//BaseDataItem
 			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseDataItem));
 			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataField");
+//				tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Column");
+			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Column");
 			sideTab.Items.Add(new SideTabItemDesigner(tb));	
 			
 			//Grahics

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -252,7 +252,6 @@
     <Compile Include="Project\Globals\UnitConverter.cs" />
     <Compile Include="Project\Interfaces\IDataAccessStrategy.cs" />
     <Compile Include="Project\Interfaces\IDataViewStrategy.cs" />
-    <Compile Include="Project\Interfaces\IHierarchyInterfaces.cs" />
     <Compile Include="Project\Interfaces\IItemConverter.cs" />
     <Compile Include="Project\Interfaces\ILayouter.cs" />
     <Compile Include="Project\Interfaces\IReportItem.cs" />
@@ -260,7 +259,6 @@
     <Compile Include="Project\Interfaces\IReportModel.cs" />
     <Compile Include="Project\Interfaces\ISinglePage.cs" />
     <Compile Include="Project\IReportCreator.cs" />
-    <Compile Include="Project\Printing\ExtendedPrintController.cs" />
     <Compile Include="Project\Printing\Graphics\BaseLine.cs" />
     <Compile Include="Project\Printing\Graphics\BaseShape.cs" />
     <Compile Include="Project\Printing\Graphics\Border.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs

@@ -33,8 +33,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 				return Rectangle.Empty;
 			}
 			
-			Console.WriteLine("\tlayouter for container <{0}>",container.ToString());
+//			Console.WriteLine("\tlayouter for container <{0}>",container.ToString());
-			
+			Console.WriteLine("\tLayouter for Container");
 			Rectangle desiredContainerRectangle = new Rectangle (container.Location,container.Size);
 			
 			System.Collections.Generic.IEnumerable<BaseReportItem> canGrowShrinkCollection = from bt in container.Items where bt.CanGrow == true select bt;
@@ -58,7 +58,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 //				                                       
 //				Console.WriteLine("Diff {0} - {1} dif  {2}",desiredContainerRectangle,r1,desiredContainerRectangle.Height - r1.Height);
 			}
-			Console.WriteLine("\tContainer : {0} - DesiredContainerRectangle {1} ",container.Size,desiredContainerRectangle.Size);
+//			Console.WriteLine("\tContainer : {0} - DesiredContainerRectangle {1} ",container.Size,desiredContainerRectangle.Size);
 			return desiredContainerRectangle;
 		}
 		
@@ -72,8 +72,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 				throw new ArgumentNullException("section");
 			}
 		
-			Console.WriteLine("\tlayouter for section <{0}>",section.Name);
+//				Console.WriteLine("\tLayouter for Container");Console.WriteLine("\tlayouter for section <{0}>",section.Name);
-			
+				Console.WriteLine("\tLayouter for Section");
 			IEnumerable<BaseReportItem> canGrowShrinkCollection = from bt in section.Items where bt.CanGrow == true select bt;
 			
 			Rectangle desiredSectionRectangle = new Rectangle(section.Location.X,
@@ -93,7 +93,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 					                                        surroundingRec.Size.Height);
 				}
 			}
-			Console.WriteLine("\tSection : {0} - DesiredContainerRectangle {1} ",section.Size,desiredSectionRectangle.Size);
+//			Console.WriteLine("\tSection : {0} - DesiredContainerRectangle {1} ",section.Size,desiredSectionRectangle.Size);
 			return desiredSectionRectangle;
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@@ -143,7 +143,6 @@ namespace ICSharpCode.Reports.Core{
 		
 		protected override void RemoveItem(int index)
 		{
-			BaseReportItem item = this[index];
 			base.RemoveItem(index);
 		}
 	

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs

@@ -191,23 +191,7 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		/*
-		private void CheckReportColumns()
-		{
 		
-			if (this.reportSettings.SortColumnCollection.Count > 0) {
-				if (this.dataViewStrategy.AvailableFields.Count > 0) {
-					foreach (SortColumn col in this.reportSettings.SortColumnCollection) {
-						string colName = col.ColumnName;
-						AbstractColumn c = this.dataViewStrategy.AvailableFields.Find (colName);
-						if (c == null) {
-							throw new WrongColumnException(col.ColumnName);
-						}
-					}
-				}
-			}
-		}
-		*/
 		#endregion
 		
 		
@@ -245,23 +229,6 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		/*
-		public IndexList ChildRows
-		{
-			get {
-				return this.dataViewStrategy.ChildRows;
-			}
-		}
-		
-
-	
-		public bool IsGrouped
-		{
-			get {
-				return this.dataViewStrategy.IsGrouped;
-			}
-		}
-		*/
 		
 		public bool IsSorted
 		{
@@ -270,17 +237,11 @@ namespace ICSharpCode.Reports.Core {
 			}
 		}
 		
-		/*
+	
-		public bool IsFiltered
-		{
-			get {
-				return this.dataViewStrategy.IsFiltered;
-			}
-		}
-		*/
 		#endregion
 		
 		#region System.IDisposable interface implementation
+		
 		public void Dispose() {
 			this.Dispose(true);
 			GC.SuppressFinalize(this);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs

@@ -130,7 +130,7 @@ namespace ICSharpCode.Reports.Core {
 		#endregion
 		
 		#region Debug Code
-		
+		/*
 		protected  static void ShowIndexList (IndexList list)
 		{
 			
@@ -151,7 +151,7 @@ namespace ICSharpCode.Reports.Core {
 				}
 			}
 		}
-		
+		*/
 		#endregion
 		
 		public  virtual void Reset()

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs

@@ -14,7 +14,7 @@ namespace ICSharpCode.Reports.Core
 	/// </summary>
 	/// 
 	
-	public class SqlDataAccessStrategy:IDataAccessStrategy
+	internal class SqlDataAccessStrategy:IDataAccessStrategy
 	{
 		private ConnectionObject  connectionObject;
 		private ReportSettings reportSettings;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@@ -27,16 +27,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Constructor
 		
-		public BasePager(IReportModel reportModel,ILayouter layouter)
+		public BasePager(IReportModel reportModel)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
 			}
-			if (layouter == null) {
+		
-				throw new ArgumentNullException ("layouter");
-			}
 			this.ReportModel = reportModel;
-			this.Layouter = layouter;
+			//this.Layouter = layouter;
+			this.Layouter = new Layouter();
 			this.Graphics = CreateGraphicObject.FromSize(this.ReportModel.ReportSettings.PageSize);
 		}
 		
@@ -210,7 +209,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				ExportText et = be as ExportText;
 				
 				if (et != null) {
-					if (et.Text.StartsWith("=")) {
+					if (et.Text.StartsWith("=",StringComparison.InvariantCulture)) {
 						et.Text = evaluatorFassade.Evaluate(et.Text);
 					}
 				}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs

@@ -78,7 +78,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (row == null) {
 				throw new ArgumentException("row");
 			}
-			Console.WriteLine("\tFireRowRendering");
+//			Console.WriteLine("\tFireRowRendering");
 			RowRenderEventArgs rrea = new RowRenderEventArgs(row,currentNavigator.Current);
 			EventHelper.Raise<RowRenderEventArgs>(RowRendering,this,rrea);
 		}
@@ -86,7 +86,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		protected void FireGroupHeaderRendering (GroupHeader groupHeader)
 		{
-			Console.WriteLine("\tFireGroupHeaderRendering");
+//			Console.WriteLine("\tFireGroupHeaderRendering");
 			GroupHeaderEventArgs ghea = new GroupHeaderEventArgs(groupHeader);
 			EventHelper.Raise<GroupHeaderEventArgs>(GroupHeaderRendering,this,ghea);
 		}
@@ -94,7 +94,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		protected void FireGroupFooterRendering (GroupFooter groupFooter)
 		{
-			Console.WriteLine("\tFireGroupFooterRendering");
+//			Console.WriteLine("\tFireGroupFooterRendering");
 			GroupFooterEventArgs gfea = new GroupFooterEventArgs(groupFooter);
 			EventHelper.Raise<GroupFooterEventArgs>(GroupFooterRendering,this,gfea);
 		}
@@ -136,27 +136,18 @@ namespace ICSharpCode.Reports.Core.Exporter
 	
 		#region Grouping
 		
-		protected void ConvertGroupFooter (BaseSection section,ISimpleContainer container,ExporterCollection exporterCollection)
+		protected void ConvertGroupFooter (ISimpleContainer container,ExporterCollection exporterCollection)
 		{
 			var footers = BaseConverter.FindGroupFooter(container);
 			if (footers.Count > 0) {
 				
 				Size rowSize = footers[0].Size;
-				CurrentPosition = ConvertStandardRow(exporterCollection,section,(ISimpleContainer)footers[0]);
+				CurrentPosition = ConvertStandardRow(exporterCollection,(ISimpleContainer)footers[0]);
 				FireGroupFooterRendering(footers[0]);
 				footers[0].Size = rowSize;
 			}
 		}
 		
-		protected Point ConvertGroupChilds(ExporterCollection mylist, BaseSection section,
-		                                   ISimpleContainer simpleContainer)
-		{
-			PrepareContainerForConverting(section,simpleContainer);
-			Point curPos  = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition);
-			AfterConverting (mylist);
-			return curPos;
-		}
-		
 		
 		protected void PageBreakAfterGroupChange(BaseSection section,ExporterCollection exporterCollection)
 		{
@@ -247,21 +238,25 @@ namespace ICSharpCode.Reports.Core.Exporter
 		}
 		
 		
-		protected  Point ConvertStandardRow(ExporterCollection mylist, BaseSection section, ISimpleContainer simpleContainer)
+		protected	void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer)
+		{
+			Console.WriteLine("\tPrepareContainerForConverting");
+			
+			FireSectionRendering(section);
+			LayoutRow(simpleContainer);
+		}
+		
+		
+		protected  Point ConvertStandardRow(ExporterCollection mylist,  ISimpleContainer simpleContainer)
 		{
 			var rowSize = simpleContainer.Size;
-			PrepareContainerForConverting(section,simpleContainer);
+Console.WriteLine("ConvertStandardRow");
 			Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition);
 			AfterConverting (mylist);
 			simpleContainer.Size = rowSize;
+			Console.WriteLine("");
 			return curPos;
-		}
-		
 			
-		protected	void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer)
-		{
-			FireSectionRendering(section);
-			LayoutRow(simpleContainer);
 		}
 		
 		
@@ -279,10 +274,10 @@ namespace ICSharpCode.Reports.Core.Exporter
 		}
 		
 		
-		protected  void FillRow (ISimpleContainer row)
+		protected static  void FillRow (ISimpleContainer row,IDataNavigator currentNavigator)
 		{
-			Console.WriteLine("\tFillRow");
+			Console.WriteLine("\tFillrow");
-			DataNavigator.Fill(row.Items);
+			currentNavigator.Fill(row.Items);
 		}
 		
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@@ -96,21 +96,22 @@ namespace ICSharpCode.Reports.Core.Exporter
 						StandardPrinter.AdjustBackColor(simpleContainer,GlobalValues.DefaultBackColor);
 						do
 						{
-							Console.WriteLine("");
 							section.Size = base.RestoreSectionSize;
 							section.Items[0].Size = groupSize;
 							section.Items[1].Size = childSize;
-							Console.WriteLine("\tFillRow");
+						
-							childNavigator.Fill(simpleContainer.Items);
+							FillRow(simpleContainer,childNavigator);
-							base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer);   
 							FireRowRendering(simpleContainer,childNavigator);
+							PrepareContainerForConverting(section,simpleContainer);
+ 
+//							FireRowRendering(simpleContainer,childNavigator);
+							base.CurrentPosition = ConvertStandardRow(exporterCollection,simpleContainer);
 							CheckForPageBreak(section,exporterCollection);
-								Console.WriteLine("");
 						}
 						while ( childNavigator.MoveNext());
 						
 						// GroupFooter
-						base.ConvertGroupFooter(section,section,exporterCollection);
+						base.ConvertGroupFooter(section,exporterCollection);
 						
 						base.PageBreakAfterGroupChange(section,exporterCollection);
 						
@@ -120,15 +121,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 				else
 				{
 					// No Grouping at all, the first item in section.items is the DetailRow
-					Console.WriteLine("");
-					Size containerSize = section.Items[0].Size;
-					base.FillRow(simpleContainer);
 					
-					base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer);
+					Size containerSize = section.Items[0].Size;
-					base.FireRowRendering(simpleContainer,base.DataNavigator);
+					FillRow(simpleContainer,base.DataNavigator);
+					FireRowRendering(simpleContainer,base.DataNavigator);
+					base.PrepareContainerForConverting(section,simpleContainer);
+//					FireRowRendering(simpleContainer,base.DataNavigator);
+					base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer);
 					section.Size = base.RestoreSectionSize;
 					section.Items[0].Size = containerSize;
-					Console.WriteLine("");
 				}
 				CheckForPageBreak (section,exporterCollection);
 				ShouldDrawBorder (section,exporterCollection);
@@ -185,10 +186,11 @@ namespace ICSharpCode.Reports.Core.Exporter
 				AfterConverting (list);
 				retVal =  new Point (DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20  + (3 *GlobalValues.GapBetweenContainer));
 			} else {
-				FillRow(groupedRows[0]);
+				FillRow(groupedRows[0],base.DataNavigator);
 				rowSize = groupedRows[0].Size;
-				retVal = ConvertStandardRow(exportList,section,groupedRows[0]);
 				base.FireGroupHeaderRendering(groupedRows[0]);
+				retVal = ConvertStandardRow(exportList,groupedRows[0]);
+				
 				groupedRows[0].Size = rowSize;
 			}
 			return retVal;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

@@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			ExporterCollection mylist = base.Convert(parent,item);
 			this.table = (BaseTableItem)item ;
 			this.table.Parent = parent;
-			this.table.DataNavigator = base.DataNavigator;
+//			this.table.DataNavigator = base.DataNavigator;
 			return ConvertInternal(mylist);
 		}
 		
@@ -96,6 +96,13 @@ namespace ICSharpCode.Reports.Core.Exporter
 						childNavigator.Reset();
 						childNavigator.MoveNext();
 
+/*
+---- GroupTableConverter.cs Zeile 151:
+FillRow(simpleContainer,base.DataNavigator);
+FireRowRendering(simpleContainer,base.DataNavigator);
+base.PrepareContainerForConverting(section,simpleContainer);
+----
+*/	
 						//Convert children
 						if (childNavigator != null) {
 							do
@@ -104,9 +111,11 @@ namespace ICSharpCode.Reports.Core.Exporter
 								simpleContainer = table.Items[2] as ISimpleContainer;
 								containerSize = simpleContainer.Size;
 								
-								childNavigator.Fill(simpleContainer.Items);
+								FillRow(simpleContainer,childNavigator);
-
+//								PrepareContainerForConverting(section,simpleContainer);								
-								base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer);						                                           
+								FireRowRendering(simpleContainer,childNavigator);
+								PrepareContainerForConverting(section,simpleContainer);		
+								base.CurrentPosition = ConvertStandardRow(exporterCollection,simpleContainer);
 								
 								simpleContainer.Size = containerSize;
 								CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection);
@@ -115,7 +124,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 							while ( childNavigator.MoveNext());
 							
 							// GroupFooter
-							base.ConvertGroupFooter(section,table,exporterCollection);
+							base.ConvertGroupFooter(table,exporterCollection);
 							base.PageBreakAfterGroupChange(section,exporterCollection);
 							
 							base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator;
@@ -131,22 +140,22 @@ namespace ICSharpCode.Reports.Core.Exporter
 					simpleContainer =  table.Items[1] as ISimpleContainer;				
 					base.SaveSectionSize(section.Size);
 					containerSize = simpleContainer.Size;
-						Console.WriteLine("datasection - NO grouping");
+						
 					do {
 
-							Console.WriteLine("");
 						PrintHelper.AdjustSectionLocation(section);
 						CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection);
-						FillRow(simpleContainer);
+						
-						base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer);
+						FillRow(simpleContainer,base.DataNavigator);
+//						base.PrepareContainerForConverting(section,simpleContainer);
 						FireRowRendering(simpleContainer,base.DataNavigator);
+						base.PrepareContainerForConverting(section,simpleContainer);
+						
+						base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer);
 						simpleContainer.Size = containerSize;
 						section.Size = base.RestoreSectionSize;
-						Console.WriteLine("");
 					}
 					while (base.DataNavigator.MoveNext());
-					Console.WriteLine("");
-					Console.WriteLine("END of datasection - NO grouping");
 					base.DataNavigator.Reset();
 					base.DataNavigator.MoveNext();
 					SectionBounds.ReportFooterRectangle =  new Rectangle(SectionBounds.ReportFooterRectangle.Left,
@@ -168,7 +177,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			{
 				base.CurrentPosition = ForcePageBreak(exporterCollection,section);
 				
-				base.CurrentPosition = ConvertStandardRow (exporterCollection,section,headerRow);
+				base.CurrentPosition = ConvertStandardRow (exporterCollection,headerRow);
 			}
 
 		}
@@ -208,9 +217,11 @@ namespace ICSharpCode.Reports.Core.Exporter
 				
 				
 			} else {
+				
 				rowSize = groupedRow[0].Size;
+				FillRow(groupedRow[0],base.DataNavigator);
 				base.FireGroupHeaderRendering(groupedRow[0]);
-				retVal = ConvertStandardRow(exportList,section,groupedRow[0]);
+				retVal = ConvertStandardRow(exportList,groupedRow[0]);
 				groupedRow[0].Size = rowSize;
 			}
 			return retVal;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs

@@ -19,8 +19,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Constructor
 		
-		
+		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager)
-		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter)
+//		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
@@ -28,15 +28,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (dataManager == null) {
 				throw new ArgumentNullException("dataManager");
 			}
-			if (layouter == null) {
+			DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager);
-				throw new ArgumentNullException("layouter");
-			}
-			DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager,layouter);
 			return instance;
 		}
 		
 		
-		private DataPageBuilder (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel,layouter) 
+		private DataPageBuilder (IReportModel reportModel,IDataManager dataManager):base(reportModel) 
 		{
 			this.dataManager = dataManager;
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs

@@ -11,6 +11,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 	/// </summary>
 	/// 
 	public class BaseExportRenderer{
+		
 		PagesCollection pages;
 		
 		public BaseExportRenderer ()
@@ -46,6 +47,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 		{
 		}
 		
+		
 		public virtual void RenderOutput ()
 		{
 		}
@@ -54,6 +56,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 		{
 		}
 		
+		
 		public PagesCollection Pages 
 		{
 			get {if (this.pages == null) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs

@@ -11,10 +11,8 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer
 	/// </summary>
 	
 	
-	public class PreviewRenderer:BaseExportRenderer
+	internal class PreviewRenderer:BaseExportRenderer
 	{
-		Graphics graphics;
-		ExporterPage page;
 		
 		#region Constructor
 		
@@ -29,23 +27,18 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer
 	
 		public override void RenderOutput(){
 			base.RenderOutput();
-			if (this.graphics != null) {
+			if (this.Graphics != null) {
-				BaseExportRenderer.DrawItems(this.graphics,this.page.Items);
+				BaseExportRenderer.DrawItems(this.Graphics,this.Page.Items);
 			} else {
 				return;
 			}
 		}
 		
 	
-		public Graphics Graphics {
+		public Graphics Graphics {get;set;}
-			get { return this.graphics;}
-			set { this.graphics = value;}
-		}
 			
-		public ExporterPage Page {
+		
-			get {return this.page;}
+		public ExporterPage Page {get;set;}
-			set { page = value; }
-		}
 		
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs

@@ -10,7 +10,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 	/// Description of PrintRenderer.
 	/// </summary>
 	public class PrintRenderer:BaseExportRenderer,IDisposable{
-		PrintDocument doc;
+
 		int currentPage;
 		PrinterSettings printerSettings;
 		
@@ -43,11 +43,14 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 		
 		private PrintRenderer(PagesCollection pages):base(pages)
 		{
-			doc = new PrintDocument();
+			this.PrintDocument = new PrintDocument();
+			this.PrintDocument.PrinterSettings = new PrinterSettings();
+			
+			
 //			doc.QueryPageSettings += new QueryPageSettingsEventHandler(OnQueryPage);
-			doc.BeginPrint += new PrintEventHandler(OnBeginPrint);
+			this.PrintDocument.BeginPrint += new PrintEventHandler(OnBeginPrint);
-			doc.EndPrint += new PrintEventHandler(OnEndPrint);
+			this.PrintDocument.EndPrint += new PrintEventHandler(OnEndPrint);
-			doc.PrintPage += new PrintPageEventHandler(OnPrintPage);
+			this.PrintDocument.PrintPage += new PrintPageEventHandler(OnPrintPage);
 		}
 		
 		#endregion
@@ -87,22 +90,25 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 		{
 			base.RenderOutput();
 			if (this.printerSettings != null) {
-				doc.PrinterSettings = this.printerSettings;
+				this.PrintDocument.PrinterSettings = this.printerSettings;
 			}
-			doc.Print();
 		}
 		
+		
 		public override void End()
 		{
 			base.End();
 		}
 		
 		
+		public PrintDocument PrintDocument {get;private set;}
+		
 		internal PrinterSettings PrinterSettings 
 		{
 			set { printerSettings = value; }
 		}
 		
+		
 		#region IDisposable
 		
 		public  void Dispose()
@@ -116,10 +122,10 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{
 			if (disposing)
 			{
 				// free managed resources
-				if (this.doc != null)
+				if (this.PrintDocument != null)
 				{
-					doc.Dispose();
+					this.PrintDocument.Dispose();
-					doc = null;
+					this.PrintDocument = null;
 				}
 			}
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs

@@ -16,18 +16,17 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Constructure
 		
-		public static FormPageBuilder CreateInstance(IReportModel reportModel,ILayouter layouter)
+		public static FormPageBuilder CreateInstance(IReportModel reportModel)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
 			}
-			
+			FormPageBuilder instance = new FormPageBuilder(reportModel);
-			FormPageBuilder instance = new FormPageBuilder(reportModel,layouter);
 			return instance;
 		}
 		
 		
-		private FormPageBuilder(IReportModel reportModel,ILayouter layouter):base(reportModel,layouter)
+		private FormPageBuilder(IReportModel reportModel):base(reportModel)
 		{
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs

@@ -1,30 +0,0 @@
-// 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)
-
-//ToDo with NET2.0 change this Interface to the one provided by NET2.0
-using System;
-
-namespace ICSharpCode.Reports.Core {
-	
-	public interface IHierarchyData{
-		
-		IndexList GetChildren {
-			get;
-		}
-
-		bool HasChildren {
-			get;
-		}
-		
-		object Item {
-			get;
-		}
-		string Path {
-			get;
-		}
-		
-		string Type {
-			get;
-		}
-	}
-}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs

@@ -1,56 +0,0 @@
-// 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.Drawing.Printing;
-
-namespace ICSharpCode.Reports.Core
-{
-	/// <summary>
-	/// Description of ExtendedPrintController.
-	/// </summary>
-
-	
-	public class ExtendedPrintController:PrintController
-	{
-		PrintController controller;
-		
-		public ExtendedPrintController(PrintController controller):base()
-		{
-			if (controller == null) {
-				throw new ArgumentNullException("controller");
-			}
-			this.controller = controller;
-		}
-		
-		public override System.Drawing.Graphics OnStartPage(PrintDocument document, PrintPageEventArgs e)
-		{
-			System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnStartPage");
-			return this.controller.OnStartPage (document, e);
-		}
-		
-		
-		public override void OnStartPrint(PrintDocument document, PrintEventArgs e)
-		{
-			System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnStartPrint");
-			this.controller.OnStartPrint(document, e);
-		}
-		
-		
-		public override void OnEndPage(PrintDocument document, PrintPageEventArgs e)
-		{
-			System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnEndPage");
-			this.controller.OnEndPage (document, e);
-		}
-		
-		public override void OnEndPrint(PrintDocument document, PrintEventArgs e)
-		{
-			System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnEndprint");
-			PreviewPrintController c = this.controller as PreviewPrintController;
-			if (c != null) {
-				PreviewPageInfo[] ppia = c.GetPreviewPageInfo();
-			}
-			this.controller.OnEndPrint(document,e);
-		}
-	}
-}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs

@@ -21,7 +21,6 @@ namespace ICSharpCode.Reports.Core {
 	public class ReportEngine : IDisposable
 	{
 		private PreviewControl previewControl;
-//		private IDataManager dataMan;
 		
 		/// <summary>
 		/// This event is fired before a Section is Rendered, you can use
@@ -470,13 +469,12 @@ namespace ICSharpCode.Reports.Core {
 			
 			IReportModel reportModel = LoadReportModel (fileName);
 			IReportCreator builder = null;
-			Layouter layouter = new Layouter();
 			if (reportModel.DataModel == GlobalEnums.PushPullModel.FormSheet) {
-				builder = FormPageBuilder.CreateInstance(reportModel,layouter);
+				builder = FormPageBuilder.CreateInstance(reportModel);
 			} else {
 				CheckForParameters(reportModel,reportParameters);
 				IDataManager dataMan  = DataManagerFactory.CreateDataManager(reportModel,reportParameters);
-				builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter);
+				builder = DataPageBuilder.CreateInstance(reportModel, dataMan);
 			}
 			return builder;
 		}
@@ -494,8 +492,7 @@ namespace ICSharpCode.Reports.Core {
 				throw new ArgumentNullException("reportModel");
 			}
 			IDataManager dataMan  = DataManagerFactory.CreateDataManager(reportModel,(ReportParameters)null);
-			Layouter layouter = new Layouter();
+			IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan);
-			IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter);
 			return builder;
 		}
 		
@@ -544,8 +541,7 @@ namespace ICSharpCode.Reports.Core {
 			IDataManager dataMan  = DataManager.CreateInstance(dataTable,reportModel.ReportSettings);
 			if (dataMan != null)
 			{
-				Layouter layouter = new Layouter();
+				return DataPageBuilder.CreateInstance(reportModel, dataMan);
-				return DataPageBuilder.CreateInstance(reportModel, dataMan,layouter);
 			} else {
 				throw new MissingDataManagerException();
 			}
@@ -572,8 +568,7 @@ namespace ICSharpCode.Reports.Core {
 			ReportEngine.CheckForParameters(reportModel,reportParameters);
 			IDataManager dataMan  = DataManager.CreateInstance(list,reportModel.ReportSettings);
 			if (dataMan != null) {
-				Layouter layouter = new Layouter();
+				return DataPageBuilder.CreateInstance(reportModel,dataMan);
-				return DataPageBuilder.CreateInstance(reportModel,dataMan,layouter);
 			} else {
 				throw new MissingDataManagerException();
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@@ -23,7 +23,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 	public partial class PreviewControl
 	{
 		public event EventHandler <EventArgs> PreviewLayoutChanged;
-//		public event EventHandler<SectionRenderEventArgs> SectionRendering;
+
 		
 		private float zoom;
 		
@@ -151,9 +151,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		
 		private void RunFormSheet (ReportModel reportModel)
 		{
-			
+			IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel);
-			Layouter layouter = new Layouter();
-			IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel,layouter);
 			reportCreator.SectionRendering += new EventHandler<SectionRenderEventArgs>(PushPrinting);
 			reportCreator.PageCreated += OnPageCreated;
 			reportCreator.BuildExportList();
@@ -163,8 +161,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		
 		private void RunDataReport (ReportModel reportModel,IDataManager data)
 		{
-			ILayouter layouter = new Layouter();
+			IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data);
-			IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data,layouter);
 			reportCreator.SectionRendering += new EventHandler<SectionRenderEventArgs>(PushPrinting);
 			reportCreator.GroupHeaderRendering += new EventHandler<GroupHeaderEventArgs>(GroupHeaderRendering);
 			reportCreator.GroupFooterRendering += GroupFooterRendering;
@@ -195,7 +192,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		
 		private void PushPrinting (object sender,SectionRenderEventArgs e)
 		{
-			string sectionName = e.Section.Name;
+//			string sectionName = e.Section.Name;
 			/*
 			if (sectionName == ReportSectionNames.ReportHeader) {
 				Console.WriteLine("PushPrinting  :" + ReportSectionNames.ReportHeader);