Skip to content

Commit a80cf79

Browse files
committed
Merge branch 'next' into AnnotateCommand
2 parents 9e68b4d + 37bd1bb commit a80cf79

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,8 @@
333333
SelectionMode="Extended"
334334
ShowGroupingItemCount="True"
335335
InitialExpandedState="True"
336-
RequestBringIntoView="TestGrid_RequestBringIntoView"
337336
VirtualizingPanel.IsVirtualizingWhenGrouping="True"
338-
ScrollViewer.CanContentScroll="True"
337+
ScrollViewer.CanContentScroll="False"
339338
ScrollViewer.VerticalScrollBarVisibility="Auto"
340339
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
341340
<DataGrid.Columns>

Rubberduck.Resources/Inspections/InspectionResults.de.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
<value>Der Variable '{0}' wird kein Wert zugewiesen.</value>
184184
</data>
185185
<data name="EmptyStringLiteralInspection" xml:space="preserve">
186-
<value>vbNullString' sollte statt einem leeren String-Literal verwendet werden.</value>
186+
<value>'vbNullString' sollte statt einem leeren String-Literal verwendet werden.</value>
187187
</data>
188188
<data name="ObjectVariableNotSetInspection" xml:space="preserve">
189189
<value>Objektvariable '{0}' wird ohne das 'Set'-Schlüsselwort zugewiesen.</value>
@@ -467,4 +467,4 @@ In Memoriam, 1972-2018</value>
467467
<data name="SuperfluousAnnotationArgumentInspection" xml:space="preserve">
468468
<value>Die Annotation '{0}' erwartet weniger Argumente.</value>
469469
</data>
470-
</root>
470+
</root>

0 commit comments

Comments
 (0)