Merge branch 'next' into revert-1848-next

Author: Hosch250

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -676,7 +676,7 @@
                                   IsCheckable="True" />
                         <MenuItem Name="SortBySelection"
                                   Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center" 
-                                  Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_BySelection}"
+                                  Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_ByCodeOrder}"
                                   IsChecked="{Binding SortBySelection, UpdateSourceTrigger=PropertyChanged}" 
                                   Command="{Binding SetSelectionSortCommand}"
                                   CommandParameter="{Binding ElementName=SortBySelection, Path=IsChecked}"

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1578,8 +1578,8 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="SortStyle_ByType" xml:space="preserve">
     <value>By type</value>
   </data>
-  <data name="SortStyle_BySelection" xml:space="preserve">
-    <value>By selection</value>
+  <data name="SortStyle_ByCodeOrder" xml:space="preserve">
+    <value>By code order</value>
   </data>
   <data name="CodeExplorer_RefreshComponent" xml:space="preserve">
     <value>Refresh component</value>