Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 4392588

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
2 parents fb9b9fe + 7a05881 commit 4392588

228 files changed

Lines changed: 4702 additions & 1785 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎data/resources/StringResources.fr.resx‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,6 +1536,30 @@ Pour créer ou manipuler un objet ActiveX/COM, déplcaer une classe depuis TypeL
15361536
<data name="CQA.MainWindow.FormTitle" xml:space="preserve">
15371537
<value>Analyse Qualité du Code</value>
15381538
</data>
1539+
<data name="CSharpBinding.Formatting.AutoFormat" xml:space="preserve">
1540+
<value>Formater automatiquement le code</value>
1541+
</data>
1542+
<data name="CSharpBinding.Formatting.DefaultOptionReference" xml:space="preserve">
1543+
<value>(défaut)</value>
1544+
</data>
1545+
<data name="CSharpBinding.Formatting.GlobalOptionReference" xml:space="preserve">
1546+
<value>(global)</value>
1547+
</data>
1548+
<data name="CSharpBinding.Formatting.NoPresetSelectedMessage" xml:space="preserve">
1549+
<value>Aucun choix de formatage sélectionné!</value>
1550+
</data>
1551+
<data name="CSharpBinding.Formatting.PresetOverwriteQuestion" xml:space="preserve">
1552+
<value>Voulez-vous réinitialiser toutes les options de formatage?</value>
1553+
</data>
1554+
<data name="CSharpBinding.Formatting.ProjectOptionReference" xml:space="preserve">
1555+
<value>(projet)</value>
1556+
</data>
1557+
<data name="CSharpBinding.Formatting.ResetTo" xml:space="preserve">
1558+
<value>Réinitialiser à:</value>
1559+
</data>
1560+
<data name="CSharpBinding.Formatting.SolutionOptionReference" xml:space="preserve">
1561+
<value>(solution)</value>
1562+
</data>
15391563
<data name="CSharpBinding.GenerateNewHandlerInstructions" xml:space="preserve">
15401564
<value>Insérer une réference vers la méthode explicite; appuyer de nouveau sur tab ou enter pour insérer un nouveau template de méthode.</value>
15411565
</data>
@@ -1976,6 +2000,15 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
19762000
<data name="Dialog.Options.IDEOptions.CodeCompletion.SaveItemCountBeforeNumber" xml:space="preserve">
19772001
<value>Enregistrer</value>
19782002
</data>
2003+
<data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLinkTarget" xml:space="preserve">
2004+
<value>Les liens avec les info-bulles doivent aller vers</value>
2005+
</data>
2006+
<data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLinkTargetDefinition" xml:space="preserve">
2007+
<value>Definition dans le code source</value>
2008+
</data>
2009+
<data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLinkTargetDocumentation" xml:space="preserve">
2010+
<value>Documentation (si disponible)</value>
2011+
</data>
19792012
<data name="Dialog.Options.IDEOptions.CodeCompletion.UseDataUsageCache" xml:space="preserve">
19802013
<value>Présélectionne les membres les plus utilisés</value>
19812014
</data>
@@ -2348,6 +2381,9 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
23482381
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
23492382
<value>Accolades en surbrillance</value>
23502383
</data>
2384+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightCurrentLineCheckBox" xml:space="preserve">
2385+
<value>Surligner la ligne actuelle</value>
2386+
</data>
23512387
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23522388
<value>Surligner symboles</value>
23532389
</data>
@@ -3314,9 +3350,15 @@ Vous pouvez aussi choisir de stocker la configuration dans le fichier .user-file
33143350
<data name="ICSharpCode.CodeCoverage.CodeNotCovered" xml:space="preserve">
33153351
<value>Code non couvert</value>
33163352
</data>
3353+
<data name="ICSharpCode.CodeCoverage.CodePartCovered" xml:space="preserve">
3354+
<value>Code partiellement couvert</value>
3355+
</data>
33173356
<data name="ICSharpCode.CodeCoverage.Column" xml:space="preserve">
33183357
<value>Colonne</value>
33193358
</data>
3359+
<data name="ICSharpCode.CodeCoverage.Content" xml:space="preserve">
3360+
<value>Contenu</value>
3361+
</data>
33203362
<data name="ICSharpCode.CodeCoverage.DisplayOptions" xml:space="preserve">
33213363
<value>Afficher les options</value>
33223364
</data>
@@ -4294,6 +4336,9 @@ Utilisez seulement des lettres, chiffres, espace, '.' ou '_'.</value>
42944336
<data name="ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage" xml:space="preserve">
42954337
<value>La solution a été modifiée hors de SharpDevelop.</value>
42964338
</data>
4339+
<data name="ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title" xml:space="preserve">
4340+
<value>Options de formatage de solution</value>
4341+
</data>
42974342
<data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
42984343
<value>Convertir les projets sélectionnés vers:</value>
42994344
</data>
@@ -6092,6 +6137,12 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
60926137
<data name="SharpDevelop.Refactoring.ClassesDerivingFrom" xml:space="preserve">
60936138
<value>Classes dérivant de ${Name}</value>
60946139
</data>
6140+
<data name="SharpDevelop.Refactoring.ClipboardRingCommand" xml:space="preserve">
6141+
<value>Coller depuis le presse-papier circulaire...</value>
6142+
</data>
6143+
<data name="SharpDevelop.Refactoring.ClipboardRingEmpty" xml:space="preserve">
6144+
<value>Le presse-papier circulaire est vide</value>
6145+
</data>
60956146
<data name="SharpDevelop.Refactoring.ConvertToAutomaticProperty" xml:space="preserve">
60966147
<value>Convertir en propriété automatique</value>
60976148
</data>
@@ -6567,6 +6618,12 @@ Les fichiers de resources ont été renommés/déplacés en conséquence.</value
65676618
<data name="StatusBarService.CursorStatusBarPanelText" xml:space="preserve">
65686619
<value>li. ${Line} col. ${Column} car. ${Character}</value>
65696620
</data>
6621+
<data name="StatusBarService.SelectionStatusBarPanelTextMulti" xml:space="preserve">
6622+
<value>longueur ${Rows} * ${Cols} (${Total})</value>
6623+
</data>
6624+
<data name="StatusBarService.SelectionStatusBarPanelTextSingle" xml:space="preserve">
6625+
<value>longueur ${Length}</value>
6626+
</data>
65706627
<data name="Templates.File.Categories.Misc" xml:space="preserve">
65716628
<value>Divers</value>
65726629
</data>

