Sitelet https://github.com/icsharpcode/SharpDevelop/commit/feae14a98503a6544f06f3c9fa6f010199bc771c
Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit feae14a

Browse files
author
Dragan
committed
Merge remote-tracking branch 'upstream/master'
2 parents 19383cb + 0b974a1 commit feae14a

138 files changed

Lines changed: 2650 additions & 1359 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.

‎.tgitconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[tgit]
2+
icon = src/Main/SharpDevelop/Resources/SharpDevelop.ico

‎SharpDevelop.Tests.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ EndProject
3131
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
3232
EndProject
3333
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
34-
ProjectSection(SolutionItems) = preProject
35-
TODOnewNR.txt = TODOnewNR.txt
36-
EndProjectSection
3734
EndProject
3835
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "src\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
3936
EndProject

‎data/resources/StringResources.cz.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,12 +1652,12 @@ Chcete přidat nový soubor do projektu ${CurrentProjectName}?</value>
16521652
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
16531653
<value>Zobrazit značku EOL</value>
16541654
</data>
1655+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
1656+
<value>Zvýraznit párovou závorku</value>
1657+
</data>
16551658
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
16561659
<value>Zvýrazňovat symboly</value>
16571660
</data>
1658-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
1659-
<value>Zvýraznit párovou závorku</value>
1660-
</data>
16611661
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
16621662
<value>Ukázat vodorovné měřítko</value>
16631663
</data>

‎data/resources/StringResources.de.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,12 +2341,12 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
23412341
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23422342
<value>Markierung an Zeilen&amp;ende anzeigen</value>
23432343
</data>
2344+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2345+
<value>&amp;Passende Klammer markieren</value>
2346+
</data>
23442347
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23452348
<value>Symbole hervorheben</value>
23462349
</data>
2347-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2348-
<value>&amp;Passende Klammer markieren</value>
2349-
</data>
23502350
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23512351
<value>&amp;Horizontales Linial</value>
23522352
</data>

‎data/resources/StringResources.es-mx.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,12 +2349,12 @@ Ejemplo: "120", "MainClass", "Main.cs, 120".</value>
23492349
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23502350
<value>Mostrar marcas de &amp;párrafo</value>
23512351
</data>
2352+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2353+
<value>Resaltar &amp;corchetes</value>
2354+
</data>
23522355
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23532356
<value>Resaltar símbolos</value>
23542357
</data>
2355-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2356-
<value>Resaltar &amp;corchetes</value>
2357-
</data>
23582358
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23592359
<value>Mostrar regla &amp;horizontal</value>
23602360
</data>
@@ -5041,6 +5041,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
50415041
<data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
50425042
<value>Alternar Ajuste de Línea</value>
50435043
</data>
5044+
<data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
5045+
<value>Agregar inspección</value>
5046+
</data>
50445047
<data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
50455048
<value>Puntos de interrupción</value>
50465049
</data>

‎data/resources/StringResources.es.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,12 +2346,12 @@ Para crear/manipular un objeto ActiveX/COM, arrastre una clase de un Control/Bib
23462346
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23472347
<value>Mostrar marcas de &amp;párrafo</value>
23482348
</data>
2349+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2350+
<value>Resaltar &amp;corchetes</value>
2351+
</data>
23492352
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23502353
<value>Resaltar símbolos</value>
23512354
</data>
2352-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2353-
<value>Resaltar &amp;corchetes</value>
2354-
</data>
23552355
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23562356
<value>Mostrar regla &amp;horizontal</value>
23572357
</data>
@@ -5047,6 +5047,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
50475047
<data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
50485048
<value>Alterna el Ajuste de Línea</value>
50495049
</data>
5050+
<data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
5051+
<value>Agregar inspección</value>
5052+
</data>
50505053
<data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
50515054
<value>Puntos de interrupción</value>
50525055
</data>

‎data/resources/StringResources.fi.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,12 +1520,12 @@ Llisää tiedosto projektiin ${CurrentProjectName}?</value>
15201520
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
15211521
<value>Rivin Loppumerkit</value>
15221522
</data>
1523+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
1524+
<value>Väritä Sulut</value>
1525+
</data>
15231526
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
15241527
<value>Väritä Symboolit</value>
15251528
</data>
1526-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
1527-
<value>Väritä Sulut</value>
1528-
</data>
15291529
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
15301530
<value>Vaaka Viivotin</value>
15311531
</data>

‎data/resources/StringResources.fr.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,12 +2345,12 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}?</value>
23452345
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23462346
<value>Affich&amp;er les marqueurs de fin de ligne</value>
23472347
</data>
2348+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2349+
<value>Accolades en surbrillance</value>
2350+
</data>
23482351
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23492352
<value>Surligner symboles</value>
23502353
</data>
2351-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2352-
<value>Accolades en surbrillance</value>
2353-
</data>
23542354
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23552355
<value>Afficher la règle &amp;horizontale</value>
23562356
</data>
@@ -5036,6 +5036,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
50365036
<data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
50375037
<value>Activer Retour à la Ligne</value>
50385038
</data>
5039+
<data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
5040+
<value>Ajouter un espion</value>
5041+
</data>
50395042
<data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
50405043
<value>Points d'arrêt</value>
50415044
</data>

‎data/resources/StringResources.hu.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ Hozzáadja az új fáljt a ${CurrentProjectName} projekthez?</value>
12331233
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
12341234
<value>Sorvége &amp;jelek mutatása</value>
12351235
</data>
1236-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
1236+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
12371237
<value>Záró&amp;jelpár kiemelése</value>
12381238
</data>
12391239
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">

‎data/resources/StringResources.it.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,12 +2323,12 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}?</value>
23232323
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23242324
<value>Mostra marcatori &amp;EOL</value>
23252325
</data>
2326+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2327+
<value>Evide&amp;nzia coppie parentesi</value>
2328+
</data>
23262329
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23272330
<value>Evidenzia simboli</value>
23282331
</data>
2329-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2330-
<value>Evide&amp;nzia coppie parentesi</value>
2331-
</data>
23322332
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23332333
<value>Mostra rig&amp;hello oriz.le</value>
23342334
</data>

0 commit comments

Comments
 (0)