Skip to content

Commit

Permalink
Merge branch 'next' into AnnotateCommand
Browse files Browse the repository at this point in the history
  • Loading branch information
MDoerner committed Jun 6, 2020
2 parents 9e68b4d + 37bd1bb commit a80cf79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
Expand Up @@ -333,9 +333,8 @@
SelectionMode="Extended"
ShowGroupingItemCount="True"
InitialExpandedState="True"
RequestBringIntoView="TestGrid_RequestBringIntoView"
VirtualizingPanel.IsVirtualizingWhenGrouping="True"
ScrollViewer.CanContentScroll="True"
ScrollViewer.CanContentScroll="False"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
<DataGrid.Columns>
Expand Down
4 changes: 2 additions & 2 deletions Rubberduck.Resources/Inspections/InspectionResults.de.resx
Expand Up @@ -183,7 +183,7 @@
<value>Der Variable '{0}' wird kein Wert zugewiesen.</value>
</data>
<data name="EmptyStringLiteralInspection" xml:space="preserve">
<value>vbNullString' sollte statt einem leeren String-Literal verwendet werden.</value>
<value>'vbNullString' sollte statt einem leeren String-Literal verwendet werden.</value>
</data>
<data name="ObjectVariableNotSetInspection" xml:space="preserve">
<value>Objektvariable '{0}' wird ohne das 'Set'-Schlüsselwort zugewiesen.</value>
Expand Down Expand Up @@ -467,4 +467,4 @@ In Memoriam, 1972-2018</value>
<data name="SuperfluousAnnotationArgumentInspection" xml:space="preserve">
<value>Die Annotation '{0}' erwartet weniger Argumente.</value>
</data>
</root>
</root>

0 comments on commit a80cf79

Please sign in to comment.