‎data/resources/StringResources.it.resx‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,17 @@ L'applicazione tenterà di scaricarlo e installarlo. Sei sicuro di voler continu
309309
<data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
310310
<value>&amp;Rifiuto</value>
311311
</data>
312+
<data name="AddInManager2.LicenseAcceptance.Explanation.Package" xml:space="preserve">
313+
<value>Cliccando "Accetto" accetti i termini di licenza del pacchetto specificato sopra.
314+
Se non accetti i termini di licenza clicca "Rifiuto".</value>
315+
</data>
316+
<data name="AddInManager2.LicenseAcceptance.Explanation.Packages" xml:space="preserve">
317+
<value>Cliccando "Accetto" accetti i termini di licenza dei pacchetti specificati sopra.
318+
Se non accetti i termini di licenza clicca "Rifiuto".</value>
319+
</data>
320+
<data name="AddInManager2.LicenseAcceptance.Introduction.Package" xml:space="preserve">
321+
<value>Questo pacchetto richiede l'accettazione della licenza:</value>
322+
</data>
312323
<data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
313324
<value>I seguenti pacchetti richiedono un clic per accettare la licenza:</value>
314325
</data>
@@ -318,6 +329,9 @@ L'applicazione tenterà di scaricarlo e installarlo. Sei sicuro di voler continu
318329
<data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
319330
<value>Aggiungi</value>
320331
</data>
332+
<data name="AddInManager2.OptionPanel.AutoCheckForUpdates" xml:space="preserve">
333+
<value>Ricerca aggiornamenti automaticamente</value>
334+
</data>
321335
<data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
322336
<value>Sposta Giù</value>
323337
</data>
@@ -336,6 +350,9 @@ L'applicazione tenterà di scaricarlo e installarlo. Sei sicuro di voler continu
336350
<data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
337351
<value>AddIns</value>
338352
</data>
353+
<data name="AddInManager2.OptionPanel.Tree.General" xml:space="preserve">
354+
<value>Generale</value>
355+
</data>
339356
<data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
340357
<value>Repositories</value>
341358
</data>
@@ -404,7 +421,7 @@ Smetteranno di funzionare dopo la rimozione di questo AddIn! Sei sicuro di voler
404421
<value>Aiuto in linea</value>
405422
</data>
406423
<data name="AddIns.HelpViewer.HelpModeLabel" xml:space="preserve">
407-
<value>Modalità di Aiuto</value>
424+
<value>Imposta le Preferenze di Aiuto</value>
408425
</data>
409426
<data name="AddIns.HelpViewer.HLMNotFound" xml:space="preserve">
410427
<value>Aiuto in linea non trovato. Per favore controlla che sia installato correttamente.</value>
@@ -434,7 +451,7 @@ Smetteranno di funzionare dopo la rimozione di questo AddIn! Sei sicuro di voler
434451
<value>Mostra Aiuto</value>
435452
</data>
436453
<data name="AddIns.HelpViewer.UseExternalHelp" xml:space="preserve">
437-
<value>Usa un aiuto esterno</value>
454+
<value>Visualizza l'Aiuto con un programma esterno</value>
438455
</data>
439456
<data name="AddIns.HelpViewer.UseOfflineHelpLabel" xml:space="preserve">
440457
<value>Usa l'aiuto locale</value>
@@ -3296,6 +3313,9 @@ Puoi anche scegliere di memorizzare le impostazioni in un file .user invece che
32963313
<data name="ICSharpCode.CodeCoverage.Column" xml:space="preserve">
32973314
<value>Colonna</value>
32983315
</data>
3316+
<data name="ICSharpCode.CodeCoverage.Content" xml:space="preserve">
3317+
<value>Contenuto</value>
3318+
</data>
32993319
<data name="ICSharpCode.CodeCoverage.DisplayOptions" xml:space="preserve">
33003320
<value>Visualizza Opzioni</value>
33013321
</data>

