diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-03 13:02:33 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-03 13:02:33 +0400 |
| commit | a41e429b4cd5dc717a037b2086db03df06aa2740 (patch) | |
| tree | 765c29072a3661c056cfbcc14e15493cae92be73 | |
| parent | f2c2840ac9f3f29a01e4a7457e261a07f4ac1162 (diff) | |
| parent | 017cecfc1febb5580b94b21362f35bc0d963cc88 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
version-checks
111 files changed, 1584 insertions, 1412 deletions
diff --git a/.gitignore b/.gitignore index 90f166ff55..31c374e8ed 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ obj/ /main/src/addins/MonoDevelop.Debugger.Win32/CorApi/bin /main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/bin /main/src/core/MonoDevelop.Core/BuildVariables.cs +/scripts/configure.exe #VS writes these sometimes even when it doesn't change anything /main/_UpgradeReport_Files diff --git a/main/Main.sln b/main/Main.sln index 9a5c1b1bd3..718db8425a 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -272,11 +272,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.TextEditor.Test EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ide.Tests", "tests\Ide.Tests\Ide.Tests.csproj", "{73D4CC8B-BAB9-4A29-841B-F25C6311F067}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8D032520-DF32-49A7-9E8A-80819C011970}"
- ProjectSection(SolutionItems) = preProject
- Main.sln = Main.sln
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index ca4fc4e5bf..b46b95935f 100644 --- a/main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -16,7 +16,7 @@ <AssemblyOriginatorKeyFile>..\..\external\nrefactory\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile> <DelaySign>False</DelaySign> <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> diff --git a/main/external/nrefactory b/main/external/nrefactory -Subproject 7eaf69e3d99a82c32c9994c2f70329053591a73 +Subproject 5aded3faae91519fdd15f5b8b0f0daf1ffa3444 diff --git a/main/po/fr.po b/main/po/fr.po index 9f1ed04aa8..1fe3c312ba 100644 --- a/main/po/fr.po +++ b/main/po/fr.po @@ -4,43 +4,42 @@ # This file is distributed under the same license as Monodevelop # # +# François DORIN <f.dorin@free.fr>, 2014. msgid "" msgstr "" "Project-Id-Version: fr_FR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-12 11:17:35-0500\n" -"PO-Revision-Date: 2009-12-29 15:03+0100\n" -"Last-Translator: Bruno Bovey <bbovey@ambrey.fr>\n" -"Language-Team: \n" -"Language: \n" +"POT-Creation-Date: 2014-03-01 23:37:59+0100\n" +"PO-Revision-Date: 2014-03-01 23:55+0100\n" +"Last-Translator: François DORIN <f.dorin@free.fr>\n" +"Language-Team: French <kde-i18n-doc@kde.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: BELGIUM\n" "Plural-Forms: nplurals=2; plural=n>1\n" -"X-Generator: MonoDevelop Gettext addin\n" +"X-Generator: Lokalize 1.5\n" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs:12 -#, fuzzy msgid "{0} External Console" -msgstr "Console Externe MonoDevelop" +msgstr "Console Externe {0}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs:19 msgid "The application was terminated by a signal: {0}" msgstr "L'application s'est terminée par un signal : {0}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs:19 -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:123 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:129 #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs:8 #: ../src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs:60 msgid "The application exited with code: {0}" msgstr "L'application s'est terminée avec le code : {0}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs:97 -#, fuzzy msgid "Can't resolve full path {0}" -msgstr "Impossible de retirer le fichier {0}" +msgstr "Impossible de trouver le chemin complet {0}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs:109 msgid "Can't remove file {0}" @@ -51,13 +50,12 @@ msgid "Can't remove directory {0}" msgstr "Impossible de retirer le répertoire {0}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.FileSystem/FileSystemExtension.cs:4 -#, fuzzy msgid "File '{0}' can't be modified" -msgstr "Le fichier '{0}' n'a pas pu être ouvert" +msgstr "Le fichier '{0}' ne peut être modifié" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs:8 msgid "RaygunApiKey" -msgstr "" +msgstr "RaygunApiKey" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.Logging/FileLogger.cs:3 msgid "FATAL ERROR" @@ -105,84 +103,81 @@ msgstr "OptionName" msgid "File '{0}' not found." msgstr "Fichier '{0}' introuvable." -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 -#, fuzzy +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 msgid "Project Configuration" -msgstr "Nouvelle configuration" +msgstr "Configuration du projet" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 -#, fuzzy +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 msgid "Project Configuration Name" -msgstr "Nouvelle configuration" +msgstr "Nom de la configuration du projet" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 -#, fuzzy +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 msgid "Project Configuration Platform" msgstr "Répertoire de configuration mono " -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 -#, fuzzy +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 msgid "Target File" -msgstr "Nom cible" +msgstr "Fichier cible" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 msgid "Target Name" msgstr "Nom cible" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 #: ../src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PropertyProvider.cs:3 msgid "Target Directory" msgstr "Répertoire cible" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:11 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs:10 msgid "Target Extension" msgstr "Extension cible" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:29 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:28 msgid "Cannot create directory {0}, as a file with that name exists." -msgstr "Impossible de créer le répertoire {0}. Il existe déjà ." +msgstr "" +"Impossible de créer le répertoire {0} car un fichier avec le même nom existe " +"déjà ." -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:31 -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:49 -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:51 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:30 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:48 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:50 msgid "Configuration '{0}' not found in project '{1}'" msgstr "La configuration '{0}' n'a pas été trouvée dans le projet '{1}'" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:34 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:33 msgid "Build complete -- " -msgstr "Construction terminée -- " +msgstr "Compilation terminée -- " # Support ? -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:40 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:39 msgid "Could not find support file '{0}'." msgstr "Impossible de trouver le fichier de support '{0}'." # Support? -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:41 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:40 msgid "Error copying support file '{0}'." msgstr "Erreur lors de la copie du fichier de support '{0}'." # Support -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:45 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:44 msgid "Error deleting support file '{0}'." msgstr "Erreur lors de la suppression du fichier de support '{0}'." -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:49 -#, fuzzy +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:48 msgid "Clean complete" -msgstr " terminé." +msgstr "Nettoyage terminé" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:33 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:32 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:35 -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:9 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:21 msgid "{0} error" msgid_plural "{0} errors" msgstr[0] "{0} erreur" msgstr[1] "{0} erreurs" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:33 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs:32 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:35 -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:9 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:21 msgid "{0} warning" msgid_plural "{0} warnings" msgstr[0] "{0} avertissement" @@ -230,7 +225,7 @@ msgstr "Exécution : {0} {1}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommand.cs:3 msgid "Custom command working directory does not exist" -msgstr "" +msgstr "Le répertoire de travail de la commande personnalisée n'existe pas" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommand.cs:3 #, fuzzy @@ -328,18 +323,18 @@ msgstr "Toujours copier" msgid "Copy if newer" msgstr "Copier si plus récent" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:25 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:30 #, fuzzy msgid "Incompatible target framework: {0}" msgstr "(Framework cible incompatible : v{0})" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:118 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:124 #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs:3 #: ../src/addins/NUnit/Gui/TestResultsPad.cs:19 msgid "Running {0} ..." msgstr "Exécution de {0}..." -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:121 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:127 #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs:6 msgid "" "Can not execute \"{0}\". The selected execution mode is not supported for ." @@ -348,7 +343,7 @@ msgstr "" "Impossible d'exécuter \"{0}\". Le mode d'exécution sélectionné n'est pas " "supporté pour les projets .NET." -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:123 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:129 #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs:8 msgid "Cannot execute \"{0}\"" msgstr "Impossible d'exécuter \"{0}\"" @@ -359,11 +354,11 @@ msgstr "Une dépendance de construction cyclique a été détectée." #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:2 msgid "Skipping project since output files are up to date" -msgstr "" +msgstr "Projet ignoré puisque les fichiers de sortie sont à jour" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:3 msgid "Framework '{0}' not installed." -msgstr "Framework '{0}' n'est pas installé." +msgstr "Le framework '{0}' n'est pas installé." #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:3 msgid "" @@ -378,11 +373,10 @@ msgid "Referenced project '{0}' not found in the solution." msgstr "Le projet {0} référencé n'a pas été trouvé dans la solution." #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:5 -#, fuzzy msgid "Reference '{0}' not found on system. Using '{1}' instead." msgstr "" -"La référence '{0}' n'a pas été trouvée sur le système. Utilisez à la place " -"'{1}'." +"La référence '{0}' n'a pas été trouvée sur le système. Utilisation de '{1}' " +"à la place." #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:5 msgid "" @@ -484,11 +478,11 @@ msgstr "" "cette version de Visual Studio ne supporte pas le framework que le projet " "cible ({2})" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:60 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:61 msgid "Invalid file path" msgstr "Chemin de fichier non valide" -#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:90 +#: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:92 msgid "Reference to unknown project '{0}' ignored." msgstr "Référence au projet inconnu '{0}' ignorée." @@ -562,6 +556,8 @@ msgid "" "Invalid solution file. There are two projects with the same GUID. The " "project {0} will be ignored." msgstr "" +"Fichier solution invalide. Il y a deux projets ayant le même GUID. Le projet " +"'{0}' sera ignoré" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs:94 #, fuzzy @@ -718,7 +714,7 @@ msgstr "Répertoire du projet" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/UnknownProjectTypeNode.cs:11 msgid "This project type is not supported by MonoDevelop on {0}." -msgstr "" +msgstr "Ce type de projet n'est pas supporté par MonoDevelop sur {0}" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/UnknownProjectTypeNode.cs:12 #, fuzzy @@ -761,13 +757,15 @@ msgstr "Microsoft Visual Studio" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml:15 msgid "Invariant" -msgstr "" +msgstr "Invariant" #: ../src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml:15 msgid "" "Xamarin.iOS projects are not supported in MonoDevelop on Windows. You need " "to use Visual Studio, or Xamarin Studio on Mac." msgstr "" +"Les projets Xamarin.iOS ne sont pas supportés dans MonoDevelop sous Windows. " +"Vous devez utiliser Visual Studio ou Xamarin Studio sous Mac." #: ../src/core/MonoDevelop.Core/frameworks/framework_NET_1_1.xml:0 msgid "Mono / .NET 1.1" @@ -796,7 +794,7 @@ msgstr "Mono / .NET 4.0" #: ../src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml:0 msgid ".NET 3.5 Client Profile" -msgstr "" +msgstr ".NET 3.5 Client Profile" #: ../src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml:0 #, fuzzy @@ -833,7 +831,7 @@ msgstr "Solution vide" #: ../src/core/MonoDevelop.Ide/templates/Workspace.xpt.xml:1 #: ../src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml:4 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:9 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:41 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:49 #: ../src/addins/MonoDevelop.Gettext/templates/TranslationProject.xpt.xml:1 #: ../src/addins/Deployment/MonoDevelop.Deployment/templates/PackagingProject.xpt.xml:0 #: ../external/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs:5 @@ -854,7 +852,7 @@ msgstr "Classe vide" #: ../src/core/MonoDevelop.Ide/templates/EmptyStruct.xft.xml:0 #: ../src/core/MonoDevelop.Ide/ExtensionModel/DefaultPolicyPanels.addin.xml:2 #: ../src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml:1 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs:25 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs:27 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/TemplatePickerWidget.cs:4 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml:24 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml:26 @@ -932,7 +930,7 @@ msgid "Empty XML File" msgstr "Fichier XML vide" #: ../src/core/MonoDevelop.Ide/templates/EmptyXMLFile.xft.xml:0 -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:96 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:97 msgid "XML" msgstr "XML" @@ -1737,7 +1735,7 @@ msgstr "_Ajouter des fichiers..." #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 msgid "Adds files from a folder recursively" -msgstr "" +msgstr "Ajoute les fichiers d'un répertoire de manière récursive" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 #, fuzzy @@ -1808,13 +1806,13 @@ msgstr "_Définir en tant que projet de démarrage" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 msgid "Start program without debugging" -msgstr "" +msgstr "Démarre le programme sans débogage" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs:18 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:7 msgid "Start Without Debugging" -msgstr "" +msgstr "Démarre Sans Débogage" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 msgid "Run With List" @@ -1891,7 +1889,7 @@ msgstr "Recharger" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 msgid "Edit selected item" -msgstr "" +msgstr "Editer l'élément sélectionné" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 #, fuzzy @@ -1915,7 +1913,7 @@ msgstr "Disposition active" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 msgid "Apply Policy..." -msgstr "" +msgstr "Appliquer politique..." #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:6 #, fuzzy @@ -1927,7 +1925,7 @@ msgstr "_Exporter..." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs:40 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs:12 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs:35 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:8 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:7 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:12 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:5 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:4 @@ -2150,11 +2148,11 @@ msgstr "Vue maximisée/normale" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:8 msgid "Reopen Closed Tab" -msgstr "" +msgstr "Réouvrir l'onglet fermé" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:8 msgid "Opens the last tab that has been closed" -msgstr "" +msgstr "Ouvre le dernier onglet qui a été fermé" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:8 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs:26 @@ -2429,7 +2427,7 @@ msgstr "Dossier racine" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:10 msgid "Opens the directory where the diagnostic logs are stored" -msgstr "" +msgstr "Ouvre le répertoire où les logs sont stockés" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:10 msgid "_About" @@ -2451,11 +2449,11 @@ msgstr "Vérifier les mises à jour de MonoDevelop et les packages requis" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:10 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:2 msgid "Send Feedback" -msgstr "" +msgstr "Envoyer vos impressions" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:10 msgid "Send feedback to the MonoDevelop development team" -msgstr "" +msgstr "Envoyer vos impression à l'équipe de développement de MonoDevelop" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:10 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs:2 @@ -2628,7 +2626,7 @@ msgstr "Sélectionner un modèle" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:14 msgid "Uses the current selection as replace string" -msgstr "" +msgstr "Utilise la sélection courante comme chaîne de remplacement" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 #: ../src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml:2 @@ -2642,13 +2640,15 @@ msgstr "Afficher la fenêtre d'achèvement" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 msgid "Toggle Completion Suggestion Mode" -msgstr "" +msgstr "Bascule le mode d'auto-complétion" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 msgid "" "Inserts a template or when something is selected surrounds selection with a " "template" msgstr "" +"Insère un patron ou lorsque un élément est sélectionné, entoure la sélection " +"avec un patron" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs:16 @@ -2730,6 +2730,8 @@ msgstr "Supprimer la fin de la ligne" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 msgid "Deletes to end of line, or if at end, deletes line ending" msgstr "" +"Supprime jusqu'à la fin de la ligne, ou si à la fin de la ligne, supprime le " +"saut de ligne" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 msgid "Move the line or highlighted selection up" @@ -2876,7 +2878,7 @@ msgstr "Aller d'un caractère sur la droite" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 msgid "Swaps the characters on either side of the caret" -msgstr "" +msgstr "Permute les caractères de part et d'autre du curseur" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 #, fuzzy @@ -2885,7 +2887,7 @@ msgstr "Un éditeur de texte" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 msgid "Scrolls the editor so that the caret is centered" -msgstr "" +msgstr "Défile l'éditeur de telle sorte que le curseur soit centré" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:15 #, fuzzy @@ -2967,7 +2969,7 @@ msgstr "Raccourcis-clavier" #: ../src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml:1 msgid "Fonts" -msgstr "" +msgstr "Polices" #: ../src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml:1 #: ../external/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs:2 @@ -3022,7 +3024,7 @@ msgstr "Modèles de code" #: ../src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml:4 msgid "Log Agent" -msgstr "" +msgstr "Agent de log" #: ../src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml:4 msgid "MonoDevelop Maintenance" @@ -3268,6 +3270,11 @@ msgstr "Sélectionnez un script de déploiement" msgid "f# files" msgstr "fichiers diff" +#: ../src/core/MonoDevelop.Ide/ExtensionModel/MimeTypes.addin.xml:2 +#, fuzzy +msgid "MSBuild targets file" +msgstr "Nom de la cible de construction :" + #: ../src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml:3 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs:11 #, fuzzy @@ -3371,8 +3378,8 @@ msgid "MD Workbench" msgstr "Chargement de Workbench" #: ../src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml:9 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:29 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:31 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 msgid "Arguments" msgstr "Arguments" @@ -3507,7 +3514,7 @@ msgstr "Reconstruire {0}" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs:18 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:7 msgid "Restart Without Debugging" -msgstr "" +msgstr "Redémarrer Sans Débogage" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs:20 #, fuzzy @@ -3719,9 +3726,10 @@ msgstr "Le nom doit commencer par une lettre ou '_'" msgid "Name must contain only letters, numbers and spaces" msgstr "Le nom ne peut contenir que des lettres, des chiffres et '_'" +# Je n'ai pas traduit le terme "layout" dans ce contexte particulier puisqu'il ne s'agit pas d'un terme générique mais d'un terme technique #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs:5 msgid "There is already a layout with that name" -msgstr "" +msgstr "Il y a déjà un layout portant ce nom" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs:5 #, fuzzy @@ -3792,7 +3800,7 @@ msgid "Invalid project path specified" msgstr "Le chemin de projet spécifié n'est pas valide" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs:10 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:14 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:13 msgid "Stop" msgstr "Arrêter" @@ -3858,7 +3866,7 @@ msgid "Do you really want to copy the folder '{0}' to the folder '{1}'?" msgstr "Êtes-vous sûr de vouloir copier le dossier '{0}' dans le dossier {1} ?" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:28 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:15 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:18 #, fuzzy msgid "The file '{0}' already exists. Do you want to overwrite it?" msgstr "Le fichier '{0}' existe déjà . Voulez-vous le remplacer ?" @@ -3946,9 +3954,9 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:42 msgid "There is already a link with the name '{0}' in the target directory" -msgstr "" +msgstr "Il y a déjà un lien avec le nom '{0}' dans le répertoire cible" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:10 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:13 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:7 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs:4 msgid "" @@ -3957,7 +3965,7 @@ msgid "" msgstr "" "Le nom choisi contient des caractères illégaux. Veuillez en choisir un autre." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:10 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:13 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:7 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs:4 msgid "" @@ -3965,33 +3973,36 @@ msgid "" msgstr "" "Nom de fichier ou de répertoire déjà utilisé. Veuillez en choisir un autre." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:10 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:13 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs:4 msgid "There was an error renaming the file." msgstr "Une erreur s'est produite lors du changement de nom du fichier" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:18 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:21 #, fuzzy msgid "Moving file..." msgstr "Copie des fichiers en cours..." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:18 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:21 #, fuzzy msgid "Copying file..." msgstr "Copie des fichiers en cours..." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:24 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:27 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:7 msgid "_Remove from Project" msgstr "_Retirer du projet" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:24 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:27 msgid "" "The Delete option permanently removes the file from your hard disk. Click " "Remove from Project if you only want to remove it from your current solution." msgstr "" +"L'option \"Suppression\" supprime complètement le fichier de votre disque. " +"Cliquez sur \"Retirer du projet\" si vous voulez seulement retirer le " +"fichier de la solution courante." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:24 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:27 msgid "" "Are you sure you want to remove the file {0} and its code-behind children " "from project {1}?" @@ -3999,7 +4010,7 @@ msgstr "" "Êtes-vous sûr de vouloir retirer le fichier {0} et ses enfants code-behind " "du projet {1} ?" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:24 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:27 msgid "" "Are you sure you want to remove the selected files and their code-behind " "children from the project?" @@ -4007,15 +4018,15 @@ msgstr "" "Êtes-vous sûr de vouloir retirer les fichiers sélectionnés et leurs enfants " "code-behind du projet ?" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:24 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:27 msgid "Are you sure you want to remove file {0} from project {1}?" msgstr "Êtes-vous sûr de vouloir retirer le fichier {0} du projet {1} ?" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:24 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:27 msgid "Are you sure you want to remove the selected files from the project?" msgstr "Êtes-vous sur de vouloir retirer les fichiers sélectionnés du projet ?" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:25 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:28 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:11 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/WorkspaceNodeBuilder.cs:8 #: ../src/addins/VBNetBinding/gtk-gui/MonoDevelop.VBNetBinding.ImportsOptionsPanelWidget.cs:1 @@ -4023,7 +4034,7 @@ msgstr "Êtes-vous sur de vouloir retirer les fichiers sélectionnés du projet msgid "Remove" msgstr "Retirer" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:25 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:28 msgid "Open with '{0}'" msgstr "Ouvrir avec '{0}'" @@ -4037,12 +4048,18 @@ msgid "" "contains from your hard disk. Click Remove from Project if you only want to " "remove it from your current solution." msgstr "" +"L'option \"Suppression\" supprime complètement le répertoire et tout son " +"contenu de votre disque. Cliquez sur \"Retirer du projet\" si vous voulez " +"seulement retirer le répertoire de la solution courante sans le supprimer du " +"disque." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:8 msgid "" -"The directory and any files it contains will be permanintly removed from " +"The directory and any files it contains will be permanently removed from " "your hard disk. " msgstr "" +"Le répertoire et tous les fichiers qu'il contient vont être supprimés " +"définitivement de votre disque." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:11 #, fuzzy @@ -4139,62 +4156,62 @@ msgstr "Initialisation de la fenêtre principale" msgid "Opening {0}" msgstr "Ouverture de {0} en cours" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:48 #: ../src/addins/MonoDevelop.Autotools/MakefileGeneratorTool.cs:16 #: ../src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/MonoDevelop.AspNet.Mvc.Gui.AddViewDialog.cs:301 msgid "Options" msgstr "Options" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:48 msgid "Preferences" msgstr "Préférences" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:49 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:51 msgid "Save the changes to document '{0}' before closing?" msgstr "Enregistrer les modifications du document '{0}' avant de le fermer ?" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:49 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:51 msgid "If you don't save, all changes will be permanently lost." msgstr "" "Si vous ne l'enregistrez pas, toutes les modifications seront définitivement " "perdues." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:50 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:52 msgid "The document could not be saved." msgstr "Le document n'a pas pu être enregistré." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:50 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:52 msgid "Invalid file name" msgstr "Nom de fichier non valide" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:50 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:52 msgid "{0} is a directory" msgstr "{0} est un répertoire" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:50 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:52 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:32 msgid "File not found: {0}" msgstr "Fichier {0} introuvable" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:50 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:52 msgid "File '{0}' could not be opened" msgstr "Le fichier '{0}' n'a pas pu être ouvert" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:50 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:52 #, fuzzy msgid "Loading workspace documents" msgstr "Chargement de l'élément d'espace de travail : {0}" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:68 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:70 msgid "The file '{0}' could not be opened." msgstr "Le fichier '{0}' n'a pas pu être ouvert." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:68 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:70 #, fuzzy msgid "The file '{0}' could not opened. {1}" msgstr "Le fichier '{0}' n'a pas pu être ouvert." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:68 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:70 #, fuzzy msgid "The file '{0}' could not opened. File too large." msgstr "Le fichier '{0}' n'a pas pu être ouvert." @@ -4365,7 +4382,7 @@ msgstr "Afficher/Cacher la colonne Projet" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs:40 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs:13 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs:36 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:11 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:10 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs:11 #: ../src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:3 #: ../src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs:3 @@ -4518,11 +4535,11 @@ msgstr "Construire la solution avant de l'exécuter" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs:2 msgid "Log _verbosity:" -msgstr "" +msgstr "Niveau de log" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs:2 msgid "Quiet" -msgstr "" +msgstr "Silencieux" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs:2 #, fuzzy @@ -4536,7 +4553,7 @@ msgstr "Détails" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs:2 msgid "Diagnostic" -msgstr "" +msgstr "Diagnostique" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs:2 msgid "<b>File Save Options Before Building</b>" @@ -4608,7 +4625,7 @@ msgstr "Liste de _jetons :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.TasksPanelWidget.cs:2 #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.AuthorInformationPanelWidget.cs:2 #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.GlobalAuthorInformationPanelWidget.cs:2 -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 +#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:21 #: ../src/addins/MonoDevelop.GtkCore/libstetic/editor/GroupPicker.cs:19 #: ../src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs:1 #: ../src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs:1 @@ -4671,15 +4688,15 @@ msgstr "Revenir en arrière" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs:2 msgid "Install unstable developer updates" -msgstr "" +msgstr "Installer les mises à jour développeurs (instables)" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs:2 msgid "Beta updates (weekly)" -msgstr "" +msgstr "Mise à jour Beta (hebdomadaire)" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs:2 msgid "Alpha updates (very often, very unstable)" -msgstr "" +msgstr "Mises à jour Alpha (très fréquentes, mais très instables)" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs:2 #, fuzzy @@ -4763,6 +4780,8 @@ msgid "" "The user interface language change will take effect the next time you start " "{0}" msgstr "" +"La modification de la langue de l'interface utilisateur sera prise en compte " +"lors du prochain redémarrage {0}" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs:2 #, fuzzy @@ -4831,7 +4850,7 @@ msgstr "Modèles de code" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.AuthorInformationPanelWidget.cs:2 #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.GlobalAuthorInformationPanelWidget.cs:2 msgid "_Trademark:" -msgstr "" +msgstr "_Marque déposée :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanelWidget.cs:2 msgid "_Include standard header in new files" @@ -4923,7 +4942,7 @@ msgstr "Modifier le modèle" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs:6 msgid "notset" -msgstr "" +msgstr "non initialisé" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.cs:2 msgid "_Mime:" @@ -4947,7 +4966,7 @@ msgstr "_Raccourci :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.cs:2 #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineInformationWidget.cs:2 -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 +#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:21 #: ../src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs:1 #: ../src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs:1 msgid "_Description:" @@ -4966,7 +4985,7 @@ msgid "Identifier" msgstr "Identificateur" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateVariable.cs:5 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:10 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:9 #: ../src/addins/MonoDevelop.GtkCore/libstetic/stetic.glade:41 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Visualizer/TextVisualizer.cs:5 msgid "Text" @@ -5043,7 +5062,6 @@ msgid "Set as Default" msgstr "Définir en tant que défaut" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs:2 -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 #: ../external/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoView.cs:2 msgid "label1" msgstr "label1" @@ -5143,6 +5161,7 @@ msgstr "Créer une nouvelle solution" msgid "" "Currently there is no project selected. Search in the solution instead ?" msgstr "" +"Il n'y a aucun projet de sélectionner. Rechercher dans la solution complète ?" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs:21 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/BaseDirectoryPanel.cs:6 @@ -5279,19 +5298,19 @@ msgstr "Remplacement de '{0}' dans le dossier '{1}'" msgid "File {0} not found." msgstr "Fichier '{0}' introuvable." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:15 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:14 msgid "Clear results" msgstr "Effacer les résultats" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:15 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:14 msgid "Show output" msgstr "Afficher la sortie" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:15 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:14 msgid "Pin results pad" msgstr "Fixer le panneau de résultats" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:48 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:47 #, fuzzy msgid "Search Result" msgstr "Résultats de la recherche" @@ -5490,6 +5509,9 @@ msgid "" "Generate and register debugging information with gdb. This is only supported " "on some platforms, and only when using gdb 7.0 or later." msgstr "" +"Génère et enregistre des informations de débogage avec gdb. Ceci est " +"seulement supporté sur certaines plateforme et seulement avec une version de " +"gdb 7.0 ou ultérieure." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 msgid "Runs in profiling mode with the specified profiler module." @@ -5752,7 +5774,7 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 msgid "Selects the Garbage Collector engine for Mono to use." -msgstr "" +msgstr "Sélectionne le Ramasse-Miette pour Mono à utiliser." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 msgid "" @@ -5761,12 +5783,18 @@ msgid "" "generation engine to JIT or AOT compile. For more information consult: " "http://www.mono-project.com/Mono_LLVM" msgstr "" +"Si le runtime Mono a été compilé avec le support LLVM (non disponible sur " +"toutes les plateformes), cette option active l'utilisation des optimisations " +"LLVM ainsi que du moteur de génération LLVM à la compilation JIT ou AOT. " +"Pour plus d'information : http://www.mono-project.com/Mono_LLVM" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 msgid "" "When using a Mono that has been compiled with LLVM support, it forces Mono " "to fallback to its JIT engine and not use the LLVM backend" msgstr "" +"Utilsé avec une version de Mono compilé avec le support LLVM, cela force " +"Mono à utiliser son moteur JIT au lieu du moteur LLVM" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 msgid "" @@ -5774,15 +5802,19 @@ msgid "" "Currently this sets the GC system to avoid expanding the heap as much as " "possible at the expense of slowing down garbage collection a bit." msgstr "" +"Configure la machine virtuelle pour être adaptée aux applications de bureau. " +"Cela configure le ramasse-miette pour éviter d'étendre la mémoire allouée au " +"tas autant que possible au prix d'un petit ralentissement lors du nettoyage." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:4 msgid "" "Configures the virtual machine to be better suited for server operations." msgstr "" +"Configure la machine virtuelle pour être adaptée aux applications serveur" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:5 msgid "Additional command line options to be provided to the Mono command." -msgstr "" +msgstr "Options supplémentaires à passer à la commande Mono." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:5 msgid "Disabled" @@ -5826,7 +5858,7 @@ msgstr "Compatibilité" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 msgid "LLVM" -msgstr "" +msgstr "LLVM" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:3 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParameters.cs:4 @@ -5886,7 +5918,7 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildMessagePanel.cs:5 #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:51 #: ../src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs:4 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:3 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:8 #: ../external/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs:2 #, fuzzy msgid "Error" @@ -5940,7 +5972,7 @@ msgstr "Plus d'erreurs, ni d'avertissements" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs:26 msgid "Console input not supported" -msgstr "" +msgstr "Entrée console non supportée" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs:26 msgid "" @@ -5948,6 +5980,10 @@ msgid "" "application needs to read data from the standard input, please set the 'Run " "in External Console' option in the project options." msgstr "" +"Les entrées console ne sont pas supportés lors de l'utilisation de la sortie " +"console {0}. Si votre application nécessite de lire des données depuis " +"l'entrée standard, veuillez sélectionner l'option \"Exécuter dans une " +"Console Externe\" dans les options du projet." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs:2 #, fuzzy @@ -5956,7 +5992,7 @@ msgstr "Recherche de '{0}' dans le dossier '{1}.'" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs:2 msgid "Cancelled because generator ran again for the same file" -msgstr "" +msgstr "Annulé car le générateur tourne encore sur le même fichier" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs:2 #, fuzzy @@ -5970,7 +6006,7 @@ msgstr "Le fichier '{0}' n'a pas pu être créé." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs:2 msgid "The '{0}' code generator output invalid filename '{1}'" -msgstr "" +msgstr "Le générateur de code '{0}' a émit un nom de fichier invalide '{1}'" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components/FileSelector.cs:4 msgid "Open file..." @@ -6143,7 +6179,7 @@ msgstr "Détails" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.cs:2 msgid "GtkButton" -msgstr "" +msgstr "GtkButton" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:16 msgid "Loading Workbench" @@ -6183,15 +6219,11 @@ msgstr "Impossible de fermer la solution '{0}'." msgid "File is not a project or solution: {0}" msgstr "Le fichier n'est ni un projet, ni une solution : {0}" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:35 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:34 msgid "Solution loaded." msgstr "Solution chargée." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:36 -msgid "Found new files in {0}" -msgstr "Nouveaux fichiers trouvés dans {0}" - -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:45 msgid "" "WARNING: Some documents may need to be closed, and unsaved data will be " "lost. You will be asked to save the unsaved documents." @@ -6200,7 +6232,7 @@ msgstr "" "enregistrées seront perdues. Vous serez invité à enregistrer les documents " "non enregistrés." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:45 msgid "" "WARNING: Some documents may need to be reloaded or closed, and unsaved data " "will be lost. You will be asked to save the unsaved documents." @@ -6209,7 +6241,7 @@ msgstr "" "données non enregistrées seront perdues. Vous serez invité à enregistrer les " "documents non enregistrés." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:45 msgid "" "WARNING: Some files may need to be reloaded, and unsaved data will be lost. " "You will be asked to save the unsaved files." @@ -6218,7 +6250,7 @@ msgstr "" "enregistrées seront perdues. Vous serez invité à enregistrer les fichiers " "non enregistrés." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:45 msgid "" "Some files may need to be reloaded, and editing status for those files (such " "as the undo queue) will be lost." @@ -6226,7 +6258,7 @@ msgstr "" "Certains fichiers doivent être rechargés, et le statut d'édition de ces " "fichiers (tel que la file d'annulation) sera perdu." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:46 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:45 #: ../src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:7 msgid "" "The project '{0}' has been modified by an external application. Do you want " @@ -6281,7 +6313,7 @@ msgstr "_Écraser le fichier" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs:7 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:4 msgid "An error has occurred" -msgstr "" +msgstr "Une erreur est survenue" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsPanel.cs:10 msgid "Use default settings from '{0}'" @@ -6298,6 +6330,9 @@ msgid "" "for existing projects can be modified in the project (or solution) options " "dialog." msgstr "" +"Les changements effectuées dans cette section ne seront appliquées qu'aux " +"nouveaux projets. Les propriétés pour les projets existants peuvent être " +"modifiées dans les options du projet (ou de la solution)." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs:6 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs:6 @@ -6444,6 +6479,8 @@ msgid "" "Project directory can't be deleted since it contains files from other " "projects or solutions" msgstr "" +"Le répertoire du projet ne peut être supprimé car il contient des fichiers " +"d'autres projets ou solutions" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs:2 #, fuzzy @@ -6599,6 +6636,8 @@ msgid "" "The Remove option remove the project from the solution, but it will not " "physically delete any file from disk." msgstr "" +"L'option \"Retirer\" retire le projet de la solution mais ne le supprime " +"aucuns fichiers du disque." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:26 #, fuzzy @@ -6693,7 +6732,7 @@ msgstr "Ajout des fichiers en cours..." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:39 msgid "There is a already a file or link in the project with the name '{0}'" -msgstr "" +msgstr "Il existe déjà un fichier ou un lien dans le projet avec le nom '{0}'" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:39 msgid "" @@ -6705,7 +6744,7 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:39 msgid "The link '{0}' in the project already includes the file '{1}'" -msgstr "" +msgstr "Le lien '{0}' dans le projet inclue déjà le fichier '{1}'" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:39 msgid "The file '{0}' already exists. Do you want to replace it?" @@ -7009,35 +7048,23 @@ msgstr "Exécuter sur une console e_xterne" msgid "Pause _console output" msgstr "Mettre la sortie console en pause" -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 +#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:21 msgid "<b>Project Information</b>" msgstr "<b>Informations sur le projet</b>" -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 +#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:21 msgid "Default Namespace:" msgstr "Espace de noms par défaut :" -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 +#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:21 msgid "Get version from parent solution" msgstr "Obtenir la version depuis la solution parent" -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 +#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:21 #: ../src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs:2 msgid "Version:" msgstr "Version :" -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 -msgid "<b>On Project Load</b>" -msgstr "<b>Lors du chargement du projet</b>" - -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 -msgid "Search for new _files on load" -msgstr "Recherche de nouveaux fichiers au chargement" - -#: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.GeneralProjectOptionsWidget.cs:2 -msgid "Automatically _include found files" -msgstr "_Inclure automatiquement les fichiers trouvés" - #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanelWidget.cs:2 msgid "_Associate namespaces with directory names" msgstr "_Associer les espaces de noms aux noms des répertoires." @@ -7501,6 +7528,9 @@ msgid "" "Remove from Solution if you only want to remove it from your current " "solution." msgstr "" +"L'option \"Supprimer\" supprime de manière définitive le fichier de votre " +"disque. Cliquez sur \"Retirer de la solution\" si vous souhaitez seulement " +"le retirer de la solution sans le supprimer." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderFileNodeBuilder.cs:2 #, fuzzy @@ -7534,7 +7564,7 @@ msgstr "Modifier" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs:2 msgid "Font" -msgstr "" +msgstr "Police" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Fonts.FontChooserPanelWidget.cs:2 #, fuzzy @@ -7544,7 +7574,7 @@ msgstr "_Commentaires :" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs:3 #: ../src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs:5 msgid "Apply to all" -msgstr "" +msgstr "Appliquer à tous" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewPolicySetDialog.cs:2 #, fuzzy @@ -7559,11 +7589,11 @@ msgstr "Nom du projet :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewPolicySetDialog.cs:2 msgid "Copy Settings From:" -msgstr "" +msgstr "Copier les propriétés depuis :" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs:7 msgid "Searching for references in solution..." -msgstr "" +msgstr "Recherche des références dans la solution en cours..." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs:16 #, fuzzy @@ -7613,7 +7643,7 @@ msgstr "Le projet sera enregistré dans" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs:1 msgid "No policies" -msgstr "" +msgstr "Pas de politique" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs:3 #, fuzzy @@ -7638,6 +7668,7 @@ msgstr "Exporter le projet" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs:2 msgid "Save project policies as a new custom policy set" msgstr "" +"Enregistrer les politiques du projet en tant que nouveau jeu de politiques" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs:2 #, fuzzy @@ -7656,7 +7687,7 @@ msgstr "Fichier :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs:2 msgid "Policies to export:" -msgstr "" +msgstr "Politiques à exporter :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs:2 #, fuzzy @@ -7680,7 +7711,7 @@ msgstr "Veuillez entrer un nom de projet valide" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ApplyPolicyDialog.cs:2 msgid "The selected file is not a valid policies file" -msgstr "" +msgstr "Le fichier sélectionné n'est pas un fichier de politiques valide" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ApplyPolicyDialog.cs:2 #, fuzzy @@ -7709,11 +7740,11 @@ msgstr "_Stratégie :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs:2 msgid "Apply policies from file" -msgstr "" +msgstr "Appliquer des politiques depuis un fichier" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs:2 msgid "Policies to set or replace:" -msgstr "" +msgstr "Politiques pour initialiser ou remplacer :" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs:2 msgid "_Apply policies" @@ -7749,7 +7780,7 @@ msgstr "{0} est en dehors du répertoire du projet, que dois-je faire ?" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs:2 msgid "<b>Keep</b> the file in its the current subdirectory ({0})" -msgstr "" +msgstr "<b>Garde</b> le fichier dans son sous-répertoire courant ({0})" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs:2 #, fuzzy @@ -7758,11 +7789,11 @@ msgstr "Copier le chemin du fichier dans le presse-papiers" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs:2 msgid "<b>Move</b> the file to the directory" -msgstr "" +msgstr "<b>Déplace</b> le fichier dans le répertoire" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs:2 msgid "<b>Add a link</b> to the file" -msgstr "" +msgstr "<b>Ajoute un lien</b> vers le fichier" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs:2 #, fuzzy @@ -7803,11 +7834,11 @@ msgstr "Veuillez entrer un nom de projet valide" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:2 msgid "Tell us how we can make {0} better." -msgstr "" +msgstr "Dites nous comment nous pouvons améliorer {0}." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:2 msgid "Please enter some feedback" -msgstr "" +msgstr "Veuillez saisir un commentaire" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:2 #, fuzzy @@ -7816,15 +7847,15 @@ msgstr "Forme {0}" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:2 msgid "Your feedbacks: {0}" -msgstr "" +msgstr "Vos commentaires : {0}" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:4 msgid "Thank you for your feedback!" -msgstr "" +msgstr "Merci pour votre retour !" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FeedbackDialog.cs:4 msgid "Feedbacks sent: {0}" -msgstr "" +msgstr "Commentaires envoyés : {0}" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/AddinsUpdateHandler.cs:1 msgid "New add-in updates are available:" @@ -7847,11 +7878,11 @@ msgstr "Aller à une ligne spécifique" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs:5 msgid "SDK found at default location." -msgstr "" +msgstr "SDK trouvé à son emplacement par défaut." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs:6 msgid "No SDK found at default location." -msgstr "" +msgstr "Aucun SDK trouvé à l'emplacement par défaut." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/PackageReferencePanel.cs:16 #, fuzzy @@ -7868,7 +7899,7 @@ msgstr "Mettre à jour la page de bienvenue via internet" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageOptionPanel.cs:3 msgid "Close welcome page after opening a solution" -msgstr "" +msgstr "Ferme la page d'accueil après l'ouverture d'une solution" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs:201 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs:16 @@ -7918,22 +7949,22 @@ msgstr[1] "Impossible d'ouvrir le projet {0}" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs:134 msgid "Last opened {0} hour ago" msgid_plural "Last opened {0} hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Dernière ouverture il y a {0} minute" +msgstr[1] "Dernière ouverture il y a {0} heures" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs:136 msgid "Last opened {0} minute ago" msgid_plural "Last opened {0} minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Dernière ouverture il y a {0} minute" +msgstr[1] "Dernière ouverture il y a {0} minutes" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs:4 msgid "Back up and migrate" -msgstr "" +msgstr "Sauvegarde et migre" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs:4 msgid "Migrate" -msgstr "" +msgstr "Migre" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs:4 #, fuzzy @@ -7953,18 +7984,23 @@ msgid "" "If you choose to back up the project before migration, a copy of the project " "file will be saved in a 'backup' directory in the project directory." msgstr "" +"Il est nécessaire de migrer un ou plusieurs projets vers le nouveau format. " +"Après cette migration, il ne sera plus possible d'ouvrir ces projets via une " +"version antérieure de MonoDevelop. Si vous choisissez \"sauvegarder le " +"projet avant migration\", une copie du fichier de projet sera enregistrée " +"dans le répertoire \"backup\" du répertoire du projet." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LogAgentOptionsPanel.cs:4 msgid "Automatically submit error diagnostic information" -msgstr "" +msgstr "Envoyer automatiquement les rapports d'erreur" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LogAgentOptionsPanel.cs:4 msgid "Automatically submit usage information" -msgstr "" +msgstr "Envoyer automatiquement les informations d'utilisation" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:4 msgid "Do _Not Send" -msgstr "" +msgstr "Ne _Pas Envoyer" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:4 #, fuzzy @@ -7978,22 +8014,27 @@ msgstr "Toujours s'arrêter" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:4 msgid "A fatal error has occurred" -msgstr "" +msgstr "Une erreur fatale est survenue" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:5 msgid "" "Details of this error have been automatically sent to Xamarin for analysis." msgstr "" +"Les détails de cette erreur ont été transmis automatiquement à Xamarin pour " +"analyse." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:5 msgid " {0} will now close." -msgstr "" +msgstr "{0} va maintenant être fermé." #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs:6 msgid "" "Details of errors, along with anonymous installation information, can be " "sent to Xamarin to help improve {0}. Do you wish to send this information?" msgstr "" +"Les détails des erreurs, ainsi que des informations anonymes sur votre " +"configuration, peuvent être envoyé à Xamarin pour aider à améliorer {0}. " +"Voulez-vous envoyer ces informations ?" #: ../src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ExportSolutionDialog.cs:2 #, fuzzy @@ -8014,7 +8055,7 @@ msgstr "Format en cours :" msgid "New format:" msgstr "Nouveau format :" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs:355 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs:352 msgid "Generating database" msgstr "Génération de la base de données" @@ -8025,11 +8066,11 @@ msgstr "Exceptions :" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs:7 msgid "Remarks:" -msgstr "" +msgstr "Remarques :" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs:7 msgid "Returns:" -msgstr "" +msgstr "Retours : " #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs:7 #, fuzzy @@ -8038,7 +8079,7 @@ msgstr "Valeur" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/AmbienceService.cs:7 msgid "See also:" -msgstr "" +msgstr "Voir aussi : " #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs:2 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs:3 @@ -8054,19 +8095,19 @@ msgstr "Erreur lors de l'écriture du fichier '{0}'." #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs:7 #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs:11 msgid "No valid insertion point can be found in type '{0}'." -msgstr "" +msgstr "Aucun point d'insertion valide ne peut être trouvé pour le type '{0}'" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs:45 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs:46 #, fuzzy msgid "Search Files" msgstr "Chercher des _fichiers" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs:45 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs:46 #, fuzzy msgid "Search Types" msgstr "Chercher des _types" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs:45 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs:46 #, fuzzy msgid "Search Members" msgstr "Recherche d'un membre..." @@ -8091,7 +8132,7 @@ msgstr "Commande" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs:191 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs:25 msgid "Today" -msgstr "" +msgstr "Aujourd'hui" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs:194 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs:25 @@ -8143,7 +8184,7 @@ msgstr "Nom d'énumération" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs:17 msgid "class ({0})" -msgstr "" +msgstr "class({0})" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs:21 #, fuzzy @@ -8167,7 +8208,7 @@ msgstr "Forme {0}" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs:26 msgid "field ({0})" -msgstr "" +msgstr "field({0})" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs:26 #, fuzzy @@ -8200,8 +8241,9 @@ msgid "constructor ({0})" msgstr "Constructeur <b>{0}</b>" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs:26 -msgid "destrutcor ({0})" -msgstr "" +#, fuzzy +msgid "destructor ({0})" +msgstr "Structure <b>{0}</b>" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs:4 #: ../src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:19 @@ -8215,7 +8257,7 @@ msgstr "Support GTK#" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs:4 msgid "Q&A" -msgstr "" +msgstr "Q&R" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs:5 #, fuzzy @@ -8224,7 +8266,7 @@ msgstr "Solution" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs:5 msgid "Xamarin News" -msgstr "" +msgstr "Nouvelles de Xamarin" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 #, fuzzy @@ -8243,7 +8285,7 @@ msgstr "Fermer la so_lution" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 msgid "Solution '{0}' and others are currently open" -msgstr "" +msgstr "La solution '{0}' et d'autres sont actuellement ouvertes" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 #, fuzzy @@ -8257,7 +8299,7 @@ msgstr "Fermer toutes les _solutions" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 msgid "A workspace is currently open" -msgstr "" +msgstr "Un espace de travail est actuellement ouvert" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 #, fuzzy @@ -8301,7 +8343,7 @@ msgstr "Fermer le _fichier" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 msgid "Some documents are currently open" -msgstr "" +msgstr "Certains documents sont actuellement ouverts" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs:15 #, fuzzy @@ -8351,7 +8393,7 @@ msgstr "Le nom de fichier {0} n'est pas valide" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs:4 msgid "Files {0} and {1} are read-only" -msgstr "" +msgstr "Les fichiers '{0}' et '{1}' sont en lecture seule" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs:5 #, fuzzy @@ -8361,10 +8403,12 @@ msgstr "Makefile" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs:5 msgid "Would you like {0} to attempt to make the file writable and try again?" msgstr "" +"Voulez-vous essayer d'obtenir un accès en écriture au fichier {0} et de " +"réessayer ?" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/PortableFrameworkSubsetNodeBuilder.cs:6 msgid ".NET Portable Subset" -msgstr "" +msgstr "Sous ensemble portable .NET" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/PortableFrameworkSubsetNodeBuilder.cs:10 #, fuzzy @@ -8378,11 +8422,11 @@ msgstr "_Chercher dans" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs:55 msgid "Use MSBuild build engine (recommended for this project type)" -msgstr "" +msgstr "Utiliser MSBuild (recommandé pour ce type de projet)" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs:56 msgid "Use MSBuild build engine (unsupported for this project type)" -msgstr "" +msgstr "Utiliser MSBuild (non supporté pour ce type de projet)" #: ../src/addins/ILAsmBinding/ILAsmConsoleProject.xpt.xml:0 #: ../src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml:0 @@ -8414,7 +8458,7 @@ msgstr "Compilateur C# introuvable pour {0}." #: ../src/addins/ILAsmBinding/ILAsmCompilerManager.cs:4 msgid "You may need to install the .NET SDK." -msgstr "" +msgstr "Vous pourriez avoir besoin d'installer le SDK .Net" #: ../src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs:2 #: ../src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs:5 @@ -8956,7 +9000,7 @@ msgstr "Utilisateur :" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs:2 msgid "<small><span color='red'>Invalid URL</span></small>" -msgstr "" +msgstr "<small><span color='red'>URL invalide</span></small>" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:2 msgid "Commit Files" @@ -9066,7 +9110,7 @@ msgstr "Utiliser des puces" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs:1 msgid "Wrap" -msgstr "" +msgstr "Envelopper" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs:2 msgid "Version Control _Policy" @@ -9074,7 +9118,7 @@ msgstr "Straté_gie de contrôle de version" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs:0 msgid "Blame" -msgstr "" +msgstr "Accuser" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:7 #, fuzzy @@ -9108,11 +9152,11 @@ msgstr "Récupération de l'historique de {0}..." #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs:3 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs:1 msgid "Merge" -msgstr "" +msgstr "Fusionner" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs:8 msgid "My" -msgstr "" +msgstr "Mon" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs:8 msgid "Current" @@ -9120,7 +9164,7 @@ msgstr "Courant" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs:8 msgid "Theirs" -msgstr "" +msgstr "Les leurs" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs:67 #, fuzzy @@ -9134,7 +9178,7 @@ msgstr "Journal des modifications" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:2 msgid "Both files are equal" -msgstr "" +msgstr "Les deux fichiers sont identiques" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:2 #, fuzzy @@ -9149,7 +9193,7 @@ msgstr "Ligne suivante" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:2 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:3 msgid "Unified Diff" -msgstr "" +msgstr "Diff unifié" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:3 #, fuzzy @@ -9163,7 +9207,7 @@ msgstr "copie de travail" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:3 msgid "(base)" -msgstr "" +msgstr "(base)" #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs:3 #, fuzzy @@ -9307,6 +9351,8 @@ msgstr "Le fichier '{0}' n'a pas pu être déverrouillé" msgid "" "Project publishing failed. There is a stale .svn folder in the path '{0}'" msgstr "" +"La publication du projet a échoué. Il y a un répertoire .svn non à jour à " +"l'emplacement \"{0}\"" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:543 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:151 @@ -9436,6 +9482,37 @@ msgstr "" "<b>Des informations d'identification de l'utilisateur sont requises pour " "accéder au référentiel Subversion</b>" +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs:1 +#, fuzzy +msgid "Upgrade working copy" +msgstr "copie de travail" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs:1 +#, fuzzy +msgid "Disable version control" +msgstr "Straté_gie de contrôle de version" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs:2 +msgid "The subversion working copy format is too old." +msgstr "Le format de la copie de travail de subversion est trop vieille." + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs:2 +msgid "" +"Would you like to upgrade the working copy or disable subversion integration " +"for this solution?" +msgstr "" +"Voulez-vous mettre à jour la copie de travail ou désactiver l'intégration de " +"subversion pour cette solution ?" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs:2 +msgid "The subversion working copy format is too new." +msgstr "Le format de la copie de travail de subversion est trop récente." + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs:2 +#, fuzzy +msgid "Subversion integration will be disabled for this solution." +msgstr "Obtenir la version depuis la solution parent" + #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:39 msgid "Updating" msgstr "Mise à jour en cours" @@ -9447,11 +9524,13 @@ msgstr "Récupération de l'élément externe dans '{0}'" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:49 msgid "You have local changes in the submodules below" -msgstr "" +msgstr "Vos changements locaux sont dans les sous-modules suivants" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:49 msgid "Do you want continue? Detached HEADs will have their changes lost.{0}" msgstr "" +"Voulez-vous continuer ? Les HEADs détachés vont voir leurs changements " +"perdus. {0}" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:53 msgid "Rebasing" @@ -9479,7 +9558,7 @@ msgstr "" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:58 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:72 msgid "What do you want to do?" -msgstr "" +msgstr "Que voulez-vous faire ?" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:60 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:74 @@ -9490,11 +9569,11 @@ msgstr "Analyse des modifications..." #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:63 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:77 msgid "Restoring local changes" -msgstr "" +msgstr "Restauration des changements locaux" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:66 msgid "Merging" -msgstr "" +msgstr "Fusion" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:85 #, fuzzy @@ -9519,7 +9598,7 @@ msgstr "Les fichiers suivants seront validés :" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:92 msgid "Successfully reverted {0} to revision {1}" -msgstr "" +msgstr "Retour de la version {0} à la version {1} effectué avec succès" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:109 #, fuzzy @@ -9528,11 +9607,11 @@ msgstr "Inclure dans le Makefile" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:118 msgid "Remote branch is up to date." -msgstr "" +msgstr "La branche distance est à jour." #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:118 msgid "The server is configured to deny deletion of the branch" -msgstr "" +msgstr "Le serveur est configuré pour refuser les suppressions de branches" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:118 msgid "" @@ -9567,11 +9646,11 @@ msgstr "Se connecter au référentiel" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs:1 msgid "Push to:" -msgstr "" +msgstr "Poussez vers : " #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs:1 msgid "Branch:" -msgstr "" +msgstr "Branche : " #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs:1 #, fuzzy @@ -9638,6 +9717,9 @@ msgid "" "user information configured in MonoDevelop. Which user information do you " "want to use?" msgstr "" +"Le nom d'utilisateur et l'e-mail configuré au niveau du dépôt Git ne " +"correspondent pas avec les informations de l'utilisateur renseignées au " +"niveau de MonoDevelop. Quelles informations souhaitez-vous utiliser ?" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs:1 #, fuzzy @@ -9647,6 +9729,7 @@ msgstr "Configuration par défaut :" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs:1 msgid "If you chose this option the Git configuration will be overwritten." msgstr "" +"Si vous choisissez cette option, la configuration de Git va être écrasée." #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs:1 #, fuzzy @@ -9670,15 +9753,15 @@ msgstr "Chemin de fichier" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.ConflictResolutionDialog.cs:1 msgid "Accept Merge" -msgstr "" +msgstr "Accepter la fusion" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/ConflictResolutionDialog.cs:2 msgid "A merge conflict has been detected in file <b>{0}</b>" -msgstr "" +msgstr "Un conflit de fusion a été détecté dans le fichier <b>{0}</b>" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs:2 msgid "Branch" -msgstr "" +msgstr "Branche" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs:2 #, fuzzy @@ -9697,7 +9780,7 @@ msgstr "Le projet n'a pas pu être renommé." #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs:6 msgid "WARNING: The branch has not yet been merged to HEAD" -msgstr "" +msgstr "ATTENTION : La branche n'a pas encore été fusionnée avec le HEAD" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs:6 #, fuzzy @@ -9734,7 +9817,7 @@ msgstr "Concordances" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitConfigurationDialog.cs:2 msgid "_Push" -msgstr "" +msgstr "_Pousser" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitConfigurationDialog.cs:2 #, fuzzy @@ -9761,6 +9844,9 @@ msgid "" "Start with '.' or end with '/' or '.lock'\n" "Contain a ' ', '..', '~', '^', ':', '\\', '?', '['" msgstr "" +"Le nom d'une branche ne peut pas : " +"Commencer avec '.' ou se terminer par un '/' ou par '.lock' " +"Contenir ' ', '..', '~', '^', ':', '\\', '?', '['" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditBranchDialog.cs:1 #, fuzzy @@ -9788,7 +9874,7 @@ msgstr "Imports" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs:1 msgid "Select the branch to be merged with the current branch:" -msgstr "" +msgstr "Sélectionnez la branche à fusionner avec la branche courante : " #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs:1 msgid "Stash/unstash local changes before/after the merge" @@ -9834,7 +9920,7 @@ msgstr "" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs:6 msgid "branch" -msgstr "" +msgstr "branche" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs:1 #, fuzzy @@ -9872,7 +9958,7 @@ msgid "Date/Time" msgstr "Durée" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs:2 -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:47 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:48 msgid "Comment" msgstr "Commentaire" @@ -11600,7 +11686,7 @@ msgid "Types" msgstr "Types" #: ../src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSettings.cs:3 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs:2 msgid "Fields" msgstr "Champs" @@ -12400,6 +12486,11 @@ msgid "Web Service References" msgstr "Références du Service Web" #: ../src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:1 +#, fuzzy +msgid "Web Services" +msgstr "Service Web" + +#: ../src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:1 msgid "Web References" msgstr "Références Web" @@ -12747,7 +12838,7 @@ msgstr "Impossible de retirer le fichier {0}" msgid "{0} could not be found or is invalid." msgstr "{0} est introuvable ou non valide." -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs:27 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs:28 msgid "C# compiler not found for {0}." msgstr "Compilateur C# introuvable pour {0}." @@ -12819,7 +12910,7 @@ msgid "Field" msgstr "Champ" #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:5 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 #, fuzzy msgid "Indexer" msgstr "Index" @@ -12973,7 +13064,7 @@ msgid "New Lines" msgstr "Nouvelles lignes" #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:7 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 msgid "Declarations" msgstr "Déclarations" @@ -13011,7 +13102,7 @@ msgstr "dans les événements" #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:7 #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:9 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 msgid "Statements" msgstr "Instructions" @@ -13166,316 +13257,326 @@ msgstr "Placer sur une nouvelle ligne" msgid "Place embedded statements on new line" msgstr "Placer sur une nouvelle ligne" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:28 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:27 +#, fuzzy +msgid "Place constructor initializer ':' on new line" +msgstr "Placer sur une nouvelle ligne" + +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:27 +#, fuzzy +msgid "Place constructor initializer 'base/this' on new line" +msgstr "Placer sur une nouvelle ligne" + +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 #, fuzzy msgid "Method declarations" msgstr "Déclaration de la méthode" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:28 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:30 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs:2 #, fuzzy msgid "Parameters" msgstr "Paramètres :" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:28 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:29 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:30 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 #, fuzzy msgid "New line after open parentheses" msgstr "Modèle pour les parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:28 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:29 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:30 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 #, fuzzy msgid "New line before closing parentheses" msgstr "Modèle pour les parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:28 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:30 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:31 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 msgid "Align to first parameter" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:29 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 #, fuzzy msgid "Method calls" msgstr "Appel de la méthode" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:29 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 #, fuzzy msgid "Align to first argument" msgstr "Arguments supplémentaires du compilateur:" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:30 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 #, fuzzy msgid "Indexer declarations" msgstr "Déclaration de l'interface" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:31 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 msgid "Indexer usage" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:31 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 #, fuzzy msgid "New line after open bracket" msgstr "Insérer une nouvelle ligne et ne pas déplacer le signe d'insertion" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:31 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 #, fuzzy msgid "New line before closing bracket" msgstr "_Else sur la même ligne que l'accolade fermante" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:44 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:45 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:46 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "before opening parenthesis" msgstr "Avant les parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:44 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:45 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:46 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "within parenthesis" msgstr "Entre parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "between empty parenthesis" msgstr "Modèle pour les parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "before comma in parenthesis" msgstr "Avant les parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "after comma in parenthesis" msgstr "Modèle pour les parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 msgid "before comma in multiple field declarations" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:34 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:42 msgid "after comma in multiple field declarations" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 msgid "Constructors" msgstr "Constructeurs" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 msgid "before opening bracket" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "within brackets" msgstr "Entre crochets" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "before comma in brackets" msgstr "Avant la virgule" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "after comma in brackets" msgstr "Entre crochets" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs:2 #, fuzzy msgid "Delegates" msgstr "Supprimer" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 msgid "'if'" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:35 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:43 msgid "'while'" msgstr "'while'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:44 msgid "'for'" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:41 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:44 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:49 #, fuzzy msgid "before semicolon" msgstr "Après le point-virgule" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:36 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:44 #, fuzzy msgid "after semicolon" msgstr "Après le point-virgule" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:37 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:45 #, fuzzy msgid "'foreach'" msgstr "instruction 'foreach'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:46 msgid "'catch'" msgstr "'catch'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:46 #, fuzzy msgid "'switch'" msgstr "'catch'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:38 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:46 #, fuzzy msgid "'lock'" msgstr "Blocs" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "'using'" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Expressions" msgstr "Expressions" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Method invocations" msgstr "Déclaration de la méthode" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Object creation" msgstr "Opération" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Element access" msgstr "Éléments" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Parentheses" msgstr "Parenthèses" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Type cast" msgstr "Conversion de type" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "after type cast" msgstr "Après la conversion de type" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "'sizeof'" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "'typeof'" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Around Operators" msgstr "Autour des opérateurs" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Assignment (=, +=, -=, ...)" msgstr "Affectation (=, -=, ...)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Logical (&&, ||) operators" msgstr "Opérateurs logiques (&&,||)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Equality (==, !=) operators" msgstr "Opérateurs d'égalité (==, !=)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Relational (<, >, <=, >=) operators" msgstr "Opérateurs relationnels (<,>,<=,>=)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Bitwise &, |, ^, ~() operators" msgstr "Opérateurs bit-à -bit (&,|,^)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Additive (+, -) operators" msgstr "Opérateurs d'addition (+,-)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Multiplicative (*, /, %) operators" msgstr "Opérateurs de multiplication (*,/,%)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 #, fuzzy msgid "Shift (<<, >>) operators" msgstr "Opérateurs de décalage (<<,>>)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Null coalescing (??) operator" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Unsafe addressof operator (&)" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Unsafe asterisk operator (*)" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:39 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:47 msgid "Unsafe arrow operator (->)" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 msgid "Conditional Operator (?:)" msgstr "Opérateur conditionnel (?:)" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 msgid "before '?'" msgstr "avant '?'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 msgid "after '?'" msgstr "après '?'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 msgid "before ':'" msgstr "avant ':'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 msgid "after ':'" msgstr "après ':'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:40 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs:48 #, fuzzy msgid "Array Declarations" msgstr "Déclarations" @@ -13492,15 +13593,15 @@ msgid "page1" msgstr "page1" #: ../src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs:2 -msgid "<b>Blank lines in namespaces</b>" +msgid "<b>Minimum blank lines in namespaces</b>" msgstr "" #: ../src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs:2 -msgid "<b>Blank lines in types</b>" +msgid "<b>Minimum blank lines in types</b>" msgstr "" #: ../src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs:2 -msgid "<b>Blank lines in compilation unit</b>" +msgid "<b>Minimum blank lines in compilation unit</b>" msgstr "" #: ../src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs:2 @@ -13581,7 +13682,7 @@ msgstr "" msgid "No region" msgstr "Pas de régressions trouvées." -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs:109 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs:111 #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs:3 #, fuzzy msgid "(from '{0}')" @@ -13848,40 +13949,40 @@ msgstr "" msgid "(partial)" msgstr "" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:87 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:161 #, fuzzy msgid "Alias information" msgstr "Informations d'assemblage" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:87 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:161 #, fuzzy msgid "Resolved using alias '{0}'" msgstr "Conflit résolu '{0}'" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:111 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:185 #, fuzzy msgid "Namespace:\t{0}" msgstr "Espace de noms :" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:111 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:112 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:185 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:186 #, fuzzy msgid "Project:\t{0}" msgstr "Projet : {0}" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:111 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:112 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:185 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:186 #, fuzzy msgid "File:\t\t{0} (line {1})" msgstr "{0}, Ligne {1}" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:111 -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:112 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:185 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:186 #, fuzzy msgid "Assembly:\t{0}" msgstr "Assemblage" -#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:112 +#: ../src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs:186 #, fuzzy msgid "From type:\t{0}" msgstr "Forme {0}" @@ -14319,8 +14420,6 @@ msgstr[0] "Entrée de catalogue {0} trouvée." msgstr[1] "Entrées de catalogue {0} trouvées." #: ../src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:2 -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeActions.ContextActionPanelWidget.cs:2 -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssuePanelWidget.cs:2 msgid "_Filter:" msgstr "_Filtre :" @@ -15989,7 +16088,7 @@ msgid "Reached top, continued from bottom" msgstr "Haut du fichier atteint, poursuite depuis le bas" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:22 -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:9 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:20 #, fuzzy msgid "{0} match" msgid_plural "{0} matches" @@ -16255,25 +16354,25 @@ msgstr "_Créer un nouveau dossier" msgid "_Based on:" msgstr "" -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:9 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:21 #, fuzzy msgid "No errors or warnings" msgstr "Plus d'erreurs, ni d'avertissements" -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:9 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:21 #, fuzzy msgid "{0} errors and {1} warnings" msgstr "Activer les avertissements :" -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:10 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:22 msgid "Click to navigate to the next error" msgstr "" -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:10 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:22 msgid "Click to navigate to the next warning" msgstr "" -#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:10 +#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs:22 msgid "Click to navigate to the next message" msgstr "" @@ -17856,31 +17955,31 @@ msgstr "Fichiers XAML" msgid "Select XML Schema" msgstr "Sélectionner le schéma XML" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:187 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:185 msgid "Creating schema..." msgstr "Création du schéma..." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:188 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:186 msgid "Schema created." msgstr "Schéma créé." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:188 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:186 msgid "Error creating XML schema." msgstr "Erreur lors de la création du schéma XML." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:213 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:211 msgid "Error reading file '{0}'." msgstr "Erreur lors de la lecture du fichier '{0}'." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:213 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:211 msgid "Executing transform..." msgstr "Exécution de la transformation..." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:213 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:211 msgid "Transform completed." msgstr "Transformation terminée." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:213 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlTextEditorExtension.cs:211 msgid "Could not run transform." msgstr "Impossible d'exécuter la transformation." @@ -17941,19 +18040,19 @@ msgstr "<b>Associations de fichiers par défaut</b>" msgid "Unhandled error saving schema changes." msgstr "Erreur non gérée lors de l'enregistrement des modifications du schéma." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:47 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:48 msgid "Closing tag for '{0}'" msgstr "Fermeture de la balise pour '{0}' :" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:47 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:48 msgid "Character data" msgstr "Données caractères" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:50 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:51 msgid "Select" msgstr "Sélectionner" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:50 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs:51 msgid "Select contents" msgstr "Sélectionner le contenu" @@ -18068,43 +18167,43 @@ msgstr "" msgid "Advanced Settings" msgstr "Paramètres principaux" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:47 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:48 msgid "XmlEditor" msgstr "XmlEditor" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:49 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:50 msgid "Create _Schema" msgstr "Créer un _schéma" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:52 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:53 msgid "_Validate" msgstr "_Valider" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:63 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:64 msgid "_Assign XSLT..." msgstr "_Assigner XSLT..." -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:66 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:67 msgid "_Open XSLT" msgstr "_Ouvrir XSLT" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:69 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:70 msgid "Run XSL_T" msgstr "Exécuter XSL_T" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:73 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:74 msgid "_Go to Schema Definition" msgstr "Aller à la définition du schéma" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:80 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:81 msgid "_XML" msgstr "_XML" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:99 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:100 msgid "XML Schemas" msgstr "Schémas XML" -#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:132 +#: ../src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml:134 #, fuzzy msgid "XML Format" msgstr "Format C#" @@ -18582,86 +18681,88 @@ msgid "Rename '{0}' to '{1}' with preview" msgstr "Renommer le fichier '{0}' en '{1}'" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:9 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:16 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:30 #, fuzzy msgid "_Options for \"{0}\"" msgstr "_Options" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:10 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:12 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:26 #, fuzzy msgid "Apply in file: {0}" msgstr "Déploiement du fichier {0}." #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:12 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:13 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:27 msgid "_Suppress with attribute" msgstr "" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:13 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:14 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:28 msgid "_Suppress with #pragma" msgstr "" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:14 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:15 -msgid "_Disable once with comment" -msgstr "" +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:29 +#, fuzzy +msgid "_Disable Once" +msgstr "Désactiver AIO" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:15 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:16 -msgid "Disable _and restore with comments" -msgstr "" +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:30 +#, fuzzy +msgid "Disable _and Restore" +msgstr "Désactiver la collation managée" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs:16 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:17 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:31 #, fuzzy -msgid "_Configure inspection" -msgstr "Génération de code" +msgid "_Configure Rule" +msgstr "Configuration" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:12 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:13 msgid "Refactor" msgstr "Refactoriser" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:18 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:19 #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml:0 #, fuzzy msgid "_Go to Declaration" msgstr "_Aller à la déclaration" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:18 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:19 msgid "{0}, Line {1}" msgstr "{0}, Ligne {1}" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:19 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:20 #, fuzzy msgid "Go to _Base Symbol" msgstr "Aller a la _base" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:22 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:23 #, fuzzy msgid "Find Derived Symbols" msgstr "Définir les symboles :" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:22 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:23 #, fuzzy msgid "Find Member Overloads" msgstr "Chercher les ré_férences" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:23 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:24 #, fuzzy msgid "Go to _Base" msgstr "Aller a la _base" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:23 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:24 msgid "Find _derived classes" msgstr "Chercher les classes _dérivées" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:23 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:24 msgid "Find _implementor classes" msgstr "Chercher les classes de l'_implémenteur" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:23 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:24 #, fuzzy msgid "Find Extension Methods" msgstr "(Extension) " @@ -18828,73 +18929,30 @@ msgstr "" msgid "Add namespace import '{0}'" msgstr "" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs:19 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:19 #, fuzzy msgid "Quick Fixes" msgstr "Propriétés _rapides" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:3 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:8 #, fuzzy msgid "Do not show" msgstr "Ne pas copier" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:3 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:8 #, fuzzy msgid "Warning" msgstr "avertissement" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:3 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:8 msgid "Hint" msgstr "" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:3 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs:8 #, fuzzy msgid "Suggestion" msgstr "Question" -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "Code Issue Options" -msgstr "Réinitialiser les options" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "_Is enabled" -msgstr "Nom d'énumération" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "Severity:" -msgstr "Sécurité" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "_Do not show" -msgstr "Ne pas copier" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -msgid "_Hint" -msgstr "" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "_Suggestion" -msgstr "Question" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "_Warning" -msgstr "avertissement" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -#, fuzzy -msgid "_Error" -msgstr "Erreur" - -#: ../src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs:2 -msgid "Note: You find all this in the options dialog as well." -msgstr "" - #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DefaultCodeIssueCategories.cs:1 #, fuzzy msgid "Code Improvements" @@ -18928,13 +18986,13 @@ msgstr "Navigation" msgid "Resolve" msgstr "Résoudre" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs:23 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs:22 #, fuzzy msgid "Reference '{0}'" msgstr "Référence :" -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs:23 -#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs:25 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs:22 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs:24 #, fuzzy msgid "Reference '{0}' and use '{1}'" msgstr "Renommer le fichier '{0}' en '{1}'" @@ -19005,12 +19063,12 @@ msgstr "" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml:1 #, fuzzy -msgid "Code Inspection" -msgstr "Génération de code" +msgid "Code Rules" +msgstr "_Cacher les autres" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml:1 #, fuzzy -msgid "Context Actions" +msgid "Code Actions" msgstr "Actions communes" #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml:1 @@ -19617,7 +19675,7 @@ msgstr "" msgid "ASP.NET Controls" msgstr "Contrôles ASP.NET" -#: ../src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs:5 +#: ../src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs:6 #: ../src/addins/AspNet/MonoDevelop.AspNet.Mvc/Gui/RazorCSharpEditorExtension.cs:511 #, fuzzy msgid "Document type" @@ -20654,16 +20712,16 @@ msgstr "Dernière trace" msgid "Id" msgstr "Id" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:45 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:46 #: ../src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs:1 msgid "The Debugger is waiting for an expression evaluation to finish." msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:70 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:74 msgid "Waiting for debugger to connect..." msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:71 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:75 #, fuzzy msgid "Waiting for debugger" msgstr "Débogueur" @@ -22430,12 +22488,12 @@ msgstr "Fichier '{0}' introuvable." msgid "Parameter '{0}' not found" msgstr "Fichier '{0}' introuvable." -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs:18 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs:15 #, fuzzy msgid "Cannot find reference '{0}'" msgstr "Impossible de trouver le projet référencé '{0}'" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs:18 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs:15 msgid "Reference parsing error '{0}'." msgstr "" @@ -23373,7 +23431,7 @@ msgid "'base.' is redundant and can be removed safely." msgstr "" #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantBaseQualifierIssue.cs:17 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs:4 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CallToObjectEqualsViaBaseIssue.cs:4 #, fuzzy msgid "Remove 'base.'" msgstr "Retirer les accolades" @@ -23747,67 +23805,6 @@ msgstr "" msgid "Type parameter is never used" msgstr "" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs:1 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs:3 -msgid "" -"Call to base.Equals resolves to Object.Equals, which is reference equality" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CallToObjectEqualsViaBaseIssue.cs:4 -msgid "Change invocation to call Object.ReferenceEquals" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CastExpressionOfIncompatibleTypeIssue.cs:2 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CastExpressionOfIncompatibleTypeIssue.cs:9 -msgid "Type cast expression of incompatible type" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs:1 -msgid "CS0659: Class overrides Object.Equals but not Object.GetHashCode." -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs:12 -msgid "If two objects are equal then they must both have the same hash code" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs:12 -#, fuzzy -msgid "Override GetHashCode" -msgstr "Redéfinir les membres" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs:2 -msgid "CS1729: Class does not contain a 0 argument constructor" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs:5 -msgid "" -"CS1729: The type '{0}' does not contain a constructor that takes '{1}' " -"arguments" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs:2 -msgid "Condition is always 'true' or always 'false'" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs:17 -#, fuzzy -msgid "Replace '?:' with '{0}' branch" -msgstr "Remplacer '{0}' par '{1}'" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs:17 -#, fuzzy -msgid "Replace 'if' with '{0}' branch" -msgstr "Remplacer '{0}' par '{1}'" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs:18 -#, fuzzy -msgid "Replace expression with '{0}'" -msgstr "Remplacer l'expression par la constante '{0}'" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ConstantConditionIssue.cs:18 -msgid "Condition is always '{0}'" -msgstr "" - #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs:1 #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs:12 msgid "Type does not implement IDisposable despite having a Dispose method" @@ -23858,56 +23855,11 @@ msgstr "" msgid "Use type '{0}'" msgstr "Mettre à jour '{0}'" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExpressionIsNeverOfProvidedTypeIssue.cs:2 -msgid "CS0184:Given expression is never of the provided type" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExpressionIsNeverOfProvidedTypeIssue.cs:7 -#, fuzzy -msgid "Given expression is never of the provided type" -msgstr "Ecrire l'expression dans la sortie" - #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs:1 #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs:6 msgid "Call resolves to Object.GetHashCode, which is reference based" msgstr "" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs:1 -msgid "Optional argument has default value and can be skipped" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs:6 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs:10 -#, fuzzy -msgid "Remove redundant arguments" -msgstr "Modèle pour les arguments d'événements" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs:6 -msgid "Argument is identical to the default value" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs:8 -#, fuzzy -msgid "Remove this argument" -msgstr "Modèle pour les arguments d'événements" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/OptionalParameterCouldBeSkippedIssue.cs:8 -#, fuzzy -msgid "Remove this and the following positional arguments" -msgstr "Ne pas afficher dans les environnement suivants :" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs:1 -msgid "Redundant assignment" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs:31 -msgid "Assignment is redundant" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantAssignmentIssue.cs:31 -msgid "Remove redundant assignment" -msgstr "" - #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs:2 msgid "Result of async call is ignored" msgstr "" @@ -23918,22 +23870,6 @@ msgid "" "is unused" msgstr "" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs:2 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs:12 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs:24 -msgid "Code is unreachable" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs:12 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs:24 -#, fuzzy -msgid "Remove unreachable code" -msgstr "Retirer les accolades" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnreachableCodeIssue.cs:24 -msgid "Comment unreachable code" -msgstr "" - #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UseOfMemberOfNullReference.cs:1 msgid "" "Use of (non-extension method) member of null value will cause a " @@ -23944,14 +23880,6 @@ msgstr "" msgid "Using member of null value will cause a NullReferenceException" msgstr "" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs:1 -msgid "Parameter is only assigned" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs:5 -msgid "Parameter is assigned but its value is never used" -msgstr "" - #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddExceptionDescriptionAction.cs:1 #, fuzzy msgid "Add an exception description to the xml documentation" @@ -24279,6 +24207,11 @@ msgstr "" #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs:10 #, fuzzy +msgid "Remove redundant arguments" +msgstr "Modèle pour les arguments d'événements" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantArgumentDefaultValueIssue.cs:10 +#, fuzzy msgid "Remove redundant argument" msgstr "Modèle pour les arguments d'événements" @@ -24675,12 +24608,12 @@ msgid "Replace with '='" msgstr "Remplacer '{0}' par '{1}'" #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs:2 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs:12 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs:9 #, fuzzy msgid "Operator 'is' can be used" msgstr "Opération annulée." -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs:12 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs:9 #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/PracticesAndImprovements/UseIsOperatorIssue.cs:6 #, fuzzy msgid "Replace with 'is' operator" @@ -24740,18 +24673,6 @@ msgstr "" msgid "Remove 'try' statement" msgstr "instruction 'for'" -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs:1 -msgid "Check if a namespace corresponds to a file location" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs:5 -msgid "Namespace does not correspond to file location, should be: '{0}'" -msgstr "" - -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/CheckNamespaceIssue.cs:6 -msgid "Type should be declared inside the namespace '{0}'" -msgstr "" - #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleMultipleEnumerationIssue.cs:2 #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/PossibleMultipleEnumerationIssue.cs:21 msgid "Possible multiple enumeration of IEnumerable" @@ -25074,7 +24995,7 @@ msgid "Delegate subtractions" msgstr "Déclaration du délégué" #: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs:3 -#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs:4 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/DelegateSubtractionIssue.cs:5 msgid "Delegate subtraction has unpredictable result" msgstr "" @@ -25221,6 +25142,124 @@ msgstr "" msgid "Convert method to static" msgstr "_Convertir les tabulations en espaces" +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs:1 +msgid "CS0659: Class overrides Object.Equals but not Object.GetHashCode." +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs:12 +msgid "If two objects are equal then they must both have the same hash code" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS0659OverrideEqualWithoutGetHashCode.cs:12 +#, fuzzy +msgid "Override GetHashCode" +msgstr "Redéfinir les membres" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs:2 +msgid "CS1729: Class does not contain a 0 argument constructor" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/CS1729TypeHasNoConstructorWithNArgumentsIssue.cs:5 +msgid "" +"CS1729: The type '{0}' does not contain a constructor that takes '{1}' " +"arguments" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ParameterOnlyAssignedIssue.cs:1 +msgid "Parameter is only assigned" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ParameterOnlyAssignedIssue.cs:5 +msgid "Parameter is assigned but its value is never used" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CallToObjectEqualsViaBaseIssue.cs:1 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CallToObjectEqualsViaBaseIssue.cs:3 +msgid "" +"Call to base.Equals resolves to Object.Equals, which is reference equality" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CallToObjectEqualsViaBaseIssue.cs:4 +msgid "Change invocation to call Object.ReferenceEquals" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConstantConditionIssue.cs:2 +msgid "Condition is always 'true' or always 'false'" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConstantConditionIssue.cs:17 +#, fuzzy +msgid "Replace '?:' with '{0}' branch" +msgstr "Remplacer '{0}' par '{1}'" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConstantConditionIssue.cs:17 +#, fuzzy +msgid "Replace 'if' with '{0}' branch" +msgstr "Remplacer '{0}' par '{1}'" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConstantConditionIssue.cs:18 +#, fuzzy +msgid "Replace expression with '{0}'" +msgstr "Remplacer l'expression par la constante '{0}'" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/ConstantConditionIssue.cs:18 +msgid "Condition is always '{0}'" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CheckNamespaceIssue.cs:1 +msgid "Check if a namespace corresponds to a file location" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CheckNamespaceIssue.cs:5 +msgid "Namespace does not correspond to file location, should be: '{0}'" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CheckNamespaceIssue.cs:6 +msgid "Type should be declared inside the namespace '{0}'" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CastExpressionOfIncompatibleTypeIssue.cs:2 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CastExpressionOfIncompatibleTypeIssue.cs:9 +msgid "Type cast expression of incompatible type" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/ExpressionIsNeverOfProvidedTypeIssue.cs:2 +msgid "CS0184:Given expression is never of the provided type" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/CompilerErrors/ExpressionIsNeverOfProvidedTypeIssue.cs:7 +#, fuzzy +msgid "Given expression is never of the provided type" +msgstr "Ecrire l'expression dans la sortie" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantAssignmentIssue.cs:1 +msgid "Redundant assignment" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantAssignmentIssue.cs:31 +msgid "Assignment is redundant" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/RedundantAssignmentIssue.cs:31 +msgid "Remove redundant assignment" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs:2 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs:12 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs:24 +msgid "Code is unreachable" +msgstr "" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs:12 +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs:24 +#, fuzzy +msgid "Remove unreachable code" +msgstr "Retirer les accolades" + +#: ../external/nrefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs:24 +msgid "Comment unreachable code" +msgstr "" + #: ../src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.InstrumentationViewerDialog.cs:2 #, fuzzy msgid "C_onnect" @@ -25284,6 +25323,62 @@ msgstr "Une seule ligne" msgid "Show Categories" msgstr "Catégories :" +#~ msgid "Found new files in {0}" +#~ msgstr "Nouveaux fichiers trouvés dans {0}" + +#~ msgid "<b>On Project Load</b>" +#~ msgstr "<b>Lors du chargement du projet</b>" + +#~ msgid "Search for new _files on load" +#~ msgstr "Recherche de nouveaux fichiers au chargement" + +#~ msgid "Automatically _include found files" +#~ msgstr "_Inclure automatiquement les fichiers trouvés" + +#, fuzzy +#~ msgid "_Configure inspection" +#~ msgstr "Génération de code" + +#, fuzzy +#~ msgid "Code Issue Options" +#~ msgstr "Réinitialiser les options" + +#, fuzzy +#~ msgid "_Is enabled" +#~ msgstr "Nom d'énumération" + +#, fuzzy +#~ msgid "Severity:" +#~ msgstr "Sécurité" + +#, fuzzy +#~ msgid "_Do not show" +#~ msgstr "Ne pas copier" + +#, fuzzy +#~ msgid "_Suggestion" +#~ msgstr "Question" + +#, fuzzy +#~ msgid "_Warning" +#~ msgstr "avertissement" + +#, fuzzy +#~ msgid "_Error" +#~ msgstr "Erreur" + +#, fuzzy +#~ msgid "Code Inspection" +#~ msgstr "Génération de code" + +#, fuzzy +#~ msgid "Remove this argument" +#~ msgstr "Modèle pour les arguments d'événements" + +#, fuzzy +#~ msgid "Remove this and the following positional arguments" +#~ msgstr "Ne pas afficher dans les environnement suivants :" + #~ msgid "The project could not be saved" #~ msgstr "Le projet n'a pu être enregistré." diff --git a/main/po/po.mdproj b/main/po/po.mdproj index 28a24f63eb..ce58a1145a 100644 --- a/main/po/po.mdproj +++ b/main/po/po.mdproj @@ -35,7 +35,7 @@ <packageName>monodevelop</packageName> <outputType>RelativeToOutput</outputType> <ProjectGuid>{AC7D119C-980B-4712-8811-5368C14412D7}</ProjectGuid> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj index dbc7e02831..0b61eb8cf3 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{B32AD0DD-5247-437B-A2EF-1A4676C1B072}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj index f9466d77f7..b1151bf720 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj index b629c735d6..52548f7839 100644 --- a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj +++ b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{B841F25D-4F6D-4E0D-885F-212B54381F28}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj index 8b64f2c193..6640b57b3c 100644 --- a/main/src/addins/CBinding/CBinding.csproj +++ b/main/src/addins/CBinding/CBinding.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{7B57882B-AD46-469B-84E7-06DF98D11468}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj index 1a9efe1a2a..744f5f99e3 100644 --- a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj +++ b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{F426CBB2-77FC-4E14-9E28-E667C2D1299A}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj index e3db35b5e0..268465bfb4 100644 --- a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj +++ b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index 178f2ff522..75702c059c 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml index 714d68d17f..1c04f1b65a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml @@ -91,7 +91,7 @@ THE SOFTWARE. <BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma> <AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma> <WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses> - <NewLineBeforeConstructorInitializerColon>NextLine</NewLineBeforeConstructorInitializerColon> + <NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon> <NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon> <BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket> <WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml index eea74f57fa..53f4997373 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml @@ -91,7 +91,7 @@ THE SOFTWARE. <BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma> <AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma> <WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses> - <NewLineBeforeConstructorInitializerColon>NextLine</NewLineBeforeConstructorInitializerColon> + <NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon> <NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon> <BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket> <WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml index 474b7cbf23..5b8c345fed 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml @@ -91,7 +91,7 @@ THE SOFTWARE. <BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma> <AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma> <WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses> - <NewLineBeforeConstructorInitializerColon>NextLine</NewLineBeforeConstructorInitializerColon> + <NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon> <NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon> <BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket> <WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml index 979ab80e0a..9485f76f7c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml @@ -91,7 +91,7 @@ THE SOFTWARE. <BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma> <AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma> <WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses> - <NewLineBeforeConstructorInitializerColon>NextLine</NewLineBeforeConstructorInitializerColon> + <NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon> <NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon> <BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket> <WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml index a0c692ac22..027251b724 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml @@ -91,7 +91,7 @@ THE SOFTWARE. <BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma> <AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma> <WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses> - <NewLineBeforeConstructorInitializerColon>NextLine</NewLineBeforeConstructorInitializerColon> + <NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon> <NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon> <BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket> <WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs index 810ef5dc79..b9c7e2375b 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs @@ -48,7 +48,7 @@ namespace MonoDevelop.CSharp.Project /// <summary> /// This class handles project specific compiler parameters /// </summary> - public class CSharpCompilerParameters: ConfigurationParameters + public class CSharpCompilerParameters: DotNetConfigurationParameters { // Configuration parameters @@ -282,7 +282,7 @@ namespace MonoDevelop.CSharp.Project } } - public bool NoStdLib { + public override bool NoStdLib { get { return noStdLib; } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs index d321dfee92..c85426a764 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs @@ -876,16 +876,18 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("abstract", colorStyle.KeywordModifiers) + " modifier can be used with classes, methods, properties, indexers, and events."; break; case "add": - result.SignatureMarkup = Highlight ("add", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("add", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Form", "[modifiers] " + Highlight("add", colorStyle.KeywordContext) + " { accessor-body }");
+ result.SummaryMarkup = "The " + Highlight("add", colorStyle.KeywordContext) + " keyword is used to define a custom accessor for when an event is subscribed to. If supplied, a remove accessor must also be supplied."; break; case "ascending": - result.SignatureMarkup = Highlight ("ascending", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("ascending", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("orderby", colorStyle.KeywordContext) + " ordering-statement " + Highlight("ascending", colorStyle.KeywordContext));
+ result.SummaryMarkup = "The " + Highlight("ascending", colorStyle.KeywordContext) + " keyword is used to set the sorting order from smallest to largest in a query expression. This is the default behaviour."; break; case "async": - result.SignatureMarkup = Highlight ("async", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("async", colorStyle.KeywordContext) + keywordSign;
+ result.SummaryMarkup = "The " + Highlight("async", colorStyle.KeywordContext) + " modifier is used to specify that a class method, anonymous method, or lambda expression is asynchronous."; break; case "as": result.SignatureMarkup = Highlight ("as", colorStyle.KeywordOperators) + keywordSign; @@ -893,8 +895,9 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("as", colorStyle.KeywordOperators) + " operator is used to perform conversions between compatible types. "; break; case "await": - result.SignatureMarkup = Highlight ("await", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("await", colorStyle.KeywordContext) + keywordSign;
+ result.SummaryMarkup = "The " + Highlight("await", colorStyle.KeywordContext) + " operator is used to specify that an " + Highlight("async", colorStyle.KeywordContext) + " method is to have its execution suspended until the " + Highlight("await", colorStyle.KeywordContext) +
+ " task has completed."; break; case "base": result.SignatureMarkup = Highlight ("base", colorStyle.KeywordAccessors) + keywordSign; @@ -982,12 +985,13 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "A " + Highlight ("delegate", colorStyle.KeywordDeclaration) + " declaration defines a reference type that can be used to encapsulate a method with a specific signature."; break; case "dynamic": - result.SignatureMarkup = Highlight ("dynamic", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("dynamic", colorStyle.KeywordContext) + keywordSign;
+ result.SummaryMarkup = "The " + Highlight("dynamic", colorStyle.KeywordContext) + " type allows for an object to bypass compile-time type checking and resolve type checking during run-time."; break; case "descending": - result.SignatureMarkup = Highlight ("descending", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("descending", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("orderby", colorStyle.KeywordContext) + " ordering-statement " + Highlight("descending", colorStyle.KeywordContext));
+ result.SummaryMarkup = "The " + Highlight("descending", colorStyle.KeywordContext) + " keyword is used to set the sorting order from largest to smallest in a query expression."; break; case "do": result.SignatureMarkup = Highlight ("do", colorStyle.KeywordIteration) + keywordSign; @@ -1042,16 +1046,20 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("foreach", colorStyle.KeywordIteration) + " statement repeats a group of embedded statements for each element in an array or an object collection. "; break; case "from": - result.SignatureMarkup = Highlight ("from", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("from", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Form", Highlight("from", colorStyle.KeywordContext) + " range-variable " + Highlight("in", colorStyle.KeywordIteration)
+ + " data-source [query clauses] " + Highlight("select", colorStyle.KeywordContext) + " product-expression");
+ result.SummaryMarkup = "The " + Highlight("from", colorStyle.KeywordContext) + " keyword marks the beginning of a query expression and defines the data source and local variable to represent the elements in the sequence."; break; case "get": - result.SignatureMarkup = Highlight ("get", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("get", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Form", "[modifiers] " + Highlight("get", colorStyle.KeywordContext) + " [ { accessor-body } ]");
+ result.SummaryMarkup = "The " + Highlight("get", colorStyle.KeywordContext) + " keyword is used to define an accessor method to retrieve the value of the property or indexer element."; break; case "global": - result.SignatureMarkup = Highlight ("global", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("global", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Form", Highlight("global", colorStyle.KeywordContext) + " :: type");
+ result.SummaryMarkup = "The " + Highlight("global", colorStyle.KeywordContext) + " keyword is used to specify a type is within the global namespace."; break; case "goto": result.SignatureMarkup = Highlight ("goto", colorStyle.KeywordJump) + keywordSign; @@ -1061,8 +1069,12 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("goto", colorStyle.KeywordJump) + " statement transfers the program control directly to a labeled statement. "; break; case "group": - result.SignatureMarkup = Highlight ("group", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("group", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("group", colorStyle.KeywordContext) + " range-variable " + Highlight("by", colorStyle.KeywordContext) + "key-value"
+ +Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine +
+ Highlight("group", colorStyle.KeywordContext) + " range-variable " + Highlight("by", colorStyle.KeywordContext) + " key-value " + Highlight("into", colorStyle.KeywordContext) + " group-name ");
+ result.SummaryMarkup = "The " + Highlight("group", colorStyle.KeywordContext) + " keyword groups elements together from a query which match the key value and stores the result in an " + + Highlight ("IGrouping<TKey, TElement>", colorStyle.KeywordTypes) + ". It can also be stored in a group for further use in the query with 'into'."; break; case "if": result.SignatureMarkup = Highlight ("if", colorStyle.KeywordSelection) + keywordSign; @@ -1074,7 +1086,8 @@ namespace MonoDevelop.CSharp break; case "into": result.SignatureMarkup = Highlight ("into", colorStyle.KeywordContext) + keywordSign; - //TODO + result.AddCategory("Query Form", Highlight("group", colorStyle.KeywordContext) + " range-variable " + Highlight("by", colorStyle.KeywordContext) + " key-value " + Highlight("into", colorStyle.KeywordContext) + " group-name ");
+ result.SummaryMarkup = "The " + Highlight("into", colorStyle.KeywordContext) + " keyword stores the result of a group statement for further use in the query."; break; case "implicit": result.SignatureMarkup = Highlight ("implicit", colorStyle.KeywordOperatorDeclaration) + keywordSign; @@ -1121,12 +1134,15 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("is", colorStyle.KeywordOperators) + " operator is used to check whether the run-time type of an object is compatible with a given type."; break; case "join": - result.SignatureMarkup = Highlight ("join", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("join", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("join", colorStyle.KeywordContext) + " range-variable2 " + Highlight("in", colorStyle.KeywordContext) + " range2 " + Highlight("on", colorStyle.KeywordContext)
+ + " statement1 " + Highlight("equals", colorStyle.KeywordContext) + " statement2 [ " + Highlight("into", colorStyle.KeywordContext) + " group-name ]");
+ result.SummaryMarkup = "The " + Highlight("join", colorStyle.KeywordContext) + " clause produces a new sequence of elements from two source sequences on a given equality condition."; break; case "let": - result.SignatureMarkup = Highlight ("let", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("let", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("let", colorStyle.KeywordContext) + " range-variable = expression");
+ result.SummaryMarkup = "The " + Highlight("let", colorStyle.KeywordContext) + " clause allows for a sub-expression to have its value stored in a new range variable for use later in the query."; break; case "lock": result.SignatureMarkup = Highlight ("lock", colorStyle.KeywordOther) + keywordSign; @@ -1160,8 +1176,9 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an operator in a class or struct declaration."; break; case "orderby": - result.SignatureMarkup = Highlight ("orderby", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("orderby", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("orderby", colorStyle.KeywordContext) + " order-key1 [ " + Highlight("ascending", colorStyle.KeywordContext) + "|" + Highlight("descending", colorStyle.KeywordContext) + " , [order-key2, ...]");
+ result.SummaryMarkup = "The " + Highlight("orderby", colorStyle.KeywordContext) + " clause specifies for the returned sequence to be sorted on a given element in either ascending or descending order."; break; case "out": result.SignatureMarkup = Highlight ("out", colorStyle.KeywordParameter) + keywordSign; @@ -1194,8 +1211,24 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("params", colorStyle.KeywordParameter) + " keyword lets you specify a method parameter that takes an argument where the number of arguments is variable."; break; case "partial": - result.SignatureMarkup = Highlight ("partial", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("partial", colorStyle.KeywordContext) + keywordSign;
+ if (hintNode != null)
+ {
+ if (hintNode.Parent is TypeDeclaration)
+ {
+ result.AddCategory("Form", "[modifiers] " + Highlight("partial", colorStyle.KeywordContext) + " type-declaration");
+ result.SummaryMarkup = "The " + Highlight("partial", colorStyle.KeywordContext) + " keyword on a type declaration allows for the definition to be split into multiple files.";
+ break;
+ }
+ else if(hintNode.Parent is MethodDeclaration)
+ {
+ result.AddCategory("Form", Highlight("partial", colorStyle.KeywordContext) + " method-declaration");
+ result.SummaryMarkup = "The " + Highlight("partial", colorStyle.KeywordContext) + " keyword on a method declaration allows for the implementation of a method to be defined in another part of the partial class.";
+ }
+ }
+ else
+ result.AddCategory("Form", "[modifiers] " + Highlight("partial", colorStyle.KeywordContext) + " type-declaration" + Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine +
+ Highlight("partial", colorStyle.KeywordContext) + " method-declaration"); break; case "private": result.SignatureMarkup = Highlight ("private", colorStyle.KeywordModifiers) + keywordSign; @@ -1218,8 +1251,9 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("ref", colorStyle.KeywordParameter) + " method parameter keyword on a method parameter causes a method to refer to the same variable that was passed into the method."; break; case "remove": - result.SignatureMarkup = Highlight ("remove", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("remove", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Form", "[modifiers] " + Highlight("remove", colorStyle.KeywordContext) + " { accessor-body }");
+ result.SummaryMarkup = "The " + Highlight("remove", colorStyle.KeywordContext) + " keyword is used to define a custom accessor for when an event is unsubscribed from. If supplied, an add accessor must also be supplied."; break; case "return": result.SignatureMarkup = Highlight ("return", colorStyle.KeywordJump) + keywordSign; @@ -1227,16 +1261,18 @@ namespace MonoDevelop.CSharp result.SummaryMarkup = "The " + Highlight ("return", colorStyle.KeywordJump) + " statement terminates execution of the method in which it appears and returns control to the calling method."; break; case "select": - result.SignatureMarkup = Highlight ("select", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("select", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Query Form", Highlight("select", colorStyle.KeywordContext) + " return-type");
+ result.SummaryMarkup = "The " + Highlight("select", colorStyle.KeywordContext) + " clause specifies the type of value to return from the query."; break; case "sealed": result.SignatureMarkup = Highlight ("sealed", colorStyle.KeywordModifiers) + keywordSign; result.SummaryMarkup = "A sealed class cannot be inherited."; break; case "set": - result.SignatureMarkup = Highlight ("set", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("set", colorStyle.KeywordContext) + keywordSign;
+ result.AddCategory("Form", "[modifiers] " + Highlight("set", colorStyle.KeywordContext) + " [ { accessor-body } ]");
+ result.SummaryMarkup = "The " + Highlight("set", colorStyle.KeywordContext) + " keyword is used to define an accessor method to assign to the value of the property or indexer element."; break; case "sizeof": result.SignatureMarkup = Highlight ("sizeof", colorStyle.KeywordOperators) + keywordSign; @@ -1322,12 +1358,35 @@ namespace MonoDevelop.CSharp result.SignatureMarkup = Highlight ("void", colorStyle.KeywordTypes) + keywordSign; break; case "where": - result.SignatureMarkup = Highlight ("where", colorStyle.KeywordContext) + keywordSign; - //TODO + result.SignatureMarkup = Highlight ("where", colorStyle.KeywordContext) + keywordSign;
+ if (hintNode != null)
+ {
+ if (hintNode.Parent is QueryWhereClause)
+ {
+ result.AddCategory("Query Form", Highlight("where", colorStyle.KeywordContext) + " condition");
+ result.SummaryMarkup = "The " + Highlight("where", colorStyle.KeywordContext) + " clause specifies which elements from the data source to be returned according to a given condition.";
+ break;
+ }
+ if(hintNode.Parent is Constraint)
+ {
+ result.AddCategory("Form", "generic-class-declaration " + Highlight("where", colorStyle.KeywordContext) + " type-parameter : type-constraint");
+ result.SummaryMarkup = "The " + Highlight("where", colorStyle.KeywordContext) + " clause constrains which types can be used as the type parameter in a generic declaration.";
+ break;
+ }
+ }
+ else
+ {
+ result.AddCategory("Form", "generic-class-declaration " + Highlight("where", colorStyle.KeywordContext) + " type-parameter : type-constraint"
+ +Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine + "query-clauses " + Highlight("where", colorStyle.KeywordContext) +
+ " condition" + " [query-clauses]");
+ } break; case "yield": result.SignatureMarkup = Highlight ("yield", colorStyle.KeywordContext) + keywordSign; - //TODO + result.AddCategory("Form", Highlight("yield", colorStyle.KeywordContext) + Highlight("break", colorStyle.KeywordJump) + Environment.NewLine + + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine + + Highlight("yield", colorStyle.KeywordContext) + Highlight("return", colorStyle.KeywordJump) + " expression");
+ result.SummaryMarkup = "The " + Highlight("yield", colorStyle.KeywordContext) + " keyword is used to indicate that a method, get accessor, or operator is an iterator."; break; case "while": result.SignatureMarkup = Highlight ("while", colorStyle.KeywordIteration) + keywordSign; diff --git a/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml b/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml index ff241b00d3..51a5345be6 100644 --- a/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml +++ b/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Template originator = "Jeffrey Stedfast" created = "04/03/2012" - lastModified = "07/12/2013"> + lastModified = "02/26/2014"> <!-- Template Header --> <TemplateConfiguration> @@ -25,7 +25,7 @@ </Options> <Project name = "${ProjectName}" directory = "." type = "PortableDotNet"> - <Options Target = "Library" TargetFrameworkVersion = ".NETPortable,Version=v4.0,Profile=Profile136"/> + <Options Target = "Library" TargetFrameworkVersion = ".NETPortable,Version=v4.5,Profile=Profile78"/> <References> </References> <Files> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj index 319908f676..81c37fb669 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{BA9020AD-A2D1-47C8-9A7C-756162C38296}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj index d13796d0bc..c6eab4da2d 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{9BC670A8-1851-40EC-9685-279F4C98433D}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj index c9602726f0..1bb1b7eccf 100644 --- a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj +++ b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{961B9266-C44A-42B6-BA3D-3FB229C9C417}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj index 65e5e824a9..b2b05dd315 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{0EA3AD14-404A-4D3F-979B-F087E2E70C82}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj index 8a8706a852..31e6bd688f 100644 --- a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj +++ b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj index 870e7c1d32..afdec71223 100644 --- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{F5390DA4-08B7-47E3-B6F3-D50683316AB4}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj index 53f13d019f..a475ebcaa7 100644 --- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{3D363F0C-5731-42AA-9022-B7F4657F298A}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi/CorApi.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi/CorApi.csproj index 5d0bfc1f96..b14843db91 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi/CorApi.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi/CorApi.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{9FBCC262-10DC-4E84-A5C4-17230BBF8862}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj index 0246f09c30..15ff23810e 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/CorApi2.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{69136056-BFD3-4CEC-BB41-D9991C79593C}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj index 933c6f829b..a80ca234fb 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}</ProjectGuid> <OutputType>Library</OutputType> @@ -54,15 +54,9 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> - <Reference Include="System.Core"> - <RequiredTargetFramework>4.0</RequiredTargetFramework> - </Reference> - <Reference Include="System.Xml.Linq"> - <RequiredTargetFramework>4.0</RequiredTargetFramework> - </Reference> - <Reference Include="System.Data.DataSetExtensions"> - <RequiredTargetFramework>4.0</RequiredTargetFramework> - </Reference> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj index 20f2f3088c..802f09fcc8 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}</ProjectGuid> <OutputType>Exe</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj index 1f4f3e1dd0..5b0b0076b8 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index 18ba4a2ffd..6b4bf610ba 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerEngine.cs index f8ee08e3f9..0fc870c018 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerEngine.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerEngine.cs @@ -85,10 +85,8 @@ namespace MonoDevelop.Debugger public ProcessInfo[] GetAttachableProcesses () { LoadEngine (); - if (engine != null) - return engine.GetAttachableProcesses (); - else - return new ProcessInfo [0]; + + return engine != null ? engine.GetAttachableProcesses () : new ProcessInfo [0]; } public DebuggerSession CreateSession () diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs index 0f79c0ac7a..959e580edb 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs @@ -175,7 +175,7 @@ namespace MonoDevelop.Debugger EnginePriority = parray; return parray; } - return s.Split (new char[] {','}, StringSplitOptions.RemoveEmptyEntries); + return s.Split (new [] {','}, StringSplitOptions.RemoveEmptyEntries); } set { string s = string.Join (",", value); @@ -477,8 +477,9 @@ namespace MonoDevelop.Debugger public static IProcessAsyncOperation Run (string file, IConsole console) { - DebugExecutionHandler h = new DebugExecutionHandler (null); - ExecutionCommand cmd = Runtime.ProcessService.CreateCommand (file); + var h = new DebugExecutionHandler (null); + var cmd = Runtime.ProcessService.CreateCommand (file); + return h.Execute (cmd, console); } @@ -508,7 +509,7 @@ namespace MonoDevelop.Debugger eval.GroupPrivateMembers = PropertyService.Get ("MonoDevelop.Debugger.DebuggingService.GroupPrivateMembers", true); eval.GroupStaticMembers = PropertyService.Get ("MonoDevelop.Debugger.DebuggingService.GroupStaticMembers", true); eval.MemberEvaluationTimeout = eval.EvaluationTimeout * 2; - return new DebuggerSessionOptions () { + return new DebuggerSessionOptions { StepOverPropertiesAndOperators = PropertyService.Get ("MonoDevelop.Debugger.DebuggingService.StepOverPropertiesAndOperators", true), ProjectAssembliesOnly = PropertyService.Get ("MonoDevelop.Debugger.DebuggingService.ProjectAssembliesOnly", true), EvaluationOptions = eval, @@ -883,7 +884,7 @@ namespace MonoDevelop.Debugger public static Dictionary<string, ExpressionEvaluatorExtensionNode> GetExpressionEvaluators() { if (evaluators == null) { - Dictionary<string, ExpressionEvaluatorExtensionNode> evgs = new Dictionary<string, ExpressionEvaluatorExtensionNode> (StringComparer.InvariantCultureIgnoreCase); + var evgs = new Dictionary<string, ExpressionEvaluatorExtensionNode> (StringComparer.InvariantCultureIgnoreCase); foreach (ExpressionEvaluatorExtensionNode node in AddinManager.GetExtensionNodes (EvaluatorsPath)) evgs.Add (node.extension, node); @@ -972,17 +973,18 @@ namespace MonoDevelop.Debugger public static ExpressionEvaluatorExtensionNode EvaluatorForExtension (string extension) { ExpressionEvaluatorExtensionNode result; + if (GetExpressionEvaluators ().TryGetValue (extension, out result)) return result; + return null; } static IExpressionEvaluator OnGetExpressionEvaluator (string extension) { - ExpressionEvaluatorExtensionNode info = EvaluatorForExtension (extension); - if (info != null) - return info.Evaluator; - return null; + var info = EvaluatorForExtension (extension); + + return info != null ? info.Evaluator : null; } } diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs index a98f19cc71..d230723907 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs @@ -56,13 +56,13 @@ namespace MonoDevelop.Debugger public static bool CanDebugFile (this ProjectOperations opers, string file) { - ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors); + var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors); return opers.CanExecuteFile (file, context); } public static IAsyncOperation DebugFile (this ProjectOperations opers, string file) { - ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors); + var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors); return opers.ExecuteFile (file, context); } @@ -74,9 +74,9 @@ namespace MonoDevelop.Debugger string oldLayout = IdeApp.Workbench.CurrentLayout; IdeApp.Workbench.CurrentLayout = "Debug"; - IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor (); + var monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor (); - IAsyncOperation oper = DebuggingService.Run (executableFile, (IConsole) monitor); + var oper = DebuggingService.Run (executableFile, (IConsole) monitor); oper.Completed += delegate { monitor.Dispose (); Gtk.Application.Invoke (delegate { @@ -93,7 +93,7 @@ namespace MonoDevelop.Debugger if (opers.CurrentRunOperation != null && !opers.CurrentRunOperation.IsCompleted) return opers.CurrentRunOperation; - IAsyncOperation oper = DebuggingService.AttachToProcess (debugger, proc); + var oper = DebuggingService.AttachToProcess (debugger, proc); SwitchToDebugLayout (oper); opers.CurrentRunOperation = oper; diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj index 453ecbac6d..0ca1d6f660 100644 --- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj +++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{875D389F-48D1-4D46-BFC6-998837DD6AE0}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj index bbf268ae39..2172c497a3 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj index 3e5b3477d5..2e7bdd7e95 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{7FCDB0D9-AA7D-44E4-BE74-55312B432389}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj index 24bac2866e..eb1701a30e 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj index dccb4ab568..fc38b4c1e5 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{7926DB5B-96A7-47A7-9870-DB42FA5C3548}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj index 34c4bb2f68..5a2751e03d 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs index 95ffb5231c..0f4f22cf32 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs @@ -48,7 +48,12 @@ namespace MonoDevelop.AnalysisCore.Fixes public override string OptionsTitle { get { return GetTitle (Inspector); } } public override void ShowResultOptionsDialog () { - MessageService.RunCustomDialog (new CodeIssueOptionsDialog (Inspector), MessageService.RootWindow); + IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "CodeIssuePanel", dialog => { + var panel = dialog.GetPanel<CodeIssuePanel> ("CodeIssuePanel"); + if (panel == null) + return; + panel.Widget.SelectCodeIssue (Inspector.IdString); + }); } public static string GetTitle (BaseCodeIssueProvider inspector) diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs index 6be36784fc..0474bdf319 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs @@ -209,8 +209,7 @@ namespace MonoDevelop.AnalysisCore.Gui ext.markers.Enqueue (marker); } } - if (currentResult.Level != Severity.Hint) - ext.tasks.Add (new QuickTask (currentResult.Message, currentResult.Region.Begin, currentResult.Level)); + ext.tasks.Add (new QuickTask (currentResult.Message, currentResult.Region.Begin, currentResult.Level)); } return true; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs index 409f903f5a..0e074aeb1c 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs @@ -42,10 +42,25 @@ namespace MonoDevelop.CodeIssues class CodeIssuePanel : OptionsPanel { CodeIssuePanelWidget widget; + + public CodeIssuePanelWidget Widget { + get { + EnsureWidget (); + return widget; + } + } + + void EnsureWidget () + { + if (widget != null) + return; + widget = new CodeIssuePanelWidget ("text/x-csharp"); + } public override Widget CreatePanelWidget () { - return widget = new CodeIssuePanelWidget ("text/x-csharp"); + EnsureWidget (); + return widget; } public override void ApplyChanges () @@ -75,6 +90,35 @@ namespace MonoDevelop.CodeIssues } } + public void SelectCodeIssue (string idString) + { + TreeIter iter; + if (!treeStore.GetIterFirst (out iter)) + return; + SelectCodeIssue (idString, iter); + } + + bool SelectCodeIssue (string idString, TreeIter iter) + { + do { + var provider = treeStore.GetValue (iter, 1) as BaseCodeIssueProvider; + if (provider != null && provider.IdString == idString) { + treeviewInspections.ExpandToPath (treeStore.GetPath (iter)); + treeviewInspections.Selection.SelectIter (iter); + return true; + } + + TreeIter childIterator; + if (treeStore.IterChildren (out childIterator, iter)) { + do { + if (SelectCodeIssue (idString, childIterator)) + return true; + } while (treeStore.IterNext (ref childIterator)); + } + } while (treeStore.IterNext (ref iter)); + return false; + } + static string GetDescription (Severity severity) { switch (severity) { diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml index a0cab92a1e..8ce7b43b8e 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml @@ -158,7 +158,7 @@ <Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/SourceCode"> <Section id = "C#" _label = "C#"> - <Section id = "Inspection" _label = "Code Rules" fill="true" + <Section id = "CodeIssuePanel" _label = "Code Rules" fill="true" class="MonoDevelop.CodeIssues.CodeIssuePanel"/> <Section id = "CodeActions" _label = "Code Actions" fill="true" icon="md-text-quickfix" diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 5c22ce2ba0..180cc93538 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -104,8 +104,6 @@ <Compile Include="gtk-gui\MonoDevelop.CodeActions.ContextActionPanelWidget.cs" /> <Compile Include="MonoDevelop.CodeIssues\CodeIssuePanelWidget.cs" /> <Compile Include="gtk-gui\MonoDevelop.CodeIssues.CodeIssuePanelWidget.cs" /> - <Compile Include="MonoDevelop.CodeIssues\CodeIssueOptionsDialog.cs" /> - <Compile Include="gtk-gui\MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs" /> <Compile Include="MonoDevelop.CodeActions\ICodeActionProviderSource.cs" /> <Compile Include="MonoDevelop.CodeIssues\ICodeIssueProviderSource.cs" /> <Compile Include="MonoDevelop.CodeIssues\CodeAnalysisRunner.cs" /> diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs deleted file mode 100644 index c4f52c1311..0000000000 --- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.CodeIssues.CodeIssueOptionsDialog.cs +++ /dev/null @@ -1,199 +0,0 @@ - -// This file has been generated by the GUI designer. Do not modify. -namespace MonoDevelop.CodeIssues -{ - internal partial class CodeIssueOptionsDialog - { - private global::Gtk.VBox vbox2; - - private global::Gtk.Label labelInspectionTitle; - - private global::Gtk.CheckButton isEnabledCheckbutton; - - private global::Gtk.Label label1; - - private global::Gtk.RadioButton radiobuttonHide; - - private global::Gtk.RadioButton radiobuttonHint; - - private global::Gtk.RadioButton radiobuttonSuggestion; - - private global::Gtk.RadioButton radiobuttonWarning; - - private global::Gtk.RadioButton radiobuttonError; - - private global::Gtk.Label label2; - - private global::Gtk.Button buttonCancel; - - private global::Gtk.Button buttonOk; - - protected virtual void Build () - { - global::Stetic.Gui.Initialize (this); - // Widget MonoDevelop.CodeIssues.CodeIssueOptionsDialog - this.Name = "MonoDevelop.CodeIssues.CodeIssueOptionsDialog"; - this.Title = global::Mono.Unix.Catalog.GetString ("Code Issue Options"); - this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); - this.WindowPosition = ((global::Gtk.WindowPosition)(1)); - this.Modal = true; - this.BorderWidth = ((uint)(6)); - this.Resizable = false; - // Internal child MonoDevelop.CodeIssues.CodeIssueOptionsDialog.VBox - global::Gtk.VBox w1 = this.VBox; - w1.Name = "dialog1_VBox"; - w1.BorderWidth = ((uint)(2)); - // Container child dialog1_VBox.Gtk.Box+BoxChild - this.vbox2 = new global::Gtk.VBox (); - this.vbox2.Name = "vbox2"; - this.vbox2.Spacing = 6; - // Container child vbox2.Gtk.Box+BoxChild - this.labelInspectionTitle = new global::Gtk.Label (); - this.labelInspectionTitle.Name = "labelInspectionTitle"; - this.labelInspectionTitle.Xalign = 0F; - this.labelInspectionTitle.LabelProp = global::Mono.Unix.Catalog.GetString ("label1"); - this.vbox2.Add (this.labelInspectionTitle); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelInspectionTitle])); - w2.Position = 0; - w2.Expand = false; - w2.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.isEnabledCheckbutton = new global::Gtk.CheckButton (); - this.isEnabledCheckbutton.CanFocus = true; - this.isEnabledCheckbutton.Name = "isEnabledCheckbutton"; - this.isEnabledCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Is enabled"); - this.isEnabledCheckbutton.DrawIndicator = true; - this.isEnabledCheckbutton.UseUnderline = true; - this.vbox2.Add (this.isEnabledCheckbutton); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.isEnabledCheckbutton])); - w3.Position = 1; - w3.Expand = false; - w3.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label (); - this.label1.Name = "label1"; - this.label1.Xalign = 0F; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Severity:"); - this.vbox2.Add (this.label1); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1])); - w4.Position = 2; - w4.Expand = false; - w4.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.radiobuttonHide = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Do not show")); - this.radiobuttonHide.CanFocus = true; - this.radiobuttonHide.Name = "radiobuttonHide"; - this.radiobuttonHide.DrawIndicator = true; - this.radiobuttonHide.UseUnderline = true; - this.radiobuttonHide.Group = new global::GLib.SList (global::System.IntPtr.Zero); - this.vbox2.Add (this.radiobuttonHide); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radiobuttonHide])); - w5.Position = 3; - w5.Expand = false; - w5.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.radiobuttonHint = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Hint")); - this.radiobuttonHint.CanFocus = true; - this.radiobuttonHint.Name = "radiobuttonHint"; - this.radiobuttonHint.DrawIndicator = true; - this.radiobuttonHint.UseUnderline = true; - this.radiobuttonHint.Group = this.radiobuttonHide.Group; - this.vbox2.Add (this.radiobuttonHint); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radiobuttonHint])); - w6.Position = 4; - w6.Expand = false; - w6.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.radiobuttonSuggestion = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Suggestion")); - this.radiobuttonSuggestion.CanFocus = true; - this.radiobuttonSuggestion.Name = "radiobuttonSuggestion"; - this.radiobuttonSuggestion.DrawIndicator = true; - this.radiobuttonSuggestion.UseUnderline = true; - this.radiobuttonSuggestion.Group = this.radiobuttonHide.Group; - this.vbox2.Add (this.radiobuttonSuggestion); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radiobuttonSuggestion])); - w7.Position = 5; - w7.Expand = false; - w7.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.radiobuttonWarning = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Warning")); - this.radiobuttonWarning.CanFocus = true; - this.radiobuttonWarning.Name = "radiobuttonWarning"; - this.radiobuttonWarning.DrawIndicator = true; - this.radiobuttonWarning.UseUnderline = true; - this.radiobuttonWarning.Group = this.radiobuttonHide.Group; - this.vbox2.Add (this.radiobuttonWarning); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radiobuttonWarning])); - w8.Position = 6; - w8.Expand = false; - w8.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.radiobuttonError = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Error")); - this.radiobuttonError.CanFocus = true; - this.radiobuttonError.Name = "radiobuttonError"; - this.radiobuttonError.DrawIndicator = true; - this.radiobuttonError.UseUnderline = true; - this.radiobuttonError.Group = this.radiobuttonHide.Group; - this.vbox2.Add (this.radiobuttonError); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radiobuttonError])); - w9.Position = 7; - w9.Expand = false; - w9.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.label2 = new global::Gtk.Label (); - this.label2.Name = "label2"; - this.label2.Xalign = 0F; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Note: You find all this in the options dialog as well."); - this.label2.Wrap = true; - this.label2.WidthChars = 30; - this.vbox2.Add (this.label2); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2])); - w10.Position = 8; - w10.Expand = false; - w10.Fill = false; - w1.Add (this.vbox2); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2])); - w11.Position = 0; - w11.Expand = false; - w11.Fill = false; - w11.Padding = ((uint)(6)); - // Internal child MonoDevelop.CodeIssues.CodeIssueOptionsDialog.ActionArea - global::Gtk.HButtonBox w12 = this.ActionArea; - w12.Name = "dialog1_ActionArea"; - w12.Spacing = 10; - w12.BorderWidth = ((uint)(5)); - w12.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); - // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonCancel = new global::Gtk.Button (); - this.buttonCancel.CanDefault = true; - this.buttonCancel.CanFocus = true; - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.UseStock = true; - this.buttonCancel.UseUnderline = true; - this.buttonCancel.Label = "gtk-cancel"; - this.AddActionWidget (this.buttonCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w13 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCancel])); - w13.Expand = false; - w13.Fill = false; - // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonOk = new global::Gtk.Button (); - this.buttonOk.CanDefault = true; - this.buttonOk.CanFocus = true; - this.buttonOk.Name = "buttonOk"; - this.buttonOk.UseStock = true; - this.buttonOk.UseUnderline = true; - this.buttonOk.Label = "gtk-ok"; - this.AddActionWidget (this.buttonOk, -5); - global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonOk])); - w14.Position = 1; - w14.Expand = false; - w14.Fill = false; - if ((this.Child != null)) { - this.Child.ShowAll (); - } - this.DefaultWidth = 286; - this.DefaultHeight = 349; - this.Show (); - } - } -} diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic index 129ddd3a8d..11b6e6c4d6 100644 --- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic @@ -822,219 +822,4 @@ </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.CodeIssues.CodeIssueOptionsDialog" design-size="286 349"> - <property name="MemberName" /> - <property name="GeneratePublic">False</property> - <property name="Title" translatable="yes">Code Issue Options</property> - <property name="TypeHint">Dialog</property> - <property name="WindowPosition">Center</property> - <property name="Modal">True</property> - <property name="BorderWidth">6</property> - <property name="Resizable">False</property> - <property name="Buttons">2</property> - <property name="HelpButton">False</property> - <child internal-child="VBox"> - <widget class="Gtk.VBox" id="dialog1_VBox"> - <property name="MemberName" /> - <property name="BorderWidth">2</property> - <child> - <widget class="Gtk.VBox" id="vbox2"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Label" id="labelInspectionTitle"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">label1</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.CheckButton" id="isEnabledCheckbutton"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">_Is enabled</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Label" id="label1"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">Severity:</property> - </widget> - <packing> - <property name="Position">2</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.RadioButton" id="radiobuttonHide"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">_Do not show</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - <property name="Group">group1</property> - </widget> - <packing> - <property name="Position">3</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.RadioButton" id="radiobuttonHint"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">_Hint</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - <property name="Group">group1</property> - </widget> - <packing> - <property name="Position">4</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.RadioButton" id="radiobuttonSuggestion"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">_Suggestion</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - <property name="Group">group1</property> - </widget> - <packing> - <property name="Position">5</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.RadioButton" id="radiobuttonWarning"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">_Warning</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - <property name="Group">group1</property> - </widget> - <packing> - <property name="Position">6</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.RadioButton" id="radiobuttonError"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">_Error</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - <property name="Group">group1</property> - </widget> - <packing> - <property name="Position">7</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Label" id="label2"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">Note: You find all this in the options dialog as well.</property> - <property name="Wrap">True</property> - <property name="WidthChars">30</property> - </widget> - <packing> - <property name="Position">8</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - <property name="Padding">6</property> - </packing> - </child> - </widget> - </child> - <child internal-child="ActionArea"> - <widget class="Gtk.HButtonBox" id="dialog1_ActionArea"> - <property name="MemberName" /> - <property name="Spacing">10</property> - <property name="BorderWidth">5</property> - <property name="Size">2</property> - <property name="LayoutStyle">End</property> - <child> - <widget class="Gtk.Button" id="buttonCancel"> - <property name="MemberName" /> - <property name="CanDefault">True</property> - <property name="CanFocus">True</property> - <property name="UseStock">True</property> - <property name="Type">StockItem</property> - <property name="StockId">gtk-cancel</property> - <property name="ResponseId">-6</property> - <property name="label">gtk-cancel</property> - </widget> - <packing> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Button" id="buttonOk"> - <property name="MemberName" /> - <property name="CanDefault">True</property> - <property name="CanFocus">True</property> - <property name="UseStock">True</property> - <property name="Type">StockItem</property> - <property name="StockId">gtk-ok</property> - <property name="ResponseId">-5</property> - <property name="label">gtk-ok</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> </stetic-interface>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj index beadbd888f..968af87a4c 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj +++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs index ba239fea08..17e56ec624 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs @@ -35,6 +35,7 @@ using ICSharpCode.NRefactory.Refactoring; using MonoDevelop.Ide; using System.Linq; using MonoDevelop.Components; +using Mono.TextEditor.Theatrics; namespace MonoDevelop.SourceEditor.QuickTasks { @@ -46,7 +47,6 @@ namespace MonoDevelop.SourceEditor.QuickTasks static readonly Cairo.Color win81SliderPrelight = new Cairo.Color (166/255d, 166/255d, 166/255d); static readonly Cairo.Color win81SliderActive = new Cairo.Color (96/255d, 96/255d, 96/255d); - const int indicatorPadding = 3; readonly int barPadding = Platform.IsWindows? 1 : 3; readonly QuickTaskStrip parentStrip; @@ -75,7 +75,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks { this.parentStrip = parent; Events |= EventMask.ButtonPressMask | EventMask.ButtonReleaseMask | EventMask.ButtonMotionMask | - EventMask.PointerMotionMask | EventMask.LeaveNotifyMask; + EventMask.PointerMotionMask | EventMask.LeaveNotifyMask | EventMask.EnterNotifyMask; vadjustment = this.parentStrip.VAdjustment; vadjustment.ValueChanged += RedrawOnUpdate; @@ -89,6 +89,20 @@ namespace MonoDevelop.SourceEditor.QuickTasks TextEditor.GetTextEditorData ().HeightTree.LineUpdateFrom += HandleLineUpdateFrom; TextEditor.HighlightSearchPatternChanged += HandleHighlightSearchPatternChanged; HasTooltip = true; + + fadeInStage.ActorStep += delegate(Actor<QuickTaskOverviewMode> actor) { + barColorValue = actor.Percent; + return true; + }; + fadeInStage.Iteration += (sender, e) => QueueDraw (); + + fadeOutStage.ActorStep += delegate(Actor<QuickTaskOverviewMode> actor) { + barColorValue = 1 - actor.Percent; + return true; + }; + fadeOutStage.Iteration += (sender, e) => QueueDraw (); + + fadeInStage.UpdateFrequency = fadeOutStage.UpdateFrequency = 10; } void HandleHighlightSearchPatternChanged (object sender, EventArgs e) @@ -113,6 +127,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks protected override void OnDestroyed () { base.OnDestroyed (); + CancelFadeInTimeout (); RemovePreviewPopupTimeout (); DestroyPreviewWindow (); TextEditor.Caret.PositionChanged -= CaretPositionChanged; @@ -184,6 +199,9 @@ namespace MonoDevelop.SourceEditor.QuickTasks { return grabY >= 0; } + const uint FadeDuration = 90; + Stage<QuickTaskOverviewMode> fadeInStage = new Stage<QuickTaskOverviewMode> (); + Stage<QuickTaskOverviewMode> fadeOutStage = new Stage<QuickTaskOverviewMode> (); void UpdatePrelightState (double x, double y) { @@ -348,13 +366,58 @@ namespace MonoDevelop.SourceEditor.QuickTasks previewWindow = null; } } - + + bool isPointerInside; + uint fadeTimeOutHandler; + + void CancelFadeInTimeout () + { + if (fadeTimeOutHandler == 0) + return; + GLib.Source.Remove (fadeTimeOutHandler); + fadeTimeOutHandler = 0; + } + + protected override bool OnEnterNotifyEvent (EventCrossing evnt) + { + isPointerInside = true; + if (!IsInGrab ()) { + CancelFadeInTimeout (); + fadeTimeOutHandler = GLib.Timeout.Add (250, delegate { + StartFadeInAnimation (); + fadeTimeOutHandler = 0; + return false; + }); + } + return base.OnEnterNotifyEvent (evnt); + } + + void StartFadeInAnimation () + { + fadeOutStage.Pause (); + fadeInStage.AddOrReset (this, FadeDuration); + fadeInStage.Play (); + } + + void StartFadeOutAnimation () + { + CancelFadeInTimeout (); + UpdateState (StateType.Normal); + if (this.barColorValue == 0.0) + return; + fadeInStage.Pause (); + fadeOutStage.AddOrReset (this, FadeDuration); + fadeOutStage.Play (); + } + protected override bool OnLeaveNotifyEvent (EventCrossing evnt) { - if (!IsInGrab ()) - UpdateState (StateType.Normal); + isPointerInside = false; + if (!IsInGrab ()) + StartFadeOutAnimation (); RemovePreviewPopupTimeout (); DestroyPreviewWindow (); + return base.OnLeaveNotifyEvent (evnt); } @@ -381,7 +444,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks protected virtual double IndicatorHeight { get { - return Allocation.Width; + return Platform.IsWindows ? Allocation.Width : 3 + 8 + 3; } } @@ -437,7 +500,8 @@ namespace MonoDevelop.SourceEditor.QuickTasks protected override bool OnButtonReleaseEvent (EventButton evnt) { ClearGrab (); - UpdatePrelightState (evnt.X, evnt.Y); + if (!isPointerInside) + StartFadeOutAnimation (); return base.OnButtonReleaseEvent (evnt); } @@ -504,32 +568,15 @@ namespace MonoDevelop.SourceEditor.QuickTasks void DrawIndicator (Cairo.Context cr, Cairo.Color color, Cairo.Color borderColor) { - var width = Allocation.Width; - - int diameter = Math.Min (width, (int)IndicatorHeight) - indicatorPadding * 2; - var x1 = Math.Round (width / 2d); - double y1 = indicatorPadding + diameter / 2; - if (diameter % 2 == 0) { - x1 += 0.5; - y1 += 0.5; - } + const int indicatorPadding = 3; + const int indicatorDiameter = 8; + var x1 = Allocation.Width / 2d; + var y1 = indicatorPadding + indicatorDiameter / 2d; - cr.Arc (x1, y1, diameter / 2d, 0, 2 * Math.PI); + cr.Arc (x1, y1, indicatorDiameter / 2d, 0, 2 * Math.PI); - if (Platform.IsWindows) { - using (var pattern = new Cairo.SolidPattern (color)) { - cr.SetSource (pattern); - cr.FillPreserve (); - } - } else { - using (var pattern = new Cairo.RadialGradient (x1, y1, width / 2, x1 - width, y1 - width, width)) { - pattern.AddColorStop (0, borderColor); - pattern.AddColorStop (1, color); - cr.SetSource (pattern); - cr.FillPreserve (); - } - } - + cr.SetSourceColor (color); + cr.FillPreserve (); cr.SetSourceColor (borderColor); cr.Stroke (); } @@ -544,7 +591,9 @@ namespace MonoDevelop.SourceEditor.QuickTasks { var h = Allocation.Height - IndicatorHeight; var p = TextEditor.LocationToPoint (logicalLine, 1, true).Y; - var q = Math.Max (TextEditor.GetTextEditorData ().TotalHeight, TextEditor.Allocation.Height - IndicatorHeight); + var q = Math.Max (TextEditor.GetTextEditorData ().TotalHeight, TextEditor.Allocation.Height) + + TextEditor.Allocation.Height + - TextEditor.LineHeight; return IndicatorHeight + h * p / q; } @@ -638,14 +687,18 @@ namespace MonoDevelop.SourceEditor.QuickTasks { var alloc = Allocation; - x = Platform.IsWindows ? barPadding : 1 + barPadding; + x = Platform.IsWindows ? 0 : 1 + barPadding; var adjUpper = vadjustment.Upper; var allocH = alloc.Height - (int) IndicatorHeight; - y = IndicatorHeight + Math.Round (allocH * vadjustment.Value / adjUpper) + barPadding; - w = Platform.IsWindows ? alloc.Width - barPadding - barPadding : 8; + y = IndicatorHeight + Math.Round (allocH * vadjustment.Value / adjUpper); + w = Platform.IsWindows ? alloc.Width : 8; const int minBarHeight = 16; h = Math.Max (minBarHeight, Math.Round (allocH * (vadjustment.PageSize / adjUpper)) - barPadding - barPadding); } + double barColorValue = 0.0; + const double barAlphaMax = 0.5; + const double barAlphaMin = 0.22; + protected virtual void DrawBar (Cairo.Context cr) { @@ -669,7 +722,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks //compute new color such that it will produce same color when blended with bg c = AddAlpha (win81Background, c, 0.5d); } else { - c = new Cairo.Color (0, 0, 0, (prelight ? 50.0 : 22.0) / 255); + c = new Cairo.Color (0, 0, 0, barColorValue * (barAlphaMax - barAlphaMin) + barAlphaMin); } cr.SetSourceColor (c); cr.Fill (); diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj index d0c83955dd..94bac24e6f 100644 --- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj +++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{2A00A871-C641-4116-ADFD-29B7799952B4}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.csproj b/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.csproj index 4ec9036890..d147acb5d1 100644 --- a/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.csproj +++ b/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDevelop.XmlEditor/Tests/MonoDevelop.XmlEditor.Tests.csproj b/main/src/addins/MonoDevelop.XmlEditor/Tests/MonoDevelop.XmlEditor.Tests.csproj index b1d97dc396..c6d42cf208 100644 --- a/main/src/addins/MonoDevelop.XmlEditor/Tests/MonoDevelop.XmlEditor.Tests.csproj +++ b/main/src/addins/MonoDevelop.XmlEditor/Tests/MonoDevelop.XmlEditor.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{8E47B77A-A649-494C-9BF2-B845E39CADE9}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj index c3f470074e..d63fd2aa05 100644 --- a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj +++ b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{9A415695-CF80-4845-AA80-0DA26CF1E256}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj index f01db34192..f488b44dde 100644 --- a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj +++ b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{376889B5-6504-46A1-9D18-A9E4B4A50F49}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj index 6c404b0cea..825d618508 100644 --- a/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj +++ b/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{0AF16AF1-0876-413E-9803-08BD33C19E00}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj index c0d9b142e1..ccd2f3efff 100644 --- a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj +++ b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{CB590106-8331-4CBE-8131-B154E7BF79E1}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.csproj b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.csproj index d28c097c67..5f8242863e 100644 --- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{A2364D6A-00EF-417C-80A6-815726C70032}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index 4e07f8cd1a..a6d0e9c755 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj b/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj index 19f100b590..24de6a1e70 100644 --- a/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj +++ b/main/src/addins/TextTemplating/TextTransform/TextTransform.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{D1D35409-C814-47F6-B038-B9B5BF0FE490}</ProjectGuid> <OutputType>Exe</OutputType> diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj index 61c96a6380..935ae320be 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.csproj +++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{EF91D0B8-53F6-4622-9F26-3ED27815878A}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj index d1f380de7f..042f6ce105 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{F3AC14B0-3D1F-4B9B-95E8-384056060F33}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj index 47badaf362..944e6b2546 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{0413DB7D-8B35-423F-9752-D75C9225E7DE}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj index 441425d21f..e3826ed2fd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj index 8d478b0f44..dc8a9d9041 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{E2CAB397-D00C-4D11-8F5F-E3A052092969}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj b/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj index 6efa03973e..9a56a0903b 100644 --- a/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{E17829B5-8EAC-4714-8798-EB8ED3540191}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj index 40172b23a7..66dda82320 100644 --- a/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{1038FBD8-750E-4081-BC65-D89FFED3C881}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/Stage.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/Stage.cs index 7c6416e889..3929813f78 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/Stage.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Theatrics/Stage.cs @@ -127,7 +127,7 @@ namespace Mono.TextEditor.Theatrics return actor; } - return Add (target); + return Add (target, duration.HasValue ? duration.Value : default_duration); } } diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ClipboardActions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ClipboardActions.cs index a31e21f403..5176573157 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ClipboardActions.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/ClipboardActions.cs @@ -75,7 +75,7 @@ namespace Mono.TextEditor public static readonly Gdk.Atom CLIPBOARD_ATOM = Gdk.Atom.Intern ("CLIPBOARD", false); public static readonly Gdk.Atom PRIMARYCLIPBOARD_ATOM = Gdk.Atom.Intern ("PRIMARY", false); public static readonly Gdk.Atom RTF_ATOM; - public static readonly Gdk.Atom MD_ATOM = Gdk.Atom.Intern ("text/monotext", false); + public static readonly Gdk.Atom MD_ATOM = Gdk.Atom.Intern ("MD_CLIPBOARD_FORMAT", false); public static readonly Gdk.Atom HTML_ATOM; public CopyOperation () @@ -289,7 +289,8 @@ namespace Mono.TextEditor clipboard.RequestContents (CopyOperation.MD_ATOM, delegate(Clipboard clp, SelectionData selectionData) { if (selectionData.Length > 0) { byte[] selBytes = selectionData.Data; - byte[] copyData = new byte[selBytes[1]]; + var upperBound = System.Math.Max (0, System.Math.Min (selBytes [1], selBytes.Length - 2)); + byte[] copyData = new byte[upperBound]; Array.Copy (selBytes, 2, copyData, 0, copyData.Length); var rawTextOffset = 1 + 1 + copyData.Length; string text = Encoding.UTF8.GetString (selBytes, rawTextOffset, selBytes.Length - rawTextOffset); diff --git a/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json b/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json index 4019073499..0dbe35af0a 100644 --- a/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json @@ -65,10 +65,10 @@ { "name": "Bookmarks", "color":"white", "secondcolor":"skyblue" }, - { "name": "Underline(Error)", "color":"invalid-red" }, - { "name": "Underline(Warning)", "color":"chocolate2" }, - { "name": "Underline(Suggestion)", "color":"chameleon3" }, - { "name": "Underline(Hint)", "color":"chameleon1" }, + { "name": "Underline(Error)", "color":"#E896A0" }, + { "name": "Underline(Warning)", "color":"#FEB958" }, + { "name": "Underline(Suggestion)", "color":"#9CC0EA" }, + { "name": "Underline(Hint)", "color":"#9CC0EA" }, { "name": "Quick Diff(Dirty)", "color":"orangesicle-light" }, { "name": "Quick Diff(Changed)", "color":"orangesicle" }, @@ -106,10 +106,10 @@ { "name": "Message Bubble Warning Line", "color":"#fff1da"}, { "name": "Message Bubble Warning Tooltip", "color":"#D1590B"}, - { "name": "Code Analysis Status All Good", "color":"#7ED3213C", "bordercolor":"#7CCD2F64"}, - { "name": "Code Analysis Status Suggestions", "color":"#4A90E24B", "bordercolor":"#4A90E264"}, - { "name": "Code Analysis Status Warnings", "color":"#F5A62341", "bordercolor":"#F5A62364"}, - { "name": "Code Analysis Status Errors", "color":"#D522203C", "bordercolor":"#D522203C32"} + { "name": "Code Analysis Status All Good", "color":"#B1E479", "bordercolor":"#7CCD2F"}, + { "name": "Code Analysis Status Suggestions", "color":"#77ABE9", "bordercolor":"#4A90E2"}, + { "name": "Code Analysis Status Warnings", "color":"#F7C46F", "bordercolor":"#F5A623"}, + { "name": "Code Analysis Status Errors", "color":"#E67A79", "bordercolor":"#E05F5E"} ], "text":[ diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Instrumentation/InstrumentationService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Instrumentation/InstrumentationService.cs index ce2f1ce370..0cbe2dccbb 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Instrumentation/InstrumentationService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Instrumentation/InstrumentationService.cs @@ -200,6 +200,8 @@ namespace MonoDevelop.Core.Instrumentation public static bool Enabled { get { return enabled; } set { + if (enabled == value) + return; enabled = value; UpdateCounterStatus (); } diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ConfigurationParameters.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ConfigurationParameters.cs index adc6e9d608..9ff5f46356 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ConfigurationParameters.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ConfigurationParameters.cs @@ -72,4 +72,10 @@ namespace MonoDevelop.Projects } } } + + public abstract class DotNetConfigurationParameters : ConfigurationParameters + { + public abstract bool NoStdLib { get; set; } + } + } diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs index b56bc6a1c0..7fb041aa11 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs @@ -767,10 +767,21 @@ namespace MonoDevelop.Projects } } + var config = (DotNetProjectConfiguration)GetConfiguration (configuration); + bool noStdLib = false; + if (config != null) { + var parameters = config.CompilationParameters as DotNetConfigurationParameters; + if (parameters != null) { + noStdLib = parameters.NoStdLib; + } + } + // System.Core is an implicit reference - var sa = AssemblyContext.GetAssemblies (TargetFramework).FirstOrDefault (a => a.Name == "System.Core" && a.Package.IsFrameworkPackage); - if (sa != null) - yield return sa.Location; + if (!noStdLib) { + var sa = AssemblyContext.GetAssemblies (TargetFramework).FirstOrDefault (a => a.Name == "System.Core" && a.Package.IsFrameworkPackage); + if (sa != null) + yield return sa.Location; + } } protected internal override void OnSave (IProgressMonitor monitor) diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs index 6a97722e1e..ed6bb65fa5 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs @@ -111,8 +111,9 @@ namespace MonoDevelop.Projects public override SolutionItemConfiguration FindBestMatch (SolutionItemConfigurationCollection configurations) { // Get all configurations with the same value for the 'DEBUG' symbol + var isDebug = compilationParameters.GetDefineSymbols ().Contains ("DEBUG"); var matches = configurations.OfType<DotNetProjectConfiguration> ().Where (c => - c.CompilationParameters.HasDefineSymbol ("DEBUG") == compilationParameters.HasDefineSymbol ("DEBUG") + c.CompilationParameters.GetDefineSymbols ().Contains ("DEBUG") == isDebug ).ToArray (); // If the base method can't find a direct match then try to match based on finding a configuration diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProject.cs index c78b597f34..93257eed0e 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProject.cs @@ -82,8 +82,9 @@ namespace MonoDevelop.Projects public override TargetFrameworkMoniker GetDefaultTargetFrameworkId () { - // Profile136 includes .NET 4.0+, Silverlight 5, Windows Phone 8, and Xamarin.iOS/Android, so make that our default. - return new TargetFrameworkMoniker (".NETPortable", "4.0", "Profile136"); + // Profile78 includes .NET 4.5+, Windows Phone 8, and Xamarin.iOS/Android, so make that our default. + // Note: see also: PortableLibrary.xpt.xml + return new TargetFrameworkMoniker (".NETPortable", "4.5", "Profile78"); } protected internal override IEnumerable<string> OnGetReferencedAssemblies (ConfigurationSelector configuration, bool includeProjectReferences) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs index 097dbc5560..cd706dbf1e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs @@ -31,6 +31,7 @@ using System.Runtime.Serialization.Formatters.Binary; using System.IO; using System.Threading; using System.Collections.Generic; +using MonoDevelop.Core.Instrumentation; namespace MonoDevelop.Components.AutoTest { @@ -61,6 +62,7 @@ namespace MonoDevelop.Components.AutoTest var pi = new ProcessStartInfo (file, args) { UseShellExecute = false }; pi.EnvironmentVariables ["MONO_AUTOTEST_CLIENT"] = sref; + pi.EnvironmentVariables ["GTK_MODULES"] = "gail:atk-bridge"; if (environment != null) foreach (var e in environment) pi.EnvironmentVariables [e.Key] = e.Value; @@ -100,9 +102,9 @@ namespace MonoDevelop.Components.AutoTest process.Kill (); } - public bool ExecuteCommand (object cmd) + public void ExecuteCommand (object cmd) { - return session.ExecuteCommand (cmd); + session.ExecuteCommand (cmd); } public void SelectObject (string name) @@ -117,6 +119,12 @@ namespace MonoDevelop.Components.AutoTest session.SelectActiveWidget (); } + public bool SelectWidget (string name, bool focus = true) + { + ClearEventQueue (); + return session.SelectWidget (name, focus); + } + public object GlobalInvoke (string name, params object[] args) { ClearEventQueue (); @@ -156,6 +164,19 @@ namespace MonoDevelop.Components.AutoTest session.TypeText (text); } + public void SelectTreeviewItem (string name) + { + ClearEventQueue (); + session.SelectTreeviewItem (name); + } + + public string[] GetTreeviewCells () + { + + ClearEventQueue (); + return session.GetTreeviewCells (); + } + public void PressKey (Gdk.Key key) { ClearEventQueue (); @@ -191,6 +212,11 @@ namespace MonoDevelop.Components.AutoTest } } + public void WaitForWindow (string windowName, int timeout = 10000) + { + session.WaitForWindow (windowName, timeout); + } + void ClearEventQueue () { eventQueue.Clear (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestService.cs index 992e0d5756..b90fe5682d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestService.cs @@ -28,7 +28,6 @@ using System; using MonoDevelop.Components.Commands; using System.IO; using System.Runtime.Serialization.Formatters.Binary; -using System.Collections; using System.Runtime.Remoting; using System.Collections.Generic; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs index e61a3b0408..bd35e2220a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs @@ -29,16 +29,17 @@ using System.Runtime.InteropServices; using System.Linq; using System.Reflection; using System.Threading; -using MonoDevelop.Core; +using System.Collections.Generic; +using MonoDevelop.Core.Instrumentation; +using MonoDevelop.Ide; namespace MonoDevelop.Components.AutoTest { public class AutoTestSession: MarshalByRefObject { object currentObject; - bool trackingActiveWidget; - ManualResetEvent syncEvent = new ManualResetEvent (false); + readonly ManualResetEvent syncEvent = new ManualResetEvent (false); public AutoTestSession () { @@ -49,10 +50,10 @@ namespace MonoDevelop.Components.AutoTest return null; } - public bool ExecuteCommand (object cmd) + public void ExecuteCommand (object cmd) { - return (bool) Sync (delegate { - return AutoTestService.CommandManager.DispatchCommand (cmd, null, CurrentObject); + Gtk.Application.Invoke (delegate { + AutoTestService.CommandManager.DispatchCommand (cmd, null, CurrentObject); }); } @@ -60,7 +61,10 @@ namespace MonoDevelop.Components.AutoTest { object res = null; Exception error = null; - + + if (DispatchService.IsGuiThread) + return SafeObject (del ()); + syncEvent.Reset (); Gtk.Application.Invoke (delegate { try { @@ -87,10 +91,10 @@ namespace MonoDevelop.Components.AutoTest object ob = GetGlobalObject (name.Substring (0, i)); if (ob == null) throw new Exception ("Object not found"); - if (ob is Type) - return Invoke (null, (Type)ob, name.Substring (i+1), args); - else - return Invoke (ob, ob.GetType (), name.Substring (i+1), args); + var type = ob as Type; + if (type != null) + return Invoke (null, type, name.Substring (i + 1), args); + return Invoke (ob, ob.GetType (), name.Substring (i + 1), args); }); } @@ -110,8 +114,9 @@ namespace MonoDevelop.Components.AutoTest object ob = GetGlobalObject (name.Substring (0, i)); if (ob == null) throw new Exception ("Object not found"); - if (ob is Type) - SetValue (null, (Type) ob, name.Substring (i+1), value); + var type = ob as Type; + if (type != null) + SetValue (null, type, name.Substring (i + 1), value); else SetValue (ob, ob.GetType (), name.Substring (i+1), value); return null; @@ -130,6 +135,34 @@ namespace MonoDevelop.Components.AutoTest SendKeyPress (key, Gdk.ModifierType.None); } } + + //TODO: expose ATK API over the session, instead of exposing specific widgets + public void SelectTreeviewItem (string name) + { + var accessible = ((Gtk.Widget)currentObject).Accessible; + var child = GetAccessibleChildren (accessible).First (c => c.Role == Atk.Role.TableCell && c.Name == name); + Atk.ComponentAdapter.GetObject (child).GrabFocus (); + } + + public string[] GetTreeviewCells () + { + var accessible = ((Gtk.Widget)currentObject).Accessible; + return GetAccessibleChildren (accessible) + .Where (c => c.Role == Atk.Role.TableCell) + .Select (c => c.Name) + .ToArray (); + } + + IEnumerable<Atk.Object> GetAccessibleChildren (Atk.Object obj) + { + var count = obj.NAccessibleChildren; + for (int i = 0; i < count; i++) { + var child = obj.RefAccessibleChild (i); + yield return child; + foreach (var c in GetAccessibleChildren (child)) + yield return c; + } + } public void SendKeyPress (Gdk.Key key, Gdk.ModifierType state) { @@ -154,7 +187,6 @@ namespace MonoDevelop.Components.AutoTest { Sync (delegate { currentObject = GetGlobalObject (name); - trackingActiveWidget = false; return null; }); } @@ -162,32 +194,60 @@ namespace MonoDevelop.Components.AutoTest public void SelectActiveWidget () { Sync (delegate { - trackingActiveWidget = true; + currentObject = GetActiveWidget (); return null; }); } - - object CurrentObject { - get { - if (trackingActiveWidget) - return GetActiveWidget (); - else - return currentObject; + + public bool SelectWidget (string name, bool focus) + { + return (bool) Sync (delegate { + var widget = GetWidget (GetFocusedWindow (), name); + currentObject = widget; + return widget != null && (!focus || FocusWidget (widget)); + }); + } + + bool FocusWidget (Gtk.Widget widget) + { + if (widget.HasFocus) + return true; + if (widget.CanFocus) { + widget.GrabFocus (); + return true; + } + var container = widget as Gtk.Container; + if (container != null) { + var chain = container.FocusChain; + System.Collections.IEnumerable children = chain.Length > 0 ? chain : container.AllChildren; + foreach (Gtk.Widget child in children) + if (FocusWidget (child)) + return true; } + return false; } - Gtk.Widget GetActiveWidget () + object CurrentObject { + get { return currentObject; } + } + + static Gtk.Window GetFocusedWindow (bool throwIfNotFound = true) { Gtk.Window win = null; - foreach (Gtk.Window w in Gtk.Window.ListToplevels ()) { + foreach (Gtk.Window w in Gtk.Window.ListToplevels ()) if (w.Visible && w.HasToplevelFocus) win = w; - } - - if (win == null) { + + if (win == null && throwIfNotFound) throw new Exception ("No window is focused"); - } - + + return win; + } + + Gtk.Widget GetActiveWidget () + { + var win = GetFocusedWindow (); + Gtk.Widget widget = win; while (widget is Gtk.Container) { Gtk.Widget child = ((Gtk.Container)widget).FocusChild; @@ -198,6 +258,21 @@ namespace MonoDevelop.Components.AutoTest } return widget; } + + Gtk.Widget GetWidget (Gtk.Container container, string name) + { + foreach (Gtk.Widget child in container.Children) { + if (child.Name == name) + return child; + var childContainer = child as Gtk.Container; + if (childContainer != null) { + var c = GetWidget (childContainer, name); + if (c != null) + return c; + } + } + return null; + } public object GetValue (string name) { @@ -229,9 +304,6 @@ namespace MonoDevelop.Components.AutoTest return ob; if (ob is string) return ob; - var op = ob as IAsyncOperation; - if (op != null) - return new AutoTestOperation (op); return null; } @@ -270,13 +342,18 @@ namespace MonoDevelop.Components.AutoTest object GetGlobalObject (string name) { int i = 0; - Type type; + Type type = null; + var asms = AppDomain.CurrentDomain.GetAssemblies (); do { i = name.IndexOf ('.', i); if (i == -1) i = name.Length; string cname = name.Substring (0, i); - type = Type.GetType (cname); + foreach (var a in asms) { + type = a.GetType (cname); + if (type != null) + break; + } i++; } while (type == null && i < name.Length); @@ -302,28 +379,48 @@ namespace MonoDevelop.Components.AutoTest else win = (Gdk.Window) GetValue (target, target.GetType (), subWindow); - NativeEventKeyStruct nativeEvent = new NativeEventKeyStruct (); - nativeEvent.type = eventType; - nativeEvent.send_event = 1; - nativeEvent.window = win.Handle; - nativeEvent.state = (uint) state; - nativeEvent.keyval = keyval; - nativeEvent.group = (byte) keyms[0].Group; - nativeEvent.hardware_keycode = (ushort) keyms[0].Keycode; - nativeEvent.length = 0; - nativeEvent.time = Gtk.Global.CurrentEventTime; + var nativeEvent = new NativeEventKeyStruct { + type = eventType, + send_event = 1, + window = win.Handle, + state = (uint)state, + keyval = keyval, + group = (byte)keyms [0].Group, + hardware_keycode = (ushort)keyms [0].Keycode, + length = 0, + time = Gtk.Global.CurrentEventTime + }; IntPtr ptr = GLib.Marshaller.StructureToPtrAlloc (nativeEvent); try { - Gdk.EventKey evnt = new Gdk.EventKey (ptr); - Gdk.EventHelper.Put (evnt); + Gdk.EventHelper.Put (new Gdk.EventKey (ptr)); } finally { Marshal.FreeHGlobal (ptr); } } + + public void WaitForWindow (string windowName, int timeout) + { + const int pollTime = 100; + syncEvent.Reset (); + + GLib.Timeout.Add ((uint) pollTime, () => { + var window = GetFocusedWindow (false); + if (window != null && window.Name == windowName) { + syncEvent.Set (); + return false; + } + timeout -= pollTime; + return timeout > 0; + }); + + if (!syncEvent.WaitOne (timeout)) + throw new Exception ("Timeout while executing synchronized call"); + } } + // Analysis disable InconsistentNaming [StructLayout (LayoutKind.Sequential)] struct NativeEventKeyStruct { public Gdk.EventType type; @@ -369,24 +466,6 @@ namespace MonoDevelop.Components.AutoTest public double x_root; public double y_root; } - - public class AutoTestOperation : MarshalByRefObject - { - readonly IAsyncOperation op; - - public AutoTestOperation (IAsyncOperation op) - { - this.op = op; - } - - public void WaitForCompleted () - { - op.WaitForCompleted (); - } - - public bool Success { - get { return op.Success; } - } - } + // Analysis restore InconsistentNaming } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs index e266d5e434..2fd04db58e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs @@ -219,7 +219,9 @@ namespace MonoDevelop.Components.Commands label.Text = overrideLabel ?? cmdInfo.Text; label.UseMarkup = false; } - + + if (!string.IsNullOrEmpty (cmdInfo.Description) && label.TooltipText != cmdInfo.Description) + label.TooltipText = cmdInfo.Description; label.UseUnderline = true; this.Sensitive = cmdInfo.Enabled; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs index 67282102b5..3151df7301 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs @@ -83,6 +83,9 @@ namespace MonoDevelop.Components.MainToolbar bool settingGlobalConfig; SolutionEntityItem currentStartupProject; + int ignoreConfigurationChangedCount; + int ignoreRuntimeChangedCount; + public Cairo.ImageSurface Background { get; set; @@ -313,6 +316,9 @@ namespace MonoDevelop.Components.MainToolbar Add (align); SetDefaultSizes (-1, 21); + + configurationCombo.Changed += HandleConfigurationChanged; + runtimeCombo.Changed += HandleRuntimeChanged; UpdateCombos (); button.Clicked += HandleStartButtonClicked; @@ -528,12 +534,14 @@ namespace MonoDevelop.Components.MainToolbar void HandleRuntimeChanged (object sender, EventArgs e) { - NotifyConfigurationChange (); + if (ignoreRuntimeChangedCount == 0) + NotifyConfigurationChange (); } void HandleConfigurationChanged (object sender, EventArgs e) { - NotifyConfigurationChange (); + if (ignoreConfigurationChangedCount == 0) + NotifyConfigurationChange (); } void UpdateBuildConfiguration () @@ -570,7 +578,7 @@ namespace MonoDevelop.Components.MainToolbar { string name = configurationMerger.GetUnresolvedConfiguration (IdeApp.Workspace.ActiveConfigurationId); - configurationCombo.Changed -= HandleConfigurationChanged; + ignoreConfigurationChangedCount++; try { TreeIter iter; @@ -596,7 +604,7 @@ namespace MonoDevelop.Components.MainToolbar } } } finally { - configurationCombo.Changed += HandleConfigurationChanged; + ignoreConfigurationChangedCount--; } SelectActiveRuntime (); @@ -646,7 +654,7 @@ namespace MonoDevelop.Components.MainToolbar void SelectActiveRuntime () { - runtimeCombo.Changed -= HandleRuntimeChanged; + ignoreRuntimeChangedCount++; try { TreeIter iter; @@ -665,7 +673,7 @@ namespace MonoDevelop.Components.MainToolbar } } } finally { - runtimeCombo.Changed += HandleRuntimeChanged; + ignoreRuntimeChangedCount--; } } @@ -676,7 +684,7 @@ namespace MonoDevelop.Components.MainToolbar configurationMerger.Load (currentSolution); - configurationCombo.Changed -= HandleConfigurationChanged; + ignoreConfigurationChangedCount++; try { configurationStore.Clear (); if (!IdeApp.Workspace.IsOpen) { @@ -691,7 +699,7 @@ namespace MonoDevelop.Components.MainToolbar configurationStore.AppendValues (conf.Replace ("|", " | "), conf); } } finally { - configurationCombo.Changed += HandleConfigurationChanged; + ignoreConfigurationChangedCount--; } FillRuntimes (); @@ -700,7 +708,7 @@ namespace MonoDevelop.Components.MainToolbar void FillRuntimes () { - runtimeCombo.Changed -= HandleRuntimeChanged; + ignoreRuntimeChangedCount++; try { runtimeStore.Clear (); if (!IdeApp.Workspace.IsOpen || currentSolution == null || !currentSolution.SingleStartup || currentSolution.StartupItem == null) @@ -755,7 +763,7 @@ namespace MonoDevelop.Components.MainToolbar runtimeCombo.Sensitive = runtimes > 1; } finally { - runtimeCombo.Changed += HandleRuntimeChanged; + ignoreRuntimeChangedCount--; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs index 1fbffe5f3c..4d67e179ff 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs @@ -328,7 +328,7 @@ namespace MonoDevelop.Components.MainToolbar case SymbolKind.Constructor: return GettextCatalog.GetString ("constructor ({0})", loc); case SymbolKind.Destructor: - return GettextCatalog.GetString ("destrutcor ({0})", loc); + return GettextCatalog.GetString ("destructor ({0})", loc); default: throw new NotSupportedException (member.SymbolKind + " is not supported."); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs index 47ac8426e1..a3cd99132b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs @@ -113,6 +113,10 @@ namespace MonoDevelop.Ide.CodeCompletion headlabel.BreakOnPunctuation = false; headlabel.Markup = o.SignatureMarkup; headlabel.Visible = true; + int x, y; + GetPosition (out x, out y); + var geometry = DesktopService.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (x, y)); + headlabel.MaxWidth = Math.Max (geometry.Width / 5, 480); if (Theme.DrawPager && overloads.Count > 1) { headlabel.WidthRequest = headlabel.RealWidth + 70; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs index 7de20a39f6..6254495928 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs @@ -453,6 +453,7 @@ namespace MonoDevelop.Ide.FindInFiles searchentryFileMask.Query = properties.Get ("MonoDevelop.FindReplaceDialogs.FileMask", ""); + searchentryFileMask.Entry.ActivatesDefault = true; searchentryFileMask.Show (); TableAddRow (tableFindAndReplace, row, labelFileMask, searchentryFileMask); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs index 770b7f60bc..c506299911 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs @@ -281,7 +281,30 @@ namespace MonoDevelop.Ide.Gui.Dialogs } base.OnDestroyed (); } - + + /// <summary> + /// Gets a specific dialog panel from a given section. + /// </summary> + /// <returns>The panel, or null if the panel wasn't found.</returns> + /// <param name="id">The section id.</param> + /// <typeparam name="T">The type of the dialog panel.</typeparam> + public T GetPanel<T> (string id) where T : class, IOptionsPanel + { + foreach (OptionsDialogSection section in pages.Keys) { + if (section.Id == id) { + SectionPage page; + if (!pages.TryGetValue (section, out page)) + return null; + foreach (var panel in page.Panels) { + var result = panel.Panel as T; + if (result != null) + return result; + } + } + } + return null; + } + public void SelectPanel (string id) { foreach (OptionsDialogSection section in pages.Keys) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs index fa55bf66a9..1859ec094d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs @@ -34,10 +34,21 @@ namespace MonoDevelop.Ide.Gui.Dialogs { bitmap = Xwt.Drawing.Image.FromResource ("SplashScreen.png"); this.Resize ((int)bitmap.Width, (int)bitmap.Height); + MessageService.PopupDialog += HandlePopupDialog; } + + void HandlePopupDialog (object sender, EventArgs e) + { + if (!isDestroyed) + Destroy (); + } + + bool isDestroyed; protected override void OnDestroyed () { + isDestroyed = true; + MessageService.PopupDialog -= HandlePopupDialog; base.OnDestroyed (); if (bitmap != null) { bitmap.Dispose (); @@ -209,7 +220,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs { void IDisposable.Dispose () { - Destroy (); + if (!isDestroyed) + Destroy (); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs index de98311462..9feb7841af 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs @@ -117,8 +117,25 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad { if (otherNode.DataItem is ProjectFolder) return 1; - else + + if (!(thisNode.DataItem is ProjectFile)) + return DefaultSort; + if (!(otherNode.DataItem is ProjectFile)) return DefaultSort; + + string name1 = thisNode.NodeName; + string name2 = otherNode.NodeName; + + //Compare filenames without extension + string path1 = System.IO.Path.GetFileNameWithoutExtension (name1); + string path2 = System.IO.Path.GetFileNameWithoutExtension (name2); + int cmp = string.Compare (path1, path2, true); + if (cmp != 0) + return cmp; + //Compare extensions + string ext1 = System.IO.Path.GetExtension (name1); + string ext2 = System.IO.Path.GetExtension (name2); + return string.Compare (ext1, ext2, true); } public override bool HasChildNodes (ITreeBuilder builder, object dataObject) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs index 062980e420..ec07fd4c68 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs @@ -194,7 +194,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad var deleteOnlyQuestion = new QuestionMessage () { AllowApplyToAll = folders.Count > 1, - SecondaryText = GettextCatalog.GetString ("The directory and any files it contains will be permanintly removed from your hard disk. ") + SecondaryText = GettextCatalog.GetString ("The directory and any files it contains will be permanently removed from your hard disk. ") }; deleteOnlyQuestion.Buttons.Add (AlertButton.Cancel); deleteOnlyQuestion.Buttons.Add (AlertButton.Delete); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs index e24e8e4b45..98e72a490f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs @@ -580,8 +580,15 @@ namespace MonoDevelop.Ide.Gui static Properties properties = ((Properties) PropertyService.Get ( "MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties())); + + [Obsolete("Will be replaced by 'ShowGlobalPreferencesDialog (Gtk.Window parentWindow, string panelId, Action<OptionsDialog> configurationAction = null)'")] public void ShowGlobalPreferencesDialog (Gtk.Window parentWindow, string panelId) { + ShowGlobalPreferencesDialog (parentWindow, panelId, null); + } + + public void ShowGlobalPreferencesDialog (Gtk.Window parentWindow, string panelId, Action<OptionsDialog> configurationAction = null) + { if (parentWindow == null) parentWindow = IdeApp.Workbench.RootWindow; @@ -597,7 +604,8 @@ namespace MonoDevelop.Ide.Gui try { if (panelId != null) ops.SelectPanel (panelId); - + if (configurationAction != null) + configurationAction (ops); if (MessageService.RunCustomDialog (ops, parentWindow) == (int) Gtk.ResponseType.Ok) { PropertyService.SaveProperties (); MonoDevelop.Projects.Policies.PolicyService.SavePolicies (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs index 3f528ac150..7880a1764e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs @@ -1590,18 +1590,12 @@ namespace MonoDevelop.Ide.TypeSystem UnresolvedAssemblyProxy ctx; // Add mscorlib reference - // hack: find the NoStdLib flag var config = IdeApp.Workspace != null ? netProject.GetConfiguration (IdeApp.Workspace.ActiveConfiguration) as DotNetProjectConfiguration : null; bool noStdLib = false; if (config != null) { - var parameters = config.CompilationParameters; + var parameters = config.CompilationParameters as DotNetConfigurationParameters; if (parameters != null) { - var prop = parameters.GetType ().GetProperty ("NoStdLib"); - if (prop != null) { - var val = prop.GetValue (parameters, null); - if (val is bool) - noStdLib = (bool)val; - } + noStdLib = parameters.NoStdLib; } } @@ -1624,11 +1618,6 @@ namespace MonoDevelop.Ide.TypeSystem var newReferencedAssemblies = new List<UnresolvedAssemblyProxy>(); try { foreach (string file in netProject.GetReferencedAssemblies (ConfigurationSelector.Default, false)) { - - // HACK: core reference get added automatically, even if no std lib is set. - if (noStdLib && file.Contains ("System.Core.dll")) - continue; - string fileName; if (!Path.IsPathRooted (file)) { fileName = Path.Combine (Path.GetDirectoryName (netProject.FileName), file); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs index 7d71503711..abf816eec2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs @@ -317,15 +317,15 @@ namespace MonoDevelop.Ide { if (Platform.IsWindows) return; - GLib.Timeout.Add (500, () => { + GLib.Timeout.Add (5000, () => { lastIdle = DateTime.Now; return true; }); lastIdle = DateTime.Now; var lockupCheckThread = new Thread (delegate () { while (lockupCheckRunning) { - const int waitTimeout = 2000; - const int maxResponseTime = 5000; + const int waitTimeout = 5000; + const int maxResponseTime = 10000; Thread.Sleep (waitTimeout); if ((DateTime.Now - lastIdle).TotalMilliseconds > maxResponseTime) { var pid = Process.GetCurrentProcess ().Id; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs index ae3b0d06ac..46e0e41575 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs @@ -332,6 +332,7 @@ namespace MonoDevelop.Ide if (dialog.Title == null) dialog.Title = BrandingService.ApplicationName; PlaceDialog (dialog, parent); + OnPopupDialog (EventArgs.Empty); return Mono.TextEditor.GtkWorkarounds.RunDialogWithNotification (dialog); } @@ -454,6 +455,7 @@ namespace MonoDevelop.Ide Exception = e, TransientFor = parent, }; + OnPopupDialog (EventArgs.Empty); exceptionDialog.Run (); return exceptionDialog.ResultButton; } @@ -461,6 +463,7 @@ namespace MonoDevelop.Ide public AlertButton GenericAlert (MessageDescription message) { var dialog = new AlertDialog (message); + OnPopupDialog (EventArgs.Empty); return dialog.Run (); } @@ -472,12 +475,24 @@ namespace MonoDevelop.Ide Value = initialValue, IsPassword = isPassword, }; + OnPopupDialog (EventArgs.Empty); if (dialog.Run ()) return dialog.Value; return null; } } #endregion + + + static void OnPopupDialog (EventArgs e) + { + var handler = PopupDialog; + if (handler != null) + handler (null, e); + } + + public static event EventHandler PopupDialog; + } public class MessageDescription diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj index 3b630f3fe5..0dd7cecb4e 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{A437F1A3-78DF-4F00-8053-D32A8B1EB679}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj index d7e7809950..ad8f481533 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v12.0.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{C4B0275C-37D3-43F2-927D-ABF556600804}</ProjectGuid> <OutputType>WinExe</OutputType> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj index d98aa2ef75..f29e31bd76 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{DB96F55E-41C5-4330-A427-15A4EC028BBE}</ProjectGuid> <OutputType>WinExe</OutputType> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj index 3d3389f81e..d38044660b 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{B257A1A3-78DF-4F00-8053-D32A8B1EB679}</ProjectGuid> <OutputType>WinExe</OutputType> diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj index f2818248b3..fd4b050ea1 100644 --- a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj +++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}</ProjectGuid> <OutputType>WinExe</OutputType> diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj index 57e4d7f400..8e1f9a2aed 100644 --- a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj +++ b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>12.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{9E4BA410-8338-42EC-AF9C-422C35ECED81}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/src/tools/mdhost/mdhost.csproj b/main/src/tools/mdhost/mdhost.csproj index 12028a06f1..97d977bed7 100644 --- a/main/src/tools/mdhost/mdhost.csproj +++ b/main/src/tools/mdhost/mdhost.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{BFE8691A-D323-4622-9021-7B8B27F81599}</ProjectGuid> <OutputType>Exe</OutputType> diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj index 49035c7e7c..0b732f2a6b 100644 --- a/main/src/tools/mdtool/mdtool.csproj +++ b/main/src/tools/mdtool/mdtool.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}</ProjectGuid> <OutputType>Exe</OutputType> diff --git a/main/tests/Ide.Tests/Ide.Tests.csproj b/main/tests/Ide.Tests/Ide.Tests.csproj index a39988d63a..a38f63715f 100644 --- a/main/tests/Ide.Tests/Ide.Tests.csproj +++ b/main/tests/Ide.Tests/Ide.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{73D4CC8B-BAB9-4A29-841B-F25C6311F067}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj b/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj index 91c509ffbe..c8cda725f7 100644 --- a/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj +++ b/main/tests/MacPlatform.Tests/MacPlatform.Tests.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>10.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{C05AAB7A-523F-4109-966B-6675BE0975BA}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/tests/TestRunner/TestRunner.csproj b/main/tests/TestRunner/TestRunner.csproj index 2101e9a64a..0b7d4810bb 100644 --- a/main/tests/TestRunner/TestRunner.csproj +++ b/main/tests/TestRunner/TestRunner.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>12.0.0</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/main/tests/UserInterfaceTests/Gui.cs b/main/tests/UserInterfaceTests/Gui.cs new file mode 100644 index 0000000000..48a0b7cd72 --- /dev/null +++ b/main/tests/UserInterfaceTests/Gui.cs @@ -0,0 +1,58 @@ +// +// Gui.cs +// +// Author: +// Michael Hutchinson <m.j.hutchinson@gmail.com> +// +// Copyright (c) 2014 Xamarin Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; +using System.Threading; +using MonoDevelop.Core; +using MonoDevelop.Core.Instrumentation; +using MonoDevelop.Ide.Commands; +using NUnit.Framework; +using MonoDevelop.Components.AutoTest; + +namespace UserInterfaceTests +{ + + static class Gui + { + static AutoTestClientSession Session { + get { return TestService.Session; } + } + + public static void PressButton (string buttonName) + { + Assert.IsTrue (Session.SelectWidget (buttonName)); + Session.Invoke ("Activate"); + } + + public static void EnterText (string widgetName, string text, bool replace = true) + { + Assert.IsTrue (Session.SelectWidget (widgetName)); + if (replace) + Session.ExecuteCommand (EditCommands.SelectAll); + Session.TypeText (text); + } + } +} diff --git a/main/tests/UserInterfaceTests/Ide.cs b/main/tests/UserInterfaceTests/Ide.cs new file mode 100644 index 0000000000..36f0d03b45 --- /dev/null +++ b/main/tests/UserInterfaceTests/Ide.cs @@ -0,0 +1,140 @@ +// +// IdeApi.cs +// +// Author: +// Lluis Sanchez Gual <lluis@novell.com> +// +// Copyright (c) 2010 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; +using System.Threading; +using MonoDevelop.Core; +using MonoDevelop.Core.Instrumentation; +using MonoDevelop.Ide.Commands; +using NUnit.Framework; +using MonoDevelop.Components.AutoTest; +using System.Linq; + +namespace UserInterfaceTests +{ + public static class Ide + { + static AutoTestClientSession Session { + get { return TestService.Session; } + } + + public static void OpenFile (FilePath file) + { + Session.GlobalInvoke ("MonoDevelop.Ide.IdeApp.Workbench.OpenDocument", (FilePath) file, true); + Assert.AreEqual (file, Ide.GetActiveDocumentFilename ()); + } + + public static FilePath OpenTestSolution (string solution) + { + FilePath path = Util.GetSampleProject (solution); + + RunAndWaitForTimer ( + () => Session.GlobalInvoke ("MonoDevelop.Ide.IdeApp.Workspace.OpenWorkspaceItem", (string)path), + "MonoDevelop.Ide.Counters.OpenWorkspaceItemTimer" + ); + + return path; + } + + public static void CloseAll () + { + Session.ExecuteCommand (FileCommands.CloseWorkspace); + Session.ExecuteCommand (FileCommands.CloseAllFiles); + } + + public static FilePath GetActiveDocumentFilename () + { + return Session.GetGlobalValue<FilePath> ("MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument.FileName"); + } + + public static void BuildSolution () + { + RunAndWaitForTimer ( + () => Session.ExecuteCommand (ProjectCommands.BuildSolution), + "MonoDevelop.Ide.Counters.BuildItemTimer" + ); + + var status = GetStatusMessage (); + Assert.AreEqual (status, "Build successful."); + } + + static void WaitUntil (Func<bool> done, int timeout = 20000, int pollStep = 200) + { + do { + if (done ()) + return; + timeout -= pollStep; + Thread.Sleep (pollStep); + } while (timeout > 0); + + throw new Exception ("Timed out waiting for event"); + } + + //no saner way to do this + public static string GetStatusMessage (int timeout = 20000) + { + //wait for any queued messages to pop + WaitUntil ( + () => Session.GetGlobalValue<int> ("MonoDevelop.Ide.IdeApp.Workbench.Toolbar.statusArea.messageQueue.Count") == 0, + timeout + ); + return (string) Session.GetGlobalValue ("MonoDevelop.Ide.IdeApp.Workbench.Toolbar.statusArea.renderArg.CurrentText"); + } + + public static void RunAndWaitForTimer (Action action, string counter, int timeout = 20000) + { + var c = Session.GetGlobalValue<TimerCounter> (counter); + var tt = c.TotalTime; + + action (); + + WaitUntil (() => c.TotalTime > tt, timeout); + } + + public static void CreateProject (string name, string category, string kind, FilePath directory) + { + Session.ExecuteCommand (FileCommands.NewProject); + Session.WaitForWindow ("MonoDevelop.Ide.Projects.NewProjectDialog"); + + Session.SelectWidget ("lst_template_types"); + Session.SelectTreeviewItem (category); + + Session.SelectWidget ("boxTemplates"); + var cells = Session.GetTreeviewCells (); + var cellName = cells.First (c => c!= null && c.StartsWith (kind + "\n", StringComparison.Ordinal)); + Session.SelectTreeviewItem (cellName); + + Gui.EnterText ("txt_name", name); + Gui.EnterText ("entry_location", directory); + + RunAndWaitForTimer ( + () => Gui.PressButton ("btn_new"), + "MonoDevelop.Ide.Counters.OpenDocumentTimer" + ); + } + } + +} diff --git a/main/tests/UserInterfaceTests/IdeApi.cs b/main/tests/UserInterfaceTests/IdeApi.cs deleted file mode 100644 index c62053f7b3..0000000000 --- a/main/tests/UserInterfaceTests/IdeApi.cs +++ /dev/null @@ -1,78 +0,0 @@ -// -// IdeApi.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2010 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -using MonoDevelop.Components.AutoTest; -using MonoDevelop.Core; -using MonoDevelop.Ide.Commands; -using NUnit.Framework; - -namespace UserInterfaceTests -{ - public static class IdeApi - { - public static void OpenFile (FilePath file) - { - TestService.Session.GlobalInvoke ("MonoDevelop.Ide.IdeApp.Workbench.OpenDocument", (FilePath) file, true); - Assert.AreEqual (file, IdeApi.GetActiveDocumentFilename ()); - } - - public static FilePath OpenTestSolution (string solution) - { - FilePath path = Util.GetSampleProject (solution); - - var op = TestService.Session.GlobalInvoke<AutoTestOperation> ( - "MonoDevelop.Ide.IdeApp.Workspace.OpenWorkspaceItem", (string) path - ); - - op.WaitForCompleted (); - Assert.IsTrue (op.Success); - - return path; - } - - public static void CloseAll () - { - TestService.Session.ExecuteCommand (FileCommands.CloseWorkspace); - TestService.Session.ExecuteCommand (FileCommands.CloseAllFiles); - } - - public static FilePath GetActiveDocumentFilename () - { - return TestService.Session.GetGlobalValue<FilePath> ("MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument.FileName"); - } - - public static void BuildSolution (bool expectedResult = true) - { - TestService.Session.ExecuteCommand (ProjectCommands.BuildSolution); - - var buildOp = TestService.Session.GetGlobalValue<AutoTestOperation> ( - "MonoDevelop.Ide.IdeApp.ProjectOperations.CurrentBuildOperation" - ); - buildOp.WaitForCompleted (); - Assert.AreEqual (buildOp.Success, expectedResult); - } - } -} diff --git a/main/tests/UserInterfaceTests/SimpleTest.cs b/main/tests/UserInterfaceTests/SimpleTest.cs index 161ed3da21..2b0b2c1b76 100644 --- a/main/tests/UserInterfaceTests/SimpleTest.cs +++ b/main/tests/UserInterfaceTests/SimpleTest.cs @@ -38,15 +38,15 @@ namespace UserInterfaceTests [Test] public void OpenEditCompile () { - var slnFile = IdeApi.OpenTestSolution ("ConsoleApp-VS2010/ConsoleApplication.sln"); + var slnFile = Ide.OpenTestSolution ("ConsoleApp-VS2010/ConsoleApplication.sln"); var slnDir = slnFile.ParentDirectory; var exe = slnDir.Combine ("bin", "Debug", "ConsoleApplication.exe"); Assert.IsFalse (File.Exists (exe)); - IdeApi.OpenFile (slnFile.ParentDirectory.Combine ("Program.cs")); + Ide.OpenFile (slnFile.ParentDirectory.Combine ("Program.cs")); - IdeApi.BuildSolution (); + Ide.BuildSolution (); AssertExeHasOutput (exe, ""); //select text editor, move down 10 lines, and insert a statement @@ -56,10 +56,10 @@ namespace UserInterfaceTests Session.ExecuteCommand (TextEditorCommands.LineEnd); Session.TypeText ("\nConsole.WriteLine (\"Hello World!\");"); - IdeApi.BuildSolution (); + Ide.BuildSolution (); AssertExeHasOutput (exe, "Hello World!"); - IdeApi.CloseAll (); + Ide.CloseAll (); } void AssertExeHasOutput (string exe, string expectedOutput) @@ -71,5 +71,21 @@ namespace UserInterfaceTests Assert.AreEqual (expectedOutput, output.Trim ()); } + + [Test] + public void CreateBuildProject () + { + string projectName = "TestFoo"; + string projectCategory = "C#"; + string projectKind = "Console Project"; + + var projectDirectory = Util.CreateTmpDir (projectName); + + Ide.CreateProject (projectName, projectCategory, projectKind, projectDirectory); + + Ide.BuildSolution (); + + Ide.CloseAll (); + } } } diff --git a/main/tests/UserInterfaceTests/TestService.cs b/main/tests/UserInterfaceTests/TestService.cs index 8043a080a2..193a96c35a 100644 --- a/main/tests/UserInterfaceTests/TestService.cs +++ b/main/tests/UserInterfaceTests/TestService.cs @@ -46,6 +46,7 @@ namespace UserInterfaceTests { "MONODEVELOP_TEST_PROFILE", Util.CreateTmpDir ("profile") } }); + Session.SetGlobalValue ("MonoDevelop.Core.Instrumentation.InstrumentationService.Enabled", true); Session.GlobalInvoke ("MonoDevelop.Ide.IdeApp.Workbench.GrabDesktopFocus"); } diff --git a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj index ab7091bcca..f320e12bd8 100644 --- a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj +++ b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj @@ -40,12 +40,13 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="IdeApi.cs" /> <Compile Include="UITestBase.cs" /> <Compile Include="TestService.cs" /> <Compile Include="Util.cs" /> <Compile Include="SimpleTest.cs" /> <Compile Include="ProcessUtils.cs" /> + <Compile Include="Gui.cs" /> + <Compile Include="Ide.cs" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/version-checks b/version-checks index d62308f6ab..f72c7096a9 100755 --- a/version-checks +++ b/version-checks @@ -17,7 +17,7 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=a40889784d2c38e881b62c8f4cec32c59874569b +DEP_NEEDED_VERSION[0]=ff034b99ed0fbdebff82b2db5dd0abc97c38092c DEP_BRANCH_AND_REMOTE[0]="retina origin/retina" # heap-shot |