‎data/resources/StringResources.nl.resx‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,6 +1540,30 @@ Om een ActiveX/COM object te maken/manipuleren, sleep een klasse uit een type-bi
15401540
<data name="CQA.MainWindow.FormTitle" xml:space="preserve">
15411541
<value>Code kwaliteit analyse</value>
15421542
</data>
1543+
<data name="CSharpBinding.Formatting.AutoFormat" xml:space="preserve">
1544+
<value>Code automatisch formateren</value>
1545+
</data>
1546+
<data name="CSharpBinding.Formatting.DefaultOptionReference" xml:space="preserve">
1547+
<value>(verstek)</value>
1548+
</data>
1549+
<data name="CSharpBinding.Formatting.GlobalOptionReference" xml:space="preserve">
1550+
<value>(globaal)</value>
1551+
</data>
1552+
<data name="CSharpBinding.Formatting.NoPresetSelectedMessage" xml:space="preserve">
1553+
<value>Er is geen preset-formatering geselecteerd!</value>
1554+
</data>
1555+
<data name="CSharpBinding.Formatting.PresetOverwriteQuestion" xml:space="preserve">
1556+
<value>Weet u zeker dat u alle eerder gedefinieerde formatering opties wilt resetten?</value>
1557+
</data>
1558+
<data name="CSharpBinding.Formatting.ProjectOptionReference" xml:space="preserve">
1559+
<value>(project)</value>
1560+
</data>
1561+
<data name="CSharpBinding.Formatting.ResetTo" xml:space="preserve">
1562+
<value>Reset naar:</value>
1563+
</data>
1564+
<data name="CSharpBinding.Formatting.SolutionOptionReference" xml:space="preserve">
1565+
<value>(oplossing)</value>
1566+
</data>
15431567
<data name="CSharpBinding.GenerateNewHandlerInstructions" xml:space="preserve">
15441568
<value>Voeg referentie naar expliciete methode in, druk opnieuw de TAB of Enter om een nieuwe methode stub in te voegen.</value>
15451569
</data>
@@ -1981,6 +2005,15 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}?</value>
19812005
<data name="Dialog.Options.IDEOptions.CodeCompletion.SaveItemCountBeforeNumber" xml:space="preserve">
19822006
<value>Opslaan</value>
19832007
</data>
2008+
<data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLinkTarget" xml:space="preserve">
2009+
<value>Links in tooltips dienen te gaan naar</value>
2010+
</data>
2011+
<data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLinkTargetDefinition" xml:space="preserve">
2012+
<value>Definitie in code</value>
2013+
</data>
2014+
<data name="Dialog.Options.IDEOptions.CodeCompletion.TooltipLinkTargetDocumentation" xml:space="preserve">
2015+
<value>Documentatie (indien beschikbaar)</value>
2016+
</data>
19842017
<data name="Dialog.Options.IDEOptions.CodeCompletion.UseDataUsageCache" xml:space="preserve">
19852018
<value>Voorselectie recent gebruikte leden</value>
19862019
</data>
@@ -3320,9 +3353,15 @@ Er kan worden gekozen voor opslag van de instellingen in het .user bestand inpla
33203353
<data name="ICSharpCode.CodeCoverage.CodeNotCovered" xml:space="preserve">
33213354
<value>Code Dekking uit</value>
33223355
</data>
3356+
<data name="ICSharpCode.CodeCoverage.CodePartCovered" xml:space="preserve">
3357+
<value>Cpde gedeeltelijk bedekt</value>
3358+
</data>
33233359
<data name="ICSharpCode.CodeCoverage.Column" xml:space="preserve">
33243360
<value>Kolom</value>
33253361
</data>
3362+
<data name="ICSharpCode.CodeCoverage.Content" xml:space="preserve">
3363+
<value>Inhoud</value>
3364+
</data>
33263365
<data name="ICSharpCode.CodeCoverage.DisplayOptions" xml:space="preserve">
33273366
<value>Weergave opties</value>
33283367
</data>
@@ -4298,6 +4337,9 @@ Alleen letters, getallen, spatie, '.' of '_' zijn toegestaan.</value>
42984337
<data name="ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage" xml:space="preserve">
42994338
<value>De oplossing is extern gewijzigd.</value>
43004339
</data>
4340+
<data name="ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title" xml:space="preserve">
4341+
<value>Oplossing opties formateren</value>
4342+
</data>
43014343
<data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
43024344
<value>Converteer geselecteerde &amp;projecten naar</value>
43034345
</data>
@@ -6099,6 +6141,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
60996141
<data name="SharpDevelop.Refactoring.ClipboardRingCommand" xml:space="preserve">
61006142
<value>Voeg in vanaf klembord ring...</value>
61016143
</data>
6144+
<data name="SharpDevelop.Refactoring.ClipboardRingEmpty" xml:space="preserve">
6145+
<value>Klembord ring is leeg</value>
6146+
</data>
61026147
<data name="SharpDevelop.Refactoring.ConvertToAutomaticProperty" xml:space="preserve">
61036148
<value>Converteer naar automatische eigenschap</value>
61046149
</data>
@@ -6575,6 +6620,12 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze.</value>
65756620
<data name="StatusBarService.CursorStatusBarPanelText" xml:space="preserve">
65766621
<value>ln ${Line} kol ${Column} kar ${Character}</value>
65776622
</data>
6623+
<data name="StatusBarService.SelectionStatusBarPanelTextMulti" xml:space="preserve">
6624+
<value>len ${Regels} * ${Kolommen} (${Totaal})</value>
6625+
</data>
6626+
<data name="StatusBarService.SelectionStatusBarPanelTextSingle" xml:space="preserve">
6627+
<value>len $(Lengte)</value>
6628+
</data>
65786629
<data name="Templates.File.Categories.Misc" xml:space="preserve">
65796630
<value>Varia</value>
65806631
</data>

‎data/resources/StringResources.resx‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,6 +1587,30 @@ To create/manipulate a ActiveX/COM object, drag a class within a TypeLib/Control
15871587
<data name="CQA.MainWindow.FormTitle" xml:space="preserve">
15881588
<value>Code Quality Analysis</value>
15891589
</data>
1590+
<data name="CSharpBinding.Formatting.AutoFormat" xml:space="preserve">
1591+
<value>Automatically format code</value>
1592+
</data>
1593+
<data name="CSharpBinding.Formatting.DefaultOptionReference" xml:space="preserve">
1594+
<value>(default)</value>
1595+
</data>
1596+
<data name="CSharpBinding.Formatting.GlobalOptionReference" xml:space="preserve">
1597+
<value>(global)</value>
1598+
</data>
1599+
<data name="CSharpBinding.Formatting.NoPresetSelectedMessage" xml:space="preserve">
1600+
<value>No formatting preset selected!</value>
1601+
</data>
1602+
<data name="CSharpBinding.Formatting.PresetOverwriteQuestion" xml:space="preserve">
1603+
<value>Are you sure that you want to reset all previously defined formatting options?</value>
1604+
</data>
1605+
<data name="CSharpBinding.Formatting.ProjectOptionReference" xml:space="preserve">
1606+
<value>(project)</value>
1607+
</data>
1608+
<data name="CSharpBinding.Formatting.ResetTo" xml:space="preserve">
1609+
<value>Reset to:</value>
1610+
</data>
1611+
<data name="CSharpBinding.Formatting.SolutionOptionReference" xml:space="preserve">
1612+
<value>(solution)</value>
1613+
</data>
15901614
<data name="CSharpBinding.GenerateNewHandlerInstructions" xml:space="preserve">
15911615
<value>Insert reference to explicit method; press tab or enter again to insert a new method stub.</value>
15921616
</data>
@@ -2701,6 +2725,9 @@ system. I don't think that it needs translation.</comment>
27012725
<data name="Dialog.ProjectOptions.BuildOptions.VBOptionsDefaultValues" xml:space="preserve">
27022726
<value>Default values for VB Options:</value>
27032727
</data>
2728+
<data name="Dialog.ProjectOptions.CodeFormatting" xml:space="preserve">
2729+
<value>Code Formatting</value>
2730+
</data>
27042731
<data name="Dialog.ProjectOptions.Configuration" xml:space="preserve">
27052732
<value>&amp;Configuration</value>
27062733
</data>
@@ -4540,6 +4567,9 @@ If set to false, this reference specifies only a build-order dependency and does
45404567
<data name="ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage" xml:space="preserve">
45414568
<value>The solution has been changed externally.</value>
45424569
</data>
4570+
<data name="ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title" xml:space="preserve">
4571+
<value>Solution Formatting Options</value>
4572+
</data>
45434573
<data name="ICSharpCode.SharpDevelop.Project.UpgradeView.ChangeCompilerVersionLabel" xml:space="preserve">
45444574
<value>Convert selected &amp;projects to:</value>
45454575
</data>

‎samples/ComponentInspector/ComponentInspector.AddIn/Src/ShowComponentInspectorCommand.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using ICSharpCode.Core;
1010
using ICSharpCode.SharpDevelop;
1111
using ICSharpCode.SharpDevelop.Gui;
12+
using ICSharpCode.SharpDevelop.Workbench;
1213

1314
namespace ICSharpCode.ComponentInspector.AddIn
1415
{

‎src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecTestDebugger.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ICSharpCode.MachineSpecifications
2828
public class MSpecTestDebugger : TestDebuggerBase
2929
{
3030
public MSpecTestDebugger()
31-
: base(new UnitTestDebuggerService(), SD.MessageService, new MSpecUnitTestMonitor())
31+
: base(SD.Debugger, SD.MessageService, new MSpecUnitTestMonitor())
3232
{
3333
}
3434

0 commit comments

Comments
 (0)