From d650e211aea92691f095653d56d03704a933137f Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Mar 2020 23:34:30 -0800
Subject: [PATCH 01/64] Add access keys for settings window

---
 .../UI/Settings/InspectionSettings.xaml            | 14 ++++++++++----
 Rubberduck.Core/UI/Settings/UnitTestSettings.xaml  |  8 ++++++--
 Rubberduck.Resources/RubberduckUI.Designer.cs      |  6 +++---
 Rubberduck.Resources/RubberduckUI.resx             |  6 +++---
 .../Settings/UnitTestingPage.Designer.cs           | 10 +++++-----
 Rubberduck.Resources/Settings/UnitTestingPage.resx | 10 +++++-----
 6 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
index 26fe0aa908..efe81791f7 100644
--- a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -60,12 +60,18 @@
                                 </StackPanel.Resources>
                                 <Label Content="-" />
                                 <Image Source="{StaticResource FilterImage}" Width="19" />
-                                <Label Content="{Resx Key=InspectionSettings_FilterByDescription, ResxName=Rubberduck.Resources.RubberduckUI}" />
-                                <controls:SearchBox Width="100"
+                                <Label Target="{Binding ElementName=searchBox}"
+                                       Content="{Resx Key=InspectionSettings_FilterByDescription, ResxName=Rubberduck.Resources.RubberduckUI}" />
+                                <controls:SearchBox x:Name="searchBox"
+                                                    Width="100"
                                                     Text="{Binding InspectionSettingsDescriptionFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="26" />
                                 <Border Width="10" />
-                                <Label Content="{Resx Key=InspectionSettings_FilterBySeverity, ResxName=Rubberduck.Resources.RubberduckUI}" />
-                                <ComboBox Width="100"
+
+                                <Label Target="{Binding ElementName=severity}"
+                                       Content="{Resx Key=InspectionSettings_FilterBySeverity, ResxName=Rubberduck.Resources.RubberduckUI}" />
+                                <ComboBox x:Name="severity"
+                                          Width="100"
+                                          VerticalContentAlignment="Center"
                                           ItemsSource="{Binding SeverityFilters, UpdateSourceTrigger=PropertyChanged}"
                                           SelectedItem="{Binding SelectedSeverityFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                             </StackPanel>
diff --git a/Rubberduck.Core/UI/Settings/UnitTestSettings.xaml b/Rubberduck.Core/UI/Settings/UnitTestSettings.xaml
index 95383ae69c..bc5a00b542 100644
--- a/Rubberduck.Core/UI/Settings/UnitTestSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/UnitTestSettings.xaml
@@ -78,16 +78,20 @@
                 </DockPanel>
             </Label>
             <Label Content="{Resx ResxName=Rubberduck.Resources.Settings.UnitTestingPage, Key=UnitTestSettings_BindingMode}"
+                   Target="{Binding ElementName=bindingMode}"
                    FontWeight="SemiBold" />
-            <ComboBox Margin="5,0,0,5"
+            <ComboBox x:Name="bindingMode"
+                      Margin="5,0,0,5"
                       Width="210"
                       HorizontalAlignment="Left"
                       ItemsSource="{Binding Source={StaticResource BindingMode}, Converter={StaticResource BindingModeToText}, UpdateSourceTrigger=PropertyChanged}"
                       SelectedItem="{Binding BindingMode, Converter={StaticResource BindingModeValueToText}}" />
 
             <Label Content="{Resx ResxName=Rubberduck.Resources.Settings.UnitTestingPage, Key=UnitTestSettings_AssertMode}"
+                   Target="{Binding ElementName=typeSafety}"
                    FontWeight="SemiBold" />
-            <ComboBox Margin="5,0,0,5"
+            <ComboBox x:Name="typeSafety"
+                      Margin="5,0,0,5"
                       Width="210"
                       HorizontalAlignment="Left"
                       ItemsSource="{Binding Source={StaticResource AssertMode}, Converter={StaticResource AssertModeToText}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index e9dde5383b..5081b8c03e 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -525,7 +525,7 @@ public static string CodeInspectionSettings_Misc {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Run inspections automatically on successful parse.
+        ///   Looks up a localized string similar to _Run inspections automatically on successful parse.
         /// </summary>
         public static string CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse {
             get {
@@ -2410,7 +2410,7 @@ public static string InspectionResults_FilterByWarning {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Description:.
+        ///   Looks up a localized string similar to _Description:.
         /// </summary>
         public static string InspectionSettings_FilterByDescription {
             get {
@@ -2419,7 +2419,7 @@ public static string InspectionSettings_FilterByDescription {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Severity:.
+        ///   Looks up a localized string similar to _Severity:.
         /// </summary>
         public static string InspectionSettings_FilterBySeverity {
             get {
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 5c86158903..0105fa7fd1 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -950,7 +950,7 @@ Do you want to proceed with this rename?</value>
     <value>Miscellaneous</value>
   </data>
   <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Run inspections automatically on successful parse</value>
+    <value>_Run inspections automatically on successful parse</value>
   </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
     <value>Show splash screen at startup</value>
@@ -1184,7 +1184,7 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>Compile On Demand currently enabled</value>
   </data>
   <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Description:</value>
+    <value>_Description:</value>
   </data>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Busy</value>
@@ -1254,7 +1254,7 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>Ignore empty lines when locating first comment and declaration blocks</value>
   </data>
   <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Severity:</value>
+    <value>_Severity:</value>
   </data>
   <data name="Language_CS" xml:space="preserve">
     <value>Czech</value>
diff --git a/Rubberduck.Resources/Settings/UnitTestingPage.Designer.cs b/Rubberduck.Resources/Settings/UnitTestingPage.Designer.cs
index 70c97a500f..3553c3aa56 100644
--- a/Rubberduck.Resources/Settings/UnitTestingPage.Designer.cs
+++ b/Rubberduck.Resources/Settings/UnitTestingPage.Designer.cs
@@ -79,7 +79,7 @@ public static string PageInstructions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type safety:.
+        ///   Looks up a localized string similar to _Type safety:.
         /// </summary>
         public static string UnitTestSettings_AssertMode {
             get {
@@ -88,7 +88,7 @@ public static string UnitTestSettings_AssertMode {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Binding mode:.
+        ///   Looks up a localized string similar to _Binding mode:.
         /// </summary>
         public static string UnitTestSettings_BindingMode {
             get {
@@ -115,7 +115,7 @@ public static string UnitTestSettings_EarlyBinding {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Test method initialization/cleanup.
+        ///   Looks up a localized string similar to Test m_ethod initialization/cleanup.
         /// </summary>
         public static string UnitTestSettings_IncludeTestMethodInitCleanupPrompt {
             get {
@@ -124,7 +124,7 @@ public static string UnitTestSettings_IncludeTestMethodInitCleanupPrompt {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Insert test method stub.
+        ///   Looks up a localized string similar to _Insert test method stub.
         /// </summary>
         public static string UnitTestSettings_IncludeTestMethodStubWhenCreatingModulePrompt {
             get {
@@ -133,7 +133,7 @@ public static string UnitTestSettings_IncludeTestMethodStubWhenCreatingModulePro
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Test module initialization/cleanup.
+        ///   Looks up a localized string similar to Test m_odule initialization/cleanup.
         /// </summary>
         public static string UnitTestSettings_IncludeTestModuleInitCleanupPrompt {
             get {
diff --git a/Rubberduck.Resources/Settings/UnitTestingPage.resx b/Rubberduck.Resources/Settings/UnitTestingPage.resx
index d5a3854a83..fea53e2974 100644
--- a/Rubberduck.Resources/Settings/UnitTestingPage.resx
+++ b/Rubberduck.Resources/Settings/UnitTestingPage.resx
@@ -124,10 +124,10 @@
     <value>Configure the settings for new unit test modules and methods.</value>
   </data>
   <data name="UnitTestSettings_AssertMode" xml:space="preserve">
-    <value>Type safety:</value>
+    <value>_Type safety:</value>
   </data>
   <data name="UnitTestSettings_BindingMode" xml:space="preserve">
-    <value>Binding mode:</value>
+    <value>_Binding mode:</value>
   </data>
   <data name="UnitTestSettings_DualBinding" xml:space="preserve">
     <value>Dual binding</value>
@@ -136,13 +136,13 @@
     <value>Early binding</value>
   </data>
   <data name="UnitTestSettings_IncludeTestMethodInitCleanupPrompt" xml:space="preserve">
-    <value>Test method initialization/cleanup</value>
+    <value>Test m_ethod initialization/cleanup</value>
   </data>
   <data name="UnitTestSettings_IncludeTestMethodStubWhenCreatingModulePrompt" xml:space="preserve">
-    <value>Insert test method stub</value>
+    <value>_Insert test method stub</value>
   </data>
   <data name="UnitTestSettings_IncludeTestModuleInitCleanupPrompt" xml:space="preserve">
-    <value>Test module initialization/cleanup</value>
+    <value>Test m_odule initialization/cleanup</value>
   </data>
   <data name="UnitTestSettings_LateBinding" xml:space="preserve">
     <value>Late binding</value>

From ee606280b84f4955cc2e53dc7c8ba7333a1e24f5 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 8 Jul 2020 10:27:25 -0700
Subject: [PATCH 02/64] Add General settings access keys

---
 Rubberduck.Core/UI/Settings/GeneralSettings.xaml | 12 ++++++++----
 Rubberduck.Resources/RubberduckUI.Designer.cs    | 16 ++++++++--------
 Rubberduck.Resources/RubberduckUI.resx           | 14 +++++++-------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
index 8d28085040..6ecc0414e4 100644
--- a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
@@ -72,8 +72,10 @@
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>
                         </DockPanel>
                     </Label>
-                    <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_LanguageLabel}" FontWeight="SemiBold" />
-                    <ComboBox Width="210"
+                    <Label Target="{Binding ElementName=displayLanguage}"
+                           Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_LanguageLabel}" FontWeight="SemiBold" />
+                    <ComboBox x:Name="displayLanguage"
+                              Width="210"
                               HorizontalAlignment="Left"
                               Margin="5"
                               SelectedItem="{Binding SelectedLanguage, Mode=TwoWay}"
@@ -96,9 +98,11 @@
                               IsEnabled="{Binding SetDpiUnawareEnabled}"  IsChecked="{Binding SetDpiUnaware}" />
                     <StackPanel Orientation="Horizontal"/>
 
-                    <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_MinimumLogLevelLabel}" FontWeight="SemiBold" />
+                    <Label Target="{Binding ElementName=minimumLogLevel}"
+                           Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_MinimumLogLevelLabel}" FontWeight="SemiBold" Margin="1,0,-1,0" />
                     <StackPanel Orientation="Horizontal">
-                        <ComboBox Width="210"
+                        <ComboBox x:Name="minimumLogLevel"
+                                  Width="210"
                                   HorizontalAlignment="Left"
                                   Margin="5"
                                   SelectedItem="{Binding SelectedLogLevel, Mode=TwoWay}"
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 5081b8c03e..74f0b48fdc 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class RubberduckUI {
@@ -1565,7 +1565,7 @@ public static string Fix {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Check if a newer version is available at startup.
+        ///   Looks up a localized string similar to Check if a newer _version is available at startup.
         /// </summary>
         public static string GeneralSettings_CheckVersion {
             get {
@@ -1574,7 +1574,7 @@ public static string GeneralSettings_CheckVersion {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compile code before parsing.
+        ///   Looks up a localized string similar to _Compile code before parsing.
         /// </summary>
         public static string GeneralSettings_CompileBeforeParse {
             get {
@@ -1747,7 +1747,7 @@ public static string GeneralSettings_HotkeysLabel {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Tell me if a newer pre-release build is available.
+        ///   Looks up a localized string similar to Tell me if a newer _pre-release build is available.
         /// </summary>
         public static string GeneralSettings_IncludePreRelease {
             get {
@@ -1765,7 +1765,7 @@ public static string GeneralSettings_InfoLogLevel {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Display language:.
+        ///   Looks up a localized string similar to Display l_anguage:.
         /// </summary>
         public static string GeneralSettings_LanguageLabel {
             get {
@@ -1774,7 +1774,7 @@ public static string GeneralSettings_LanguageLabel {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Minimum Log Level:.
+        ///   Looks up a localized string similar to Minimum _Log Level:.
         /// </summary>
         public static string GeneralSettings_MinimumLogLevelLabel {
             get {
@@ -1810,7 +1810,7 @@ public static string GeneralSettings_PeriodDelimiter {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Correction for high-resolution display scalings.
+        ///   Looks up a localized string similar to Correction for high-resolution _display scalings.
         /// </summary>
         public static string GeneralSettings_SetDpiUnaware {
             get {
@@ -1828,7 +1828,7 @@ public static string GeneralSettings_ShowLogFolder {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show splash screen at startup.
+        ///   Looks up a localized string similar to Show _splash screen at startup.
         /// </summary>
         public static string GeneralSettings_ShowSplash {
             get {
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 0105fa7fd1..1f48e0f0ad 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -376,7 +376,7 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
     <value>Result</value>
   </data>
   <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Display language:</value>
+    <value>Display l_anguage:</value>
   </data>
   <data name="Language_EN" xml:space="preserve">
     <value>English</value>
@@ -881,7 +881,7 @@ Do you want to proceed with this rename?</value>
     <value>Parser Errors</value>
   </data>
   <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Minimum Log Level:</value>
+    <value>Minimum _Log Level:</value>
   </data>
   <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
     <value>Debug</value>
@@ -953,7 +953,7 @@ Do you want to proceed with this rename?</value>
     <value>_Run inspections automatically on successful parse</value>
   </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Show splash screen at startup</value>
+    <value>Show _splash screen at startup</value>
   </data>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Toolwindows were not correctly destroyed and/or could not be recreated; the VBE may not be in a stable state. Rubberduck will load normally next time the VBE is initialized.</value>
@@ -1055,7 +1055,7 @@ This dialog is showing because version checks are enabled. You can turn off this
     <comment>{0}=local; {1}=latest; {2}=buildtype (release/pre-release)</comment>
   </data>
   <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Check if a newer version is available at startup</value>
+    <value>Check if a newer _version is available at startup</value>
   </data>
   <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
     <value>'{0}' is already accessible to this scope.</value>
@@ -1161,7 +1161,7 @@ This dialog is showing because version checks are enabled. You can turn off this
     <value>Unable to compile for parsing</value>
   </data>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Compile code before parsing</value>
+    <value>_Compile code before parsing</value>
   </data>
   <data name="ParserState_Started" xml:space="preserve">
     <value>Started</value>
@@ -1378,7 +1378,7 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>TODO Explorer</value>
   </data>
   <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Correction for high-resolution display scalings</value>
+    <value>Correction for high-resolution _display scalings</value>
   </data>
   <data name="References_BrowseFilterAccess" xml:space="preserve">
     <value>Microsoft Access Databases({0})|{0}</value>
@@ -1658,7 +1658,7 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>Unable to suspend the Parser to perform the refactoring operation</value>
   </data>
   <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>Tell me if a newer pre-release build is available</value>
+    <value>Tell me if a newer _pre-release build is available</value>
   </data>
   <data name="VersionCheck_BuildType_PreRelease" xml:space="preserve">
     <value>pre-release</value>

From e37cc4b25ed58a60c592f8ee78b98ff2dc300048 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 8 Jul 2020 10:41:38 -0700
Subject: [PATCH 03/64] Add Autocompletion access keys

---
 .../UI/Settings/AutoCompleteSettings.xaml            | 11 ++++++-----
 .../Settings/AutoCompletesPage.Designer.cs           | 12 ++++++------
 Rubberduck.Resources/Settings/AutoCompletesPage.resx | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml b/Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml
index d5d5f6b5dd..18fa9f3f3f 100644
--- a/Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml
@@ -55,9 +55,8 @@
                         </StackPanel>
                     </DockPanel>
                 </Label>
-                <CheckBox Margin="10,0" VerticalContentAlignment="Center" IsChecked="{Binding IsEnabled}">
-                    <Label Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=EnableAutocompleteLabel}"/>
-                </CheckBox>
+                <CheckBox Margin="10,0" VerticalContentAlignment="Center" IsChecked="{Binding IsEnabled}"
+                          Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=EnableAutocompleteLabel}" />
 
                 <Label Margin="10" 
                        Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=SelfClosingPairs}"
@@ -79,9 +78,11 @@
                           IsChecked="{Binding ConcatVbNewLine}" 
                           Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=ConcatVbNewLine}" />
 
-                <Label Margin="15,0,15,0" Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=MaxConcatLines}" />
+                <Label Target="{Binding ElementName=maximumLines}"
+                       Margin="15,0,15,0" Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=MaxConcatLines}" />
                 <StackPanel Orientation="Horizontal" Margin="15,0,15,0">
-                    <TextBox Margin="5,5,0,5" Height="24" Width="50" Text="{Binding ConcatMaxLines, Mode=TwoWay, StringFormat=\{0:D\}, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" VerticalAlignment="Top" VerticalContentAlignment="Center" />
+                    <TextBox x:Name="maximumLines"
+                             Margin="5,5,0,5" Height="24" Width="50" Text="{Binding ConcatMaxLines, Mode=TwoWay, StringFormat=\{0:D\}, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" VerticalAlignment="Top" VerticalContentAlignment="Center" />
                     <StackPanel Margin="0,5" >
                         <Button Height="12" Width="20" Command="{Binding IncrementMaxConcatLinesCommand}">
                             <TextBlock Text="▲" FontSize="10" Margin="0,-4,0,0"/>
diff --git a/Rubberduck.Resources/Settings/AutoCompletesPage.Designer.cs b/Rubberduck.Resources/Settings/AutoCompletesPage.Designer.cs
index a8f65bafa8..9ad78a75f1 100644
--- a/Rubberduck.Resources/Settings/AutoCompletesPage.Designer.cs
+++ b/Rubberduck.Resources/Settings/AutoCompletesPage.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.Settings {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class AutoCompletesPage {
@@ -88,7 +88,7 @@ public static string CompleteBlockOnTab {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Concatenate &apos;vbNewLine&apos; on Ctrl+Enter.
+        ///   Looks up a localized string similar to Concatenate &apos;vb_NewLine&apos; on Ctrl+Enter.
         /// </summary>
         public static string ConcatVbNewLine {
             get {
@@ -97,7 +97,7 @@ public static string ConcatVbNewLine {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enable autocompletion features.
+        ///   Looks up a localized string similar to Enable _autocompletion features.
         /// </summary>
         public static string EnableAutocompleteLabel {
             get {
@@ -115,7 +115,7 @@ public static string EnableBlockCompletion {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enable self-closing pairs.
+        ///   Looks up a localized string similar to Enable _self-closing pairs.
         /// </summary>
         public static string EnableSelfClosingPairs {
             get {
@@ -124,7 +124,7 @@ public static string EnableSelfClosingPairs {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enable smart-concatenation.
+        ///   Looks up a localized string similar to Enable smart-_concatenation.
         /// </summary>
         public static string EnableSmartConcat {
             get {
@@ -133,7 +133,7 @@ public static string EnableSmartConcat {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Maximum Lines.
+        ///   Looks up a localized string similar to Maximum _Lines.
         /// </summary>
         public static string MaxConcatLines {
             get {
diff --git a/Rubberduck.Resources/Settings/AutoCompletesPage.resx b/Rubberduck.Resources/Settings/AutoCompletesPage.resx
index 99945c6bc7..196396d437 100644
--- a/Rubberduck.Resources/Settings/AutoCompletesPage.resx
+++ b/Rubberduck.Resources/Settings/AutoCompletesPage.resx
@@ -133,19 +133,19 @@
     <value>Block Completion</value>
   </data>
   <data name="ConcatVbNewLine" xml:space="preserve">
-    <value>Concatenate 'vbNewLine' on Ctrl+Enter</value>
+    <value>Concatenate 'vb_NewLine' on Ctrl+Enter</value>
   </data>
   <data name="EnableAutocompleteLabel" xml:space="preserve">
-    <value>Enable autocompletion features</value>
+    <value>Enable _autocompletion features</value>
   </data>
   <data name="EnableBlockCompletion" xml:space="preserve">
     <value>Enable block completion</value>
   </data>
   <data name="EnableSelfClosingPairs" xml:space="preserve">
-    <value>Enable self-closing pairs</value>
+    <value>Enable _self-closing pairs</value>
   </data>
   <data name="EnableSmartConcat" xml:space="preserve">
-    <value>Enable smart-concatenation</value>
+    <value>Enable smart-_concatenation</value>
   </data>
   <data name="SelfClosingPairs" xml:space="preserve">
     <value>Self-Closing Pairs</value>
@@ -154,6 +154,6 @@
     <value>Smart-Concatenation</value>
   </data>
   <data name="MaxConcatLines" xml:space="preserve">
-    <value>Maximum Lines</value>
+    <value>Maximum _Lines</value>
   </data>
 </root>
\ No newline at end of file

From 8b4881ffe367674c47873439568269c2f3838419 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 8 Jul 2020 11:02:58 -0700
Subject: [PATCH 04/64] Add Window settings access keys

Separate keys were added for those that were using the `caption` version
because the _ (underscore) access key indicator was showing.
---
 Rubberduck.Core/UI/Settings/WindowSettings.xaml       |  6 +++---
 .../CodeExplorer/CodeExplorerUI.Designer.cs           | 11 ++++++++++-
 Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx |  3 +++
 Rubberduck.Resources/RubberduckUI.Designer.cs         | 11 ++++++++++-
 Rubberduck.Resources/RubberduckUI.resx                |  5 ++++-
 .../UnitTesting/TestExplorer.Designer.cs              | 11 ++++++++++-
 Rubberduck.Resources/UnitTesting/TestExplorer.resx    |  3 +++
 7 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/WindowSettings.xaml b/Rubberduck.Core/UI/Settings/WindowSettings.xaml
index 409f487650..cd142eb82e 100644
--- a/Rubberduck.Core/UI/Settings/WindowSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/WindowSettings.xaml
@@ -40,7 +40,7 @@
             </Label>
             <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=WindowSettings_StartupVisibilityHeader}"
                    FontWeight="SemiBold" />
-            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorerDockablePresenter_Caption}"
+            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorerWindowSettings_AccessKey}"
                       IsChecked="{Binding CodeExplorerVisibleOnStartup, Mode=TwoWay}"
                       Margin="5,0,0,5"
                       HorizontalAlignment="Left" />
@@ -48,11 +48,11 @@
                       IsChecked="{Binding CodeInspectionsVisibleOnStartup, Mode=TwoWay}"
                       Margin="5,0,0,5"
                       HorizontalAlignment="Left" />
-            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorerWindow_Caption}"
+            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorerWindow_AccessKey}"
                       IsChecked="{Binding TestExplorerVisibleOnStartup, Mode=TwoWay}"
                       Margin="5,0,0,5"
                       HorizontalAlignment="Left" />
-            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TodoExplorer_Caption}"
+            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TodoExplorer_AccessKey}"
                       IsChecked="{Binding TodoExplorerVisibleOnStartup, Mode=TwoWay}"
                       Margin="5,0,0,5"
                       HorizontalAlignment="Left" />
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
index 361bfadbe3..e92b0c1489 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.CodeExplorer {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class CodeExplorerUI {
@@ -623,6 +623,15 @@ public static string CodeExplorerDockablePresenter_ParseStarted {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Code _Explorer.
+        /// </summary>
+        public static string CodeExplorerWindowSettings_AccessKey {
+            get {
+                return ResourceManager.GetString("CodeExplorerWindowSettings_AccessKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Confirm Delete.
         /// </summary>
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx
index 1186616073..cadf8b6370 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx
@@ -455,4 +455,7 @@ Continue?</value>
   <data name="ReplaceFromFiles" xml:space="preserve">
     <value>Replace Contents from Files...</value>
   </data>
+  <data name="CodeExplorerWindowSettings_AccessKey" xml:space="preserve">
+    <value>Code _Explorer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 74f0b48fdc..0f07ea2420 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -370,7 +370,7 @@ public static string CodeInspectionResults_Type {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Code Inspections.
+        ///   Looks up a localized string similar to Code _Inspections.
         /// </summary>
         public static string CodeInspections {
             get {
@@ -4485,6 +4485,15 @@ public static System.Drawing.Bitmap tick_circle_pinned {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to To_do Explorer.
+        /// </summary>
+        public static string TodoExplorer_AccessKey {
+            get {
+                return ResourceManager.GetString("TodoExplorer_AccessKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Todo Explorer.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 1f48e0f0ad..a0a5447bbe 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -312,7 +312,7 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
     <value>Implementations of '{0}'</value>
   </data>
   <data name="CodeInspections" xml:space="preserve">
-    <value>Code Inspections</value>
+    <value>Code _Inspections</value>
   </data>
   <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
     <value>{0} ({1} issue)</value>
@@ -1779,4 +1779,7 @@ Import aborted.</value>
   <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
     <value>Wrap Fields in Private Type</value>
   </data>
+  <data name="TodoExplorer_AccessKey" xml:space="preserve">
+    <value>To_do Explorer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs b/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
index cfb2a476dd..717176d835 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.UnitTesting {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class TestExplorer {
@@ -411,6 +411,15 @@ public static string TestExplorerDockablePresenter_MultipleTestsSameNameError {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Test Explorer.
+        /// </summary>
+        public static string TestExplorerWindow_AccessKey {
+            get {
+                return ResourceManager.GetString("TestExplorerWindow_AccessKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test Explorer.
         /// </summary>
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.resx
index 07acee92df..1340b7be7d 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.resx
@@ -363,4 +363,7 @@
   <data name="TestExplorer_ContextMenuIgnoreSelectedTests" xml:space="preserve">
     <value>Ignore selected tests</value>
   </data>
+  <data name="TestExplorerWindow_AccessKey" xml:space="preserve">
+    <value>_Test Explorer</value>
+  </data>
 </root>
\ No newline at end of file

From ee06eb3f3ea0bb6a6a9fd43d65fa42ee5995b97a Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 8 Jul 2020 17:01:00 -0700
Subject: [PATCH 05/64] Update InspectionSettings access keys

---
 Rubberduck.Core/UI/Settings/InspectionSettings.xaml | 2 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs       | 2 +-
 Rubberduck.Resources/RubberduckUI.resx              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
index 94cfaa4158..3dcf2c50d6 100644
--- a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -61,7 +61,7 @@
                                 </StackPanel.Resources>
                                 <Label Content="-" />
                                 <Image Source="{StaticResource FilterImage}" Width="19" />
-                                <Label Target="{Binding ElementName=searchBox}"
+                                <Label Target="{Binding ElementName=searchBox, Path=ValueContainer}"
                                        Content="{Resx Key=InspectionSettings_FilterByDescription, ResxName=Rubberduck.Resources.RubberduckUI}" />
                                 <controls:SearchBox x:Name="searchBox"
                                                     Width="100"
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 5e5f80fb09..c32604f5d9 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1875,7 +1875,7 @@ public static string GeneralSettings_DebugLogLevel {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enable drag and drop in Code Explorer.
+        ///   Looks up a localized string similar to Enable dr_ag and drop in Code Explorer.
         /// </summary>
         public static string GeneralSettings_EnableDragAndDrop {
             get {
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 8516ab3408..4e66c9ecd0 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1925,7 +1925,7 @@ Do you want to proceed?</value>
   </data>
   <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
     <value>Several folders with the same name are being moved. This will merge them.
-Do you want to proceed?</value>    
+Do you want to proceed?</value>
   </data>
   <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
     <value>A folder name cannot be empty.</value>
@@ -1954,7 +1954,7 @@ Do you want to proceed?</value>
     <value>Rename folder</value>
   </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Enable drag and drop in Code Explorer</value>
+    <value>Enable dr_ag and drop in Code Explorer</value>
   </data>
   <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
     <value>Add/Adjust attribute</value>

From f1a9e7ad1c3370d2bde8d182f05fd7630e41d715 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 9 Jul 2020 10:41:03 -0700
Subject: [PATCH 06/64] Resolve Usercontrol access key binding

---
 Rubberduck.Core/UI/Controls/SearchBox.xaml.cs       | 3 +++
 Rubberduck.Core/UI/Settings/InspectionSettings.xaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Rubberduck.Core/UI/Controls/SearchBox.xaml.cs b/Rubberduck.Core/UI/Controls/SearchBox.xaml.cs
index c212dd925c..d158e8db04 100644
--- a/Rubberduck.Core/UI/Controls/SearchBox.xaml.cs
+++ b/Rubberduck.Core/UI/Controls/SearchBox.xaml.cs
@@ -56,6 +56,8 @@ public string Hint
 
         public ICommand ClearSearchCommand => new DelegateCommand(LogManager.GetCurrentClassLogger(), (arg) => Text = string.Empty);
 
+        public TextBox ValueContainerInput { get; }
+
         public SearchBox()
         {
             // design instance!
@@ -66,6 +68,7 @@ public SearchBox()
             Background = SystemColors.WindowBrush;
             // not so much design instance
             InitializeComponent();
+            ValueContainerInput = ValueContainer;
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
index 3dcf2c50d6..8929c129c4 100644
--- a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -61,7 +61,7 @@
                                 </StackPanel.Resources>
                                 <Label Content="-" />
                                 <Image Source="{StaticResource FilterImage}" Width="19" />
-                                <Label Target="{Binding ElementName=searchBox, Path=ValueContainer}"
+                                <Label Target="{Binding ElementName=searchBox, Path=ValueContainerInput}"
                                        Content="{Resx Key=InspectionSettings_FilterByDescription, ResxName=Rubberduck.Resources.RubberduckUI}" />
                                 <controls:SearchBox x:Name="searchBox"
                                                     Width="100"

From ae535f99e58943ba3ab5c64971408132d59f3b50 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 12:47:50 -0700
Subject: [PATCH 07/64] Migrate AnnotateDeclarationDialog_ to new resx

---
 .../AnnotateDeclarationView.xaml              |  20 +--
 .../RefactoringsUI.cs.resx                    | 153 ++++++++++++++++++
 .../RefactoringsUI.de.resx                    | 153 ++++++++++++++++++
 .../RefactoringsUI.es.resx                    | 153 ++++++++++++++++++
 .../RefactoringsUI.fr.resx                    | 153 ++++++++++++++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 133 +++++++++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs |  99 ------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  33 ----
 Rubberduck.Resources/RubberduckUI.de.resx     |  33 ----
 Rubberduck.Resources/RubberduckUI.es.resx     |  33 ----
 Rubberduck.Resources/RubberduckUI.fr.resx     |  33 ----
 Rubberduck.Resources/RubberduckUI.resx        |  33 ----
 12 files changed, 755 insertions(+), 274 deletions(-)
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.cs.resx
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.de.resx
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.es.resx
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.fr.resx
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.resx

diff --git a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml
index bcc02d4d14..5a0cac817c 100644
--- a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml
@@ -86,13 +86,13 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_TitleText}" FontWeight="Bold"/>
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_Instructions}" Margin="5,0,0,10" TextWrapping="Wrap" />
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_TitleText}" FontWeight="Bold"/>
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_Instructions}" Margin="5,0,0,10" TextWrapping="Wrap" />
         </StackPanel>
         <StackPanel Grid.Row="1">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_DeclarationLabel}" FontWeight="DemiBold" />
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_DeclarationLabel}" FontWeight="DemiBold" />
             <TextBlock Text="{Binding Model.Target, Converter={StaticResource DeclarationToQualifiedNameConverter}}" Margin="5,0,0,5" FontWeight="Regular" />
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_AnnotationLabel}" FontWeight="DemiBold" />
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_AnnotationLabel}" FontWeight="DemiBold" />
             <ComboBox ItemsSource="{Binding ApplicableAnnotations}"
                       SelectedItem="{Binding Annotation}"
                       IsSynchronizedWithCurrentItem="True"
@@ -103,7 +103,7 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_AdjustAttributeLabel}"
+            <CheckBox Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_AdjustAttributeLabel}"
                       IsChecked="{Binding AdjustAttribute}"
                       Visibility="{Binding ShowAdjustAttributeOption, Converter={StaticResource AdjustAttributeVisibilityConverter}}"
                       Margin="10,0,10,-5"
@@ -119,17 +119,17 @@
                 <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
             <Label Grid.Column="0" 
-                   Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentsLabel}" 
+                   Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_ArgumentsLabel}" 
                    FontWeight="DemiBold" 
                    Margin="5,5,0,0" />
             <StackPanel Grid.Column="1" 
                         Orientation="Horizontal">
-                <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_AddArgumentButtonLabel}"
+                <Button Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_AddArgumentButtonLabel}"
                         Height="20"
                         Margin="5,2.5"
                         Padding="10,0"
                         Command="{Binding AddAnnotationArgument}"/>
-                <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_RemoveArgumentButtonLabel}"
+                <Button Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_RemoveArgumentButtonLabel}"
                         Height="20"
                         Margin="5,2.5"
                         Padding="10,0"
@@ -143,11 +143,11 @@
                   VerticalScrollBarVisibility="Auto"
                   Margin="5,0,5,5">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentTypeHeader}"
+                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_ArgumentTypeHeader}"
                                         CellTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
                                         CellEditingTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
                                         Width="Auto"/>
-                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentValueHeader}"
+                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_ArgumentValueHeader}"
                                         CellTemplate="{StaticResource ArgumentValueTemplate}"
                                         CellEditingTemplate="{StaticResource ArgumentValueTemplate}"
                                         Width="*"/>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
new file mode 100644
index 0000000000..e6bcb20166
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
+    <value>Přidat Anotaci:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
+    <value>Přidat</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
+    <value>Přidat/Upravit atribut</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
+    <value>Argumenty Anotace:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
+    <value>Typ</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
+    <value>Hodnota</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Anotace Deklarace</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
+    <value>Deklarace k Anotaci:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
+    <value>Vyberte anotaci (a hodnoty) pro přidání deklaraci.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
+    <value>Odstranit</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
+    <value>Deklarace Anotace</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
new file mode 100644
index 0000000000..b212140e66
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
+    <value>Hinzuzufügende Annotation:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
+    <value>Hinzufügen</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
+    <value>Attribut hinzufügen / anpassen</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
+    <value>Annotationsarguments:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
+    <value>Typ</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
+    <value>Wert</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Annotation hinzufügen</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
+    <value>Deklaration, zu welcher eine Annotation hinzugefügt werden soll:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
+    <value>Wählen Sie eine Annotation (und Werte), die zu der Deklaration hinzugefügt werden soll.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
+    <value>Entfernen</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
+    <value>Annotation hinzufügen</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
new file mode 100644
index 0000000000..7a93acd0e7
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
+    <value>Anotación a Agregar:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
+    <value>Agregar</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
+    <value>Agregar/Modificar atributo</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
+    <value>Argumentos de la anotación:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
+    <value>Tipo</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
+    <value>Valor</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Anotar Declaración</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
+    <value>Declaración a Anotar:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
+    <value>Seleccione una anotación (y valores) para agregar a la declaración.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
+    <value>Eliminar</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
+    <value>Anotar Declaración</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
new file mode 100644
index 0000000000..f71d6b8535
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
+    <value>Annotation à ajouter:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
+    <value>Ajouter</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
+    <value>Ajouter/Ajuster l'Attribut</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
+    <value>Arguments de l'annotation:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
+    <value>Valeur</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Annoter la Déclaration</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
+    <value>Déclaration:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
+    <value>Sélectionner une annotation et les valeurs associées.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
+    <value>Annoter la déclaration</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
new file mode 100644
index 0000000000..7cfa645141
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
+    <value>Add/Adjust attribute</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
+    <value>Annotation Arguments:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
+    <value>Value</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Annotate Declaration</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
+    <value>Declaration to Annotate:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
+    <value>Select an annotation (and values) to add to the declaration.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
+    <value>Annotate Declaration</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
+    <value>Annotation to Add:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ae232e690d..77fd5dab70 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -153,105 +153,6 @@ public static string AllReferences_PerformanceWarning {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Add.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_AddArgumentButtonLabel {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_AddArgumentButtonLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Add/Adjust attribute.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_AdjustAttributeLabel {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_AdjustAttributeLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation to Add:.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_AnnotationLabel {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_AnnotationLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation Arguments:.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_ArgumentsLabel {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_ArgumentsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_ArgumentTypeHeader {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_ArgumentTypeHeader", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Value.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_ArgumentValueHeader {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_ArgumentValueHeader", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Annotate Declaration.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_Caption {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Declaration to Annotate:.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_DeclarationLabel {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_DeclarationLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Select an annotation (and values) to add to the declaration..
-        /// </summary>
-        public static string AnnotateDeclarationDialog_Instructions {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_Instructions", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_RemoveArgumentButtonLabel {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_RemoveArgumentButtonLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotate Declaration.
-        /// </summary>
-        public static string AnnotateDeclarationDialog_TitleText {
-            get {
-                return ResourceManager.GetString("AnnotateDeclarationDialog_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Annotation arguments of type &apos;Attribute Name&apos; have to start with &apos;VB_&apos;..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a605648f57..38130e0265 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1542,21 +1542,12 @@ Import přerušen.</value>
   <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
     <value>Jméno složky nemůže být prázdné.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
-    <value>Přidat</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
-    <value>Přidat/Upravit atribut</value>
-  </data>
   <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
     <value>Atribut</value>
   </data>
   <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
     <value>Boolean</value>
   </data>
-  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
-    <value>Deklarace Anotace</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
     <value>Argumenty anotace mohou obsahovat pouze jeden řádek.</value>
   </data>
@@ -1584,18 +1575,9 @@ Import přerušen.</value>
   <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
     <value>Argumenty anotace typu 'Number' musejí být validní číslo ve formátu integer nebo float.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
-    <value>Argumenty Anotace:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
-    <value>Přidat Anotaci:</value>
-  </data>
   <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
     <value>Vytvoří property pro každý UDT člen</value>
   </data>
-  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
-    <value>Deklarace k Anotaci:</value>
-  </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Povolit drag and drop v Code Exploreru</value>
   </data>
@@ -1659,24 +1641,15 @@ Import přerušen.</value>
   <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
     <value>Pouze ke čtení</value>
   </data>
-  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
-    <value>Odstranit</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Přejmenovat složku</value>
   </data>
-  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Anotace Deklarace</value>
-  </data>
   <data name="MoveFoldersDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Přesunout Složky</value>
   </data>
   <data name="MoveToFolderDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Přesunout do Složky</value>
   </data>
-  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
-    <value>Vyberte anotaci (a hodnoty) pro přidání deklaraci.</value>
-  </data>
   <data name="EncapsulateField_SetterType" xml:space="preserve">
     <value>Typ Setteru:</value>
   </data>
@@ -1713,15 +1686,9 @@ Chcete pokračovat?</value>
     <value>Cílová složka '{0}' již obsahuje podsložky '{1}'. Přemístění složek je sloučí s existujícími složkami s korespondujícími jmény.
 Chcete pokračovat?</value>
   </data>
-  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
-    <value>Typ</value>
-  </data>
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>Nelze zapouzdřit '{0}'. ReDim ({0}) výrok(y) existují v jiných modulech.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
-    <value>Hodnota</value>
-  </data>
   <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
     <value>Obalit Pole Privátním Typem</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e25afdb15e..06fb4a9d77 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1607,36 +1607,6 @@ Import abgebrochen.</value>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Die Komponente '{0}' würde durch das Refactoring verändert, aber ihr Inhalt ist in Rubberduck veraltet. Bitte lassen Sie Rubberduck seinen Stand aktualisieren und versuchen Sie es erneut.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Annotation hinzufügen</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
-    <value>Annotation hinzufügen</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
-    <value>Annotationsargumente:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
-    <value>Hinzuzufügende Annotation:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
-    <value>Deklaration, zu welcher eine Annotation hinzugefügt werden soll:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
-    <value>Wert</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
-    <value>Typ</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
-    <value>Entfernen</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
-    <value>Hinzufügen</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
-    <value>Wählen Sie eine Annotation (und Werte), die zu der Deklaration hinzugefügt werden soll.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Annotationsargumente dürfen keine Kontrollzeichen enthalten.</value>
   </data>
@@ -1725,9 +1695,6 @@ Wollen Sie fortfahren?</value>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Drag and Drop im Code Explorer aktivieren</value>
   </data>
-  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
-    <value>Attribut hinzufügen/anpassen</value>
-  </data>
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>Das Kapseln von '{0}' ist nicht möglich. Es existieren ReDim({0})-Anweisungen in anderen Modulen.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 40f3148a42..e710e03d9a 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1693,39 +1693,6 @@ Importación cancelada.</value>
 Si necesita una interfaz 'Private', cambie las clases que la instancian a 'Private' también.
 Una clase privada puede asimismo implementar una interfaz pública.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Anotar Declaración</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
-    <value>Anotar Declaración</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
-    <value>Declaración a Anotar:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
-    <value>Anotación a Agregar:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
-    <value>Argumentos de la anotación:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
-    <value>Tipo</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
-    <value>Valor</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
-    <value>Agregar</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
-    <value>Eliminar</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
-    <value>Agregar/Modificar atributo</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
-    <value>Seleccione una anotación (y valores) para agregar a la declaración.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Los argumentos de anotaciones no pueden contener caracteres de control.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c3c4f58fdc..14f9774f33 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1525,39 +1525,6 @@ Mise à jour annulée.</value>
 
 Échec de l'importation.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
-    <value>Ajouter</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
-    <value>Ajouter/Ajuster l'Attribut</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
-    <value>Annotation à ajouter:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
-    <value>Arguments de l'annotation:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
-    <value>Type</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
-    <value>Valeur</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Annoter la Déclaration</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
-    <value>Déclaration:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
-    <value>Sélectionner une annotation et les valeurs associées.</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
-    <value>Supprimer</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
-    <value>Annoter la déclaration</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
     <value>Les arguments de type 'Attribute Name' doivent débuter par 'VB_'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9445c6b439..d6cc37d9ed 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1830,36 +1830,6 @@ Import aborted.</value>
 If you require a 'Private' interface, change the classes instancing to private as well.
 A private class can still implement a public interface.</value>
   </data>
-  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Annotate Declaration</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
-    <value>Annotate Declaration</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
-    <value>Declaration to Annotate:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
-    <value>Annotation to Add:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
-    <value>Annotation Arguments:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
-    <value>Type</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
-    <value>Value</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
-    <value>Add</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
-    <value>Remove</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
-    <value>Select an annotation (and values) to add to the declaration.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Annotation arguments must not contain control characters.</value>
   </data>
@@ -1953,9 +1923,6 @@ Do you want to proceed?</value>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Enable drag and drop in Code Explorer</value>
   </data>
-  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
-    <value>Add/Adjust attribute</value>
-  </data>
   <data name="TestOutcome_Ignored" xml:space="preserve">
     <value>Ignored</value>
   </data>

From 9c8b6422c5c56da78a81a607d546258911af875d Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 13:18:32 -0700
Subject: [PATCH 08/64] Migrate AnnotationArgument_ValidationError_ resources

---
 .../AnnotationArgumentViewModel.cs            |  20 +-
 .../RefactoringsUI.Designer.cs                | 243 ++++++++++++++++++
 .../RefactoringsUI.cs.resx                    |  27 ++
 .../RefactoringsUI.de.resx                    |  27 ++
 .../RefactoringsUI.es.resx                    |  27 ++
 .../RefactoringsUI.fr.resx                    |  27 ++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  28 ++
 Rubberduck.Resources/RubberduckUI.Designer.cs |  81 ------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  27 --
 Rubberduck.Resources/RubberduckUI.de.resx     |  27 --
 Rubberduck.Resources/RubberduckUI.es.resx     |  27 --
 Rubberduck.Resources/RubberduckUI.fr.resx     |  27 --
 Rubberduck.Resources/RubberduckUI.resx        |  28 --
 13 files changed, 389 insertions(+), 227 deletions(-)
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.Designer.cs

diff --git a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotationArgumentViewModel.cs b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotationArgumentViewModel.cs
index e951768a72..4249876e07 100644
--- a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotationArgumentViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotationArgumentViewModel.cs
@@ -7,8 +7,8 @@
 using System.Windows.Data;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Refactorings.AnnotateDeclaration;
-using Rubberduck.Resources;
 using Rubberduck.UI.Converters;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.AnnotateDeclaration
 {
@@ -132,19 +132,19 @@ private List<string> ArgumentValidationErrors()
 
             if (string.IsNullOrEmpty(ArgumentValue))
             {
-                errors.Add(RubberduckUI.AnnotationArgument_ValidationError_EmptyArgument);
+                errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_EmptyArgument);
             }
             if (ArgumentValue.Length > MaxAllowedCharacters)
             {
-                errors.Add(string.Format(RubberduckUI.AnnotationArgument_ValidationError_TooLong, MaxAllowedCharacters));
+                errors.Add(string.Format(RefactoringsUI.AnnotationArgument_ValidationError_TooLong, MaxAllowedCharacters));
             }
             if (ContainsNewline(ArgumentValue))
             {
-                errors.Add(RubberduckUI.AnnotationArgument_ValidationError_Newline);
+                errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_Newline);
             }
             else if (ContainsControlCharacter(ArgumentValue))
             {
-                errors.Add(RubberduckUI.AnnotationArgument_ValidationError_SpecialCharacters);
+                errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_SpecialCharacters);
             }
 
             switch (ArgumentType)
@@ -152,29 +152,29 @@ private List<string> ArgumentValidationErrors()
                 case AnnotationArgumentType.Attribute:
                     if (!ArgumentValue.StartsWith("VB_") || ContainsWhitespace(ArgumentValue))
                     {
-                        errors.Add(RubberduckUI.AnnotationArgument_ValidationError_AttributeNameStart);
+                        errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_AttributeNameStart);
                     }
                     if (ContainsWhitespace(ArgumentValue))
                     {
-                        errors.Add(RubberduckUI.AnnotationArgument_ValidationError_WhitespaceInAttribute);
+                        errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_WhitespaceInAttribute);
                     }
                     break;
                 case AnnotationArgumentType.Inspection:
                     if (!InspectionNames.Contains(ArgumentValue))
                     {
-                        errors.Add(RubberduckUI.AnnotationArgument_ValidationError_InspectionName);
+                        errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_InspectionName);
                     }
                     break;
                 case AnnotationArgumentType.Boolean:
                     if (!bool.TryParse(ArgumentValue, out _))
                     {
-                        errors.Add(RubberduckUI.AnnotationArgument_ValidationError_NotABoolean);
+                        errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_NotABoolean);
                     }
                     break;
                 case AnnotationArgumentType.Number:
                     if (!decimal.TryParse(ArgumentValue, out _))
                     {
-                        errors.Add(RubberduckUI.AnnotationArgument_ValidationError_NotANumber);
+                        errors.Add(RefactoringsUI.AnnotationArgument_ValidationError_NotANumber);
                     }
                     break;
             }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
new file mode 100644
index 0000000000..83fd34453d
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -0,0 +1,243 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.Refactorings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class RefactoringsUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal RefactoringsUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.Refactorings.RefactoringsUI", typeof(RefactoringsUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_AddArgumentButtonLabel {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_AddArgumentButtonLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add/Adjust attribute.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_AdjustAttributeLabel {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_AdjustAttributeLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation to Add:.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_AnnotationLabel {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_AnnotationLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation Arguments:.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_ArgumentsLabel {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_ArgumentsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Type.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_ArgumentTypeHeader {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_ArgumentTypeHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Value.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_ArgumentValueHeader {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_ArgumentValueHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Annotate Declaration.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_Caption {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declaration to Annotate:.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_DeclarationLabel {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_DeclarationLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select an annotation (and values) to add to the declaration..
+        /// </summary>
+        public static string AnnotateDeclarationDialog_Instructions {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_Instructions", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_RemoveArgumentButtonLabel {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_RemoveArgumentButtonLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotate Declaration.
+        /// </summary>
+        public static string AnnotateDeclarationDialog_TitleText {
+            get {
+                return ResourceManager.GetString("AnnotateDeclarationDialog_TitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments of type &apos;Attribute Name&apos; have to start with &apos;VB_&apos;..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_AttributeNameStart {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_AttributeNameStart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments cannot be empty..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_EmptyArgument {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_EmptyArgument", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments of type &apos;Inspection Name&apos; have to be the name of an existing inspection..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_InspectionName {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_InspectionName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments can only contain a single line..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_Newline {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_Newline", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments of type &apos;Boolean&apos; have to either be &apos;True&apos; or &apos;False&apos;..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_NotABoolean {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_NotABoolean", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments of type &apos;Number&apos; have to be a valid number in integer of floating point format..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_NotANumber {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_NotANumber", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments must not contain control characters..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_SpecialCharacters {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_SpecialCharacters", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments cannot be longer than {0} characters..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_TooLong {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_TooLong", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments of type &apos;Attribute Name&apos; cannot contain whitespace..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_WhitespaceInAttribute {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_WhitespaceInAttribute", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index e6bcb20166..933812ca01 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -150,4 +150,31 @@
   <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
     <value>Deklarace Anotace</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
+    <value>Argumenty anotace typu 'Attribute Name' musejí začínat 'VB_'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
+    <value>Argumenty anotace nemohou být prázdné.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
+    <value>Argumenty anotace typu 'Inspection Name' musejí být jméno existující inspekce.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
+    <value>Argumenty anotace mohou obsahovat pouze jeden řádek.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
+    <value>Argumenty anotace typu 'Boolean' musejí být buď 'True' nebo 'False'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Argumenty anotace typu 'Number' musejí být validní číslo ve formátu integer nebo float.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
+    <value>Argumenty anotace nesmějí obsahovat 'control' charaktery.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
+    <value>Argumenty anotace nemohou být delší než {0} charakterů.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
+    <value>Argumenty anotace typu 'Attribute Name' nemohou obsahovat mezeru.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index b212140e66..49b4ccfc18 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -150,4 +150,31 @@
   <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
     <value>Annotation hinzufügen</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
+    <value>Annotationsargumente vom Typ 'Attributname' müssen mit 'VB_' anfangen.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
+    <value>Annotationsargumente dürfen nicht leer sein.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
+    <value>Annotationsargumente vom Typ 'Inspektionsname' müssen der Name einer existierenden Inspektion sein.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
+    <value>Annotationsargumente dürfen nur aus einer einzigen Zeile bestehen.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
+    <value>Annotationsargumente vom Typ 'Wahrheitswert' müssen entweder 'True' oder 'False' sein.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Annotationsargumente vom Typ 'Zahl' müssen eine ganze Zahl oder eine Gleitkommazahl sein.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
+    <value>Annotationsargumente dürfen keine Kontrollzeichen enthalten.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
+    <value>Annotationsargumente dürfen nicht länger als {0} Zeihen sein.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
+    <value>Annotationsargumente vom Typ 'Attributname' dürfen keine Leerzeichen enthalten.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 7a93acd0e7..097dee1782 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -150,4 +150,31 @@
   <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
     <value>Anotar Declaración</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
+    <value>Los argumentos de anotaciones del tipo 'Nombre de Atributo' deben comenzar con 'VB_'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
+    <value>Los argumentos de anotaciones no pueden estar vacíos.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
+    <value>Los argumentos de anotaciones del tipo 'Nombre de Inspección' deben usar el nombre de una inspección existente.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
+    <value>Los argumentos de anotaciones sólo pueden incluir una sóla línea.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
+    <value>Los argumentos de anotaciones del tipo 'Booleano' deben ser 'True' o 'False'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Los argumentos de anotaciones del tipo 'Número' deben ser un numero válido entero o en formato de punto flotante.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
+    <value>Los argumentos de anotaciones no pueden contener caracteres de control.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
+    <value>Los argumentos de anotaciones no pueden tener más de {0} caracteres.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
+    <value>Los argumentos de anotaciones del tipo 'Nombre de Atributo' no pueden contener espacios.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index f71d6b8535..4909e86b80 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -150,4 +150,31 @@
   <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
     <value>Annoter la déclaration</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
+    <value>Les arguments de type 'Attribute Name' doivent débuter par 'VB_'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
+    <value>Les arguments ne peuvent être laissés vides.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
+    <value>Les arguments de type 'Inspection Name' doivent correspondre au nom d'une inspection existante.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
+    <value>Les arguments d'annotations doivent tenir sur une seule ligne.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
+    <value>La valeur des arguments de type 'Boolean' doit être 'True' ou 'False'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>La valeur des arguments de type 'Number' doit être un nombre entier ou décimal valide.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
+    <value>La valeur des arguments ne doit pas contenir de caractères de contrôle.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
+    <value>La valeur des arguments ne peut dépasser {0} caractères.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
+    <value>Les arguments de type 'Attribute Name' ne peuvent contenir d'espaces.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 7cfa645141..d210be9c5e 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -130,4 +130,32 @@
   <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
     <value>Annotation to Add:</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
+    <value>Annotation arguments of type 'Attribute Name' have to start with 'VB_'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
+    <value>Annotation arguments cannot be empty.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
+    <value>Annotation arguments of type 'Inspection Name' have to be the name of an existing inspection.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
+    <value>Annotation arguments can only contain a single line.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
+    <value>Annotation arguments of type 'Boolean' have to either be 'True' or 'False'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Annotation arguments of type 'Number' have to be a valid number in integer of floating point format.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
+    <value>Annotation arguments must not contain control characters.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
+    <value>Annotation arguments cannot be longer than {0} characters.</value>
+    <comment>{0} max allowed characters</comment>
+  </data>
+  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
+    <value>Annotation arguments of type 'Attribute Name' cannot contain whitespace.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 77fd5dab70..8a0c0703c0 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -153,87 +153,6 @@ public static string AllReferences_PerformanceWarning {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments of type &apos;Attribute Name&apos; have to start with &apos;VB_&apos;..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_AttributeNameStart {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_AttributeNameStart", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments cannot be empty..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_EmptyArgument {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_EmptyArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments of type &apos;Inspection Name&apos; have to be the name of an existing inspection..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_InspectionName {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_InspectionName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments can only contain a single line..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_Newline {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_Newline", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments of type &apos;Boolean&apos; have to either be &apos;True&apos; or &apos;False&apos;..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_NotABoolean {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_NotABoolean", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments of type &apos;Number&apos; have to be a valid number in integer of floating point format..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_NotANumber {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_NotANumber", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments must not contain control characters..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_SpecialCharacters {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_SpecialCharacters", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments cannot be longer than {0} characters..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_TooLong {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_TooLong", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments of type &apos;Attribute Name&apos; cannot contain whitespace..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_WhitespaceInAttribute {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_WhitespaceInAttribute", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Attribute.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 38130e0265..2ad1d697ec 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1548,33 +1548,6 @@ Import přerušen.</value>
   <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
     <value>Boolean</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
-    <value>Argumenty anotace mohou obsahovat pouze jeden řádek.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
-    <value>Argumenty anotace nemohou být prázdné.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
-    <value>Argumenty anotace nemohou být delší než {0} charakterů.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
-    <value>Argumenty anotace nesmějí obsahovat 'control' charaktery.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
-    <value>Argumenty anotace typu 'Attribute Name' nemohou obsahovat mezeru.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
-    <value>Argumenty anotace typu 'Attribute Name' musejí začínat 'VB_'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
-    <value>Argumenty anotace typu 'Boolean' musejí být buď 'True' nebo 'False'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
-    <value>Argumenty anotace typu 'Inspection Name' musejí být jméno existující inspekce.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Argumenty anotace typu 'Number' musejí být validní číslo ve formátu integer nebo float.</value>
-  </data>
   <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
     <value>Vytvoří property pro každý UDT člen</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 06fb4a9d77..22f602b3e3 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1607,24 +1607,6 @@ Import abgebrochen.</value>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Die Komponente '{0}' würde durch das Refactoring verändert, aber ihr Inhalt ist in Rubberduck veraltet. Bitte lassen Sie Rubberduck seinen Stand aktualisieren und versuchen Sie es erneut.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
-    <value>Annotationsargumente dürfen keine Kontrollzeichen enthalten.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
-    <value>Annotationsargumente vom Typ 'Inspektionsname' müssen der Name einer existierenden Inspektion sein.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
-    <value>Annotationsargumente vom Typ 'Attributname' müssen mit 'VB_' anfangen.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Annotationsargumente vom Typ 'Zahl' müssen eine ganze Zahl oder eine Gleitkommazahl sein.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
-    <value>Annotationsargumente vom Typ 'Wahrheitswert' müssen entweder 'True' oder 'False' sein.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
-    <value>Annotationsargumente dürfen nicht leer sein.</value>
-  </data>
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Text</value>
   </data>
@@ -1640,15 +1622,6 @@ Import abgebrochen.</value>
   <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
     <value>Attribut</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
-    <value>Annotationsargumente dürfen nur aus einer einzigen Zeile bestehen.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
-    <value>Annotationsargumente vom Typ 'Attributname' dürfen keine Leerzeichen enthalten.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
-    <value>Annotationsargumente dürfen nicht länger als {0} Zeihen sein.</value>
-  </data>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>Das Refactoring kann Annotationen nur zu Komponenten, Methoden und Variablen hinzufügen. Die Zieldeklaration hatte allerdings den Typ '{0}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index e710e03d9a..810bb1ba24 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1693,24 +1693,6 @@ Importación cancelada.</value>
 Si necesita una interfaz 'Private', cambie las clases que la instancian a 'Private' también.
 Una clase privada puede asimismo implementar una interfaz pública.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
-    <value>Los argumentos de anotaciones no pueden contener caracteres de control.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
-    <value>Los argumentos de anotaciones del tipo 'Nombre de Inspección' deben usar el nombre de una inspección existente.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
-    <value>Los argumentos de anotaciones del tipo 'Nombre de Atributo' deben comenzar con 'VB_'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Los argumentos de anotaciones del tipo 'Número' deben ser un numero válido entero o en formato de punto flotante.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
-    <value>Los argumentos de anotaciones del tipo 'Booleano' deben ser 'True' o 'False'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
-    <value>Los argumentos de anotaciones no pueden estar vacíos.</value>
-  </data>
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Texto</value>
   </data>
@@ -1726,15 +1708,6 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
     <value>Atributo</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
-    <value>Los argumentos de anotaciones sólo pueden incluir una sóla línea.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
-    <value>Los argumentos de anotaciones del tipo 'Nombre de Atributo' no pueden contener espacios.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
-    <value>Los argumentos de anotaciones no pueden tener más de {0} caracteres.</value>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 14f9774f33..8aa93f076b 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1525,33 +1525,6 @@ Mise à jour annulée.</value>
 
 Échec de l'importation.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
-    <value>Les arguments de type 'Attribute Name' doivent débuter par 'VB_'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
-    <value>Les arguments ne peuvent être laissés vides.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
-    <value>Les arguments de type 'Inspection Name' doivent correspondre au nom d'une inspection existante.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
-    <value>Les arguments d'annotations doivent tenir sur une seule ligne.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
-    <value>La valeur des arguments de type 'Boolean' doit être 'True' ou 'False'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>La valeur des arguments de type 'Number' doit être un nombre entier ou décimal valide.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
-    <value>La valeur des arguments ne doit pas contenir de caractères de contrôle.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
-    <value>La valeur des arguments ne peut dépasser {0} caractères.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
-    <value>Les arguments de type 'Attribute Name' ne peuvent contenir d'espaces.</value>
-  </data>
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>Impossible d'encapsuler le champ '{0}'. Une ou plusieurs instructions ReDim({0}) existent dans d'autres modules.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index d6cc37d9ed..9faee10a06 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1830,24 +1830,6 @@ Import aborted.</value>
 If you require a 'Private' interface, change the classes instancing to private as well.
 A private class can still implement a public interface.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
-    <value>Annotation arguments must not contain control characters.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
-    <value>Annotation arguments of type 'Inspection Name' have to be the name of an existing inspection.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
-    <value>Annotation arguments of type 'Attribute Name' have to start with 'VB_'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Annotation arguments of type 'Number' have to be a valid number in integer of floating point format.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
-    <value>Annotation arguments of type 'Boolean' have to either be 'True' or 'False'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
-    <value>Annotation arguments cannot be empty.</value>
-  </data>
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Text</value>
   </data>
@@ -1863,16 +1845,6 @@ A private class can still implement a public interface.</value>
   <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
     <value>Attribute</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
-    <value>Annotation arguments can only contain a single line.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
-    <value>Annotation arguments of type 'Attribute Name' cannot contain whitespace.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
-    <value>Annotation arguments cannot be longer than {0} characters.</value>
-    <comment>{0} max allowed characters</comment>
-  </data>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>The refactoring can only annotate components, members and variables, but the target had type '{0}'.</value>
     <comment>{0} declaration type</comment>

From 744919aebf91974d41583cfcf11343d99ed9f024 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 13:27:00 -0700
Subject: [PATCH 09/64] Migrate AnnotationArgumentType_ resources

---
 .../Converters/EnumToLocalizedStringConverter.cs  |  8 ++++----
 Rubberduck.Refactorings/RefactoringsUI.cs.resx    | 15 +++++++++++++++
 Rubberduck.Refactorings/RefactoringsUI.de.resx    | 15 +++++++++++++++
 Rubberduck.Refactorings/RefactoringsUI.es.resx    | 15 +++++++++++++++
 Rubberduck.Refactorings/RefactoringsUI.resx       | 15 +++++++++++++++
 Rubberduck.Resources/RubberduckUI.cs.resx         | 15 ---------------
 Rubberduck.Resources/RubberduckUI.de.resx         | 15 ---------------
 Rubberduck.Resources/RubberduckUI.es.resx         | 15 ---------------
 Rubberduck.Resources/RubberduckUI.resx            | 15 ---------------
 9 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/Rubberduck.Core/UI/Converters/EnumToLocalizedStringConverter.cs b/Rubberduck.Core/UI/Converters/EnumToLocalizedStringConverter.cs
index ad012167ac..1c36ea8316 100644
--- a/Rubberduck.Core/UI/Converters/EnumToLocalizedStringConverter.cs
+++ b/Rubberduck.Core/UI/Converters/EnumToLocalizedStringConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Converters
 {
@@ -18,17 +18,17 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             }
 
             //TODO: Make this independent of the resource used.
-            return RubberduckUI.ResourceManager.GetString(ResourcePrefix + value.ToString(), culture);
+            return RefactoringsUI.ResourceManager.GetString(ResourcePrefix + value.ToString(), culture);
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var str = (string)value;
 
             foreach (var enumValue in Enum.GetValues(targetType))
             {
                 //TODO: Make this independent of the resource used.
-                if (str == RubberduckUI.ResourceManager.GetString(ResourcePrefix + enumValue.ToString(), culture))
+                if (str == RefactoringsUI.ResourceManager.GetString(ResourcePrefix + enumValue.ToString(), culture))
                 {
                     return enumValue;
                 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 933812ca01..95c7e1f3f5 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -177,4 +177,19 @@
   <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
     <value>Argumenty anotace typu 'Attribute Name' nemohou obsahovat mezeru.</value>
   </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>Název Inspekce</value>
+  </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Atribut</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Boolean</value>
+  </data>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>Číslo</value>
+  </data>
+  <data name="AnnotationArgumentType_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 49b4ccfc18..002f28c3f8 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -177,4 +177,19 @@
   <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
     <value>Annotationsargumente vom Typ 'Attributname' dürfen keine Leerzeichen enthalten.</value>
   </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>Inspektionsname</value>
+  </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Attribut</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Wahrheitswert</value>
+  </data>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>Zahl</value>
+  </data>
+  <data name="AnnotationArgumentType_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 097dee1782..eadb928950 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -177,4 +177,19 @@
   <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
     <value>Los argumentos de anotaciones del tipo 'Nombre de Atributo' no pueden contener espacios.</value>
   </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>Nombre de Inspección</value>
+  </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Atributo</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Booleano</value>
+  </data>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>Número</value>
+  </data>
+  <data name="AnnotationArgumentType_Text" xml:space="preserve">
+    <value>Texto</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index d210be9c5e..94928a0963 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -158,4 +158,19 @@
   <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
     <value>Annotation arguments of type 'Attribute Name' cannot contain whitespace.</value>
   </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>Inspection Name</value>
+  </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Attribute</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Boolean</value>
+  </data>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>Number</value>
+  </data>
+  <data name="AnnotationArgumentType_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 2ad1d697ec..b2a9294f6b 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1542,12 +1542,6 @@ Import přerušen.</value>
   <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
     <value>Jméno složky nemůže být prázdné.</value>
   </data>
-  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
-    <value>Atribut</value>
-  </data>
-  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
-    <value>Boolean</value>
-  </data>
   <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
     <value>Vytvoří property pro každý UDT člen</value>
   </data>
@@ -1569,9 +1563,6 @@ Import přerušen.</value>
   <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
     <value>Plná nová složka:</value>
   </data>
-  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
-    <value>Název Inspekce</value>
-  </data>
   <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
     <value>Instancování</value>
   </data>
@@ -1590,9 +1581,6 @@ Import přerušen.</value>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>Cíl nebyl specifikován.</value>
   </data>
-  <data name="AnnotationArgumentType_Number" xml:space="preserve">
-    <value>Číslo</value>
-  </data>
   <data name="EncapsulateField_ParameterName" xml:space="preserve">
     <value>Název Parametru:</value>
   </data>
@@ -1630,9 +1618,6 @@ Import přerušen.</value>
     <value>Je přesunováno několik složek se tejným jménem. Toto je spojí.
 Chcete pokračovat?</value>
   </data>
-  <data name="AnnotationArgumentType_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Komponenta '{0}' by byla ovlivněna refactorováním, avšak její stav v paměti Rubberducku je zastaralý. Prosím obnovte Rubberduck a zkuste to znovu.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 22f602b3e3..73fd14aa82 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1607,21 +1607,6 @@ Import abgebrochen.</value>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Die Komponente '{0}' würde durch das Refactoring verändert, aber ihr Inhalt ist in Rubberduck veraltet. Bitte lassen Sie Rubberduck seinen Stand aktualisieren und versuchen Sie es erneut.</value>
   </data>
-  <data name="AnnotationArgumentType_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
-  <data name="AnnotationArgumentType_Number" xml:space="preserve">
-    <value>Zahl</value>
-  </data>
-  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
-    <value>Inspektionsname</value>
-  </data>
-  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
-    <value>Wahrheitswert</value>
-  </data>
-  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
-    <value>Attribut</value>
-  </data>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>Das Refactoring kann Annotationen nur zu Komponenten, Methoden und Variablen hinzufügen. Die Zieldeklaration hatte allerdings den Typ '{0}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 810bb1ba24..143d66725b 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1693,21 +1693,6 @@ Importación cancelada.</value>
 Si necesita una interfaz 'Private', cambie las clases que la instancian a 'Private' también.
 Una clase privada puede asimismo implementar una interfaz pública.</value>
   </data>
-  <data name="AnnotationArgumentType_Text" xml:space="preserve">
-    <value>Texto</value>
-  </data>
-  <data name="AnnotationArgumentType_Number" xml:space="preserve">
-    <value>Número</value>
-  </data>
-  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
-    <value>Nombre de Inspección</value>
-  </data>
-  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
-    <value>Booleano</value>
-  </data>
-  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
-    <value>Atributo</value>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9faee10a06..eb7d059b2f 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1830,21 +1830,6 @@ Import aborted.</value>
 If you require a 'Private' interface, change the classes instancing to private as well.
 A private class can still implement a public interface.</value>
   </data>
-  <data name="AnnotationArgumentType_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
-  <data name="AnnotationArgumentType_Number" xml:space="preserve">
-    <value>Number</value>
-  </data>
-  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
-    <value>Inspection Name</value>
-  </data>
-  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
-    <value>Boolean</value>
-  </data>
-  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
-    <value>Attribute</value>
-  </data>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>The refactoring can only annotate components, members and variables, but the target had type '{0}'.</value>
     <comment>{0} declaration type</comment>

From 553a94cbb6780d5871e3003cec5eeecc738a788b Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 13:46:44 -0700
Subject: [PATCH 10/64] Migrate AssignedByValDialog_ resources

Included previously missed RubberduckUI->RefactoringsUI updates.
---
 .../AnnotateDeclarationFailedNotifier.cs      |  3 +-
 .../AnnotateDeclarationPresenter.cs           |  4 +-
 .../AssignedByValParameterQuickFixDialog.cs   |  6 +-
 .../RefactoringsUI.Designer.cs                | 63 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    |  6 ++
 .../RefactoringsUI.de.resx                    |  6 ++
 .../RefactoringsUI.es.resx                    |  6 ++
 .../RefactoringsUI.fr.resx                    |  6 ++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  8 +++
 .../Rubberduck.Refactorings.csproj            | 13 ++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 63 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  6 --
 Rubberduck.Resources/RubberduckUI.de.resx     |  6 --
 Rubberduck.Resources/RubberduckUI.es.resx     |  7 ---
 Rubberduck.Resources/RubberduckUI.fr.resx     |  6 --
 Rubberduck.Resources/RubberduckUI.resx        |  8 ---
 16 files changed, 115 insertions(+), 102 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs
index 52c51a917a..aec9c9c435 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs
@@ -2,6 +2,7 @@
 using Rubberduck.Interaction;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
 {
@@ -11,7 +12,7 @@ public AnnotateDeclarationFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => RubberduckUI.AnnotateDeclarationDialog_Caption;
+        protected override string Caption => RefactoringsUI.AnnotateDeclarationDialog_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationPresenter.cs b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationPresenter.cs
index 86d125291c..7febfb71cb 100644
--- a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationPresenter.cs
@@ -1,11 +1,11 @@
 using Rubberduck.Refactorings.AnnotateDeclaration;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.AnnotateDeclaration
 {
     internal class AnnotateDeclarationPresenter : RefactoringPresenterBase<AnnotateDeclarationModel>, IAnnotateDeclarationPresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.AnnotateDeclarationDialog_Caption, 500, 400);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.AnnotateDeclarationDialog_Caption, 500, 400);
 
         public AnnotateDeclarationPresenter(AnnotateDeclarationModel model, IRefactoringDialogFactory dialogFactory) :
             base(DialogData, model, dialogFactory)
diff --git a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
index b95b7ced6b..3be06b2189 100644
--- a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
-using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.Common;
 using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings
 {
@@ -57,7 +57,7 @@ private string GetVariableNameFeedback()
 
             if (_isConflictingName(NewName))
             {
-                return string.Format(RubberduckUI.AssignedByValDialog_NewNameAlreadyUsedFormat, NewName);
+                return string.Format(RefactoringsUI.AssignedByValDialog_NewNameAlreadyUsedFormat, NewName);
             }
 
             if (VBAIdentifierValidator.TryMatchInvalidIdentifierCriteria(NewName, DeclarationType.Variable, out var invalidMessage))
@@ -67,7 +67,7 @@ private string GetVariableNameFeedback()
 
             if (VBAIdentifierValidator.TryMatchMeaninglessIdentifierCriteria(NewName, out var meaninglessNameMessage))
             {
-                return string.Format(RubberduckUI.AssignedByValDialog_MeaninglessNameFormat, meaninglessNameMessage);
+                return string.Format(RefactoringsUI.AssignedByValDialog_MeaninglessNameFormat, meaninglessNameMessage);
             }
 
             return string.Empty;
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 83fd34453d..b550fd4a4d 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -239,5 +239,68 @@ public static string AnnotationArgument_ValidationError_WhitespaceInAttribute {
                 return ResourceManager.GetString("AnnotationArgument_ValidationError_WhitespaceInAttribute", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Attribute.
+        /// </summary>
+        public static string AnnotationArgumentType_Attribute {
+            get {
+                return ResourceManager.GetString("AnnotationArgumentType_Attribute", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Boolean.
+        /// </summary>
+        public static string AnnotationArgumentType_Boolean {
+            get {
+                return ResourceManager.GetString("AnnotationArgumentType_Boolean", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inspection Name.
+        /// </summary>
+        public static string AnnotationArgumentType_Inspection {
+            get {
+                return ResourceManager.GetString("AnnotationArgumentType_Inspection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Number.
+        /// </summary>
+        public static string AnnotationArgumentType_Number {
+            get {
+                return ResourceManager.GetString("AnnotationArgumentType_Number", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Text.
+        /// </summary>
+        public static string AnnotationArgumentType_Text {
+            get {
+                return ResourceManager.GetString("AnnotationArgumentType_Text", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} Consider choosing a different name..
+        /// </summary>
+        public static string AssignedByValDialog_MeaninglessNameFormat {
+            get {
+                return ResourceManager.GetString("AssignedByValDialog_MeaninglessNameFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is already accessible to this scope..
+        /// </summary>
+        public static string AssignedByValDialog_NewNameAlreadyUsedFormat {
+            get {
+                return ResourceManager.GetString("AssignedByValDialog_NewNameAlreadyUsedFormat", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 95c7e1f3f5..ee0e3aae27 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -192,4 +192,10 @@
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Text</value>
   </data>
+  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
+    <value>'{0}' je již přístupný v tomto rozsahu.</value>
+  </data>
+  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
+    <value>{0} Zvaž použití jiného jména.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 002f28c3f8..d73143229f 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -192,4 +192,10 @@
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Text</value>
   </data>
+  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
+    <value>'{0}' ist in diesem Kontext bereits verfügbar.</value>
+  </data>
+  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
+    <value>{0} Überlegen Sie, einen anderen Namen zu wählen.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index eadb928950..ff732fdb08 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -192,4 +192,10 @@
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Texto</value>
   </data>
+  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
+    <value>'{0}' ya está accesible para este ámbito.</value>
+  </data>
+  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
+    <value>{0} Considere utilizar otro nombre.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 4909e86b80..c33e910ca1 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -177,4 +177,10 @@
   <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
     <value>Les arguments de type 'Attribute Name' ne peuvent contenir d'espaces.</value>
   </data>
+  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
+    <value>'{0}' est déjà accessible à cette procédure.</value>
+  </data>
+  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
+    <value>{0} Considérez utiliser un nom plus descriptif.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 94928a0963..96c5b7076a 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -173,4 +173,12 @@
   <data name="AnnotationArgumentType_Text" xml:space="preserve">
     <value>Text</value>
   </data>
+  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
+    <value>'{0}' is already accessible to this scope.</value>
+    <comment>{0} = proposed variable name.</comment>
+  </data>
+  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
+    <value>{0} Consider choosing a different name.</value>
+    <comment>{0} = Meaningless name message</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/Rubberduck.Refactorings.csproj b/Rubberduck.Refactorings/Rubberduck.Refactorings.csproj
index 78a137d982..ded682bef5 100644
--- a/Rubberduck.Refactorings/Rubberduck.Refactorings.csproj
+++ b/Rubberduck.Refactorings/Rubberduck.Refactorings.csproj
@@ -23,4 +23,17 @@
       <Version>4.6.4</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="RefactoringsUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>RefactoringsUI.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="RefactoringsUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>RefactoringsUI.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 8a0c0703c0..96755a0dfe 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -153,51 +153,6 @@ public static string AllReferences_PerformanceWarning {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Attribute.
-        /// </summary>
-        public static string AnnotationArgumentType_Attribute {
-            get {
-                return ResourceManager.GetString("AnnotationArgumentType_Attribute", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Boolean.
-        /// </summary>
-        public static string AnnotationArgumentType_Boolean {
-            get {
-                return ResourceManager.GetString("AnnotationArgumentType_Boolean", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Inspection Name.
-        /// </summary>
-        public static string AnnotationArgumentType_Inspection {
-            get {
-                return ResourceManager.GetString("AnnotationArgumentType_Inspection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Number.
-        /// </summary>
-        public static string AnnotationArgumentType_Number {
-            get {
-                return ResourceManager.GetString("AnnotationArgumentType_Number", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Text.
-        /// </summary>
-        public static string AnnotationArgumentType_Text {
-            get {
-                return ResourceManager.GetString("AnnotationArgumentType_Text", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Apply.
         /// </summary>
@@ -257,24 +212,6 @@ public static System.Drawing.Bitmap arrow_circle_double {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to {0} Consider choosing a different name..
-        /// </summary>
-        public static string AssignedByValDialog_MeaninglessNameFormat {
-            get {
-                return ResourceManager.GetString("AssignedByValDialog_MeaninglessNameFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is already accessible to this scope..
-        /// </summary>
-        public static string AssignedByValDialog_NewNameAlreadyUsedFormat {
-            get {
-                return ResourceManager.GetString("AssignedByValDialog_NewNameAlreadyUsedFormat", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Assigned ByVal parameter QuickFix - Make Local Copy.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index b2a9294f6b..55161c7eae 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -946,9 +946,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="GeneralSettings_CheckVersion" xml:space="preserve">
     <value>Při startu zkontrolovat, zda je dostupná nová verze.</value>
   </data>
-  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
-    <value>'{0}' je již přístupný v tomto rozsahu.</value>
-  </data>
   <data name="ConfirmRemoveAssignmentWithUnusedDeclaration" xml:space="preserve">
     <value>Proměnná '{0}' je přidělena. Odstranit přidělení instrukce?</value>
   </data>
@@ -1425,9 +1422,6 @@ End Enum</value>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>Identifikátor '{0}' zobrazí inspekci 'Použij Smysluplnější Slovo'.</value>
   </data>
-  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
-    <value>{0} Zvaž použití jiného jména.</value>
-  </data>
   <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
     <value>Oznámení, pokud je k dispozici novější verze předběžného vydání.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 73fd14aa82..d744d423e9 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -991,9 +991,6 @@ Um den Change Log anzuschauen und Rubberduck manuell zu aktualisieren, klicken S
 
 Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Diese können unter Rubberduck &gt; Einstellungen deaktiviert werden.</value>
   </data>
-  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
-    <value>'{0}' ist in diesem Kontext bereits verfügbar.</value>
-  </data>
   <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
     <value>Bitte stellen Sie zur Umbenennung sicher, dass genau ein Control-Objekt ausgewählt ist.</value>
   </data>
@@ -1457,9 +1454,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>Der Name '{0}' wird die "Sinnige Namen verwenden"-Inspektion auslösen.</value>
   </data>
-  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
-    <value>{0} Überlegen Sie, einen anderen Namen zu wählen.</value>
-  </data>
   <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
     <value>Informiere mich, wenn ein neuer Prerelease verfügbar ist.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 143d66725b..9799d9b88a 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1047,10 +1047,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="GeneralSettings_CheckVersion" xml:space="preserve">
     <value>Compruebe si hay una versión más nueva disponible en el inicio</value>
   </data>
-  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
-    <value>'{0}' ya está accesible para este ámbito.</value>
-    <comment>{0} = nombre de la variable propuesta.</comment>
-  </data>
   <data name="ConfirmRemoveAssignmentWithUnusedDeclaration" xml:space="preserve">
     <value>Se asigna la variable '{0}'. Eliminar instrucciones de asignación)?</value>
   </data>
@@ -1419,9 +1415,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Navegando...</value>
   </data>
-  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
-    <value>{0} Considere utilizar otro nombre.</value>
-  </data>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Guardar y Cerrar</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 8aa93f076b..5212d2dca8 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -977,9 +977,6 @@ Cliquez 'Oui' pour lire les changements apportés et télécharger manuellement
 Ce message s'affiche parce que la vérification d'une nouvelle version au démarrage est activée.
 Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Paramètres.</value>
   </data>
-  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
-    <value>'{0}' est déjà accessible à cette procédure.</value>
-  </data>
   <data name="SmartIndenter_LegacySettingPrompt" xml:space="preserve">
     <value>Des paramètres utilisés par Smart Indenter existent dans votre registre. Voulez-vous les importer dans Rubberduck?</value>
   </data>
@@ -1483,9 +1480,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>L'identifiant '{0}' chatouillera l'inspection suggérant d'utiliser un nom conférant signification et importance.</value>
   </data>
-  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
-    <value>{0} Considérez utiliser un nom plus descriptif.</value>
-  </data>
   <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
     <value>Le contrôle ciblé '{0}' est introuvable.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index eb7d059b2f..6dbabde84b 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1057,10 +1057,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="GeneralSettings_CheckVersion" xml:space="preserve">
     <value>Check if a newer version is available at startup.</value>
   </data>
-  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
-    <value>'{0}' is already accessible to this scope.</value>
-    <comment>{0} = proposed variable name.</comment>
-  </data>
   <data name="ConfirmRemoveAssignmentWithUnusedDeclaration" xml:space="preserve">
     <value>Variable '{0}' is assigned. Remove assignment instruction(s)?</value>
   </data>
@@ -1644,10 +1640,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>The identifier '{0}' will trigger a 'Use Meaningful Name' inspection result.</value>
     <comment>{0} = code element name</comment>
   </data>
-  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
-    <value>{0} Consider choosing a different name.</value>
-    <comment>{0} = Meaningless name message</comment>
-  </data>
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
     <value>Rubberduck Test Results - {0}</value>
   </data>

From e440ef96da304e41e4b23242da179b4884acb1dd Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 13:51:43 -0700
Subject: [PATCH 11/64] Migrate AssignedByValParameterQuickFixDialog_ resources

---
 .../AssignedByValParameterQuickFixDialog.cs   |  6 ++---
 .../RefactoringsUI.Designer.cs                | 27 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    |  9 +++++++
 .../RefactoringsUI.de.resx                    |  9 +++++++
 .../RefactoringsUI.es.resx                    |  9 +++++++
 .../RefactoringsUI.fr.resx                    |  9 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 10 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 27 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.de.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 10 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.resx        | 10 -------
 13 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
index 3be06b2189..6fdf3d2fc0 100644
--- a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
@@ -20,15 +20,15 @@ public AssignedByValParameterQuickFixDialog(string identifier, string identifier
 
         private void InitializeCaptions(string identifierName, string targetDeclarationType)
         {
-            Text = RubberduckUI.AssignedByValParamQFixDialog_Caption;
+            Text = RefactoringsUI.AssignedByValParamQFixDialog_Caption;
             OkButton.Text = RubberduckUI.OK;
             CancelDialogButton.Text = RubberduckUI.CancelButtonText;
-            TitleLabel.Text = RubberduckUI.AssignedByValParamQFixDialog_TitleText;
+            TitleLabel.Text = RefactoringsUI.AssignedByValParamQFixDialog_TitleText;
             NameLabel.Text = RubberduckUI.NameLabelText;
 
             var declarationType =
             RubberduckUI.ResourceManager.GetString("DeclarationType_" + targetDeclarationType, Settings.Settings.Culture);
-            InstructionsLabel.Text = string.Format(RubberduckUI.AssignedByValParamQFixDialog_InstructionsLabelText, declarationType,
+            InstructionsLabel.Text = string.Format(RefactoringsUI.AssignedByValParamQFixDialog_InstructionsLabelText, declarationType,
                 identifierName);
         }
 
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index b550fd4a4d..c1a608ff99 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -302,5 +302,32 @@ public static string AssignedByValDialog_NewNameAlreadyUsedFormat {
                 return ResourceManager.GetString("AssignedByValDialog_NewNameAlreadyUsedFormat", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Assigned ByVal parameter QuickFix - Make Local Copy.
+        /// </summary>
+        public static string AssignedByValParamQFixDialog_Caption {
+            get {
+                return ResourceManager.GetString("AssignedByValParamQFixDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify a name to use for the local copy of ByVal {0} &apos;{1}&apos;..
+        /// </summary>
+        public static string AssignedByValParamQFixDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("AssignedByValParamQFixDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specify Local Copy Variable Name.
+        /// </summary>
+        public static string AssignedByValParamQFixDialog_TitleText {
+            get {
+                return ResourceManager.GetString("AssignedByValParamQFixDialog_TitleText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index ee0e3aae27..be0ec1c374 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -198,4 +198,13 @@
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Zvaž použití jiného jména.</value>
   </data>
+  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
+    <value>Přiřazen ByVal parametr QuickFix - Udělat Lokální Kopii</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte název, který se má použít na lokální kopii ByVal {0} '{1}'.</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
+    <value>Specifikujte Název Kopie Lokální Proměnné</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index d73143229f..585421ec45 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -198,4 +198,13 @@
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Überlegen Sie, einen anderen Namen zu wählen.</value>
   </data>
+  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
+    <value>ByVal zugewiesener Parameter QuickFix - Lokale Kopie erstellen</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen Namen für die lokale Kopie von ByVal {0} '{1}'.</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
+    <value>Variablenname der Lokalen Kopie festlegen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index ff732fdb08..589e7c2575 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -198,4 +198,13 @@
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Considere utilizar otro nombre.</value>
   </data>
+  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
+    <value>Parámetro ByVal asignado. Solución rápida: Hacer una copia local</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Especifique un nombre para usar para la copia local de ByVal {0} '{1}'.</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
+    <value>Especifique el nombre de la variable de copia local</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index c33e910ca1..ca001a284a 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -183,4 +183,13 @@
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Considérez utiliser un nom plus descriptif.</value>
   </data>
+  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
+    <value>Introduire une variable locale</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier le nom à utiliser pour la copie locale du paramètre {0} '{1}'.</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
+    <value>Nommer la variable locale</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 96c5b7076a..ef3e4fd0de 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -181,4 +181,14 @@
     <value>{0} Consider choosing a different name.</value>
     <comment>{0} = Meaningless name message</comment>
   </data>
+  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
+    <value>Assigned ByVal parameter QuickFix - Make Local Copy</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify a name to use for the local copy of ByVal {0} '{1}'.</value>
+    <comment>0: DeclarationType; 1: IdentifierName</comment>
+  </data>
+  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
+    <value>Specify Local Copy Variable Name</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 96755a0dfe..a8461ed052 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -212,33 +212,6 @@ public static System.Drawing.Bitmap arrow_circle_double {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Assigned ByVal parameter QuickFix - Make Local Copy.
-        /// </summary>
-        public static string AssignedByValParamQFixDialog_Caption {
-            get {
-                return ResourceManager.GetString("AssignedByValParamQFixDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify a name to use for the local copy of ByVal {0} &apos;{1}&apos;..
-        /// </summary>
-        public static string AssignedByValParamQFixDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("AssignedByValParamQFixDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specify Local Copy Variable Name.
-        /// </summary>
-        public static string AssignedByValParamQFixDialog_TitleText {
-            get {
-                return ResourceManager.GetString("AssignedByValParamQFixDialog_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 55161c7eae..ae56abdc8a 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -923,15 +923,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>procedura knihovny</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
-    <value>Přiřazen ByVal parametr QuickFix - Udělat Lokální Kopii</value>
-  </data>
-  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte název, který se má použít na lokální kopii ByVal {0} '{1}'.</value>
-  </data>
-  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
-    <value>Specifikujte Název Kopie Lokální Proměnné</value>
-  </data>
   <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
     <value>Příklad Odsazeného Kódu</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index d744d423e9..73a47b672d 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -959,15 +959,9 @@ Möchten sie die Einstellungen in Rubberduck importieren?</value>
   <data name="GeneralSettings_CheckVersion" xml:space="preserve">
     <value>Beim Start prüfen, ob eine neuere Version verfügbar ist.</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
-    <value>Variablenname der Lokalen Kopie festlegen</value>
-  </data>
   <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
     <value>Eingerücktes Codebeispiel</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen Namen für die lokale Kopie von ByVal {0} '{1}'.</value>
-  </data>
   <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
     <value>Vertikalen Abstand aufrecht erhalten</value>
   </data>
@@ -977,9 +971,6 @@ Möchten sie die Einstellungen in Rubberduck importieren?</value>
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>Laufzeitausdruck</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
-    <value>ByVal zugewiesener Parameter QuickFix - Lokale Kopie erstellen</value>
-  </data>
   <data name="WindowSettings_StartupVisibilityHeader" xml:space="preserve">
     <value>Fenstersichtbarkeit beim Start</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 9799d9b88a..5b8fa830f7 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1023,16 +1023,6 @@ End Sub</value>
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>expresión en tiempo de ejecución</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
-    <value>Parámetro ByVal asignado. Solución rápida: Hacer una copia local</value>
-  </data>
-  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Especifique un nombre para usar para la copia local de ByVal {0} '{1}'.</value>
-    <comment>0: Tipo de declaración; 1: Nombre del identificador</comment>
-  </data>
-  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
-    <value>Especifique el nombre de la variable de copia local</value>
-  </data>
   <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
     <value>Ejemplo de código indentado</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 5212d2dca8..bc0cf1c888 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -980,9 +980,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="SmartIndenter_LegacySettingPrompt" xml:space="preserve">
     <value>Des paramètres utilisés par Smart Indenter existent dans votre registre. Voulez-vous les importer dans Rubberduck?</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
-    <value>Nommer la variable locale</value>
-  </data>
   <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
     <value>Échantillon de code indenté</value>
   </data>
@@ -992,9 +989,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="ContextMultipleControlsSelection" xml:space="preserve">
     <value>contrôles multiples</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier le nom à utiliser pour la copie locale du paramètre {0} '{1}'.</value>
-  </data>
   <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
     <value>Maintenir l'espacement vertical</value>
   </data>
@@ -1007,9 +1001,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>expression résolue à l'exécution</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
-    <value>Introduire une variable locale</value>
-  </data>
   <data name="WindowSettings_StartupVisibilityHeader" xml:space="preserve">
     <value>Visibilité au démarrage</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 6dbabde84b..45be6ae602 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1032,16 +1032,6 @@ Would you like to import them to Rubberduck?</value>
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>runtime expression</value>
   </data>
-  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
-    <value>Assigned ByVal parameter QuickFix - Make Local Copy</value>
-  </data>
-  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify a name to use for the local copy of ByVal {0} '{1}'.</value>
-    <comment>0: DeclarationType; 1: IdentifierName</comment>
-  </data>
-  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
-    <value>Specify Local Copy Variable Name</value>
-  </data>
   <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
     <value>Indented Code Sample</value>
   </data>

From 7534bfce41919f53752560a70295b57cf7393d08 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 14:06:56 -0700
Subject: [PATCH 12/64] Migrate CodeInspectionResults_ resources

---
 .../CodeAnalysisUI.Designer.cs                |  90 ++++++++++++
 .../CodeAnalysisUI.cs.resx                    | 129 ++++++++++++++++++
 .../CodeAnalysisUI.de.resx                    | 129 ++++++++++++++++++
 .../CodeAnalysisUI.es.resx                    | 129 ++++++++++++++++++
 .../CodeAnalysisUI.fr.resx                    | 129 ++++++++++++++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   | 109 +++++++++++++++
 .../Rubberduck.CodeAnalysis.csproj            |   5 +
 .../Inspections/InspectionResultsControl.xaml |   6 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs |  45 ------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  15 --
 Rubberduck.Resources/RubberduckUI.de.resx     |  15 --
 Rubberduck.Resources/RubberduckUI.es.resx     |  15 --
 Rubberduck.Resources/RubberduckUI.fr.resx     |  15 --
 Rubberduck.Resources/RubberduckUI.resx        |  15 --
 14 files changed, 723 insertions(+), 123 deletions(-)
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
new file mode 100644
index 0000000000..43399f395a
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.CodeAnalysis {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class CodeAnalysisUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal CodeAnalysisUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.CodeAnalysis.CodeAnalysisUI", typeof(CodeAnalysisUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Issue.
+        /// </summary>
+        internal static string CodeInspectionResults_Issue {
+            get {
+                return ResourceManager.GetString("CodeInspectionResults_Issue", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location.
+        /// </summary>
+        internal static string CodeInspectionResults_Location {
+            get {
+                return ResourceManager.GetString("CodeInspectionResults_Location", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Type.
+        /// </summary>
+        internal static string CodeInspectionResults_Type {
+            get {
+                return ResourceManager.GetString("CodeInspectionResults_Type", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
new file mode 100644
index 0000000000..00dd93c7a3
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CodeInspectionResults_Type" xml:space="preserve">
+    <value>Typ</value>
+  </data>
+  <data name="CodeInspectionResults_Issue" xml:space="preserve">
+    <value>Problém</value>
+  </data>
+  <data name="CodeInspectionResults_Location" xml:space="preserve">
+    <value>Lokace</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
new file mode 100644
index 0000000000..27e7085530
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CodeInspectionResults_Type" xml:space="preserve">
+    <value>Typ</value>
+  </data>
+  <data name="CodeInspectionResults_Issue" xml:space="preserve">
+    <value>Problem</value>
+  </data>
+  <data name="CodeInspectionResults_Location" xml:space="preserve">
+    <value>Ort</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
new file mode 100644
index 0000000000..ad87564f50
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CodeInspectionResults_Type" xml:space="preserve">
+    <value>Tipo</value>
+  </data>
+  <data name="CodeInspectionResults_Issue" xml:space="preserve">
+    <value>Problema</value>
+  </data>
+  <data name="CodeInspectionResults_Location" xml:space="preserve">
+    <value>Ubicación</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
new file mode 100644
index 0000000000..14950f0593
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CodeInspectionResults_Type" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="CodeInspectionResults_Issue" xml:space="preserve">
+    <value>Problème</value>
+  </data>
+  <data name="CodeInspectionResults_Location" xml:space="preserve">
+    <value>Emplacement</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
new file mode 100644
index 0000000000..1f69995395
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CodeInspectionResults_Type" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="CodeInspectionResults_Issue" xml:space="preserve">
+    <value>Issue</value>
+  </data>
+  <data name="CodeInspectionResults_Location" xml:space="preserve">
+    <value>Location</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
index e42e51303b..fbcfc7a0be 100644
--- a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
+++ b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
@@ -67,6 +67,11 @@
       <DependentUpon>CodeInspectionDefaults.settings</DependentUpon>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="CodeAnalysisUI.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <None Update="Properties\CodeInspectionDefaults.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
index fb7b6636fe..58ab2c361b 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
@@ -232,15 +232,15 @@
                             </DataTemplate>
                         </DataGrid.RowDetailsTemplate>
                         <DataGrid.Columns>
-                            <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Type}">
+                            <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionResults_Type}">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate DataType="inspections:IInspectionResult">
                                         <Image Source="{Binding Inspection, Converter={StaticResource InspectionIconConverter}, Mode=OneTime}" Width="16" Height="16" />
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Issue}" Binding="{Binding Description, Mode=OneTime}" />
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Location}" Binding="{Binding QualifiedSelection.QualifiedName, Mode=OneTime, Converter={StaticResource GroupingGridLocationConverter}}" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionResults_Issue}" Binding="{Binding Description, Mode=OneTime}" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionResults_Location}" Binding="{Binding QualifiedSelection.QualifiedName, Mode=OneTime, Converter={StaticResource GroupingGridLocationConverter}}" />
                         </DataGrid.Columns>
                         <DataGrid.ContextMenu>
                             <ContextMenu ItemsSource="{Binding PlacementTarget.DataContext.QuickFixes, RelativeSource={RelativeSource Self}}"
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ae232e690d..d458328c94 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -549,51 +549,6 @@ public static string CodeExplorer_IExportable_DeclarationFormat {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to By module.
-        /// </summary>
-        public static string CodeInspectionResults_GroupByModule {
-            get {
-                return ResourceManager.GetString("CodeInspectionResults_GroupByModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to By inspection type.
-        /// </summary>
-        public static string CodeInspectionResults_GroupByType {
-            get {
-                return ResourceManager.GetString("CodeInspectionResults_GroupByType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Issue.
-        /// </summary>
-        public static string CodeInspectionResults_Issue {
-            get {
-                return ResourceManager.GetString("CodeInspectionResults_Issue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Location.
-        /// </summary>
-        public static string CodeInspectionResults_Location {
-            get {
-                return ResourceManager.GetString("CodeInspectionResults_Location", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type.
-        /// </summary>
-        public static string CodeInspectionResults_Type {
-            get {
-                return ResourceManager.GetString("CodeInspectionResults_Type", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Code Inspections.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a605648f57..1ae0865d39 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -501,9 +501,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
     <value>Nastavení odsazení</value>
   </data>
-  <data name="CodeInspectionResults_Type" xml:space="preserve">
-    <value>Typ</value>
-  </data>
   <data name="Settings" xml:space="preserve">
     <value>Nastavení</value>
   </data>
@@ -701,18 +698,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="CommandDescription_IndentCurrentProcedureCommand" xml:space="preserve">
     <value>Odsadit Proceduru</value>
   </data>
-  <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
-    <value>Dle modulu</value>
-  </data>
-  <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
-    <value>Dle typu inspekce</value>
-  </data>
-  <data name="CodeInspectionResults_Issue" xml:space="preserve">
-    <value>Problém</value>
-  </data>
-  <data name="CodeInspectionResults_Location" xml:space="preserve">
-    <value>Lokace</value>
-  </data>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Seskupení</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e25afdb15e..a462b136c2 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -683,21 +683,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
     <value>Spezielle Optionen</value>
   </data>
-  <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
-    <value>Nach Modul</value>
-  </data>
-  <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
-    <value>Nach Inspektionstyp</value>
-  </data>
-  <data name="CodeInspectionResults_Issue" xml:space="preserve">
-    <value>Problem</value>
-  </data>
-  <data name="CodeInspectionResults_Location" xml:space="preserve">
-    <value>Ort</value>
-  </data>
-  <data name="CodeInspectionResults_Type" xml:space="preserve">
-    <value>Typ</value>
-  </data>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Gruppierung</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 40f3148a42..d8ebe53aad 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -715,21 +715,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="CommandDescription_IndentCurrentProcedureCommand" xml:space="preserve">
     <value>Indentar procedimiento</value>
   </data>
-  <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
-    <value>Por módulo</value>
-  </data>
-  <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
-    <value>Por tipo de inspección</value>
-  </data>
-  <data name="CodeInspectionResults_Issue" xml:space="preserve">
-    <value>Problema</value>
-  </data>
-  <data name="CodeInspectionResults_Location" xml:space="preserve">
-    <value>Ubicación</value>
-  </data>
-  <data name="CodeInspectionResults_Type" xml:space="preserve">
-    <value>Tipo</value>
-  </data>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Agrupamiento</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c3c4f58fdc..5edc804166 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -648,9 +648,6 @@ Continuer?</value>
   <data name="EndOfLineCommentStyle_AlignInColumn" xml:space="preserve">
     <value>Aligner dans la colonne</value>
   </data>
-  <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
-    <value>Par type d'inspection</value>
-  </data>
   <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
     <value>Raccourcis:</value>
   </data>
@@ -750,9 +747,6 @@ Continuer?</value>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Sévérité:</value>
   </data>
-  <data name="CodeInspectionResults_Issue" xml:space="preserve">
-    <value>Problème</value>
-  </data>
   <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
     <value>Indenter le premier bloc de déclarations</value>
   </data>
@@ -771,15 +765,9 @@ Continuer?</value>
   <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
     <value>Aligner les commentaires avec le code</value>
   </data>
-  <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
-    <value>Par module</value>
-  </data>
   <data name="SearchResults_AllImplementationsTabFormat" xml:space="preserve">
     <value>Implémentations: '{0}'</value>
   </data>
-  <data name="CodeInspectionResults_Type" xml:space="preserve">
-    <value>Type</value>
-  </data>
   <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
     <value>Aligner les continuations</value>
   </data>
@@ -801,9 +789,6 @@ Continuer?</value>
   <data name="ParserState_Parsing" xml:space="preserve">
     <value>Analyse…</value>
   </data>
-  <data name="CodeInspectionResults_Location" xml:space="preserve">
-    <value>Emplacement</value>
-  </data>
   <data name="SearchResults_Location" xml:space="preserve">
     <value>Emplacement</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9445c6b439..dcb41e836c 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -724,21 +724,6 @@ Do you want to proceed with this rename?</value>
   <data name="CommandDescription_IndentCurrentProcedureCommand" xml:space="preserve">
     <value>Indent Procedure</value>
   </data>
-  <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
-    <value>By module</value>
-  </data>
-  <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
-    <value>By inspection type</value>
-  </data>
-  <data name="CodeInspectionResults_Issue" xml:space="preserve">
-    <value>Issue</value>
-  </data>
-  <data name="CodeInspectionResults_Location" xml:space="preserve">
-    <value>Location</value>
-  </data>
-  <data name="CodeInspectionResults_Type" xml:space="preserve">
-    <value>Type</value>
-  </data>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Grouping</value>
   </data>

From 0c936a5e8907609fb9032421e5af4cad8470c696 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 14:28:55 -0700
Subject: [PATCH 13/64] Migrate CodeInspections_ resources

---
 .../CodeAnalysisUI.Designer.cs                |  41 +++++-
 .../CodeAnalysisUI.cs.resx                    |  11 ++
 .../CodeAnalysisUI.de.resx                    |  11 ++
 .../CodeAnalysisUI.es.resx                    |  11 ++
 .../CodeAnalysisUI.fr.resx                    |  11 ++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   |  13 ++
 .../Inspections/Logistics/Inspector.cs        |   3 +-
 .../Rubberduck.CodeAnalysis.csproj            |   6 +
 .../Inspections/InspectionResultsViewModel.cs |   5 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 128 ------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  44 ------
 Rubberduck.Resources/RubberduckUI.de.resx     |  44 ------
 Rubberduck.Resources/RubberduckUI.es.resx     |  49 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  48 -------
 Rubberduck.Resources/RubberduckUI.resx        |  49 -------
 15 files changed, 103 insertions(+), 371 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index 43399f395a..829dbd4304 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -22,7 +22,7 @@ namespace Rubberduck.CodeAnalysis {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class CodeAnalysisUI {
+    public class CodeAnalysisUI {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ internal CodeAnalysisUI() {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.CodeAnalysis.CodeAnalysisUI", typeof(CodeAnalysisUI).Assembly);
@@ -51,7 +51,7 @@ internal CodeAnalysisUI() {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ internal CodeAnalysisUI() {
         /// <summary>
         ///   Looks up a localized string similar to Issue.
         /// </summary>
-        internal static string CodeInspectionResults_Issue {
+        public static string CodeInspectionResults_Issue {
             get {
                 return ResourceManager.GetString("CodeInspectionResults_Issue", resourceCulture);
             }
@@ -72,7 +72,7 @@ internal static string CodeInspectionResults_Issue {
         /// <summary>
         ///   Looks up a localized string similar to Location.
         /// </summary>
-        internal static string CodeInspectionResults_Location {
+        public static string CodeInspectionResults_Location {
             get {
                 return ResourceManager.GetString("CodeInspectionResults_Location", resourceCulture);
             }
@@ -81,10 +81,39 @@ internal static string CodeInspectionResults_Location {
         /// <summary>
         ///   Looks up a localized string similar to Type.
         /// </summary>
-        internal static string CodeInspectionResults_Type {
+        public static string CodeInspectionResults_Type {
             get {
                 return ResourceManager.GetString("CodeInspectionResults_Type", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inspecting....
+        /// </summary>
+        public static string CodeInspections_Inspecting {
+            get {
+                return ResourceManager.GetString("CodeInspections_Inspecting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck Code Inspections - {0}
+        ///{1} issues found..
+        /// </summary>
+        public static string CodeInspections_NumberOfIssuesFound_Plural {
+            get {
+                return ResourceManager.GetString("CodeInspections_NumberOfIssuesFound_Plural", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck Code Inspections - {0}
+        ///{1} issue found..
+        /// </summary>
+        public static string CodeInspections_NumberOfIssuesFound_Singular {
+            get {
+                return ResourceManager.GetString("CodeInspections_NumberOfIssuesFound_Singular", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index 00dd93c7a3..6905df9105 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -126,4 +126,15 @@
   <data name="CodeInspectionResults_Location" xml:space="preserve">
     <value>Lokace</value>
   </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
+    <value>Rubberduck Inspekce Kódu - {0}
+{1} problém nalezen.</value>
+  </data>
+  <data name="CodeInspections_Inspecting" xml:space="preserve">
+    <value>Kontroluji...</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
+    <value>Rubberduck Inspekce Kódu - {0}
+Nalezeno {1} problémů.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 27e7085530..5b84b14d25 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -126,4 +126,15 @@
   <data name="CodeInspectionResults_Location" xml:space="preserve">
     <value>Ort</value>
   </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
+    <value>Rubberduck Code Untersuchung - {0} 
+{1} Problem gefunden.</value>
+  </data>
+  <data name="CodeInspections_Inspecting" xml:space="preserve">
+    <value>Inspiziere...</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
+    <value>Rubberduck Code Untersuchung - {0} 
+{1} Probleme gefunden.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index ad87564f50..6c813b4bed 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -126,4 +126,15 @@
   <data name="CodeInspectionResults_Location" xml:space="preserve">
     <value>Ubicación</value>
   </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
+    <value>Inspecciones del código de Rubberduck - {0}
+{1} problema encontrado.</value>
+  </data>
+  <data name="CodeInspections_Inspecting" xml:space="preserve">
+    <value>Inspeccionando...</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
+    <value>Inspecciones del código de Rubberduck - {0}
+{1} problemas encontrados.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index 14950f0593..8d2d1741e8 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -126,4 +126,15 @@
   <data name="CodeInspectionResults_Location" xml:space="preserve">
     <value>Emplacement</value>
   </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
+    <value>Inspections Rubberduck - {0}
+{1} problème trouvé.</value>
+  </data>
+  <data name="CodeInspections_Inspecting" xml:space="preserve">
+    <value>Inspection...</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
+    <value>Inspections Rubberduck - {0}
+{1} problèmes trouvés.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index 1f69995395..569f25bc8a 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -106,4 +106,17 @@
   <data name="CodeInspectionResults_Location" xml:space="preserve">
     <value>Location</value>
   </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
+    <value>Rubberduck Code Inspections - {0}
+{1} issue found.</value>
+    <comment>{0}=timestamp; {1}=number</comment>
+  </data>
+  <data name="CodeInspections_Inspecting" xml:space="preserve">
+    <value>Inspecting...</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
+    <value>Rubberduck Code Inspections - {0}
+{1} issues found.</value>
+    <comment>{0}=timestamp; {1}=number</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/Inspections/Logistics/Inspector.cs b/Rubberduck.CodeAnalysis/Inspections/Logistics/Inspector.cs
index cb229a071d..2c706788bc 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Logistics/Inspector.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Logistics/Inspector.cs
@@ -17,6 +17,7 @@
 using Rubberduck.Resources;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor;
+using Rubberduck.CodeAnalysis;
 
 namespace Rubberduck.CodeAnalysis.Inspections.Logistics
 {
@@ -63,7 +64,7 @@ public async Task<IEnumerable<IInspectionResult>> FindIssuesAsync(RubberduckPars
             }
             token.ThrowIfCancellationRequested();
 
-            state.OnStatusMessageUpdate(RubberduckUI.CodeInspections_Inspecting);
+            state.OnStatusMessageUpdate(CodeAnalysisUI.CodeInspections_Inspecting);
             var allIssues = new ConcurrentBag<IInspectionResult>();
             token.ThrowIfCancellationRequested();
 
diff --git a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
index fbcfc7a0be..6105fffa3e 100644
--- a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
+++ b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
@@ -61,6 +61,11 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="CodeAnalysisUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>CodeAnalysisUI.resx</DependentUpon>
+    </Compile>
     <Compile Update="Properties\CodeInspectionDefaults.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -70,6 +75,7 @@
   <ItemGroup>
     <EmbeddedResource Update="CodeAnalysisUI.resx">
       <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>CodeAnalysisUI.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs
index fc88907ece..e597b472bc 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs
@@ -13,6 +13,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using NLog;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.CodeAnalysis.Inspections;
 using Rubberduck.CodeAnalysis.QuickFixes;
 using Rubberduck.Common;
@@ -809,8 +810,8 @@ private void ExecuteCopyResultsCommand(object parameter)
                 .ToArray();
 
             var resource = resultArray.Length == 1
-                ? Resources.RubberduckUI.CodeInspections_NumberOfIssuesFound_Singular
-                : Resources.RubberduckUI.CodeInspections_NumberOfIssuesFound_Plural;
+                ? CodeAnalysisUI.CodeInspections_NumberOfIssuesFound_Singular
+                : CodeAnalysisUI.CodeInspections_NumberOfIssuesFound_Plural;
 
             var title = string.Format(resource, DateTime.Now.ToString(CultureInfo.InvariantCulture), resultArray.Count());
 
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index d458328c94..9366f5bd96 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -558,134 +558,6 @@ public static string CodeInspections {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Copy inspection results to clipboard.
-        /// </summary>
-        public static string CodeInspections_CopyToolTip {
-            get {
-                return ResourceManager.GetString("CodeInspections_CopyToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Navigate to selected issue.
-        /// </summary>
-        public static string CodeInspections_GoToolTip {
-            get {
-                return ResourceManager.GetString("CodeInspections_GoToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Inspecting....
-        /// </summary>
-        public static string CodeInspections_Inspecting {
-            get {
-                return ResourceManager.GetString("CodeInspections_Inspecting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} ({1} issues).
-        /// </summary>
-        public static string CodeInspections_InspectingIssues_Plural {
-            get {
-                return ResourceManager.GetString("CodeInspections_InspectingIssues_Plural", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} ({1} issue).
-        /// </summary>
-        public static string CodeInspections_InspectingIssues_Singular {
-            get {
-                return ResourceManager.GetString("CodeInspections_InspectingIssues_Singular", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Navigate to next issue.
-        /// </summary>
-        public static string CodeInspections_NextToolTip {
-            get {
-                return ResourceManager.GetString("CodeInspections_NextToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} issues.
-        /// </summary>
-        public static string CodeInspections_NumberOfIssues_Plural {
-            get {
-                return ResourceManager.GetString("CodeInspections_NumberOfIssues_Plural", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} issue.
-        /// </summary>
-        public static string CodeInspections_NumberOfIssues_Singular {
-            get {
-                return ResourceManager.GetString("CodeInspections_NumberOfIssues_Singular", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck Code Inspections - {0}
-        ///{1} issues found..
-        /// </summary>
-        public static string CodeInspections_NumberOfIssuesFound_Plural {
-            get {
-                return ResourceManager.GetString("CodeInspections_NumberOfIssuesFound_Plural", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck Code Inspections - {0}
-        ///{1} issue found..
-        /// </summary>
-        public static string CodeInspections_NumberOfIssuesFound_Singular {
-            get {
-                return ResourceManager.GetString("CodeInspections_NumberOfIssuesFound_Singular", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Navigate to previous issue.
-        /// </summary>
-        public static string CodeInspections_PreviousToolTip {
-            get {
-                return ResourceManager.GetString("CodeInspections_PreviousToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Address the issue.
-        /// </summary>
-        public static string CodeInspections_QuickFixToolTip {
-            get {
-                return ResourceManager.GetString("CodeInspections_QuickFixToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Run code inspections.
-        /// </summary>
-        public static string CodeInspections_RefreshToolTip {
-            get {
-                return ResourceManager.GetString("CodeInspections_RefreshToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Run code inspections.
-        /// </summary>
-        public static string CodeInspections_Run {
-            get {
-                return ResourceManager.GetString("CodeInspections_Run", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Inspection Severities.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 1ae0865d39..9067ef728e 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -168,9 +168,6 @@
   <data name="RenameDialog_TitleText" xml:space="preserve">
     <value>Přejmenovat identifikátor</value>
   </data>
-  <data name="CodeInspections_Inspecting" xml:space="preserve">
-    <value>Kontroluji...</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(žádné)</value>
   </data>
@@ -354,15 +351,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="CodeInspections" xml:space="preserve">
     <value>Inspekce kódu</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
-    <value>{0} ({1} problém}</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
-    <value>{0} problém</value>
-  </data>
-  <data name="CodeInspections_Run" xml:space="preserve">
-    <value>Spustit inspekce kódu</value>
-  </data>
   <data name="Passed" xml:space="preserve">
     <value>V pořádku</value>
   </data>
@@ -390,27 +378,9 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Navigate" xml:space="preserve">
     <value>Navigovat</value>
   </data>
-  <data name="CodeInspections_CopyToolTip" xml:space="preserve">
-    <value>Zkopírovat výsledky kontroly do schránky</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Go</value>
   </data>
-  <data name="CodeInspections_GoToolTip" xml:space="preserve">
-    <value>Navigovat na vybraný problém</value>
-  </data>
-  <data name="CodeInspections_NextToolTip" xml:space="preserve">
-    <value>Navigovat na následující problém</value>
-  </data>
-  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
-    <value>Navigovat na předchozí problém</value>
-  </data>
-  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
-    <value>Řešit problém</value>
-  </data>
-  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
-    <value>Spustit inspekci kódu</value>
-  </data>
   <data name="ModuleName" xml:space="preserve">
     <value>Název modulu</value>
   </data>
@@ -531,10 +501,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
     <value>Vyberte parametr a dvojím poklepáním na něj, nebo použitím tlačítek, ho odstraňte nebo obnovte.</value>
   </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck Inspekce Kódu - {0}
-Nalezeno {1} problémů.</value>
-  </data>
   <data name="RenameDialog_ConflictingNames" xml:space="preserve">
     <value>Přejmenování na '{0}' je ve střetu s existující deklarací '{1}. Přejmenování '{2}' na '{0}' může vyústit v nekompatibilní kód nebo změnu v jeho logice.
 Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
@@ -542,12 +508,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
     <value>Přesvědčte se, že máte před přejemnováním vybrán pouze 1 control.</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
-    <value>{0} ({1} problémů)</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Plural" xml:space="preserve">
-    <value>{0} problémů</value>
-  </data>
   <data name="Language_DE" xml:space="preserve">
     <value>Němčina</value>
   </data>
@@ -1081,10 +1041,6 @@ End Enum</value>
   <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
     <value>Zvol parametr a za použití táhnutí myši nebo pomocí tlačítek ho přesuň výše nebo níže.</value>
   </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck Inspekce Kódu - {0}
-{1} problém nalezen.</value>
-  </data>
   <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
     <value>Vynutit pokyny kompilátoru do sloupce 1</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index a462b136c2..e336788a3b 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -187,9 +187,6 @@
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>Sprungmarke</value>
   </data>
-  <data name="CodeInspections_Inspecting" xml:space="preserve">
-    <value>Inspiziere...</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(nichts)</value>
   </data>
@@ -310,9 +307,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="CodeInspections" xml:space="preserve">
     <value>Code Untersuchung</value>
   </data>
-  <data name="CodeInspections_Run" xml:space="preserve">
-    <value>Code-Untersuchung ausführen</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Beheben</value>
   </data>
@@ -394,27 +388,9 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Rename" xml:space="preserve">
     <value>Umbenennen</value>
   </data>
-  <data name="CodeInspections_CopyToolTip" xml:space="preserve">
-    <value>Untersuchungsergebnisse in Zwischenablage kopieren</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Los</value>
   </data>
-  <data name="CodeInspections_GoToolTip" xml:space="preserve">
-    <value>Zum ausgewählten Problem navigieren</value>
-  </data>
-  <data name="CodeInspections_NextToolTip" xml:space="preserve">
-    <value>Zum nächsten Problem navigieren</value>
-  </data>
-  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
-    <value>Zum vorigen Problem navigieren</value>
-  </data>
-  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
-    <value>Das Problem beheben</value>
-  </data>
-  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
-    <value>Code-Untersuchung ausführen</value>
-  </data>
   <data name="TodoExplorer_Description" xml:space="preserve">
     <value>Beschreibung</value>
   </data>
@@ -471,26 +447,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="Rename_DeclarationType" xml:space="preserve">
     <value>{0} Umbenennen</value>
   </data>
-  <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
-    <value>{0} Problem</value>
-  </data>
-  <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
-    <value>{0} ({1} Probleme)</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck Code Untersuchung - {0} 
-{1} Problem gefunden.</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Plural" xml:space="preserve">
-    <value>{0} Probleme</value>
-  </data>
-  <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
-    <value>{0} ({1} Problem)</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck Code Untersuchung - {0} 
-{1} Probleme gefunden.</value>
-  </data>
   <data name="Language_DE" xml:space="preserve">
     <value>Deutsch</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index d8ebe53aad..ecc535ec86 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -187,9 +187,6 @@
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>etiqueta de línea</value>
   </data>
-  <data name="CodeInspections_Inspecting" xml:space="preserve">
-    <value>Inspeccionando...</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(ninguno)</value>
   </data>
@@ -311,16 +308,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="CodeInspections" xml:space="preserve">
     <value>Inspecciones de código</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
-    <value>{0} ({1} problema)</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
-    <value>{0} problema</value>
-    <comment>{0} = número</comment>
-  </data>
-  <data name="CodeInspections_Run" xml:space="preserve">
-    <value>Ejecutar inspecciones de código</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Arreglo</value>
   </data>
@@ -405,27 +392,9 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Rename" xml:space="preserve">
     <value>Renombrar</value>
   </data>
-  <data name="CodeInspections_CopyToolTip" xml:space="preserve">
-    <value>Copiar los resultados de la inspección al portapapeles</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Ir</value>
   </data>
-  <data name="CodeInspections_GoToolTip" xml:space="preserve">
-    <value>Navegar al problema seleccionado</value>
-  </data>
-  <data name="CodeInspections_NextToolTip" xml:space="preserve">
-    <value>Navegar al problema siguiente</value>
-  </data>
-  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
-    <value>Navegar al problema anterior</value>
-  </data>
-  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
-    <value>Arreglar el problema</value>
-  </data>
-  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
-    <value>Ejecutar inspecciones de código</value>
-  </data>
   <data name="TodoExplorer_Description" xml:space="preserve">
     <value>Descripción</value>
   </data>
@@ -465,11 +434,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Navigation" xml:space="preserve">
     <value>Navegación</value>
   </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Inspecciones del código de Rubberduck - {0}
-{1} problemas encontrados.</value>
-    <comment>{0} = marca de tiempo; {1} = número</comment>
-  </data>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
     <value>El método '{0}' implementa '{1}. {2}'. ¿Renombrar el miembro de la interfaz?</value>
     <comment>0: objetivo seleccionado; 1: nombre de la interfaz; 2: nombre del miembro de la interfaz</comment>
@@ -491,19 +455,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Rename_DeclarationType" xml:space="preserve">
     <value>Renombrar {0}</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
-    <value>{0} ({1} problemas)</value>
-    <comment>{0} = estado; {1} = número</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Inspecciones del código de Rubberduck - {0}
-{1} problema encontrado.</value>
-    <comment>{0} = marca de tiempo; {1} = número</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Plural" xml:space="preserve">
-    <value>{0} problemas</value>
-    <comment>{0} = número</comment>
-  </data>
   <data name="Language_DE" xml:space="preserve">
     <value>Alemán</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 5edc804166..07411df44f 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -190,9 +190,6 @@
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>l'étiquette de ligne</value>
   </data>
-  <data name="CodeInspections_Inspecting" xml:space="preserve">
-    <value>Inspection...</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(aucun)</value>
   </data>
@@ -273,10 +270,6 @@
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Aucune implémentation trouvée pour '{0}'.</value>
   </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Inspections Rubberduck - {0}
-{1} problèmes trouvés.</value>
-  </data>
   <data name="Home" xml:space="preserve">
     <value>Accueil</value>
   </data>
@@ -319,15 +312,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="AllImplementations_Caption" xml:space="preserve">
     <value>Implémentations de '{0}'</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
-    <value>{0} ({1} problème)</value>
-  </data>
-  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
-    <value>Naviguer au problème précédent</value>
-  </data>
-  <data name="CodeInspections_Run" xml:space="preserve">
-    <value>Exécuter les inspections</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Régler</value>
   </data>
@@ -382,12 +366,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="CodeInspections" xml:space="preserve">
     <value>Inspections</value>
   </data>
-  <data name="CodeInspections_CopyToolTip" xml:space="preserve">
-    <value>Copier les résultats au presse-papier</value>
-  </data>
-  <data name="CodeInspections_GoToolTip" xml:space="preserve">
-    <value>Naviguer au problème sélectionné</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Aller</value>
   </data>
@@ -442,19 +420,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="TodoSettings_TokenListLabel" xml:space="preserve">
     <value>Liste:</value>
   </data>
-  <data name="CodeInspections_NextToolTip" xml:space="preserve">
-    <value>Naviguer au prochain problème</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
-    <value>{0} problème</value>
-    <comment>{0}=number</comment>
-  </data>
-  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
-    <value>Appliquer une solution</value>
-  </data>
-  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
-    <value>Exécuter les inspections à nouveau</value>
-  </data>
   <data name="Component" xml:space="preserve">
     <value>Componsant</value>
   </data>
@@ -491,19 +456,6 @@ Continuer?</value>
   <data name="Rename_DeclarationType" xml:space="preserve">
     <value>Renommer {0}</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
-    <value>{0} ({1} problèmes)</value>
-    <comment>{0}=status; {1}=number</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Inspections Rubberduck - {0}
-{1} problème trouvé.</value>
-    <comment>{0}=timestamp; {1}=number</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Plural" xml:space="preserve">
-    <value>{0} problèmes</value>
-    <comment>{0}=number</comment>
-  </data>
   <data name="Language_DE" xml:space="preserve">
     <value>Allemand</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index dcb41e836c..a09f9c706b 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -190,9 +190,6 @@
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>line label</value>
   </data>
-  <data name="CodeInspections_Inspecting" xml:space="preserve">
-    <value>Inspecting...</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(none)</value>
   </data>
@@ -314,16 +311,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="CodeInspections" xml:space="preserve">
     <value>Code Inspections</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
-    <value>{0} ({1} issue)</value>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
-    <value>{0} issue</value>
-    <comment>{0}=number</comment>
-  </data>
-  <data name="CodeInspections_Run" xml:space="preserve">
-    <value>Run code inspections</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Fix</value>
   </data>
@@ -408,27 +395,9 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Rename" xml:space="preserve">
     <value>Rename</value>
   </data>
-  <data name="CodeInspections_CopyToolTip" xml:space="preserve">
-    <value>Copy inspection results to clipboard</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Go</value>
   </data>
-  <data name="CodeInspections_GoToolTip" xml:space="preserve">
-    <value>Navigate to selected issue</value>
-  </data>
-  <data name="CodeInspections_NextToolTip" xml:space="preserve">
-    <value>Navigate to next issue</value>
-  </data>
-  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
-    <value>Navigate to previous issue</value>
-  </data>
-  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
-    <value>Address the issue</value>
-  </data>
-  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
-    <value>Run code inspections</value>
-  </data>
   <data name="TodoExplorer_Description" xml:space="preserve">
     <value>Description</value>
   </data>
@@ -468,11 +437,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Navigation" xml:space="preserve">
     <value>Navigation</value>
   </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck Code Inspections - {0}
-{1} issues found.</value>
-    <comment>{0}=timestamp; {1}=number</comment>
-  </data>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
     <value>Method '{0}' implements '{1}.{2}'. Rename the interface member?</value>
     <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
@@ -494,19 +458,6 @@ Do you want to proceed with this rename?</value>
   <data name="Rename_DeclarationType" xml:space="preserve">
     <value>Rename {0}</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
-    <value>{0} ({1} issues)</value>
-    <comment>{0}=status; {1}=number</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck Code Inspections - {0}
-{1} issue found.</value>
-    <comment>{0}=timestamp; {1}=number</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Plural" xml:space="preserve">
-    <value>{0} issues</value>
-    <comment>{0}=number</comment>
-  </data>
   <data name="Language_DE" xml:space="preserve">
     <value>German</value>
   </data>

From ab317400bd46c984ba34bc88a1def0c29103fa66 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 15:05:22 -0700
Subject: [PATCH 14/64] Migrate CodeInspectionSettings_ resources

A suffix was added to differentiate values from those found within the
InspectionUI.resx file. Those values are used in the following files:
	InspectionBase.cs
	CodeInspectionSettings.cs
	InspectionTypeConverter.cs

Used as `InspectionsUI.ResourceManager.GetString($"CodeInspectionSettings_`.
---
 .../CodeAnalysisUI.Designer.cs                | 45 +++++++++++++++++++
 .../CodeAnalysisUI.cs.resx                    | 15 +++++++
 .../CodeAnalysisUI.de.resx                    | 15 +++++++
 .../CodeAnalysisUI.es.resx                    | 15 +++++++
 .../CodeAnalysisUI.fr.resx                    | 15 +++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   | 15 +++++++
 .../Inspections/Abstract/InspectionBase.cs    |  2 +-
 .../Rubberduck.CodeAnalysis.csproj            |  2 +-
 .../UI/Settings/InspectionSettings.xaml       | 10 ++---
 Rubberduck.Resources/RubberduckUI.cs.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.resx        | 15 -------
 14 files changed, 127 insertions(+), 82 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index 829dbd4304..f3477f169f 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -115,5 +115,50 @@ public static string CodeInspections_NumberOfIssuesFound_Singular {
                 return ResourceManager.GetString("CodeInspections_NumberOfIssuesFound_Singular", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inspection Severities.
+        /// </summary>
+        public static string CodeInspectionSettingsPage_InspectionSeveritySettingsLabel {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_InspectionSeveritySettingsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Miscellaneous.
+        /// </summary>
+        public static string CodeInspectionSettingsPage_Misc {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_Misc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Run inspections automatically on successful parse.
+        /// </summary>
+        public static string CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to These identifiers will be ignored by the &apos;Use meaningful names&apos; inspection..
+        /// </summary>
+        public static string CodeInspectionSettingsPage_WhitelistedIdentifiersDescription {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_WhitelistedIdentifiersDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Allowed Identifiers.
+        /// </summary>
+        public static string CodeInspectionSettingsPage_WhitelistedIdentifiersLabel {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_WhitelistedIdentifiersLabel", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index 6905df9105..7d0924df22 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -137,4 +137,19 @@
     <value>Rubberduck Inspekce Kódu - {0}
 Nalezeno {1} problémů.</value>
   </data>
+  <data name="CodeInspectionSettingsPage_InspectionSeveritySettingsLabel" xml:space="preserve">
+    <value>Závažnosti Inspekce</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersLabel" xml:space="preserve">
+    <value>Dovolené Identifikátory</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc" xml:space="preserve">
+    <value>Různé</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
+    <value>Spustit automaticky inspekce po úspěšném parsování</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
+    <value>Tyto identifikátory budou ignorovány inspekcí 'Použij smysluplné názvy'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 5b84b14d25..1d0e541571 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -137,4 +137,19 @@
     <value>Rubberduck Code Untersuchung - {0} 
 {1} Probleme gefunden.</value>
   </data>
+  <data name="CodeInspectionSettingsPage_InspectionSeveritySettingsLabel" xml:space="preserve">
+    <value>Inspektionsschwere</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersLabel" xml:space="preserve">
+    <value>Explizit erlaubte Namen</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc" xml:space="preserve">
+    <value>Verschiedenes</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
+    <value>Inspektionen nach erfolgreichem Parsen automatisch starten</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
+    <value>Diese Namen werden von der Inspektion "Nutze aussagekräftige Namen" ignoriert.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index 6c813b4bed..a71291a6f3 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -137,4 +137,19 @@
     <value>Inspecciones del código de Rubberduck - {0}
 {1} problemas encontrados.</value>
   </data>
+  <data name="CodeInspectionSettingsPage_InspectionSeveritySettingsLabel" xml:space="preserve">
+    <value>Severidad de la inspección</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersLabel" xml:space="preserve">
+    <value>Identificadores en lista blanca</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc" xml:space="preserve">
+    <value>Misceláneas</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
+    <value>Ejecutar inspecciones automáticamente en el análisis exitoso</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
+    <value>Estos identificadores serán ignorados por la inspección 'Usar nombres significativos'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index 8d2d1741e8..2aee298d8a 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -137,4 +137,19 @@
     <value>Inspections Rubberduck - {0}
 {1} problèmes trouvés.</value>
   </data>
+  <data name="CodeInspectionSettingsPage_InspectionSeveritySettingsLabel" xml:space="preserve">
+    <value>Niveau de sévérité</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersLabel" xml:space="preserve">
+    <value>Identifiants permis</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc" xml:space="preserve">
+    <value>Autres options</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
+    <value>Exécuter les inspections automatiquement</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
+    <value>L'inspection des noms ignorera ces identifiants.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index 569f25bc8a..17bd7891a2 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -119,4 +119,19 @@
 {1} issues found.</value>
     <comment>{0}=timestamp; {1}=number</comment>
   </data>
+  <data name="CodeInspectionSettingsPage_InspectionSeveritySettingsLabel" xml:space="preserve">
+    <value>Inspection Severities</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersLabel" xml:space="preserve">
+    <value>Allowed Identifiers</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc" xml:space="preserve">
+    <value>Miscellaneous</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
+    <value>Run inspections automatically on successful parse</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
+    <value>These identifiers will be ignored by the 'Use meaningful names' inspection.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/Inspections/Abstract/InspectionBase.cs b/Rubberduck.CodeAnalysis/Inspections/Abstract/InspectionBase.cs
index 23b94c9a92..4b8e227e0d 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Abstract/InspectionBase.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Abstract/InspectionBase.cs
@@ -55,7 +55,7 @@ protected InspectionBase(IDeclarationFinderProvider declarationFinderProvider)
         /// Gets a localized string representing the type of inspection.
         /// <see cref="InspectionType"/>
         /// </summary>
-        public virtual string InspectionTypeName => Resources.Inspections.InspectionsUI.ResourceManager.GetString($"CodeInspectionSettings_{InspectionType.ToString()}", CultureInfo.CurrentUICulture);
+        public virtual string InspectionTypeName => Resources.Inspections.InspectionsUI.ResourceManager.GetString($"CodeInspectionSettings_{InspectionType}", CultureInfo.CurrentUICulture);
 
         /// <summary>
         /// Gets a string representing the text that must be present in an 
diff --git a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
index 6105fffa3e..290c039a38 100644
--- a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
+++ b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="CodeAnalysisUI.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>CodeAnalysisUI.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
index a91363f8b6..beb3bfb235 100644
--- a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -52,7 +52,7 @@
                     <DockPanel FlowDirection="LeftToRight">
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                             <Label Style="{StaticResource HeaderText}"
-                                Content="{Resx Key=CodeInspectionSettings_InspectionSeveritySettingsLabel, ResxName=Rubberduck.Resources.RubberduckUI}" Margin="5,5,0,5" Width="127" />
+                                Content="{Resx ResxName=Rubberduck.CodeAnalysus.CodeAnalysisUI,Key=CodeInspectionSettingsPage_InspectionSeveritySettingsLabel}" Margin="5,5,0,5" Width="127" />
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
                                 <StackPanel.Resources>
                                     <Style BasedOn="{StaticResource HeaderText}" TargetType="Label">
@@ -134,22 +134,22 @@
                 <Border Style="{StaticResource BorderHeader}"
                         Margin="0,15,0,5">
                     <Label Style="{StaticResource HeaderText}"
-                           Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_Misc}">
+                           Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_Misc}">
                     </Label>
                 </Border>
 
                 <StackPanel>
                     <CheckBox IsChecked="{Binding RunInspectionsOnSuccessfulParse}" 
-                              Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse}" />
+                              Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse}" />
                 </StackPanel>
 
                 <Border Style="{StaticResource BorderHeader}"
                         Margin="0,15,0,5">
                     <Label Style="{StaticResource HeaderText}"
-                           Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_WhitelistedIdentifiersLabel}" />
+                           Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_WhitelistedIdentifiersLabel}" />
                 </Border>
 
-                <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_WhitelistedIdentifiersDescription}" />
+                <TextBlock Text="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_WhitelistedIdentifiersDescription}" />
                 <ToolBarTray IsLocked="True"
                              Background="Transparent">
                     <ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}"
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 9067ef728e..134e7193c3 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -829,21 +829,9 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="RegexAssistant_Title" xml:space="preserve">
     <value>Analyzátor Regulárních Výrazů</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Dovolené Identifikátory</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Tyto identifikátory budou ignorovány inspekcí 'Použij smysluplné názvy'.</value>
-  </data>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Refaktorovat / Zapouzdřit Pole</value>
   </data>
-  <data name="CodeInspectionSettings_Misc" xml:space="preserve">
-    <value>Různé</value>
-  </data>
-  <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Spustit automaticky inspekce po úspěšném parsování</value>
-  </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
     <value>Zobrazit úvodní obrazovku po spuštění</value>
   </data>
@@ -909,9 +897,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
     <value>{0} {1} není možno změnit.</value>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Závažnosti Inspekce</value>
-  </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>Metoda '{0}' je EventHandler pro ovládací prvek '{1}'. Přejmenovat lze pouze ovládací prvek. Místo toho přejmenovat '{1}'?</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e336788a3b..97b1f44fcd 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -804,21 +804,12 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="RegexAssistant_Title" xml:space="preserve">
     <value>Assistent für Reguläre Ausdrücke</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Explizit erlaubte Namen</value>
-  </data>
   <data name="RegexAssistant_Instructions" xml:space="preserve">
     <value>Einen Regulären Ausdruck zur Analyse in die Box unten eingeben.</value>
   </data>
   <data name="RegexAssistant_IgnoreCaseFlag" xml:space="preserve">
     <value>Ignoriere Groß-/Kleinschreibung</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Diese Namen werden von der Inspektion "Nutze aussagekräftige Namen" ignoriert.</value>
-  </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Inspektionsschwere</value>
-  </data>
   <data name="RegexAssistant_DescriptionResultsLabel" xml:space="preserve">
     <value>Beschreibung</value>
   </data>
@@ -828,18 +819,12 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
     <value>Kommentare in Enums und Typen wie in Prozeduren einrücken</value>
   </data>
-  <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Inspektionen nach erfolgreichem Parsen automatisch starten</value>
-  </data>
   <data name="RubberduckReloadFailure_Title" xml:space="preserve">
     <value>Rubberduck wird nicht neu geladen</value>
   </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
     <value>Ein Startlogo zu Beginn zeigen</value>
   </data>
-  <data name="CodeInspectionSettings_Misc" xml:space="preserve">
-    <value>Verschiedenes</value>
-  </data>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Werkzeugfenster wurden nicht korrekt entfernt und/oder konnten nicht wieder hergestellt werden; Die VBE könnte instabil sein. Rubberduck wird beim nächsten Start der VBE normal laden.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index ecc535ec86..078e38351d 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -864,21 +864,9 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="RegexAssistant_Title" xml:space="preserve">
     <value>Analizador de expresiones regulares</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Identificadores en lista blanca</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Estos identificadores serán ignorados por la inspección 'Usar nombres significativos'.</value>
-  </data>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Refactorizar / Encapsular Campo</value>
   </data>
-  <data name="CodeInspectionSettings_Misc" xml:space="preserve">
-    <value>Misceláneas</value>
-  </data>
-  <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Ejecutar inspecciones automáticamente en el análisis exitoso</value>
-  </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
     <value>Mostrar pantalla de bienvenida al inicio</value>
   </data>
@@ -1003,9 +991,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
     <value>{0} {1} no se puede cambiar.</value>
     <comment>0: Tipo de declaración; 1: Nombre del identificador</comment>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Severidad de la inspección</value>
-  </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>El método '{0}' es un EventHandler para el control '{1}'. Solo el control puede ser renombrado. ¿Renombrar '{1}' en su lugar?</value>
     <comment>0: identificador de objetivo seleccionado; 1: Nombre de control</comment>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 07411df44f..926ff607a4 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -792,12 +792,6 @@ Continuer?</value>
   <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
     <value>Info</value>
   </data>
-  <data name="CodeInspectionSettings_Misc" xml:space="preserve">
-    <value>Autres options</value>
-  </data>
-  <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Exécuter les inspections automatiquement</value>
-  </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
     <value>Afficher l'écran d'initialisation</value>
   </data>
@@ -863,9 +857,6 @@ End Sub</value>
   <data name="RegexAssistant_Title" xml:space="preserve">
     <value>Analyseur d'expressions Regex</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Identifiants permis</value>
-  </data>
   <data name="RegexAssistant_Instructions" xml:space="preserve">
     <value>Entrer une expression Regex à analyser dans l'espace ci-dessous.</value>
   </data>
@@ -875,15 +866,9 @@ End Sub</value>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Les fenêtres ancrables n'ont probablement pas été correctement détruites, et/ou n'ont pas pu être recréées. l'environnement peut ne pas être dans un état stable. Rubberduck démerrera normalement à la prochaine initialisation du VBE.</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>L'inspection des noms ignorera ces identifiants.</value>
-  </data>
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Résolution des références...</value>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Niveau de sévérité</value>
-  </data>
   <data name="RegexAssistant_DescriptionResultsLabel" xml:space="preserve">
     <value>Description</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index a09f9c706b..4cca7f209b 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -873,21 +873,9 @@ Do you want to proceed with this rename?</value>
   <data name="RegexAssistant_Title" xml:space="preserve">
     <value>Regular Expression Analyzer</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Allowed Identifiers</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>These identifiers will be ignored by the 'Use meaningful names' inspection.</value>
-  </data>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Refactor / Encapsulate Field</value>
   </data>
-  <data name="CodeInspectionSettings_Misc" xml:space="preserve">
-    <value>Miscellaneous</value>
-  </data>
-  <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Run inspections automatically on successful parse</value>
-  </data>
   <data name="GeneralSettings_ShowSplash" xml:space="preserve">
     <value>Show splash screen at startup</value>
   </data>
@@ -1013,9 +1001,6 @@ This dialog is showing because version checks are enabled. You can turn off this
     <value>{0} {1} cannot be changed.</value>
     <comment>0: DeclarationType; 1: IdentifierName</comment>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Inspection Severities</value>
-  </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>Method '{0}' is an EventHandler for control '{1}'.  Only the control can be renamed.  Rename '{1}' instead?</value>
     <comment>0: Selected target Identifier; 1: Control Name</comment>

From 06dbac08f54885712397adf470e033b0219d3d93 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 15:59:16 -0700
Subject: [PATCH 15/64] Migrate CodeMetrics resources

---
 .../CodeAnalysisUI.Designer.cs                | 36 +++++++++
 .../CodeAnalysisUI.cs.resx                    | 12 +++
 .../CodeAnalysisUI.de.resx                    | 12 +++
 .../CodeAnalysisUI.es.resx                    | 12 +++
 .../CodeAnalysisUI.fr.resx                    | 12 +++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   | 12 +++
 .../UI/CodeMetrics/CodeMetricsWindow.cs       |  4 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 81 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 12 ---
 Rubberduck.Resources/RubberduckUI.de.resx     | 12 ---
 Rubberduck.Resources/RubberduckUI.es.resx     | 12 ---
 Rubberduck.Resources/RubberduckUI.fr.resx     | 12 ---
 Rubberduck.Resources/RubberduckUI.resx        | 12 ---
 13 files changed, 98 insertions(+), 143 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index f3477f169f..b3e62e46e0 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -160,5 +160,41 @@ public static string CodeInspectionSettingsPage_WhitelistedIdentifiersLabel {
                 return ResourceManager.GetString("CodeInspectionSettingsPage_WhitelistedIdentifiersLabel", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cyclomatic Complexity.
+        /// </summary>
+        public static string CodeMetrics_Complexity {
+            get {
+                return ResourceManager.GetString("CodeMetrics_Complexity", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lines.
+        /// </summary>
+        public static string CodeMetrics_Lines {
+            get {
+                return ResourceManager.GetString("CodeMetrics_Lines", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Maximum Nesting.
+        /// </summary>
+        public static string CodeMetrics_Nesting {
+            get {
+                return ResourceManager.GetString("CodeMetrics_Nesting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Code Metrics.
+        /// </summary>
+        public static string CodeMetricsDockablePresenter_Caption {
+            get {
+                return ResourceManager.GetString("CodeMetricsDockablePresenter_Caption", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index 7d0924df22..26ecc5ae95 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -152,4 +152,16 @@ Nalezeno {1} problémů.</value>
   <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
     <value>Tyto identifikátory budou ignorovány inspekcí 'Použij smysluplné názvy'.</value>
   </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Řádky</value>
+  </data>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Cyklomatická Komplexita</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Maximální Vnoření</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Metrika Kódu</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 1d0e541571..606069ef10 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -152,4 +152,16 @@
   <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
     <value>Diese Namen werden von der Inspektion "Nutze aussagekräftige Namen" ignoriert.</value>
   </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Codezeilen</value>
+  </data>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Zyklomatische Komplexität</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Maximale Einrückung</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Codemetrikergebnisse</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index a71291a6f3..11a690206c 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -152,4 +152,16 @@
   <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
     <value>Estos identificadores serán ignorados por la inspección 'Usar nombres significativos'.</value>
   </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Líneas</value>
+  </data>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Complejidad ciclomática</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Anidamiento maximo</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Métricas de Código</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index 2aee298d8a..48ad38772d 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -152,4 +152,16 @@
   <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
     <value>L'inspection des noms ignorera ces identifiants.</value>
   </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Lignes</value>
+  </data>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Complexité Cyclomatique</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Imbrication</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Statistiques</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index 17bd7891a2..f591d24444 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -134,4 +134,16 @@
   <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
     <value>These identifiers will be ignored by the 'Use meaningful names' inspection.</value>
   </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Lines</value>
+  </data>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Cyclomatic Complexity</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Maximum Nesting</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Code Metrics</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs b/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
index 325375306c..2b9506ecc6 100644
--- a/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
+++ b/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-using Rubberduck.Resources;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.CodeAnalysis.CodeMetrics;
 
 namespace Rubberduck.UI.CodeMetrics
@@ -10,7 +10,7 @@ public sealed partial class CodeMetricsWindow : UserControl, IDockableUserContro
     {
         private const string ClassId = "C5318B5A-172F-417C-88E3-B377CDA2D809";
         string IDockableUserControl.ClassId => ClassId;
-        string IDockableUserControl.Caption => RubberduckUI.CodeMetricsDockablePresenter_Caption;
+        string IDockableUserControl.Caption => CodeAnalysisUI.CodeMetricsDockablePresenter_Caption;
 
         private CodeMetricsWindow()
         {
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 9366f5bd96..03ce787f14 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -558,87 +558,6 @@ public static string CodeInspections {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Inspection Severities.
-        /// </summary>
-        public static string CodeInspectionSettings_InspectionSeveritySettingsLabel {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_InspectionSeveritySettingsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Miscellaneous.
-        /// </summary>
-        public static string CodeInspectionSettings_Misc {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_Misc", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Run inspections automatically on successful parse.
-        /// </summary>
-        public static string CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to These identifiers will be ignored by the &apos;Use meaningful names&apos; inspection..
-        /// </summary>
-        public static string CodeInspectionSettings_WhitelistedIdentifiersDescription {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_WhitelistedIdentifiersDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Allowed Identifiers.
-        /// </summary>
-        public static string CodeInspectionSettings_WhitelistedIdentifiersLabel {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_WhitelistedIdentifiersLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cyclomatic Complexity.
-        /// </summary>
-        public static string CodeMetrics_Complexity {
-            get {
-                return ResourceManager.GetString("CodeMetrics_Complexity", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lines.
-        /// </summary>
-        public static string CodeMetrics_Lines {
-            get {
-                return ResourceManager.GetString("CodeMetrics_Lines", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Maximum Nesting.
-        /// </summary>
-        public static string CodeMetrics_Nesting {
-            get {
-                return ResourceManager.GetString("CodeMetrics_Nesting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Code Metrics.
-        /// </summary>
-        public static string CodeMetricsDockablePresenter_Caption {
-            get {
-                return ResourceManager.GetString("CodeMetricsDockablePresenter_Caption", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 134e7193c3..6f65b4e249 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -944,18 +944,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>Zkopírovat do schránky</value>
   </data>
-  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
-    <value>Metrika Kódu</value>
-  </data>
-  <data name="CodeMetrics_Complexity" xml:space="preserve">
-    <value>Cyklomatická Komplexita</value>
-  </data>
-  <data name="CodeMetrics_Lines" xml:space="preserve">
-    <value>Řádky</value>
-  </data>
-  <data name="CodeMetrics_Nesting" xml:space="preserve">
-    <value>Maximální Vnoření</value>
-  </data>
   <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
     <value>Klávesové zkratky by měly obsahovat buď Alt a/nebo Ctrl.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 97b1f44fcd..c5f04430f8 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -985,18 +985,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
     <value>Rubberduck TODO Markierungen - {0}
 {1} Markierungen gefunden.</value>
   </data>
-  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
-    <value>Codemetrikergebnisse</value>
-  </data>
-  <data name="CodeMetrics_Complexity" xml:space="preserve">
-    <value>Zyklomatische Komplexität</value>
-  </data>
-  <data name="CodeMetrics_Lines" xml:space="preserve">
-    <value>Codezeilen</value>
-  </data>
-  <data name="CodeMetrics_Nesting" xml:space="preserve">
-    <value>Maximale Einrückung</value>
-  </data>
   <data name="ParserState_Started" xml:space="preserve">
     <value>Gestartet</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 078e38351d..284b907ba3 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1044,18 +1044,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>Copiar al portapapeles</value>
   </data>
-  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
-    <value>Métricas de Código</value>
-  </data>
-  <data name="CodeMetrics_Complexity" xml:space="preserve">
-    <value>Complejidad ciclomática</value>
-  </data>
-  <data name="CodeMetrics_Lines" xml:space="preserve">
-    <value>Líneas</value>
-  </data>
-  <data name="CodeMetrics_Nesting" xml:space="preserve">
-    <value>Anidamiento maximo</value>
-  </data>
   <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
     <value>Las teclas de acceso rápido deben incluir Alt y / o Ctrl.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 926ff607a4..5af844215f 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -995,18 +995,6 @@ les projets dans le VBE.</value>
     <value>Rubberduck marqueurs TODO - {0}
 {1} marqueurs trouvés.</value>
   </data>
-  <data name="CodeMetrics_Nesting" xml:space="preserve">
-    <value>Imbrication</value>
-  </data>
-  <data name="CodeMetrics_Complexity" xml:space="preserve">
-    <value>Complexité Cyclomatique</value>
-  </data>
-  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
-    <value>Statistiques</value>
-  </data>
-  <data name="CodeMetrics_Lines" xml:space="preserve">
-    <value>Lignes</value>
-  </data>
   <data name="CommandDescription_IndentCurrentModuleCommand" xml:space="preserve">
     <value>Indenter le module</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 4cca7f209b..0d4bfa48be 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1054,18 +1054,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>Copy to clipboard</value>
   </data>
-  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
-    <value>Code Metrics</value>
-  </data>
-  <data name="CodeMetrics_Complexity" xml:space="preserve">
-    <value>Cyclomatic Complexity</value>
-  </data>
-  <data name="CodeMetrics_Lines" xml:space="preserve">
-    <value>Lines</value>
-  </data>
-  <data name="CodeMetrics_Nesting" xml:space="preserve">
-    <value>Maximum Nesting</value>
-  </data>
   <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
     <value>Hotkeys should include either Alt and/or Ctrl.</value>
   </data>

From b4a3dc21a627028b79ad51b9758c7e0651c3f009 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 15:59:58 -0700
Subject: [PATCH 16/64] Convert to auto-property

---
 Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs b/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
index 2b9506ecc6..75bd3fc659 100644
--- a/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
+++ b/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
@@ -19,14 +19,10 @@ private CodeMetricsWindow()
 
         public CodeMetricsWindow(CodeMetricsViewModel viewModel) : this()
         {
-            _viewModel = viewModel;
-            codeMetricsControl1.DataContext = _viewModel;
+            ViewModel = viewModel;
+            codeMetricsControl1.DataContext = ViewModel;
         }
 
-        private readonly CodeMetricsViewModel _viewModel;
-        public CodeMetricsViewModel ViewModel
-        {
-            get { return _viewModel; }
-        }
+        public CodeMetricsViewModel ViewModel { get; }
     }
 }

From 0141245b3dd0ee3a070e56614dc224131629a711 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 16:14:47 -0700
Subject: [PATCH 17/64] Convert to auto-property

---
 .../UI/Inspections/InspectionResultsWindow.cs          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
index 6d1cb35479..7a6724dd20 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
@@ -16,14 +16,10 @@ private InspectionResultsWindow()
 
         public InspectionResultsWindow(InspectionResultsViewModel viewModel) : this()
         {
-            _viewModel = viewModel;
-            wpfInspectionResultsControl.DataContext = _viewModel;
+            ViewModel = viewModel;
+            wpfInspectionResultsControl.DataContext = ViewModel;
         }
 
-        private readonly InspectionResultsViewModel _viewModel;
-        public InspectionResultsViewModel ViewModel
-        {
-            get { return _viewModel; }
-        }
+        public InspectionResultsViewModel ViewModel { get; }
     }
 }

From c0c65afa2a6e7fa43a39cebb22d362ae433b713f Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 16:15:21 -0700
Subject: [PATCH 18/64] Migrate Command_Reparse_ resources

---
 .../CodeAnalysisUI.Designer.cs                | 45 +++++++++++++++++++
 .../CodeAnalysisUI.cs.resx                    | 15 +++++++
 .../CodeAnalysisUI.de.resx                    | 15 +++++++
 .../CodeAnalysisUI.es.resx                    | 15 +++++++
 .../CodeAnalysisUI.fr.resx                    | 15 +++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   | 15 +++++++
 .../UI/Command/ComCommands/ReparseCommand.cs  |  8 ++--
 .../UI/Inspections/InspectionResultsWindow.cs |  4 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 45 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.resx        | 15 -------
 14 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index b3e62e46e0..9f02c54ada 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -87,6 +87,15 @@ public static string CodeInspectionResults_Type {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Code Inspections.
+        /// </summary>
+        public static string CodeInspections {
+            get {
+                return ResourceManager.GetString("CodeInspections", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Inspecting....
         /// </summary>
@@ -196,5 +205,41 @@ public static string CodeMetricsDockablePresenter_Caption {
                 return ResourceManager.GetString("CodeMetricsDockablePresenter_Caption", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}.
+        /// </summary>
+        public static string Command_Reparse_CannotCompile {
+            get {
+                return ResourceManager.GetString("Command_Reparse_CannotCompile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unable to compile for parsing..
+        /// </summary>
+        public static string Command_Reparse_CannotCompile_Caption {
+            get {
+                return ResourceManager.GetString("Command_Reparse_CannotCompile_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The VBE setting &quot;Compile On Demand&quot; is currently enabled. This is not recommended as this may hide compilation errors and cause problems with parsing. Do you want to parse anyway?.
+        /// </summary>
+        public static string Command_Reparse_CompileOnDemandEnabled {
+            get {
+                return ResourceManager.GetString("Command_Reparse_CompileOnDemandEnabled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Compile On Demand Setting.
+        /// </summary>
+        public static string Command_Reparse_CompileOnDemandEnabled_Caption {
+            get {
+                return ResourceManager.GetString("Command_Reparse_CompileOnDemandEnabled_Caption", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index 26ecc5ae95..fe42d4a8a0 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -164,4 +164,19 @@ Nalezeno {1} problémů.</value>
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Metrika Kódu</value>
   </data>
+  <data name="CodeInspections" xml:space="preserve">
+    <value>Inspekce kódu</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
+    <value>VBE nastavení "Zkompilovat Na Žádost" je aktuálně povoleno. Toto není doporučeno a může vyústit v kompilační chyby a způsobit problémy při parsování. Chcete i přesto spustit parser?</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Nastavení Zkompilování Na Žádost</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
+    <value>Není možno zkompilovat pro parsování.</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
+    <value>Následující projekt(y) nemohou být zkompilovány, což je s největší pravděpodobností kvůli parsovacím chybám. I přesto pokračovat? {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 606069ef10..13e1874595 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -164,4 +164,19 @@
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Codemetrikergebnisse</value>
   </data>
+  <data name="CodeInspections" xml:space="preserve">
+    <value>Code Untersuchung</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
+    <value>Die VBE-Einstellung "Bei Bedarf Kompilieren" ist aktuell eingeschalten. Dies ist nicht empfohlen, da Kompilierungsfehler und Probleme beim Parsen versteckt werden können. Trotzdem Parsen?</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Einstellung "Bei Bedarf Kompilieren"</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
+    <value>Konnte nicht vor dem Parsen kompilieren.</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
+    <value>Folgende(s) Projekt(e) können nicht kompiliert werden. Dies führt höchstwahrscheinlich zu Parserfehlern. Trotzdem fortfahren? {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index 11a690206c..8649882c6b 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -164,4 +164,19 @@
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Métricas de Código</value>
   </data>
+  <data name="CodeInspections" xml:space="preserve">
+    <value>Inspecciones de código</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
+    <value>El VBEsetting "Compile On Demand" está habilitado actualmente. No se recomienda, ya que puede ocultar errores de compilación y causar problemas con el análisis. ¿Quieres analizar de todos modos?</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Ajuste "Compilar A Demanda"</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
+    <value>No se puede compilar para analizar.</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
+    <value>Los siguientes proyectos no pueden compilarse, lo que probablemente resultará en errores del analizador. ¿Continua de todas maneras? {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index 48ad38772d..2531ada421 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -164,4 +164,19 @@
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Statistiques</value>
   </data>
+  <data name="CodeInspections" xml:space="preserve">
+    <value>Inspections</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
+    <value>L'option VBE "Compile on demand" est présentement activée. Cette configuration n'est pas recommandée, puisqu'elle peut masquer des erreurs de compilation in interférer avec l'analyse. Poursuivre l'analyse?</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Paramètre "Compile on demand"</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
+    <value>La compilation a échoué.</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
+    <value>Les projets suivants ne peuvent être compilés, ce qui causera probablement des erreurs d'analyse. Continuer? {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index f591d24444..f142d44ce3 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -146,4 +146,19 @@
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Code Metrics</value>
   </data>
+  <data name="CodeInspections" xml:space="preserve">
+    <value>Code Inspections</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
+    <value>The VBE setting "Compile On Demand" is currently enabled. This is not recommended as this may hide compilation errors and cause problems with parsing. Do you want to parse anyway?</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Compile On Demand Setting</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
+    <value>Unable to compile for parsing.</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
+    <value>The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Command/ComCommands/ReparseCommand.cs b/Rubberduck.Core/UI/Command/ComCommands/ReparseCommand.cs
index 945bf386e2..0f2a12ae33 100644
--- a/Rubberduck.Core/UI/Command/ComCommands/ReparseCommand.cs
+++ b/Rubberduck.Core/UI/Command/ComCommands/ReparseCommand.cs
@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Resources;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.ComManagement.TypeLibs.Abstract;
@@ -100,7 +100,7 @@ private bool VerifyCompileOnDemand()
         {
             if (_vbeSettings.CompileOnDemand)
             {
-                return _messageBox.ConfirmYesNo(RubberduckUI.Command_Reparse_CompileOnDemandEnabled, RubberduckUI.Command_Reparse_CompileOnDemandEnabled_Caption, false);
+                return _messageBox.ConfirmYesNo(CodeAnalysisUI.Command_Reparse_CompileOnDemandEnabled, CodeAnalysisUI.Command_Reparse_CompileOnDemandEnabled_Caption, false);
             }
 
             return true;
@@ -137,9 +137,9 @@ private bool PromptUserToContinue(List<string> failedNames)
                 string.Join(Environment.NewLine, failedNames));
             // FIXME using Exclamation instead of warning now... 
             return _messageBox.ConfirmYesNo(
-                string.Format(RubberduckUI.Command_Reparse_CannotCompile,
+                string.Format(CodeAnalysisUI.Command_Reparse_CannotCompile,
                     formattedList),
-                RubberduckUI.Command_Reparse_CannotCompile_Caption, false);
+                CodeAnalysisUI.Command_Reparse_CannotCompile_Caption, false);
             
         }
     }
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
index 7a6724dd20..ea99757458 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
@@ -1,5 +1,5 @@
 using System.Windows.Forms;
-using Rubberduck.Resources;
+using Rubberduck.CodeAnalysis;
 
 namespace Rubberduck.UI.Inspections
 {
@@ -7,7 +7,7 @@ public sealed partial class InspectionResultsWindow : UserControl, IDockableUser
     {
         private const string ClassId = "D3B2A683-9856-4246-BDC8-6B0795DC875B";
         string IDockableUserControl.ClassId { get { return ClassId; } }
-        string IDockableUserControl.Caption { get { return RubberduckUI.CodeInspections; } }
+        string IDockableUserControl.Caption => CodeAnalysisUI.CodeInspections;
         
         private InspectionResultsWindow()
         {
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 03ce787f14..2a86da2d3e 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -549,51 +549,6 @@ public static string CodeExplorer_IExportable_DeclarationFormat {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Code Inspections.
-        /// </summary>
-        public static string CodeInspections {
-            get {
-                return ResourceManager.GetString("CodeInspections", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}.
-        /// </summary>
-        public static string Command_Reparse_CannotCompile {
-            get {
-                return ResourceManager.GetString("Command_Reparse_CannotCompile", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to compile for parsing..
-        /// </summary>
-        public static string Command_Reparse_CannotCompile_Caption {
-            get {
-                return ResourceManager.GetString("Command_Reparse_CannotCompile_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The VBE setting &quot;Compile On Demand&quot; is currently enabled. This is not recommended as this may hide compilation errors and cause problems with parsing. Do you want to parse anyway?.
-        /// </summary>
-        public static string Command_Reparse_CompileOnDemandEnabled {
-            get {
-                return ResourceManager.GetString("Command_Reparse_CompileOnDemandEnabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Compile On Demand Setting.
-        /// </summary>
-        public static string Command_Reparse_CompileOnDemandEnabled_Caption {
-            get {
-                return ResourceManager.GetString("Command_Reparse_CompileOnDemandEnabled_Caption", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Code Explorer.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 6f65b4e249..ca3ffa1c7c 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -348,9 +348,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="RubberduckLoadFailure" xml:space="preserve">
     <value>Nebylo možno načíst Rubberduck Add-In</value>
   </data>
-  <data name="CodeInspections" xml:space="preserve">
-    <value>Inspekce kódu</value>
-  </data>
   <data name="Passed" xml:space="preserve">
     <value>V pořádku</value>
   </data>
@@ -953,12 +950,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
     <value>Varování Modifikátoru</value>
   </data>
-  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
-    <value>Následující projekt(y) nemohou být zkompilovány, což je s největší pravděpodobností kvůli parsovacím chybám. I přesto pokračovat? {0}</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
-    <value>Není možno zkompilovat pro parsování.</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
     <value>Zkompilovat kód před parsováním</value>
   </data>
@@ -968,12 +959,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="ParserState_UnexpectedError" xml:space="preserve">
     <value>Neočekávaná Chyba</value>
   </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
-    <value>VBE nastavení "Zkompilovat Na Žádost" je aktuálně povoleno. Toto není doporučeno a může vyústit v kompilační chyby a způsobit problémy při parsování. Chcete i přesto spustit parser?</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Nastavení Zkompilování Na Žádost</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
     <value>VBE nastavení "Zkompilovat Na Žádost" je aktuálně povoleno. Je silně doporučeno toto nastavení zakázat přes dialog VBE Nastavení nacházející se v panelu Obecné a změnit na Kompilování Před Parsováním. Přejete si toto nastavení nyní zakázat?
 
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index c5f04430f8..2d9d545e70 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -304,9 +304,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="AllImplementations_Caption" xml:space="preserve">
     <value>Implementierungen von '{0}'</value>
   </data>
-  <data name="CodeInspections" xml:space="preserve">
-    <value>Code Untersuchung</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Beheben</value>
   </data>
@@ -1036,21 +1033,9 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
     <value>Warnung</value>
   </data>
-  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
-    <value>Folgende(s) Projekt(e) können nicht kompiliert werden. Dies führt höchstwahrscheinlich zu Parserfehlern. Trotzdem fortfahren? {0}</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
-    <value>Konnte nicht vor dem Parsen kompilieren.</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
     <value>Code vor dem Parsen kompilieren</value>
   </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
-    <value>Die VBE-Einstellung "Bei Bedarf Kompilieren" ist aktuell eingeschalten. Dies ist nicht empfohlen, da Kompilierungsfehler und Probleme beim Parsen versteckt werden können. Trotzdem Parsen?</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Einstellung "Bei Bedarf Kompilieren"</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
     <value>Die VBE-Einstellung "Bei Bedarf Kompilieren" ist aktuell eingeschalten. Wir raten stark dazu, diese Option über den Einstellungsdialog unter "Allgemein" auszuschalten, um das "Vor dem Parsen kompilieren"-Feature zu nutzen. Die Einstellung jetzt anpassen?
 
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 284b907ba3..697eab086e 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -305,9 +305,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="AllImplementations_Caption" xml:space="preserve">
     <value>Implementaciones de '{0}'</value>
   </data>
-  <data name="CodeInspections" xml:space="preserve">
-    <value>Inspecciones de código</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Arreglo</value>
   </data>
@@ -1053,12 +1050,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
     <value>Advertencia para modificador</value>
   </data>
-  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
-    <value>Los siguientes proyectos no pueden compilarse, lo que probablemente resultará en errores del analizador. ¿Continua de todas maneras? {0}</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
-    <value>No se puede compilar para analizar.</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
     <value>Compilar código antes de analizar</value>
   </data>
@@ -1068,12 +1059,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="ParserState_UnexpectedError" xml:space="preserve">
     <value>Error inesperado</value>
   </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
-    <value>El VBEsetting "Compile On Demand" está habilitado actualmente. No se recomienda, ya que puede ocultar errores de compilación y causar problemas con el análisis. ¿Quieres analizar de todos modos?</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Ajuste "Compilar A Demanda"</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
     <value>La configuración de VBE "Compile On Demand" está actualmente habilitada. Se recomienda encarecidamente que deshabilite la configuración a través del cuadro de diálogo Opciones de VBE en la pestaña General para utilizar la función Compilar antes de analizar. ¿Quieres desactivarlo ahora?
 
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 5af844215f..49ab8d6279 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -363,9 +363,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Change" xml:space="preserve">
     <value>Modifier</value>
   </data>
-  <data name="CodeInspections" xml:space="preserve">
-    <value>Inspections</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Aller</value>
   </data>
@@ -1037,12 +1034,6 @@ les projets dans le VBE.</value>
   <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
     <value>Avertissement</value>
   </data>
-  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
-    <value>Les projets suivants ne peuvent être compilés, ce qui causera probablement des erreurs d'analyse. Continuer? {0}</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
-    <value>La compilation a échoué.</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
     <value>Compiler le code avant d'analyser</value>
   </data>
@@ -1052,12 +1043,6 @@ les projets dans le VBE.</value>
   <data name="ParserState_UnexpectedError" xml:space="preserve">
     <value>Erreur inattendue</value>
   </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
-    <value>L'option VBE "Compile on demand" est présentement activée. Cette configuration n'est pas recommandée, puisqu'elle peut masquer des erreurs de compilation in interférer avec l'analyse. Poursuivre l'analyse?</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Paramètre "Compile on demand"</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
     <value>L'option VBE "Compile on demand" est activée. Il est fortement recommandé de désactiver cette option afin d'utiliser l'option "Compiler avant l'analyse". Voulez-vous désactiver "Compile on demand"?
 
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 0d4bfa48be..265d7a54bd 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -308,9 +308,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="AllImplementations_Caption" xml:space="preserve">
     <value>Implementations of '{0}'</value>
   </data>
-  <data name="CodeInspections" xml:space="preserve">
-    <value>Code Inspections</value>
-  </data>
   <data name="Fix" xml:space="preserve">
     <value>Fix</value>
   </data>
@@ -1063,12 +1060,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
     <value>Modifier Warning</value>
   </data>
-  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
-    <value>The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
-    <value>Unable to compile for parsing.</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
     <value>Compile code before parsing</value>
   </data>
@@ -1078,12 +1069,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="ParserState_UnexpectedError" xml:space="preserve">
     <value>Unexpected Error</value>
   </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
-    <value>The VBE setting "Compile On Demand" is currently enabled. This is not recommended as this may hide compilation errors and cause problems with parsing. Do you want to parse anyway?</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Compile On Demand Setting</value>
-  </data>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
     <value>The VBE setting "Compile On Demand" is currently enabled. It is strongly recommended that you disable the setting via the VBE Options dialog under General tab in order to use the Compile Before Parse feature. Do you want to disable it now?
 

From 7270030cba9fc80b9437e0e825270028d6d4160e Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 16:41:57 -0700
Subject: [PATCH 19/64] Migrate DeclarationType_ resources

---
 .../CodeAnalysisUI.cs.resx                    |  63 ++++++
 .../CodeAnalysisUI.de.resx                    |  63 ++++++
 .../CodeAnalysisUI.es.resx                    |  63 ++++++
 .../CodeAnalysisUI.fr.resx                    |  63 ++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   |  63 ++++++
 .../ImplementedInterfaceMemberInspection.cs   |   2 +-
 .../Extensions/DeclarationTypeExtensions.cs   |   3 +-
 .../Refactoring/RenameDeclarationQuickFix.cs  |   2 +-
 .../CodeExplorerItemViewModelBase.cs          |   4 +-
 .../CommandBars/IContextFormatter.cs          |   5 +-
 .../DeclarationTypeToStringConverter.cs       |   4 +-
 .../AssignedByValParameterQuickFixDialog.cs   |   4 +-
 .../MoveMultipleToFolderViewModel.cs          |   3 +-
 .../UI/Refactorings/Rename/RenameViewModel.cs |   3 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 189 ------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  63 ------
 Rubberduck.Resources/RubberduckUI.de.resx     |  63 ------
 Rubberduck.Resources/RubberduckUI.es.resx     |  63 ------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  63 ------
 Rubberduck.Resources/RubberduckUI.resx        |  63 ------
 20 files changed, 330 insertions(+), 519 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index fe42d4a8a0..be1a84fe1f 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -179,4 +179,67 @@ Nalezeno {1} problémů.</value>
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Následující projekt(y) nemohou být zkompilovány, což je s největší pravděpodobností kvůli parsovacím chybám. I přesto pokračovat? {0}</value>
   </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>runtime expression</value>
+  </data>
+  <data name="DeclarationType_ClassModule" xml:space="preserve">
+    <value>třída</value>
+  </data>
+  <data name="DeclarationType_Constant" xml:space="preserve">
+    <value>konstanta</value>
+  </data>
+  <data name="DeclarationType_Control" xml:space="preserve">
+    <value>VBDesigner-Objekt</value>
+  </data>
+  <data name="DeclarationType_Enumeration" xml:space="preserve">
+    <value>enum</value>
+  </data>
+  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
+    <value>enum člen</value>
+  </data>
+  <data name="DeclarationType_Event" xml:space="preserve">
+    <value>událost</value>
+  </data>
+  <data name="DeclarationType_Function" xml:space="preserve">
+    <value>funkce</value>
+  </data>
+  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
+    <value>funkce knihovny</value>
+  </data>
+  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
+    <value>procedura knihovny</value>
+  </data>
+  <data name="DeclarationType_LineLabel" xml:space="preserve">
+    <value>označení řádku</value>
+  </data>
+  <data name="DeclarationType_Parameter" xml:space="preserve">
+    <value>parametr</value>
+  </data>
+  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
+    <value>modul</value>
+  </data>
+  <data name="DeclarationType_Procedure" xml:space="preserve">
+    <value>procedura</value>
+  </data>
+  <data name="DeclarationType_Project" xml:space="preserve">
+    <value>projekt</value>
+  </data>
+  <data name="DeclarationType_PropertyGet" xml:space="preserve">
+    <value>Get accessor vlastnosti</value>
+  </data>
+  <data name="DeclarationType_PropertyLet" xml:space="preserve">
+    <value>Let accessor vlastnosti</value>
+  </data>
+  <data name="DeclarationType_PropertySet" xml:space="preserve">
+    <value>Set accessor vlastnosti</value>
+  </data>
+  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
+    <value>uživatelsky-definovaný typ</value>
+  </data>
+  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
+    <value>uživatelsky-definovaný člen</value>
+  </data>
+  <data name="DeclarationType_Variable" xml:space="preserve">
+    <value>proměnná</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 13e1874595..34d11a741d 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -179,4 +179,67 @@
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Folgende(s) Projekt(e) können nicht kompiliert werden. Dies führt höchstwahrscheinlich zu Parserfehlern. Trotzdem fortfahren? {0}</value>
   </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>Laufzeitausdruck</value>
+  </data>
+  <data name="DeclarationType_ClassModule" xml:space="preserve">
+    <value>Klasse</value>
+  </data>
+  <data name="DeclarationType_Constant" xml:space="preserve">
+    <value>Konstante</value>
+  </data>
+  <data name="DeclarationType_Control" xml:space="preserve">
+    <value>VBDesigner-Objekt</value>
+  </data>
+  <data name="DeclarationType_Enumeration" xml:space="preserve">
+    <value>Enum</value>
+  </data>
+  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
+    <value>Enum-Element (Konstante)</value>
+  </data>
+  <data name="DeclarationType_Event" xml:space="preserve">
+    <value>Ereignis</value>
+  </data>
+  <data name="DeclarationType_Function" xml:space="preserve">
+    <value>Funktion</value>
+  </data>
+  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
+    <value>Bibliotheks-Funktion</value>
+  </data>
+  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
+    <value>Bibliotheksprozedur</value>
+  </data>
+  <data name="DeclarationType_LineLabel" xml:space="preserve">
+    <value>Sprungmarke</value>
+  </data>
+  <data name="DeclarationType_Parameter" xml:space="preserve">
+    <value>Parameter</value>
+  </data>
+  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
+    <value>Modul</value>
+  </data>
+  <data name="DeclarationType_Procedure" xml:space="preserve">
+    <value>Prozedur</value>
+  </data>
+  <data name="DeclarationType_Project" xml:space="preserve">
+    <value>Projekt</value>
+  </data>
+  <data name="DeclarationType_PropertyGet" xml:space="preserve">
+    <value>Get-Eigenschaftsprozedur</value>
+  </data>
+  <data name="DeclarationType_PropertyLet" xml:space="preserve">
+    <value>Let-Eigenschaftsprozedur</value>
+  </data>
+  <data name="DeclarationType_PropertySet" xml:space="preserve">
+    <value>Set-Eigenschaftsprozedur</value>
+  </data>
+  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
+    <value>Nutzerdefinierter Typ</value>
+  </data>
+  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
+    <value>Element eines nutzerdefinierten Typs</value>
+  </data>
+  <data name="DeclarationType_Variable" xml:space="preserve">
+    <value>Variable</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index 8649882c6b..8978e0c124 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -179,4 +179,67 @@
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Los siguientes proyectos no pueden compilarse, lo que probablemente resultará en errores del analizador. ¿Continua de todas maneras? {0}</value>
   </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>expresión en tiempo de ejecución</value>
+  </data>
+  <data name="DeclarationType_ClassModule" xml:space="preserve">
+    <value>clase</value>
+  </data>
+  <data name="DeclarationType_Constant" xml:space="preserve">
+    <value>constante</value>
+  </data>
+  <data name="DeclarationType_Control" xml:space="preserve">
+    <value>control</value>
+  </data>
+  <data name="DeclarationType_Enumeration" xml:space="preserve">
+    <value>enumerar</value>
+  </data>
+  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
+    <value>enumerar miembro</value>
+  </data>
+  <data name="DeclarationType_Event" xml:space="preserve">
+    <value>evento</value>
+  </data>
+  <data name="DeclarationType_Function" xml:space="preserve">
+    <value>función</value>
+  </data>
+  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
+    <value>biblioteca de funciones</value>
+  </data>
+  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
+    <value>biblioteca de procedimientos</value>
+  </data>
+  <data name="DeclarationType_LineLabel" xml:space="preserve">
+    <value>etiqueta de línea</value>
+  </data>
+  <data name="DeclarationType_Parameter" xml:space="preserve">
+    <value>parámetro</value>
+  </data>
+  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
+    <value>módulo</value>
+  </data>
+  <data name="DeclarationType_Procedure" xml:space="preserve">
+    <value>procedimiento</value>
+  </data>
+  <data name="DeclarationType_Project" xml:space="preserve">
+    <value>proyecto</value>
+  </data>
+  <data name="DeclarationType_PropertyGet" xml:space="preserve">
+    <value>propiedad Get</value>
+  </data>
+  <data name="DeclarationType_PropertyLet" xml:space="preserve">
+    <value>propiedad Let</value>
+  </data>
+  <data name="DeclarationType_PropertySet" xml:space="preserve">
+    <value>propiedad Set</value>
+  </data>
+  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
+    <value>tipo definido por el usuario</value>
+  </data>
+  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
+    <value>miembro de tipo definido por el usuario</value>
+  </data>
+  <data name="DeclarationType_Variable" xml:space="preserve">
+    <value>variable</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index 2531ada421..fa487e4f0c 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -179,4 +179,67 @@
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Les projets suivants ne peuvent être compilés, ce qui causera probablement des erreurs d'analyse. Continuer? {0}</value>
   </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>expression résolue à l'exécution</value>
+  </data>
+  <data name="DeclarationType_ClassModule" xml:space="preserve">
+    <value>la classe</value>
+  </data>
+  <data name="DeclarationType_Constant" xml:space="preserve">
+    <value>la constante</value>
+  </data>
+  <data name="DeclarationType_Control" xml:space="preserve">
+    <value>le contrôle</value>
+  </data>
+  <data name="DeclarationType_Enumeration" xml:space="preserve">
+    <value>l'énumération</value>
+  </data>
+  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
+    <value>le membre de l'énumération</value>
+  </data>
+  <data name="DeclarationType_Event" xml:space="preserve">
+    <value>l'événement</value>
+  </data>
+  <data name="DeclarationType_Function" xml:space="preserve">
+    <value>la fonction</value>
+  </data>
+  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
+    <value>la fonction externe</value>
+  </data>
+  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
+    <value>la procédure externe</value>
+  </data>
+  <data name="DeclarationType_LineLabel" xml:space="preserve">
+    <value>l'étiquette de ligne</value>
+  </data>
+  <data name="DeclarationType_Parameter" xml:space="preserve">
+    <value>le paramètre</value>
+  </data>
+  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
+    <value>le module</value>
+  </data>
+  <data name="DeclarationType_Procedure" xml:space="preserve">
+    <value>la procédure</value>
+  </data>
+  <data name="DeclarationType_Project" xml:space="preserve">
+    <value>le projet</value>
+  </data>
+  <data name="DeclarationType_PropertyGet" xml:space="preserve">
+    <value>l'accesseur property get</value>
+  </data>
+  <data name="DeclarationType_PropertyLet" xml:space="preserve">
+    <value>l'accesseur property let</value>
+  </data>
+  <data name="DeclarationType_PropertySet" xml:space="preserve">
+    <value>l'accesseur property set</value>
+  </data>
+  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
+    <value>le type définit par l'utilisateur</value>
+  </data>
+  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
+    <value>le membre d'un type définit par l'utilisateur</value>
+  </data>
+  <data name="DeclarationType_Variable" xml:space="preserve">
+    <value>la variable</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index f142d44ce3..7aa5649115 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -161,4 +161,67 @@
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}</value>
   </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>runtime expression</value>
+  </data>
+  <data name="DeclarationType_ClassModule" xml:space="preserve">
+    <value>class</value>
+  </data>
+  <data name="DeclarationType_Constant" xml:space="preserve">
+    <value>constant</value>
+  </data>
+  <data name="DeclarationType_Control" xml:space="preserve">
+    <value>control</value>
+  </data>
+  <data name="DeclarationType_Enumeration" xml:space="preserve">
+    <value>enum</value>
+  </data>
+  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
+    <value>enum member</value>
+  </data>
+  <data name="DeclarationType_Event" xml:space="preserve">
+    <value>event</value>
+  </data>
+  <data name="DeclarationType_Function" xml:space="preserve">
+    <value>function</value>
+  </data>
+  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
+    <value>library function</value>
+  </data>
+  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
+    <value>library procedure</value>
+  </data>
+  <data name="DeclarationType_LineLabel" xml:space="preserve">
+    <value>line label</value>
+  </data>
+  <data name="DeclarationType_Parameter" xml:space="preserve">
+    <value>parameter</value>
+  </data>
+  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
+    <value>module</value>
+  </data>
+  <data name="DeclarationType_Procedure" xml:space="preserve">
+    <value>procedure</value>
+  </data>
+  <data name="DeclarationType_Project" xml:space="preserve">
+    <value>project</value>
+  </data>
+  <data name="DeclarationType_PropertyGet" xml:space="preserve">
+    <value>property get accessor</value>
+  </data>
+  <data name="DeclarationType_PropertyLet" xml:space="preserve">
+    <value>property let accessor</value>
+  </data>
+  <data name="DeclarationType_PropertySet" xml:space="preserve">
+    <value>property set accessor</value>
+  </data>
+  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
+    <value>user-defined type</value>
+  </data>
+  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
+    <value>user-defined type member</value>
+  </data>
+  <data name="DeclarationType_Variable" xml:space="preserve">
+    <value>variable</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplementedInterfaceMemberInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplementedInterfaceMemberInspection.cs
index b1f93a831b..f6018b56c6 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplementedInterfaceMemberInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplementedInterfaceMemberInspection.cs
@@ -73,7 +73,7 @@ private static bool IsInterfaceDeclaration(Declaration declaration)
         protected override string ResultDescription(Declaration declaration)
         {
             var qualifiedName = declaration.QualifiedModuleName.ToString();
-            var declarationType = Resources.RubberduckUI.ResourceManager
+            var declarationType = CodeAnalysisUI.ResourceManager
                 .GetString("DeclarationType_" + declaration.DeclarationType)
                 .Capitalize();
             var identifierName = declaration.IdentifierName;
diff --git a/Rubberduck.CodeAnalysis/Inspections/Extensions/DeclarationTypeExtensions.cs b/Rubberduck.CodeAnalysis/Inspections/Extensions/DeclarationTypeExtensions.cs
index c1d3914a53..30c83a769f 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Extensions/DeclarationTypeExtensions.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Extensions/DeclarationTypeExtensions.cs
@@ -1,6 +1,5 @@
 using System.Globalization;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Resources;
 
 namespace Rubberduck.CodeAnalysis.Inspections.Extensions
 {
@@ -9,7 +8,7 @@ public static class DeclarationTypeExtensions
         //ToDo: Move this to resources. (This will require moving resource lookups to Core.)
         public static string ToLocalizedString(this DeclarationType type)
         {
-            return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, CultureInfo.CurrentUICulture);
+            return CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + type, CultureInfo.CurrentUICulture);
         }
     }
 }
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs b/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs
index 5e8121cc39..0ecdb3bb10 100644
--- a/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs
+++ b/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs
@@ -65,7 +65,7 @@ protected override void Refactor(IInspectionResult result)
         public override string Description(IInspectionResult result)
         {
             return string.Format(RubberduckUI.Rename_DeclarationType,
-                RubberduckUI.ResourceManager.GetString("DeclarationType_" + result.Target.DeclarationType,
+                CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + result.Target.DeclarationType,
                     CultureInfo.CurrentUICulture));
         }
     }
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemViewModelBase.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemViewModelBase.cs
index 286e2876e6..63132e2bd1 100644
--- a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemViewModelBase.cs
+++ b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemViewModelBase.cs
@@ -5,9 +5,9 @@
 using System.Linq;
 using System.Windows;
 using NLog;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Resources;
 using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
@@ -63,7 +63,7 @@ public virtual string PanelTitle
                 }
 
                 var nameWithDeclarationType =
-                    $"{Declaration.IdentifierName} - ({RubberduckUI.ResourceManager.GetString("DeclarationType_" + Declaration.DeclarationType, CultureInfo.CurrentUICulture)})";
+                    $"{Declaration.IdentifierName} - ({CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + Declaration.DeclarationType, CultureInfo.CurrentUICulture)})";
 
                 if (string.IsNullOrEmpty(Declaration.AsTypeName))
                 {
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CommandBars/IContextFormatter.cs b/Rubberduck.Core/UI/Command/MenuItems/CommandBars/IContextFormatter.cs
index 729ce5ecef..4d9aa48fbb 100644
--- a/Rubberduck.Core/UI/Command/MenuItems/CommandBars/IContextFormatter.cs
+++ b/Rubberduck.Core/UI/Command/MenuItems/CommandBars/IContextFormatter.cs
@@ -1,9 +1,8 @@
-using System;
-using Rubberduck.Parsing;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.Resources;
 using Rubberduck.VBEditor;
+using Rubberduck.CodeAnalysis;
 
 namespace Rubberduck.UI.Command.MenuItems.CommandBars
 {
@@ -49,7 +48,7 @@ public string Format(Declaration declaration, bool multipleControls)
         private string FormatDeclaration(Declaration declaration, bool multipleControls = false)
         {
             var moduleName = declaration.QualifiedName.QualifiedModuleName;
-            var declarationType = RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, Settings.Settings.Culture);
+            var declarationType = CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, Settings.Settings.Culture);
 
             var typeName = TypeName(declaration, multipleControls, declarationType);
             var formattedDeclaration = FormattedDeclaration(declaration, typeName, moduleName, declarationType);
diff --git a/Rubberduck.Core/UI/Controls/DeclarationTypeToStringConverter.cs b/Rubberduck.Core/UI/Controls/DeclarationTypeToStringConverter.cs
index 50af44aca7..031f17001c 100644
--- a/Rubberduck.Core/UI/Controls/DeclarationTypeToStringConverter.cs
+++ b/Rubberduck.Core/UI/Controls/DeclarationTypeToStringConverter.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Controls
 {
@@ -12,7 +12,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             if (value is DeclarationType type)
             {
-                var text = RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, CultureInfo.CurrentUICulture) ?? string.Empty;
+                var text = CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + type, CultureInfo.CurrentUICulture) ?? string.Empty;
                 return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text);
             }
 
diff --git a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
index b95b7ced6b..5960c0011a 100644
--- a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Forms;
-using Rubberduck.Common;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.Common;
 using Rubberduck.Resources;
@@ -27,7 +27,7 @@ private void InitializeCaptions(string identifierName, string targetDeclarationT
             NameLabel.Text = RubberduckUI.NameLabelText;
 
             var declarationType =
-            RubberduckUI.ResourceManager.GetString("DeclarationType_" + targetDeclarationType, Settings.Settings.Culture);
+            CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + targetDeclarationType, Settings.Settings.Culture);
             InstructionsLabel.Text = string.Format(RubberduckUI.AssignedByValParamQFixDialog_InstructionsLabelText, declarationType,
                 identifierName);
         }
diff --git a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
index 0f057e87e5..d65e530942 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
@@ -5,6 +5,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Resources;
 using Rubberduck.Refactorings.MoveToFolder;
+using Rubberduck.CodeAnalysis;
 
 namespace Rubberduck.UI.Refactorings.MoveToFolder
 {
@@ -29,7 +30,7 @@ public string Instructions
                 {
                     var target = Targets.First();
                     var moduleName = target.IdentifierName;
-                    var declarationType = RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, CultureInfo.CurrentUICulture);
+                    var declarationType = CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, CultureInfo.CurrentUICulture);
                     var currentFolder = target.CustomFolder;
                     return string.Format(RubberduckUI.MoveToFolderDialog_InstructionsLabelText, declarationType, moduleName, currentFolder);
                 }
diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs b/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs
index 364aa20924..746019b410 100644
--- a/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs
@@ -7,6 +7,7 @@
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.Resources;
 using Rubberduck.Refactorings.Common;
+using Rubberduck.CodeAnalysis;
 
 namespace Rubberduck.UI.Refactorings.Rename
 {
@@ -36,7 +37,7 @@ public string Instructions
                     return string.Empty;
                 }
 
-                var declarationType = RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, CultureInfo.CurrentUICulture);
+                var declarationType = CodeAnalysisUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, CultureInfo.CurrentUICulture);
                 return string.Format(RubberduckUI.RenameDialog_InstructionsLabelText, declarationType, Target.IdentifierName);
             }
         }
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 2a86da2d3e..a955d98265 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -875,195 +875,6 @@ public static System.Drawing.Bitmap cross_script {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to runtime expression.
-        /// </summary>
-        public static string DeclarationType_BracketedExpression {
-            get {
-                return ResourceManager.GetString("DeclarationType_BracketedExpression", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to class.
-        /// </summary>
-        public static string DeclarationType_ClassModule {
-            get {
-                return ResourceManager.GetString("DeclarationType_ClassModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to constant.
-        /// </summary>
-        public static string DeclarationType_Constant {
-            get {
-                return ResourceManager.GetString("DeclarationType_Constant", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to control.
-        /// </summary>
-        public static string DeclarationType_Control {
-            get {
-                return ResourceManager.GetString("DeclarationType_Control", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to enum.
-        /// </summary>
-        public static string DeclarationType_Enumeration {
-            get {
-                return ResourceManager.GetString("DeclarationType_Enumeration", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to enum member.
-        /// </summary>
-        public static string DeclarationType_EnumerationMember {
-            get {
-                return ResourceManager.GetString("DeclarationType_EnumerationMember", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to event.
-        /// </summary>
-        public static string DeclarationType_Event {
-            get {
-                return ResourceManager.GetString("DeclarationType_Event", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to function.
-        /// </summary>
-        public static string DeclarationType_Function {
-            get {
-                return ResourceManager.GetString("DeclarationType_Function", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to library function.
-        /// </summary>
-        public static string DeclarationType_LibraryFunction {
-            get {
-                return ResourceManager.GetString("DeclarationType_LibraryFunction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to library procedure.
-        /// </summary>
-        public static string DeclarationType_LibraryProcedure {
-            get {
-                return ResourceManager.GetString("DeclarationType_LibraryProcedure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to line label.
-        /// </summary>
-        public static string DeclarationType_LineLabel {
-            get {
-                return ResourceManager.GetString("DeclarationType_LineLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to parameter.
-        /// </summary>
-        public static string DeclarationType_Parameter {
-            get {
-                return ResourceManager.GetString("DeclarationType_Parameter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to module.
-        /// </summary>
-        public static string DeclarationType_ProceduralModule {
-            get {
-                return ResourceManager.GetString("DeclarationType_ProceduralModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to procedure.
-        /// </summary>
-        public static string DeclarationType_Procedure {
-            get {
-                return ResourceManager.GetString("DeclarationType_Procedure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to project.
-        /// </summary>
-        public static string DeclarationType_Project {
-            get {
-                return ResourceManager.GetString("DeclarationType_Project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to property get accessor.
-        /// </summary>
-        public static string DeclarationType_PropertyGet {
-            get {
-                return ResourceManager.GetString("DeclarationType_PropertyGet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to property let accessor.
-        /// </summary>
-        public static string DeclarationType_PropertyLet {
-            get {
-                return ResourceManager.GetString("DeclarationType_PropertyLet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to property set accessor.
-        /// </summary>
-        public static string DeclarationType_PropertySet {
-            get {
-                return ResourceManager.GetString("DeclarationType_PropertySet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to user-defined type.
-        /// </summary>
-        public static string DeclarationType_UserDefinedType {
-            get {
-                return ResourceManager.GetString("DeclarationType_UserDefinedType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to user-defined type member.
-        /// </summary>
-        public static string DeclarationType_UserDefinedTypeMember {
-            get {
-                return ResourceManager.GetString("DeclarationType_UserDefinedTypeMember", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to variable.
-        /// </summary>
-        public static string DeclarationType_Variable {
-            get {
-                return ResourceManager.GetString("DeclarationType_Variable", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Deselect All.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index ca3ffa1c7c..bf6036bc8f 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -120,39 +120,6 @@
   <data name="CancelButtonText" xml:space="preserve">
     <value>Zrušit</value>
   </data>
-  <data name="DeclarationType_ClassModule" xml:space="preserve">
-    <value>třída</value>
-  </data>
-  <data name="DeclarationType_Constant" xml:space="preserve">
-    <value>konstanta</value>
-  </data>
-  <data name="DeclarationType_Enumeration" xml:space="preserve">
-    <value>enum</value>
-  </data>
-  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
-    <value>enum člen</value>
-  </data>
-  <data name="DeclarationType_Event" xml:space="preserve">
-    <value>událost</value>
-  </data>
-  <data name="DeclarationType_Function" xml:space="preserve">
-    <value>funkce</value>
-  </data>
-  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
-    <value>funkce knihovny</value>
-  </data>
-  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
-    <value>modul</value>
-  </data>
-  <data name="DeclarationType_Parameter" xml:space="preserve">
-    <value>parametr</value>
-  </data>
-  <data name="DeclarationType_Procedure" xml:space="preserve">
-    <value>procedura</value>
-  </data>
-  <data name="DeclarationType_Variable" xml:space="preserve">
-    <value>proměnná</value>
-  </data>
   <data name="NameLabelText" xml:space="preserve">
     <value>Jméno:</value>
   </data>
@@ -300,15 +267,9 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="TodoExplorer_Description" xml:space="preserve">
     <value>Popisek</value>
   </data>
-  <data name="DeclarationType_LineLabel" xml:space="preserve">
-    <value>označení řádku</value>
-  </data>
   <data name="ReorderParamsDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Přeuspořádat parametry</value>
   </data>
-  <data name="DeclarationType_Control" xml:space="preserve">
-    <value>VBDesigner-Objekt</value>
-  </data>
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Přeuspořádat parametry</value>
   </data>
@@ -390,9 +351,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Project" xml:space="preserve">
     <value>Projekt</value>
   </data>
-  <data name="DeclarationType_Project" xml:space="preserve">
-    <value>projekt</value>
-  </data>
   <data name="Change" xml:space="preserve">
     <value>Změnit</value>
   </data>
@@ -414,12 +372,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Rename_DeclarationType" xml:space="preserve">
     <value>Přejmenovat {0}</value>
   </data>
-  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
-    <value>uživatelsky-definovaný typ</value>
-  </data>
-  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
-    <value>uživatelsky-definovaný člen</value>
-  </data>
   <data name="TodoSettings_TokenLabel" xml:space="preserve">
     <value>Text tokenu:</value>
   </data>
@@ -850,9 +802,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
     <value>Vertikální vzdálenosti</value>
   </data>
-  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>procedura knihovny</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
     <value>Přiřazen ByVal parametr QuickFix - Udělat Lokální Kopii</value>
   </data>
@@ -971,9 +920,6 @@ POZNÁMKA: Pro aplikování tohoto nastavení je třeba restartovat Excel.</valu
     <value>Ve vašich registrech bylo nalezeno Chytré Odsazování.
 Přejete si toto nastavení importovat do Rubberducku?</value>
   </data>
-  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
-    <value>runtime expression</value>
-  </data>
   <data name="ContextMultipleControlsSelection" xml:space="preserve">
     <value>multiple controls</value>
   </data>
@@ -987,15 +933,6 @@ End Enum</value>
   <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
     <value>Odsadit komentáře v Enum a Type blocích tak, jako v procedurách</value>
   </data>
-  <data name="DeclarationType_PropertyGet" xml:space="preserve">
-    <value>Get accessor vlastnosti</value>
-  </data>
-  <data name="DeclarationType_PropertyLet" xml:space="preserve">
-    <value>Let accessor vlastnosti</value>
-  </data>
-  <data name="DeclarationType_PropertySet" xml:space="preserve">
-    <value>Set accessor vlastnosti</value>
-  </data>
   <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
     <value>Zvol parametr a za použití táhnutí myši nebo pomocí tlačítek ho přesuň výše nebo níže.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 2d9d545e70..9ca55f3f91 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -120,54 +120,6 @@
   <data name="CancelButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
-  <data name="DeclarationType_ClassModule" xml:space="preserve">
-    <value>Klasse</value>
-  </data>
-  <data name="DeclarationType_Constant" xml:space="preserve">
-    <value>Konstante</value>
-  </data>
-  <data name="DeclarationType_Enumeration" xml:space="preserve">
-    <value>Enum</value>
-  </data>
-  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
-    <value>Enum-Element (Konstante)</value>
-  </data>
-  <data name="DeclarationType_Event" xml:space="preserve">
-    <value>Ereignis</value>
-  </data>
-  <data name="DeclarationType_Function" xml:space="preserve">
-    <value>Funktion</value>
-  </data>
-  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
-    <value>Bibliotheks-Funktion</value>
-  </data>
-  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
-    <value>Modul</value>
-  </data>
-  <data name="DeclarationType_Parameter" xml:space="preserve">
-    <value>Parameter</value>
-  </data>
-  <data name="DeclarationType_Procedure" xml:space="preserve">
-    <value>Prozedur</value>
-  </data>
-  <data name="DeclarationType_PropertyGet" xml:space="preserve">
-    <value>Get-Eigenschaftsprozedur</value>
-  </data>
-  <data name="DeclarationType_PropertyLet" xml:space="preserve">
-    <value>Let-Eigenschaftsprozedur</value>
-  </data>
-  <data name="DeclarationType_PropertySet" xml:space="preserve">
-    <value>Set-Eigenschaftsprozedur</value>
-  </data>
-  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
-    <value>Nutzerdefinierter Typ</value>
-  </data>
-  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
-    <value>Element eines nutzerdefinierten Typs</value>
-  </data>
-  <data name="DeclarationType_Variable" xml:space="preserve">
-    <value>Variable</value>
-  </data>
   <data name="NameLabelText" xml:space="preserve">
     <value>Name:</value>
   </data>
@@ -184,9 +136,6 @@
   <data name="RenameDialog_TitleText" xml:space="preserve">
     <value>Identifikator umbenennen</value>
   </data>
-  <data name="DeclarationType_LineLabel" xml:space="preserve">
-    <value>Sprungmarke</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(nichts)</value>
   </data>
@@ -208,9 +157,6 @@
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Parameter umordnen</value>
   </data>
-  <data name="DeclarationType_Control" xml:space="preserve">
-    <value>VBDesigner-Objekt</value>
-  </data>
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Optionale Parameter müssen am Ende der Parameterliste deklariert werden.</value>
   </data>
@@ -409,9 +355,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Project" xml:space="preserve">
     <value>Projekt</value>
   </data>
-  <data name="DeclarationType_Project" xml:space="preserve">
-    <value>Projekt</value>
-  </data>
   <data name="Change" xml:space="preserve">
     <value>Ändern</value>
   </data>
@@ -735,9 +678,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="GroupingStyle_ByMarker" xml:space="preserve">
     <value>Nach Markierung</value>
   </data>
-  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>Bibliotheksprozedur</value>
-  </data>
   <data name="Find" xml:space="preserve">
     <value>Suchen</value>
   </data>
@@ -897,9 +837,6 @@ Möchten sie die Einstellungen in Rubberduck importieren?</value>
   <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
     <value>Vertikalen Abstand</value>
   </data>
-  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
-    <value>Laufzeitausdruck</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
     <value>ByVal zugewiesener Parameter QuickFix - Lokale Kopie erstellen</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 697eab086e..f0812de394 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -120,54 +120,6 @@
   <data name="CancelButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="DeclarationType_ClassModule" xml:space="preserve">
-    <value>clase</value>
-  </data>
-  <data name="DeclarationType_Constant" xml:space="preserve">
-    <value>constante</value>
-  </data>
-  <data name="DeclarationType_Enumeration" xml:space="preserve">
-    <value>enumerar</value>
-  </data>
-  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
-    <value>enumerar miembro</value>
-  </data>
-  <data name="DeclarationType_Event" xml:space="preserve">
-    <value>evento</value>
-  </data>
-  <data name="DeclarationType_Function" xml:space="preserve">
-    <value>función</value>
-  </data>
-  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
-    <value>biblioteca de funciones</value>
-  </data>
-  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
-    <value>módulo</value>
-  </data>
-  <data name="DeclarationType_Parameter" xml:space="preserve">
-    <value>parámetro</value>
-  </data>
-  <data name="DeclarationType_Procedure" xml:space="preserve">
-    <value>procedimiento</value>
-  </data>
-  <data name="DeclarationType_PropertyGet" xml:space="preserve">
-    <value>propiedad Get</value>
-  </data>
-  <data name="DeclarationType_PropertyLet" xml:space="preserve">
-    <value>propiedad Let</value>
-  </data>
-  <data name="DeclarationType_PropertySet" xml:space="preserve">
-    <value>propiedad Set</value>
-  </data>
-  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
-    <value>tipo definido por el usuario</value>
-  </data>
-  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
-    <value>miembro de tipo definido por el usuario</value>
-  </data>
-  <data name="DeclarationType_Variable" xml:space="preserve">
-    <value>variable</value>
-  </data>
   <data name="NameLabelText" xml:space="preserve">
     <value>Nombre:</value>
   </data>
@@ -184,9 +136,6 @@
   <data name="RenameDialog_TitleText" xml:space="preserve">
     <value>Renombrar identificador</value>
   </data>
-  <data name="DeclarationType_LineLabel" xml:space="preserve">
-    <value>etiqueta de línea</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(ninguno)</value>
   </data>
@@ -208,9 +157,6 @@
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Reordenar parametros</value>
   </data>
-  <data name="DeclarationType_Control" xml:space="preserve">
-    <value>control</value>
-  </data>
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Los parámetros opcionales deben especificarse al final de la lista de parámetros.</value>
   </data>
@@ -413,9 +359,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Project" xml:space="preserve">
     <value>Proyecto</value>
   </data>
-  <data name="DeclarationType_Project" xml:space="preserve">
-    <value>proyecto</value>
-  </data>
   <data name="Change" xml:space="preserve">
     <value>Cambiar</value>
   </data>
@@ -789,9 +732,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="GroupingStyle_ByMarker" xml:space="preserve">
     <value>Por marcador</value>
   </data>
-  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>biblioteca de procedimientos</value>
-  </data>
   <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
     <value>Delimitador de carpeta:</value>
   </data>
@@ -941,9 +881,6 @@ End Sub</value>
   <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
     <value>Espaciamiento vertical</value>
   </data>
-  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
-    <value>expresión en tiempo de ejecución</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
     <value>Parámetro ByVal asignado. Solución rápida: Hacer una copia local</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 49ab8d6279..0289cbaa1d 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -120,54 +120,6 @@
   <data name="CancelButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="DeclarationType_ClassModule" xml:space="preserve">
-    <value>la classe</value>
-  </data>
-  <data name="DeclarationType_Constant" xml:space="preserve">
-    <value>la constante</value>
-  </data>
-  <data name="DeclarationType_Enumeration" xml:space="preserve">
-    <value>l'énumération</value>
-  </data>
-  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
-    <value>le membre de l'énumération</value>
-  </data>
-  <data name="DeclarationType_Event" xml:space="preserve">
-    <value>l'événement</value>
-  </data>
-  <data name="DeclarationType_Function" xml:space="preserve">
-    <value>la fonction</value>
-  </data>
-  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
-    <value>la fonction externe</value>
-  </data>
-  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
-    <value>le module</value>
-  </data>
-  <data name="DeclarationType_Parameter" xml:space="preserve">
-    <value>le paramètre</value>
-  </data>
-  <data name="DeclarationType_Procedure" xml:space="preserve">
-    <value>la procédure</value>
-  </data>
-  <data name="DeclarationType_PropertyGet" xml:space="preserve">
-    <value>l'accesseur property get</value>
-  </data>
-  <data name="DeclarationType_PropertyLet" xml:space="preserve">
-    <value>l'accesseur property let</value>
-  </data>
-  <data name="DeclarationType_PropertySet" xml:space="preserve">
-    <value>l'accesseur property set</value>
-  </data>
-  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
-    <value>le type définit par l'utilisateur</value>
-  </data>
-  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
-    <value>le membre d'un type définit par l'utilisateur</value>
-  </data>
-  <data name="DeclarationType_Variable" xml:space="preserve">
-    <value>la variable</value>
-  </data>
   <data name="NameLabelText" xml:space="preserve">
     <value>Nom:</value>
   </data>
@@ -184,12 +136,6 @@
   <data name="RenameDialog_TitleText" xml:space="preserve">
     <value>Renommer l'identifiant</value>
   </data>
-  <data name="DeclarationType_Project" xml:space="preserve">
-    <value>le projet</value>
-  </data>
-  <data name="DeclarationType_LineLabel" xml:space="preserve">
-    <value>l'étiquette de ligne</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(aucun)</value>
   </data>
@@ -211,9 +157,6 @@
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Modifier l'ordre des paramètres</value>
   </data>
-  <data name="DeclarationType_Control" xml:space="preserve">
-    <value>le contrôle</value>
-  </data>
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Les paramètres optionels doivent être spéficiés à la fin de la liste.</value>
   </data>
@@ -708,9 +651,6 @@ Continuer?</value>
   <data name="GroupingStyle_ByMarker" xml:space="preserve">
     <value>Par marqueur</value>
   </data>
-  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>la procédure externe</value>
-  </data>
   <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
     <value>Aligner les commentaires avec le code</value>
   </data>
@@ -926,9 +866,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="ConfirmRemoveAssignmentWithUnusedDeclaration" xml:space="preserve">
     <value>La varaible '{0}' est assignée. Supprimer l'/les assignation(s)?</value>
   </data>
-  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
-    <value>expression résolue à l'exécution</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
     <value>Introduire une variable locale</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 265d7a54bd..58a6d54be8 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -120,54 +120,6 @@
   <data name="CancelButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="DeclarationType_ClassModule" xml:space="preserve">
-    <value>class</value>
-  </data>
-  <data name="DeclarationType_Constant" xml:space="preserve">
-    <value>constant</value>
-  </data>
-  <data name="DeclarationType_Enumeration" xml:space="preserve">
-    <value>enum</value>
-  </data>
-  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
-    <value>enum member</value>
-  </data>
-  <data name="DeclarationType_Event" xml:space="preserve">
-    <value>event</value>
-  </data>
-  <data name="DeclarationType_Function" xml:space="preserve">
-    <value>function</value>
-  </data>
-  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
-    <value>library function</value>
-  </data>
-  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
-    <value>module</value>
-  </data>
-  <data name="DeclarationType_Parameter" xml:space="preserve">
-    <value>parameter</value>
-  </data>
-  <data name="DeclarationType_Procedure" xml:space="preserve">
-    <value>procedure</value>
-  </data>
-  <data name="DeclarationType_PropertyGet" xml:space="preserve">
-    <value>property get accessor</value>
-  </data>
-  <data name="DeclarationType_PropertyLet" xml:space="preserve">
-    <value>property let accessor</value>
-  </data>
-  <data name="DeclarationType_PropertySet" xml:space="preserve">
-    <value>property set accessor</value>
-  </data>
-  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
-    <value>user-defined type</value>
-  </data>
-  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
-    <value>user-defined type member</value>
-  </data>
-  <data name="DeclarationType_Variable" xml:space="preserve">
-    <value>variable</value>
-  </data>
   <data name="NameLabelText" xml:space="preserve">
     <value>Name:</value>
   </data>
@@ -187,9 +139,6 @@
   <data name="RenameDialog_TitleText" xml:space="preserve">
     <value>Rename identifier</value>
   </data>
-  <data name="DeclarationType_LineLabel" xml:space="preserve">
-    <value>line label</value>
-  </data>
   <data name="ExtractMethod_OutputNone" xml:space="preserve">
     <value>(none)</value>
   </data>
@@ -211,9 +160,6 @@
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Reorder parameters</value>
   </data>
-  <data name="DeclarationType_Control" xml:space="preserve">
-    <value>control</value>
-  </data>
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Optional parameters must be specified at the end of the parameter list.</value>
   </data>
@@ -416,9 +362,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Project" xml:space="preserve">
     <value>Project</value>
   </data>
-  <data name="DeclarationType_Project" xml:space="preserve">
-    <value>project</value>
-  </data>
   <data name="Change" xml:space="preserve">
     <value>Change</value>
   </data>
@@ -798,9 +741,6 @@ Do you want to proceed with this rename?</value>
   <data name="GroupingStyle_ByMarker" xml:space="preserve">
     <value>By marker</value>
   </data>
-  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>library procedure</value>
-  </data>
   <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
     <value>Folder Delimiter:</value>
   </data>
@@ -950,9 +890,6 @@ Would you like to import them to Rubberduck?</value>
   <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
     <value>Vertical Spacing</value>
   </data>
-  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
-    <value>runtime expression</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
     <value>Assigned ByVal parameter QuickFix - Make Local Copy</value>
   </data>

From b90b38a358036db47aca15488cfc40e2e7f12a45 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 17:07:42 -0700
Subject: [PATCH 20/64] Migrate EncapsulateField_ resources

---
 .../EncapsulateFieldFailedNotifier.cs         |   3 +-
 .../EncapsulateFieldPresenter.cs              |   4 +-
 .../EncapsulateFieldView.xaml                 |  12 +-
 .../EncapsulateFieldViewModel.cs              |   8 +-
 .../EncapsulateFieldConflictFinder.cs         |   7 +-
 ...lateFieldInsertNewCodeRefactoringAction.cs |   2 +-
 ...lateFieldUseBackingFieldPreviewProvider.cs |   3 +-
 ...FieldUseBackingUDTMemberPreviewProvider.cs |   3 +-
 .../RefactoringsUI.Designer.cs                | 117 ++++++++++++++++++
 .../RefactoringsUI.cs.resx                    |  39 ++++++
 .../RefactoringsUI.de.resx                    |  39 ++++++
 .../RefactoringsUI.es.resx                    |  39 ++++++
 .../RefactoringsUI.fr.resx                    |  36 ++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  40 ++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 117 ------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  39 ------
 Rubberduck.Resources/RubberduckUI.de.resx     |  39 ------
 Rubberduck.Resources/RubberduckUI.es.resx     |  39 ------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  36 ------
 Rubberduck.Resources/RubberduckUI.resx        |  40 ------
 .../EncapsulateArrayFieldTests.cs             |   2 +-
 .../EncapsulateField/PreviewerTests.cs        |   2 +-
 22 files changed, 331 insertions(+), 335 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs
index 8680ef3d62..2496dcc045 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
@@ -10,7 +11,7 @@ public EncapsulateFieldFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.EncapsulateField_Caption;
+        protected override string Caption => RefactoringsUI.EncapsulateField_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs
index 0b2418c320..336ab365fd 100644
--- a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs
@@ -1,12 +1,12 @@
 using Rubberduck.Refactorings.EncapsulateField;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.EncapsulateField
 {
     internal class EncapsulateFieldPresenter : RefactoringPresenterBase<EncapsulateFieldModel>, IEncapsulateFieldPresenter
     {
         private static readonly DialogData DialogData =
-            DialogData.Create(RubberduckUI.EncapsulateField_Caption, 800, 900);
+            DialogData.Create(RefactoringsUI.EncapsulateField_Caption, 800, 900);
 
         public EncapsulateFieldPresenter(EncapsulateFieldModel model,
             IRefactoringDialogFactory dialogFactory) : base(DialogData, model, dialogFactory) { }
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml
index 518d258469..6c382b7706 100644
--- a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml
@@ -37,9 +37,9 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_TitleText}"
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_TitleText}"
                    FontWeight="Bold" />
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_InstructionText}"
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_InstructionText}"
                        Margin="5,0" />
         </StackPanel>
         <Grid Grid.Row="1">
@@ -53,7 +53,7 @@
             <StackPanel Grid.Row="0" Margin="5" Orientation="Vertical">
                     <CheckBox Name="WrapAsUDTCheckBox" 
                                 Grid.Row="1"
-                                Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_WrapFieldsInPrivateType}"
+                                Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_WrapFieldsInPrivateType}"
                                 IsChecked="{Binding ConvertFieldsToUDTMembers, Mode=TwoWay}"
                                 FontWeight="Bold"
                                 VerticalAlignment="Top"
@@ -138,7 +138,7 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Row="0" Visibility="{Binding Path=SelectedFieldIsPrivateUDT, Converter={StaticResource BoolToVisibleVisibility}}"
-                                           Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_PrivateUDTPropertyText}"
+                                           Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_PrivateUDTPropertyText}"
                                            Margin="10,5" />
                                 <TextBox Grid.Row="1" Visibility="{Binding Path=SelectedFieldHasEditablePropertyName, Converter={StaticResource BoolToVisibleVisibility}}"
                                          Text="{Binding Path=PropertyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
@@ -151,7 +151,7 @@
                             </Grid>
                             <CheckBox IsChecked="{Binding Path=IsReadOnly, Mode=TwoWay}"
                                 IsEnabled="{Binding Path=EnableReadOnlyOption}"
-                                Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_ReadOnlyCheckBoxContent}"
+                                Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_ReadOnlyCheckBoxContent}"
                                 Margin="10,2" FontWeight="Bold"
                                 Command="{Binding Path=ReadOnlyChangeCommand}"
                                 CommandParameter="{Binding ElementName=EncapsulationFields, Path=SelectedField}" />
@@ -166,7 +166,7 @@
                 </Grid>
             </Grid>
             <StackPanel Grid.Row="3" Margin="10,5" Orientation="Horizontal">
-                    <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EncapsulateField_Preview}" 
+                    <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_Preview}" 
                                FontSize="14" FontWeight="Bold" />
                     <Image Style="{StaticResource InvalidNameIconStyle}" Margin="0,-4"
                            Visibility="{Binding Path=HasValidNames, Converter={StaticResource BoolToHiddenVisibility}}" />
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs
index 5275c21590..b614ee65de 100644
--- a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using NLog;
-using Rubberduck.Parsing.VBA;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.EncapsulateField;
-using Rubberduck.Resources;
 using Rubberduck.UI.Command;
 
 namespace Rubberduck.UI.Refactorings.EncapsulateField
@@ -142,7 +140,7 @@ public bool EnableReadOnlyOption
             => !(_masterDetailManager.DetailField?.IsRequiredToBeReadOnly ?? false);
 
         public string GroupBoxHeaderContent
-            => $"{_masterDetailManager.DetailField?.TargetID ?? string.Empty} {RubberduckUI.EncapsulateField_PropertyName} ";
+            => $"{_masterDetailManager.DetailField?.TargetID ?? string.Empty} {RefactoringsUI.EncapsulateField_PropertyName} ";
 
         private string _validationErrorMessage;
         public string ValidationErrorMessage => _validationErrorMessage;
diff --git a/Rubberduck.Refactorings/EncapsulateField/ConflictDetection/EncapsulateFieldConflictFinder.cs b/Rubberduck.Refactorings/EncapsulateField/ConflictDetection/EncapsulateFieldConflictFinder.cs
index f73143112d..8999956159 100644
--- a/Rubberduck.Refactorings/EncapsulateField/ConflictDetection/EncapsulateFieldConflictFinder.cs
+++ b/Rubberduck.Refactorings/EncapsulateField/ConflictDetection/EncapsulateFieldConflictFinder.cs
@@ -4,7 +4,6 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Common;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
-using Rubberduck.Resources;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -91,7 +90,7 @@ public EncapsulateFieldConflictFinder(IDeclarationFinderProvider declarationFind
                 if (field.Declaration.References.Any(rf => rf.QualifiedModuleName != field.QualifiedModuleName
                     && rf.Context.TryGetAncestor<VBAParser.RedimVariableDeclarationContext>(out _)))
                 {
-                    errorMessage = string.Format(RubberduckUI.EncapsulateField_ArrayHasExternalRedimFormat, field.IdentifierName);
+                    errorMessage = string.Format(RefactoringsUI.EncapsulateField_ArrayHasExternalRedimFormat, field.IdentifierName);
                     return (false, errorMessage);
                 }
 
@@ -116,7 +115,7 @@ public bool IsConflictingIdentifier(IEncapsulateFieldCandidate field, string ide
             errorMessage = string.Empty;
             if (HasConflictIdentifiers(field, identifierToCompare))
             {
-                errorMessage = RubberduckUI.EncapsulateField_NameConflictDetected;
+                errorMessage = RefactoringsUI.EncapsulateField_NameConflictDetected;
             }
             return !string.IsNullOrEmpty(errorMessage);
         }
@@ -184,7 +183,7 @@ private static bool ConflictsWithExistingUDTMembers(IObjectStateUDT objectStateU
             errorMessage = string.Empty;
             if (objectStateUDT?.ExistingMembers.Any(nm => nm.IdentifierName.IsEquivalentVBAIdentifierTo(identifier)) ?? false)
             {
-                errorMessage = RubberduckUI.EncapsulateField_NameConflictDetected;
+                errorMessage = RefactoringsUI.EncapsulateField_NameConflictDetected;
             }
             return !string.IsNullOrEmpty(errorMessage);
         }
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs
index 98fb44da45..5f22b22f3f 100644
--- a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs
+++ b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs
@@ -92,7 +92,7 @@ private void InsertBlocks(EncapsulateFieldInsertNewCodeModel model, IRewriteSess
 
             var allNewContent = string.Join(NewLines.DOUBLE_SPACE, new string[] { newDeclarationSectionBlock });
 
-            var previewMarker = model.NewContentAggregator.RetrieveBlock(RubberduckUI.EncapsulateField_PreviewMarker);
+            var previewMarker = model.NewContentAggregator.RetrieveBlock(RefactoringsUI.EncapsulateField_PreviewMarker);
             if (!string.IsNullOrEmpty(previewMarker))
             {
                 allNewContent = $"{allNewContent}{Environment.NewLine}{previewMarker}";
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateFieldUseBackingFieldPreviewProvider.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateFieldUseBackingFieldPreviewProvider.cs
index 26ee695e82..41b8a5221f 100644
--- a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateFieldUseBackingFieldPreviewProvider.cs
+++ b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateFieldUseBackingFieldPreviewProvider.cs
@@ -1,6 +1,5 @@
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Refactorings.EncapsulateField;
-using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Refactorings.EncapsulateFieldUseBackingField
@@ -20,7 +19,7 @@ public EncapsulateFieldUseBackingFieldPreviewProvider(EncapsulateFieldUseBacking
         public override string Preview(EncapsulateFieldUseBackingFieldModel model)
         {
             model.NewContentAggregator = _aggregatorFactory.Create();
-            model.NewContentAggregator.AddNewContent(RubberduckUI.EncapsulateField_PreviewMarker, RubberduckUI.EncapsulateField_PreviewMarker);
+            model.NewContentAggregator.AddNewContent(RefactoringsUI.EncapsulateField_PreviewMarker, RefactoringsUI.EncapsulateField_PreviewMarker);
             return base.Preview(model);
         }
 
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingUDTMember/EncapsulateFieldUseBackingUDTMemberPreviewProvider.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingUDTMember/EncapsulateFieldUseBackingUDTMemberPreviewProvider.cs
index 28ced18cf4..94132b74fe 100644
--- a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingUDTMember/EncapsulateFieldUseBackingUDTMemberPreviewProvider.cs
+++ b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldUseBackingUDTMember/EncapsulateFieldUseBackingUDTMemberPreviewProvider.cs
@@ -1,6 +1,5 @@
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Refactorings.EncapsulateField;
-using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Refactorings.EncapsulateFieldUseBackingUDTMember
@@ -20,7 +19,7 @@ public EncapsulateFieldUseBackingUDTMemberPreviewProvider(EncapsulateFieldUseBac
         public override string Preview(EncapsulateFieldUseBackingUDTMemberModel model)
         {
             model.NewContentAggregator = _aggregatorFactory.Create();
-            model.NewContentAggregator.AddNewContent(RubberduckUI.EncapsulateField_PreviewMarker, RubberduckUI.EncapsulateField_PreviewMarker);
+            model.NewContentAggregator.AddNewContent(RefactoringsUI.EncapsulateField_PreviewMarker, RefactoringsUI.EncapsulateField_PreviewMarker);
             return base.Preview(model);
         }
 
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index c1a608ff99..2f48dc8345 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -329,5 +329,122 @@ public static string AssignedByValParamQFixDialog_TitleText {
                 return ResourceManager.GetString("AssignedByValParamQFixDialog_TitleText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unable to encapsulate &apos;{0}&apos;. ReDim({0}) statement(s) exist in other modules..
+        /// </summary>
+        public static string EncapsulateField_ArrayHasExternalRedimFormat {
+            get {
+                return ResourceManager.GetString("EncapsulateField_ArrayHasExternalRedimFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Encapsulate Field.
+        /// </summary>
+        public static string EncapsulateField_Caption {
+            get {
+                return ResourceManager.GetString("EncapsulateField_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select one or more fields to encapsulate.  Accept the default values or edit property names..
+        /// </summary>
+        public static string EncapsulateField_InstructionText {
+            get {
+                return ResourceManager.GetString("EncapsulateField_InstructionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Name conflict.
+        /// </summary>
+        public static string EncapsulateField_NameConflictDetected {
+            get {
+                return ResourceManager.GetString("EncapsulateField_NameConflictDetected", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Parameter Name:.
+        /// </summary>
+        public static string EncapsulateField_ParameterName {
+            get {
+                return ResourceManager.GetString("EncapsulateField_ParameterName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Preview:.
+        /// </summary>
+        public static string EncapsulateField_Preview {
+            get {
+                return ResourceManager.GetString("EncapsulateField_Preview", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;&lt;===== Property and declaration changes above this line =====&gt;.
+        /// </summary>
+        public static string EncapsulateField_PreviewMarker {
+            get {
+                return ResourceManager.GetString("EncapsulateField_PreviewMarker", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Creates a property for each UDT Member.
+        /// </summary>
+        public static string EncapsulateField_PrivateUDTPropertyText {
+            get {
+                return ResourceManager.GetString("EncapsulateField_PrivateUDTPropertyText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Property Name:.
+        /// </summary>
+        public static string EncapsulateField_PropertyName {
+            get {
+                return ResourceManager.GetString("EncapsulateField_PropertyName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Read Only.
+        /// </summary>
+        public static string EncapsulateField_ReadOnlyCheckBoxContent {
+            get {
+                return ResourceManager.GetString("EncapsulateField_ReadOnlyCheckBoxContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Setter Type:.
+        /// </summary>
+        public static string EncapsulateField_SetterType {
+            get {
+                return ResourceManager.GetString("EncapsulateField_SetterType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Encapsulate Field.
+        /// </summary>
+        public static string EncapsulateField_TitleText {
+            get {
+                return ResourceManager.GetString("EncapsulateField_TitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Wrap Fields in Private Type.
+        /// </summary>
+        public static string EncapsulateField_WrapFieldsInPrivateType {
+            get {
+                return ResourceManager.GetString("EncapsulateField_WrapFieldsInPrivateType", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index be0ec1c374..79b55c6166 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -207,4 +207,43 @@
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Specifikujte Název Kopie Lokální Proměnné</value>
   </data>
+  <data name="EncapsulateField_InstructionText" xml:space="preserve">
+    <value>Prosím, specifikujte jméno vlastnosti, přístupnost parametru a typ 'setteru'.</value>
+  </data>
+  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
+    <value>Obalit Pole Privátním Typem</value>
+  </data>
+  <data name="EncapsulateField_TitleText" xml:space="preserve">
+    <value>Zapouzdřit Pole</value>
+  </data>
+  <data name="EncapsulateField_SetterType" xml:space="preserve">
+    <value>Typ Setteru:</value>
+  </data>
+  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
+    <value>Pouze ke čtení</value>
+  </data>
+  <data name="EncapsulateField_PropertyName" xml:space="preserve">
+    <value>Jméno Property:</value>
+  </data>
+  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
+    <value>Vytvoří property pro každý UDT člen</value>
+  </data>
+  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
+    <value>'&lt;===== Změny v deklaraci a vlastnostech nad tímto řádkem =====&gt;</value>
+  </data>
+  <data name="EncapsulateField_Preview" xml:space="preserve">
+    <value>Náhled:</value>
+  </data>
+  <data name="EncapsulateField_ParameterName" xml:space="preserve">
+    <value>Název Parametru:</value>
+  </data>
+  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
+    <value>Konflikt názvu</value>
+  </data>
+  <data name="EncapsulateField_Caption" xml:space="preserve">
+    <value>Rubberduck - Zapouzdřit Pole</value>
+  </data>
+  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
+    <value>Nelze zapouzdřit '{0}'. ReDim ({0}) výrok(y) existují v jiných modulech.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 585421ec45..1c88f91300 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -207,4 +207,43 @@
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Variablenname der Lokalen Kopie festlegen</value>
   </data>
+  <data name="EncapsulateField_InstructionText" xml:space="preserve">
+    <value>Bitte wählen Sie ein oder mehrere Felder, die gekapselt werden sollen. Die Eigenschaftsnamen könne vor dem bestätigen geändert werden.</value>
+  </data>
+  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
+    <value>Felder in einem privaten Typ kapseln</value>
+  </data>
+  <data name="EncapsulateField_TitleText" xml:space="preserve">
+    <value>Feld Kapseln</value>
+  </data>
+  <data name="EncapsulateField_SetterType" xml:space="preserve">
+    <value>Typ des Schreibzugriffs:</value>
+  </data>
+  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
+    <value>Schreibgeschützt</value>
+  </data>
+  <data name="EncapsulateField_PropertyName" xml:space="preserve">
+    <value>Eigenschaftsname:</value>
+  </data>
+  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
+    <value>Erstellt eine Eigenschaft für jedes UDT-Element</value>
+  </data>
+  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
+    <value>'&lt;===== Eigenschafts- und Deklarationsänderungen oberhalb dieser Zeile =====&gt;</value>
+  </data>
+  <data name="EncapsulateField_Preview" xml:space="preserve">
+    <value>Vorschau:</value>
+  </data>
+  <data name="EncapsulateField_ParameterName" xml:space="preserve">
+    <value>Parametername:</value>
+  </data>
+  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
+    <value>Namenskonflikt</value>
+  </data>
+  <data name="EncapsulateField_Caption" xml:space="preserve">
+    <value>Rubberduck - Gekapseltes Feld</value>
+  </data>
+  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
+    <value>Das Kapseln von '{0}' ist nicht möglich. Es existieren ReDim({0})-Anweisungen in anderen Modulen.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 589e7c2575..63cc2f7edb 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -207,4 +207,43 @@
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Especifique el nombre de la variable de copia local</value>
   </data>
+  <data name="EncapsulateField_InstructionText" xml:space="preserve">
+    <value>Seleccione uno o más campos para encapsular.  Acepte los valores por default o edite los nommbres de las propiedades.</value>
+  </data>
+  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
+    <value>Envolver campos en tipo Privado</value>
+  </data>
+  <data name="EncapsulateField_TitleText" xml:space="preserve">
+    <value>Campo encapsulado</value>
+  </data>
+  <data name="EncapsulateField_SetterType" xml:space="preserve">
+    <value>Tipo de Setter:</value>
+  </data>
+  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
+    <value>Sólo lectura</value>
+  </data>
+  <data name="EncapsulateField_PropertyName" xml:space="preserve">
+    <value>Nombre de la propiedad:</value>
+  </data>
+  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
+    <value>Crear una propiedad para cada miembro de tipo definido por el usuario</value>
+  </data>
+  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
+    <value>'&lt;===== Propiedad y declaración cambian por encima de esta línea=====&gt;</value>
+  </data>
+  <data name="EncapsulateField_Preview" xml:space="preserve">
+    <value>Vista previa:</value>
+  </data>
+  <data name="EncapsulateField_ParameterName" xml:space="preserve">
+    <value>Nombre del parámetro:</value>
+  </data>
+  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
+    <value>Conflicto de nombres</value>
+  </data>
+  <data name="EncapsulateField_Caption" xml:space="preserve">
+    <value>Rubberduck - Campo Encapsulado</value>
+  </data>
+  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
+    <value>No se puede encapsular {0}. Sentencias ReDim({0}) existen en otros módulos.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index ca001a284a..75c67cd412 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -192,4 +192,40 @@
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Nommer la variable locale</value>
   </data>
+  <data name="EncapsulateField_InstructionText" xml:space="preserve">
+    <value>Veuillez spécifier le nom, l'accessibilité des paramètres, et le type de mutateur pour la nouvelle propriété.</value>
+  </data>
+  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
+    <value>Envelopper les champs dans une structure 'Private Type'</value>
+  </data>
+  <data name="EncapsulateField_TitleText" xml:space="preserve">
+    <value>Encapsuler le champ</value>
+  </data>
+  <data name="EncapsulateField_SetterType" xml:space="preserve">
+    <value>Type d'assignation:</value>
+  </data>
+  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
+    <value>Lecture seule</value>
+  </data>
+  <data name="EncapsulateField_PropertyName" xml:space="preserve">
+    <value>Nom de la propriété:</value>
+  </data>
+  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
+    <value>'&lt;===== modifications aux propriétés et déclarations au-dessus de cette ligne =====&gt;</value>
+  </data>
+  <data name="EncapsulateField_Preview" xml:space="preserve">
+    <value>Aperçu:</value>
+  </data>
+  <data name="EncapsulateField_ParameterName" xml:space="preserve">
+    <value>Nom du paramètre:</value>
+  </data>
+  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
+    <value>Conflit de nom</value>
+  </data>
+  <data name="EncapsulateField_Caption" xml:space="preserve">
+    <value>Rubberduck - Encapsuler le champ</value>
+  </data>
+  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
+    <value>Impossible d'encapsuler le champ '{0}'. Une ou plusieurs instructions ReDim({0}) existent dans d'autres modules.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index ef3e4fd0de..3aa6f76c03 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -191,4 +191,44 @@
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Specify Local Copy Variable Name</value>
   </data>
+  <data name="EncapsulateField_InstructionText" xml:space="preserve">
+    <value>Select one or more fields to encapsulate.  Accept the default values or edit property names.</value>
+  </data>
+  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
+    <value>Wrap Fields in Private Type</value>
+  </data>
+  <data name="EncapsulateField_TitleText" xml:space="preserve">
+    <value>Encapsulate Field</value>
+  </data>
+  <data name="EncapsulateField_SetterType" xml:space="preserve">
+    <value>Setter Type:</value>
+  </data>
+  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
+    <value>Read Only</value>
+  </data>
+  <data name="EncapsulateField_PropertyName" xml:space="preserve">
+    <value>Property Name:</value>
+  </data>
+  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
+    <value>Creates a property for each UDT Member</value>
+  </data>
+  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
+    <value>'&lt;===== Property and declaration changes above this line =====&gt;</value>
+  </data>
+  <data name="EncapsulateField_Preview" xml:space="preserve">
+    <value>Preview:</value>
+  </data>
+  <data name="EncapsulateField_ParameterName" xml:space="preserve">
+    <value>Parameter Name:</value>
+  </data>
+  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
+    <value>Name conflict</value>
+  </data>
+  <data name="EncapsulateField_Caption" xml:space="preserve">
+    <value>Rubberduck - Encapsulate Field</value>
+  </data>
+  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
+    <value>Unable to encapsulate '{0}'. ReDim({0}) statement(s) exist in other modules.</value>
+    <comment>{0} = selected field IdentifierName</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index a8461ed052..7260dcd266 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1166,123 +1166,6 @@ public static string EmptyUIRefreshMessage_Title {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to encapsulate &apos;{0}&apos;. ReDim({0}) statement(s) exist in other modules..
-        /// </summary>
-        public static string EncapsulateField_ArrayHasExternalRedimFormat {
-            get {
-                return ResourceManager.GetString("EncapsulateField_ArrayHasExternalRedimFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Encapsulate Field.
-        /// </summary>
-        public static string EncapsulateField_Caption {
-            get {
-                return ResourceManager.GetString("EncapsulateField_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Select one or more fields to encapsulate.  Accept the default values or edit property names..
-        /// </summary>
-        public static string EncapsulateField_InstructionText {
-            get {
-                return ResourceManager.GetString("EncapsulateField_InstructionText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Name conflict.
-        /// </summary>
-        public static string EncapsulateField_NameConflictDetected {
-            get {
-                return ResourceManager.GetString("EncapsulateField_NameConflictDetected", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameter Name:.
-        /// </summary>
-        public static string EncapsulateField_ParameterName {
-            get {
-                return ResourceManager.GetString("EncapsulateField_ParameterName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Preview:.
-        /// </summary>
-        public static string EncapsulateField_Preview {
-            get {
-                return ResourceManager.GetString("EncapsulateField_Preview", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;&lt;===== Property and declaration changes above this line =====&gt;.
-        /// </summary>
-        public static string EncapsulateField_PreviewMarker {
-            get {
-                return ResourceManager.GetString("EncapsulateField_PreviewMarker", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Creates a property for each UDT Member.
-        /// </summary>
-        public static string EncapsulateField_PrivateUDTPropertyText {
-            get {
-                return ResourceManager.GetString("EncapsulateField_PrivateUDTPropertyText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Property Name:.
-        /// </summary>
-        public static string EncapsulateField_PropertyName {
-            get {
-                return ResourceManager.GetString("EncapsulateField_PropertyName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Read Only.
-        /// </summary>
-        public static string EncapsulateField_ReadOnlyCheckBoxContent {
-            get {
-                return ResourceManager.GetString("EncapsulateField_ReadOnlyCheckBoxContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Setter Type:.
-        /// </summary>
-        public static string EncapsulateField_SetterType {
-            get {
-                return ResourceManager.GetString("EncapsulateField_SetterType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encapsulate Field.
-        /// </summary>
-        public static string EncapsulateField_TitleText {
-            get {
-                return ResourceManager.GetString("EncapsulateField_TitleText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Wrap Fields in Private Type.
-        /// </summary>
-        public static string EncapsulateField_WrapFieldsInPrivateType {
-            get {
-                return ResourceManager.GetString("EncapsulateField_WrapFieldsInPrivateType", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Absolute.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index ae56abdc8a..a1663b90c9 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -611,21 +611,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>Výběr není proměnná.</value>
   </data>
-  <data name="EncapsulateField_Caption" xml:space="preserve">
-    <value>Rubberduck - Zapouzdřit Pole</value>
-  </data>
-  <data name="EncapsulateField_InstructionText" xml:space="preserve">
-    <value>Prosím, specifikujte jméno vlastnosti, přístupnost parametru a typ 'setteru'.</value>
-  </data>
-  <data name="EncapsulateField_Preview" xml:space="preserve">
-    <value>Náhled:</value>
-  </data>
-  <data name="EncapsulateField_PropertyName" xml:space="preserve">
-    <value>Jméno Property:</value>
-  </data>
-  <data name="EncapsulateField_TitleText" xml:space="preserve">
-    <value>Zapouzdřit Pole</value>
-  </data>
   <data name="MoveCloserToUsage_Caption" xml:space="preserve">
     <value>Rubberduck - Přesuň na Místo Použití</value>
   </data>
@@ -1521,15 +1506,9 @@ Import přerušen.</value>
   <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
     <value>{0} {1} {2} {3} {4} {5}</value>
   </data>
-  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
-    <value>'&lt;===== Změny v deklaraci a vlastnostech nad tímto řádkem =====&gt;</value>
-  </data>
   <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
     <value>Jméno složky nemůže být prázdné.</value>
   </data>
-  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
-    <value>Vytvoří property pro každý UDT člen</value>
-  </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Povolit drag and drop v Code Exploreru</value>
   </data>
@@ -1560,15 +1539,9 @@ Import přerušen.</value>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>Přesunout do Složky</value>
   </data>
-  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
-    <value>Konflikt názvu</value>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>Cíl nebyl specifikován.</value>
   </data>
-  <data name="EncapsulateField_ParameterName" xml:space="preserve">
-    <value>Název Parametru:</value>
-  </data>
   <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Prosím specifikujte novou složku pro komponenty.</value>
   </data>
@@ -1584,9 +1557,6 @@ Import přerušen.</value>
   <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Prosím specifikujte novou nadřazenou složku '{1}' pro podsložku '{0}'.</value>
   </data>
-  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
-    <value>Pouze ke čtení</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Přejmenovat složku</value>
   </data>
@@ -1596,9 +1566,6 @@ Import přerušen.</value>
   <data name="MoveToFolderDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Přesunout do Složky</value>
   </data>
-  <data name="EncapsulateField_SetterType" xml:space="preserve">
-    <value>Typ Setteru:</value>
-  </data>
   <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
     <value>Je přesunováno několik složek se tejným jménem. Toto je spojí.
 Chcete pokračovat?</value>
@@ -1629,10 +1596,4 @@ Chcete pokračovat?</value>
     <value>Cílová složka '{0}' již obsahuje podsložky '{1}'. Přemístění složek je sloučí s existujícími složkami s korespondujícími jmény.
 Chcete pokračovat?</value>
   </data>
-  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
-    <value>Nelze zapouzdřit '{0}'. ReDim ({0}) výrok(y) existují v jiných modulech.</value>
-  </data>
-  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
-    <value>Obalit Pole Privátním Typem</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 73a47b672d..bb432ef78d 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -563,18 +563,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>Die Auswahl ist keine Variable.</value>
   </data>
-  <data name="EncapsulateField_Caption" xml:space="preserve">
-    <value>Rubberduck - Gekapseltes Feld</value>
-  </data>
-  <data name="EncapsulateField_Preview" xml:space="preserve">
-    <value>Vorschau:</value>
-  </data>
-  <data name="EncapsulateField_PropertyName" xml:space="preserve">
-    <value>Eigenschaftsname:</value>
-  </data>
-  <data name="EncapsulateField_TitleText" xml:space="preserve">
-    <value>Feld Kapseln</value>
-  </data>
   <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
     <value>'{0}' hat keine Referenzen.</value>
   </data>
@@ -593,9 +581,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="MoveCloserToUsage_Caption" xml:space="preserve">
     <value>Rubberduck - Näher an die Nutzung führen</value>
   </data>
-  <data name="EncapsulateField_InstructionText" xml:space="preserve">
-    <value>Bitte wählen Sie ein oder mehrere Felder, die gekapselt werden sollen. Die Eigenschaftsnamen könne vor dem bestätigen geändert werden.</value>
-  </data>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Ungültige Auswahl.</value>
   </data>
@@ -1638,24 +1623,6 @@ Wollen Sie fortfahren?</value>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Drag and Drop im Code Explorer aktivieren</value>
   </data>
-  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
-    <value>Das Kapseln von '{0}' ist nicht möglich. Es existieren ReDim({0})-Anweisungen in anderen Modulen.</value>
-  </data>
-  <data name="EncapsulateField_ParameterName" xml:space="preserve">
-    <value>Parametername:</value>
-  </data>
-  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
-    <value>'&lt;===== Eigenschafts- und Deklarationsänderungen oberhalb dieser Zeile =====&gt;</value>
-  </data>
-  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
-    <value>Erstellt eine Eigenschaft für jedes UDT-Element</value>
-  </data>
-  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
-    <value>Schreibgeschützt</value>
-  </data>
-  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
-    <value>Felder in einem privaten Typ kapseln</value>
-  </data>
   <data name="ExtractInterface_Private" xml:space="preserve">
     <value>Privat</value>
   </data>
@@ -1667,12 +1634,6 @@ Wollen Sie fortfahren?</value>
 Falls Sie eine 'private' Schnittstelle benötigen, machen Sie bitte die implementierende Klasse ebenfalls privat.
 Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   </data>
-  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
-    <value>Namenskonflikt</value>
-  </data>
-  <data name="EncapsulateField_SetterType" xml:space="preserve">
-    <value>Typ des Schreibzugriffs:</value>
-  </data>
   <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
     <value>Sichtbarkeit</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 5b8fa830f7..c865ddd651 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -565,21 +565,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
     <value>La selección no es una variable.</value>
     <comment>Utilizado tanto en Introducir parámetro como en Introducir campo</comment>
   </data>
-  <data name="EncapsulateField_Caption" xml:space="preserve">
-    <value>Rubberduck - Campo Encapsulado</value>
-  </data>
-  <data name="EncapsulateField_InstructionText" xml:space="preserve">
-    <value>Seleccione uno o más campos para encapsular.  Acepte los valores por default o edite los nommbres de las propiedades.</value>
-  </data>
-  <data name="EncapsulateField_Preview" xml:space="preserve">
-    <value>Vista previa:</value>
-  </data>
-  <data name="EncapsulateField_PropertyName" xml:space="preserve">
-    <value>Nombre de la propiedad:</value>
-  </data>
-  <data name="EncapsulateField_TitleText" xml:space="preserve">
-    <value>Campo encapsulado</value>
-  </data>
   <data name="MoveCloserToUsage_Caption" xml:space="preserve">
     <value>Rubberduck - Acercar al uso</value>
   </data>
@@ -1408,12 +1393,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Guardar y Cerrar</value>
   </data>
-  <data name="EncapsulateField_ParameterName" xml:space="preserve">
-    <value>Nombre del parámetro:</value>
-  </data>
-  <data name="EncapsulateField_SetterType" xml:space="preserve">
-    <value>Tipo de Setter:</value>
-  </data>
   <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
     <value>Refactorización falló.</value>
   </data>
@@ -1617,24 +1596,6 @@ Importación cancelada.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>Formulario VB</value>
   </data>
-  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
-    <value>No se puede encapsular {0}. Sentencias ReDim({0}) existen en otros módulos.</value>
-  </data>
-  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
-    <value>Conflicto de nombres</value>
-  </data>
-  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
-    <value>'&lt;===== Propiedad y declaración cambian por encima de esta línea=====&gt;</value>
-  </data>
-  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
-    <value>Crear una propiedad para cada miembro de tipo definido por el usuario</value>
-  </data>
-  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
-    <value>Sólo lectura</value>
-  </data>
-  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
-    <value>Envolver campos en tipo Privado</value>
-  </data>
   <data name="MoveToFolderDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Mover a Carpeta</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index bc0cf1c888..1ee0f54879 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -534,9 +534,6 @@ Continuer?</value>
   <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
     <value>'{0}' n'est jamais utilisé.</value>
   </data>
-  <data name="EncapsulateField_TitleText" xml:space="preserve">
-    <value>Encapsuler le champ</value>
-  </data>
   <data name="IntroduceParameter_Caption" xml:space="preserve">
     <value>Rubberduck - Introduire un paramètre</value>
   </data>
@@ -558,9 +555,6 @@ Continuer?</value>
   <data name="RegexSearchReplace_ReplaceLabel" xml:space="preserve">
     <value>Remplacement:</value>
   </data>
-  <data name="EncapsulateField_Caption" xml:space="preserve">
-    <value>Rubberduck - Encapsuler le champ</value>
-  </data>
   <data name="RegexSearchReplaceScope_AllOpenedFiles" xml:space="preserve">
     <value>Tous les fichiers ouverts</value>
   </data>
@@ -576,9 +570,6 @@ Continuer?</value>
   <data name="RegexSearchReplaceScope_CurrentBlock" xml:space="preserve">
     <value>Bloc courant</value>
   </data>
-  <data name="EncapsulateField_PropertyName" xml:space="preserve">
-    <value>Nom de la propriété:</value>
-  </data>
   <data name="RegexSearchReplaceScope_AllOpenProjects" xml:space="preserve">
     <value>Tous les projets ouverts</value>
   </data>
@@ -594,15 +585,9 @@ Continuer?</value>
   <data name="RegexSearchReplace_ReplaceButtonLabel" xml:space="preserve">
     <value>Remplacer</value>
   </data>
-  <data name="EncapsulateField_InstructionText" xml:space="preserve">
-    <value>Veuillez spécifier le nom, l'accessibilité des paramètres, et le type de mutateur pour la nouvelle propriété.</value>
-  </data>
   <data name="FindSymbolDialog_Caption" xml:space="preserve">
     <value>Rechercher un symbole</value>
   </data>
-  <data name="EncapsulateField_Preview" xml:space="preserve">
-    <value>Aperçu:</value>
-  </data>
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' est utilisé dans plus d'une méthode.</value>
   </data>
@@ -1510,27 +1495,6 @@ Mise à jour annulée.</value>
 
 Échec de l'importation.</value>
   </data>
-  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
-    <value>Impossible d'encapsuler le champ '{0}'. Une ou plusieurs instructions ReDim({0}) existent dans d'autres modules.</value>
-  </data>
-  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
-    <value>Conflit de nom</value>
-  </data>
-  <data name="EncapsulateField_ParameterName" xml:space="preserve">
-    <value>Nom du paramètre:</value>
-  </data>
-  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
-    <value>'&lt;===== modifications aux propriétés et déclarations au-dessus de cette ligne =====&gt;</value>
-  </data>
-  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
-    <value>Lecture seule</value>
-  </data>
-  <data name="EncapsulateField_SetterType" xml:space="preserve">
-    <value>Type d'assignation:</value>
-  </data>
-  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
-    <value>Envelopper les champs dans une structure 'Private Type'</value>
-  </data>
   <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
     <value>Instanciation</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 45be6ae602..2e8c16f9ad 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -568,27 +568,6 @@ Do you want to proceed with this rename?</value>
     <value>Selection is not a variable.</value>
     <comment>Used in both Introduce Parameter and Introduce Field</comment>
   </data>
-  <data name="EncapsulateField_Caption" xml:space="preserve">
-    <value>Rubberduck - Encapsulate Field</value>
-  </data>
-  <data name="EncapsulateField_InstructionText" xml:space="preserve">
-    <value>Select one or more fields to encapsulate.  Accept the default values or edit property names.</value>
-  </data>
-  <data name="EncapsulateField_Preview" xml:space="preserve">
-    <value>Preview:</value>
-  </data>
-  <data name="EncapsulateField_PropertyName" xml:space="preserve">
-    <value>Property Name:</value>
-  </data>
-  <data name="EncapsulateField_SetterType" xml:space="preserve">
-    <value>Setter Type:</value>
-  </data>
-  <data name="EncapsulateField_TitleText" xml:space="preserve">
-    <value>Encapsulate Field</value>
-  </data>
-  <data name="EncapsulateField_ParameterName" xml:space="preserve">
-    <value>Parameter Name:</value>
-  </data>
   <data name="MoveCloserToUsage_Caption" xml:space="preserve">
     <value>Rubberduck - Move Closer To Usage</value>
   </data>
@@ -1737,25 +1716,6 @@ Import aborted.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>VB Form</value>
   </data>
-  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
-    <value>Unable to encapsulate '{0}'. ReDim({0}) statement(s) exist in other modules.</value>
-    <comment>{0} = selected field IdentifierName</comment>
-  </data>
-  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
-    <value>Name conflict</value>
-  </data>
-  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
-    <value>'&lt;===== Property and declaration changes above this line =====&gt;</value>
-  </data>
-  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
-    <value>Creates a property for each UDT Member</value>
-  </data>
-  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
-    <value>Read Only</value>
-  </data>
-  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
-    <value>Wrap Fields in Private Type</value>
-  </data>
   <data name="MoveToFolderDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Move to Folder</value>
   </data>
diff --git a/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateArrayFieldTests.cs b/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateArrayFieldTests.cs
index 2b839da70a..0e6db36967 100644
--- a/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateArrayFieldTests.cs
+++ b/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateArrayFieldTests.cs
@@ -211,7 +211,7 @@ End Sub
 
             var result = field.TryValidateEncapsulationAttributes(out var errorMessage);
 
-            var expectedError = string.Format(RubberduckUI.EncapsulateField_ArrayHasExternalRedimFormat, field.IdentifierName);
+            var expectedError = string.Format(RefactoringsUI.EncapsulateField_ArrayHasExternalRedimFormat, field.IdentifierName);
 
             StringAssert.AreEqualIgnoringCase(expectedError, errorMessage);
             Assert.IsFalse(result);
diff --git a/RubberduckTests/Refactoring/EncapsulateField/PreviewerTests.cs b/RubberduckTests/Refactoring/EncapsulateField/PreviewerTests.cs
index b7bf02f9c0..37ce3faec6 100644
--- a/RubberduckTests/Refactoring/EncapsulateField/PreviewerTests.cs
+++ b/RubberduckTests/Refactoring/EncapsulateField/PreviewerTests.cs
@@ -145,7 +145,7 @@ Public mTest As Long
 
                 var previewResult = previewProvider.Preview(model);
 
-                StringAssert.Contains(RubberduckUI.EncapsulateField_PreviewMarker, previewResult);
+                StringAssert.Contains(RefactoringsUI.EncapsulateField_PreviewMarker, previewResult);
             }
         }
 

From 2a0aeafc4ee7a417da2291b22c77a7f363181ebf Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 17:27:14 -0700
Subject: [PATCH 21/64] Migrate ExtracteInterface_ resources

---
 .../ExtractInterfaceFailedNotifier.cs         |  3 +-
 .../EncapsulateFieldView.xaml                 |  2 +-
 .../ExtractInterfacePresenter.cs              |  4 +-
 .../ExtractInterfaceView.xaml                 | 10 +--
 .../RefactoringsUI.Designer.cs                | 74 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 20 +++++
 .../RefactoringsUI.de.resx                    | 26 +++++++
 .../RefactoringsUI.es.resx                    | 20 +++++
 .../RefactoringsUI.fr.resx                    | 20 +++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 28 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 74 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 20 -----
 Rubberduck.Resources/RubberduckUI.de.resx     | 26 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 20 -----
 Rubberduck.Resources/RubberduckUI.fr.resx     | 20 -----
 Rubberduck.Resources/RubberduckUI.resx        | 28 -------
 16 files changed, 198 insertions(+), 197 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs
index df3b3f6dbe..1886b96474 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
@@ -10,7 +11,7 @@ public ExtractInterfaceFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.ExtractInterface_Caption;
+        protected override string Caption => RefactoringsUI.ExtractInterface_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml
index 6c382b7706..daf5d1e6cf 100644
--- a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml
@@ -82,7 +82,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <TextBlock Grid.Column="0" Margin="0,5"
-                                   Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_MembersGroupBox}" />
+                                   Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_MembersGroupBox}" />
                         <StackPanel Grid.Column="1" Margin="5" Orientation="Horizontal">
                             <Button Style="{StaticResource CommandButtonStyle}" TabIndex="2"
                                     Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SelectAll_Button}"
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
index e688a40684..ccd63ec13e 100644
--- a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
@@ -1,11 +1,11 @@
 using Rubberduck.Refactorings.ExtractInterface;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.ExtractInterface
 {
     internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel>, IExtractInterfacePresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.ExtractInterface_Caption, 339, 459);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.ExtractInterface_Caption, 339, 459);
 
         public ExtractInterfacePresenter(ExtractInterfaceModel model,
             IRefactoringDialogFactory dialogFactory) : base(DialogData, model, dialogFactory) { }
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml
index fe8c94372a..40d0a5de20 100644
--- a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml
@@ -23,8 +23,8 @@
         <DockPanel Dock="Top" Background="{StaticResource BackgroundLightBrush}">
             <StackPanel>
 
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_TitleLabel}" FontWeight="Bold" />
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_InstructionLabel}"
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_TitleLabel}" FontWeight="Bold" />
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_InstructionLabel}"
                        Margin="5,0" />
             </StackPanel>
         </DockPanel>
@@ -50,7 +50,7 @@
                        Visibility="{Binding IsValidInterfaceName, Converter={StaticResource BoolToHiddenVisibility}}"/>
             </StackPanel>
 
-            <GroupBox Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_InstancingGroupBox}"
+            <GroupBox Header="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_InstancingGroupBox}"
                       Grid.Row="1" Margin="5" Padding="5">
                 <Grid>
                     <ComboBox ItemsSource="{Binding ClassInstances}"
@@ -58,12 +58,12 @@
                               Visibility="{Binding CanChooseInterfaceInstancing, Converter={StaticResource BoolToVisibility}}">
                     </ComboBox>
                     <TextBlock Visibility="{Binding CanChooseInterfaceInstancing, Converter={StaticResource BoolToHiddenVisibility}}"
-                               Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_PublicInstancingMandatedByPublicClass}"
+                               Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_PublicInstancingMandatedByPublicClass}"
                                TextWrapping="Wrap" />
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_MembersGroupBox}"
+            <GroupBox Header="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_MembersGroupBox}"
                       Grid.Row="2" Margin="5" Padding="5">
                 <Grid>
                     <Grid.ColumnDefinitions>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 2f48dc8345..bf3a977c37 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -446,5 +446,79 @@ public static string EncapsulateField_WrapFieldsInPrivateType {
                 return ResourceManager.GetString("EncapsulateField_WrapFieldsInPrivateType", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Extract Interface.
+        /// </summary>
+        public static string ExtractInterface_Caption {
+            get {
+                return ResourceManager.GetString("ExtractInterface_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Instancing.
+        /// </summary>
+        public static string ExtractInterface_InstancingGroupBox {
+            get {
+                return ResourceManager.GetString("ExtractInterface_InstancingGroupBox", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify interface name and members..
+        /// </summary>
+        public static string ExtractInterface_InstructionLabel {
+            get {
+                return ResourceManager.GetString("ExtractInterface_InstructionLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Members.
+        /// </summary>
+        public static string ExtractInterface_MembersGroupBox {
+            get {
+                return ResourceManager.GetString("ExtractInterface_MembersGroupBox", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Private.
+        /// </summary>
+        public static string ExtractInterface_Private {
+            get {
+                return ResourceManager.GetString("ExtractInterface_Private", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Public.
+        /// </summary>
+        public static string ExtractInterface_Public {
+            get {
+                return ResourceManager.GetString("ExtractInterface_Public", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The implementing class is &apos;Public&apos; mandating the interface be public as well.
+        ///If you require a &apos;Private&apos; interface, change the classes instancing to private as well.
+        ///A private class can still implement a public interface..
+        /// </summary>
+        public static string ExtractInterface_PublicInstancingMandatedByPublicClass {
+            get {
+                return ResourceManager.GetString("ExtractInterface_PublicInstancingMandatedByPublicClass", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Extract Interface.
+        /// </summary>
+        public static string ExtractInterface_TitleLabel {
+            get {
+                return ResourceManager.GetString("ExtractInterface_TitleLabel", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 79b55c6166..4dab61bf76 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -246,4 +246,24 @@
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>Nelze zapouzdřit '{0}'. ReDim ({0}) výrok(y) existují v jiných modulech.</value>
   </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>Implementovaná třída je 'Public', což nutí interface být také public.
+Jestliže vyžadujete 'Private' interface, změňte instancování třídy na private.
+Privání třída může stále implementovat public (veřejný) interface.</value>
+  </data>
+  <data name="ExtractInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Extrahovat Rozhraní</value>
+  </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Instancování</value>
+  </data>
+  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
+    <value>Prosím, specifikujte jméno rozhraní a jeho členy.</value>
+  </data>
+  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
+    <value>Členové</value>
+  </data>
+  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
+    <value>Extrahovat Rozhraní</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 1c88f91300..0c96052d97 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -246,4 +246,30 @@
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>Das Kapseln von '{0}' ist nicht möglich. Es existieren ReDim({0})-Anweisungen in anderen Modulen.</value>
   </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>Die implementierende Klasse ist öffentlich, was es notwendig macht, dass die Schnittstelle ebenfalls öffentlich ist.
+Falls Sie eine 'private' Schnittstelle benötigen, machen Sie bitte die implementierende Klasse ebenfalls privat.
+Eine private Klasse kann eine private Schnittstelle implementieren.</value>
+  </data>
+  <data name="ExtractInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Extrahiere Interface</value>
+  </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Sichtbarkeit</value>
+  </data>
+  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
+    <value>Bitte spezifizieren Sie den Interfacenamen und die Elemente.</value>
+  </data>
+  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
+    <value>Elemente</value>
+  </data>
+  <data name="ExtractInterface_Private" xml:space="preserve">
+    <value>Privat</value>
+  </data>
+  <data name="ExtractInterface_Public" xml:space="preserve">
+    <value>Öffentlich</value>
+  </data>
+  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
+    <value>Extrahiere Interface</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 63cc2f7edb..f8076b7549 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -246,4 +246,24 @@
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>No se puede encapsular {0}. Sentencias ReDim({0}) existen en otros módulos.</value>
   </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>La clase que implementa es 'Public' obligando a la interfaz a ser pública también.
+Si necesita una interfaz 'Private', cambie las clases que la instancian a 'Private' también.
+Una clase privada puede asimismo implementar una interfaz pública.</value>
+  </data>
+  <data name="ExtractInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Extraer interfaz</value>
+  </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Instanciación</value>
+  </data>
+  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
+    <value>Por favor especificar el nombre de la interfaz y los miembros.</value>
+  </data>
+  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
+    <value>Miembros</value>
+  </data>
+  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
+    <value>Extraer interfaz</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 75c67cd412..149cb6f897 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -228,4 +228,24 @@
   <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
     <value>Impossible d'encapsuler le champ '{0}'. Une ou plusieurs instructions ReDim({0}) existent dans d'autres modules.</value>
   </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>La classe est publique, l'interface extraite sera donc publique également.
+Si une interface privée est nécessaire, veuillez modifier le mode d'instanciation ("instancing") du module de classe pour 'Private'.
+Une classe privée peut toujours implémenter une interface publique.</value>
+  </data>
+  <data name="ExtractInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Extraire une interface</value>
+  </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Instanciation</value>
+  </data>
+  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
+    <value>Veuillez spécifier le nom et les membres de l'interface.</value>
+  </data>
+  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
+    <value>Membres</value>
+  </data>
+  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
+    <value>Extraire une interface</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 3aa6f76c03..6d5ec2ef5a 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -231,4 +231,32 @@
     <value>Unable to encapsulate '{0}'. ReDim({0}) statement(s) exist in other modules.</value>
     <comment>{0} = selected field IdentifierName</comment>
   </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>The implementing class is 'Public' mandating the interface be public as well.
+If you require a 'Private' interface, change the classes instancing to private as well.
+A private class can still implement a public interface.</value>
+  </data>
+  <data name="ExtractInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Extract Interface</value>
+  </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Instancing</value>
+  </data>
+  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
+    <value>Please specify interface name and members.</value>
+  </data>
+  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
+    <value>Members</value>
+  </data>
+  <data name="ExtractInterface_Private" xml:space="preserve">
+    <value>Private</value>
+    <comment>keyword.. no translations.</comment>
+  </data>
+  <data name="ExtractInterface_Public" xml:space="preserve">
+    <value>Public</value>
+    <comment>keyword.. no translation.</comment>
+  </data>
+  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
+    <value>Extract Interface</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 7260dcd266..6086f1f304 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1231,80 +1231,6 @@ public static string ExportAllCommand_SaveAsDialog_Title {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Extract Interface.
-        /// </summary>
-        public static string ExtractInterface_Caption {
-            get {
-                return ResourceManager.GetString("ExtractInterface_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Instancing.
-        /// </summary>
-        public static string ExtractInterface_InstancingGroupBox {
-            get {
-                return ResourceManager.GetString("ExtractInterface_InstancingGroupBox", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify interface name and members..
-        /// </summary>
-        public static string ExtractInterface_InstructionLabel {
-            get {
-                return ResourceManager.GetString("ExtractInterface_InstructionLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Members.
-        /// </summary>
-        public static string ExtractInterface_MembersGroupBox {
-            get {
-                return ResourceManager.GetString("ExtractInterface_MembersGroupBox", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Private.
-        /// </summary>
-        public static string ExtractInterface_Private {
-            get {
-                return ResourceManager.GetString("ExtractInterface_Private", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Public.
-        /// </summary>
-        public static string ExtractInterface_Public {
-            get {
-                return ResourceManager.GetString("ExtractInterface_Public", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The implementing class is &apos;Public&apos; mandating the interface be public as well.
-        ///If you require a &apos;Private&apos; interface, change the classes instancing to private as well.
-        ///A private class can still implement a public interface..
-        /// </summary>
-        public static string ExtractInterface_PublicInstancingMandatedByPublicClass {
-            get {
-                return ResourceManager.GetString("ExtractInterface_PublicInstancingMandatedByPublicClass", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Extract Interface.
-        /// </summary>
-        public static string ExtractInterface_TitleLabel {
-            get {
-                return ResourceManager.GetString("ExtractInterface_TitleLabel", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Accessibility:.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a1663b90c9..388cb3a630 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -459,21 +459,12 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="TodoSettings_TokenListLabel" xml:space="preserve">
     <value>Seznam tokenu:</value>
   </data>
-  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
-    <value>Extrahovat Rozhraní</value>
-  </data>
   <data name="SelectAll_Button" xml:space="preserve">
     <value>Označit vše</value>
   </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Odznačit vše</value>
   </data>
-  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
-    <value>Členové</value>
-  </data>
-  <data name="ExtractInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Extrahovat Rozhraní</value>
-  </data>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Neplatný výběr.</value>
   </data>
@@ -635,9 +626,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
     <value>Aktuální výběr není platný.</value>
   </data>
-  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
-    <value>Prosím, specifikujte jméno rozhraní a jeho členy.</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Vážnost:</value>
   </data>
@@ -1527,9 +1515,6 @@ Import přerušen.</value>
   <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
     <value>Plná nová složka:</value>
   </data>
-  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
-    <value>Instancování</value>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>Ve VBA není možné změnit pouze počáteční písmeno identifikátoru (jazyk ignoruje velká/malá písmena).</value>
   </data>
@@ -1576,11 +1561,6 @@ Chcete pokračovat?</value>
   <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
     <value>Složka '{0}' již existuje. Přejmenování '{1}' na '{2}' vyústí ve sloučení s existující složkou.
 Chcete pokračovat?</value>
-  </data>
-  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
-    <value>Implementovaná třída je 'Public', což nutí interface být také public.
-Jestliže vyžadujete 'Private' interface, změňte instancování třídy na private.
-Privání třída může stále implementovat public (veřejný) interface.</value>
   </data>
   <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
     <value>Názvy individuálních podsložek nemohou být prázdná.</value>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index bb432ef78d..eb958201c6 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -542,24 +542,12 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="FindSymbolDialog_Caption" xml:space="preserve">
     <value>Suche Symbol </value>
   </data>
-  <data name="ExtractInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Extrahiere Interface</value>
-  </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Alles abwählen</value>
   </data>
   <data name="SelectAll_Button" xml:space="preserve">
     <value>Alles auswählen</value>
   </data>
-  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
-    <value>Extrahiere Interface</value>
-  </data>
-  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
-    <value>Elemente</value>
-  </data>
-  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
-    <value>Bitte spezifizieren Sie den Interfacenamen und die Elemente.</value>
-  </data>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>Die Auswahl ist keine Variable.</value>
   </data>
@@ -1623,18 +1611,4 @@ Wollen Sie fortfahren?</value>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Drag and Drop im Code Explorer aktivieren</value>
   </data>
-  <data name="ExtractInterface_Private" xml:space="preserve">
-    <value>Privat</value>
-  </data>
-  <data name="ExtractInterface_Public" xml:space="preserve">
-    <value>Öffentlich</value>
-  </data>
-  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
-    <value>Die implementierende Klasse ist öffentlich, was es notwendig macht, dass die Schnittstelle ebenfalls öffentlich ist.
-Falls Sie eine 'private' Schnittstelle benötigen, machen Sie bitte die implementierende Klasse ebenfalls privat.
-Eine private Klasse kann eine private Schnittstelle implementieren.</value>
-  </data>
-  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
-    <value>Sichtbarkeit</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index c865ddd651..f30e57dfd7 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -595,24 +595,12 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Selección invalida.</value>
   </data>
-  <data name="ExtractInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Extraer interfaz</value>
-  </data>
-  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
-    <value>Extraer interfaz</value>
-  </data>
-  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
-    <value>Por favor especificar el nombre de la interfaz y los miembros.</value>
-  </data>
   <data name="SelectAll_Button" xml:space="preserve">
     <value>Seleccionar todo</value>
   </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Deseleccionar todo</value>
   </data>
-  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
-    <value>Miembros</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Severidad:</value>
   </data>
@@ -1629,14 +1617,6 @@ Importación cancelada.</value>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>El componente '{0}' habría sido afectado por la refactorización, pero su estado en la memoria de Rubberduck está desactualizado. Por favor actualice el estado de Rubberduck e intente de nuevo.</value>
   </data>
-  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
-    <value>Instanciación</value>
-  </data>
-  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
-    <value>La clase que implementa es 'Public' obligando a la interfaz a ser pública también.
-Si necesita una interfaz 'Private', cambie las clases que la instancian a 'Private' también.
-Una clase privada puede asimismo implementar una interfaz pública.</value>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 1ee0f54879..56f5429fca 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -522,15 +522,6 @@ Continuer?</value>
   <data name="MoveCloserToUsage_Caption" xml:space="preserve">
     <value>Rubberduck - Rapprocher la déclaration de son utilisation</value>
   </data>
-  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
-    <value>Extraire une interface</value>
-  </data>
-  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
-    <value>Veuillez spécifier le nom et les membres de l'interface.</value>
-  </data>
-  <data name="ExtractInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Extraire une interface</value>
-  </data>
   <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
     <value>'{0}' n'est jamais utilisé.</value>
   </data>
@@ -579,9 +570,6 @@ Continuer?</value>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>La sélection n'est pas une variable.</value>
   </data>
-  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
-    <value>Membres</value>
-  </data>
   <data name="RegexSearchReplace_ReplaceButtonLabel" xml:space="preserve">
     <value>Remplacer</value>
   </data>
@@ -1494,14 +1482,6 @@ Mise à jour annulée.</value>
     <value>Aucun module document existant avec le nom '{0}'; le fichier '{1}' ne pourra pas être importé.
 
 Échec de l'importation.</value>
-  </data>
-  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
-    <value>Instanciation</value>
-  </data>
-  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
-    <value>La classe est publique, l'interface extraite sera donc publique également.
-Si une interface privée est nécessaire, veuillez modifier le mode d'instanciation ("instancing") du module de classe pour 'Private'.
-Une classe privée peut toujours implémenter une interface publique.</value>
   </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Permettre glisser-déposer dans l'Explorateur de Code</value>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 2e8c16f9ad..57eb06803a 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -598,24 +598,12 @@ Do you want to proceed with this rename?</value>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Invalid Selection.</value>
   </data>
-  <data name="ExtractInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Extract Interface</value>
-  </data>
-  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
-    <value>Extract Interface</value>
-  </data>
-  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
-    <value>Please specify interface name and members.</value>
-  </data>
   <data name="SelectAll_Button" xml:space="preserve">
     <value>Select All</value>
   </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Deselect All</value>
   </data>
-  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
-    <value>Members</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Severity:</value>
   </data>
@@ -1756,22 +1744,6 @@ Import aborted.</value>
     <value>The component '{0}' would have been affected by the refactoring, but its state in Rubberduck's memory is stale. Please refresh Rubberduck and try again.</value>
     <comment>{0} stale module</comment>
   </data>
-  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
-    <value>Instancing</value>
-  </data>
-  <data name="ExtractInterface_Private" xml:space="preserve">
-    <value>Private</value>
-    <comment>keyword.. no translations.</comment>
-  </data>
-  <data name="ExtractInterface_Public" xml:space="preserve">
-    <value>Public</value>
-    <comment>keyword.. no translation.</comment>
-  </data>
-  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
-    <value>The implementing class is 'Public' mandating the interface be public as well.
-If you require a 'Private' interface, change the classes instancing to private as well.
-A private class can still implement a public interface.</value>
-  </data>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>The refactoring can only annotate components, members and variables, but the target had type '{0}'.</value>
     <comment>{0} declaration type</comment>

From 5aeee5f70da71f1d82df53499a383cc5fc907fea Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 17:33:45 -0700
Subject: [PATCH 22/64] Convert to auto-property

---
 .../ExtractMethod/ExtractedParameter.cs       | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs
index d686f162bb..6627c6abb3 100644
--- a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs
+++ b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs
@@ -13,35 +13,22 @@ public enum PassedBy
 
         public static readonly string None = RubberduckUI.ExtractMethod_OutputNone;
 
-        private readonly string _name;
-        private readonly string _typeName;
-        private readonly PassedBy _passedBy;
-
         public ExtractedParameter(string typeName, PassedBy passedBy, string name = null)
         {
-            _name = name ?? None;
-            _typeName = typeName;
-            _passedBy = passedBy;
+            Name = name ?? None;
+            TypeName = typeName;
+            Passed = passedBy;
         }
 
-        public string Name
-        {
-            get { return _name; }
-        }
+        public string Name { get; }
 
-        public string TypeName
-        {
-            get { return _typeName; }
-        }
+        public string TypeName { get; }
 
-        public PassedBy Passed
-        {
-            get { return _passedBy; }
-        }
+        public PassedBy Passed { get; }
 
         public override string ToString()
         {
-            return _passedBy.ToString() + ' ' + Name + ' ' + Tokens.As + ' ' + TypeName;
+            return Passed.ToString() + ' ' + Name + ' ' + Tokens.As + ' ' + TypeName;
         }
     }
 }

From 5152b4c534c82164e10e270954a756bebcc0557e Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 17:39:29 -0700
Subject: [PATCH 23/64] Migrate ExtractMethod_ resources

---
 .../ExtractMethod/ExtractedParameter.cs       |  3 +-
 .../RefactorExtractMethodCommand.cs           |  4 +-
 .../UI/Refactorings/ExtractMethodDialog.cs    | 16 ++--
 .../RefactoringsUI.Designer.cs                | 90 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 30 +++++++
 .../RefactoringsUI.de.resx                    | 30 +++++++
 .../RefactoringsUI.es.resx                    | 30 +++++++
 .../RefactoringsUI.fr.resx                    | 30 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 30 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 90 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 30 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 30 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 30 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 30 -------
 Rubberduck.Resources/RubberduckUI.resx        | 30 -------
 15 files changed, 251 insertions(+), 252 deletions(-)

diff --git a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs
index 6627c6abb3..b8cc193bed 100644
--- a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs
+++ b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractedParameter.cs
@@ -1,5 +1,4 @@
 using Rubberduck.Parsing.Grammar;
-using Rubberduck.Resources;
 
 namespace Rubberduck.Refactorings.ExtractMethod
 {
@@ -11,7 +10,7 @@ public enum PassedBy
             ByVal
         }
 
-        public static readonly string None = RubberduckUI.ExtractMethod_OutputNone;
+        public static readonly string None = RefactoringsUI.ExtractMethod_OutputNone;
 
         public ExtractedParameter(string typeName, PassedBy passedBy, string name = null)
         {
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs
index cda68c02c2..5787b53699 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs
@@ -6,8 +6,8 @@
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using Rubberduck.Refactorings;
 using Rubberduck.Parsing.Common;
-using Rubberduck.Resources;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings
@@ -103,7 +103,7 @@ IExtractMethodModel CreateMethodModel(QualifiedSelection? qs, string code)
 
         private void HandleInvalidSelection(object sender, EventArgs e)
         {
-            MessageBox.Show(RubberduckUI.ExtractMethod_InvalidSelectionMessage, RubberduckUI.ExtractMethod_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            MessageBox.Show(RefactoringsUI.ExtractMethod_InvalidSelectionMessage, RefactoringsUI.ExtractMethod_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs b/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
index d8915efa0a..1ed28287e9 100644
--- a/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
@@ -6,6 +6,7 @@
 using System.Windows.Forms;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.ExtractMethod;
 using Rubberduck.Resources;
 
@@ -31,16 +32,16 @@ public ExtractMethodDialog()
 
         private void Localize()
         {
-            Text = RubberduckUI.ExtractMethod_Caption;
+            Text = RefactoringsUI.ExtractMethod_Caption;
             OkButton.Text = RubberduckUI.OK;
             CancelDialogButton.Text = RubberduckUI.CancelButtonText;
 
-            TitleLabel.Text = RubberduckUI.ExtractMethod_TitleText;
-            InstructionsLabel.Text = RubberduckUI.ExtractMethod_InstructionsText;
+            TitleLabel.Text = RefactoringsUI.ExtractMethod_TitleText;
+            InstructionsLabel.Text = RefactoringsUI.ExtractMethod_InstructionsText;
             NameLabel.Text = RubberduckUI.NameLabelText;
-            AccessibilityLabel.Text = RubberduckUI.ExtractMethod_AccessibilityLabel;
-            ParametersLabel.Text = RubberduckUI.ExtractMethod_ParametersLabel;
-            PreviewLabel.Text = RubberduckUI.ExtractMethod_PreviewLabel;
+            AccessibilityLabel.Text = RefactoringsUI.ExtractMethod_AccessibilityLabel;
+            ParametersLabel.Text = RefactoringsUI.ExtractMethod_ParametersLabel;
+            PreviewLabel.Text = RefactoringsUI.ExtractMethod_PreviewLabel;
         }
 
         private void InitializeParameterGrid()
@@ -168,11 +169,10 @@ public IEnumerable<ExtractedParameter> ReturnValues
             set
             {
                 _returnValues = new BindingList<ExtractedParameter>(value.ToList());
-                var items = _returnValues.ToArray();
             }
         }
 
-        private ExtractedParameter _returnValue;
+        private ExtractedParameter _returnValue; //never assigned and will always be null
 
         public IEnumerable<ExtractedParameter> Inputs { get; set; }
         public IEnumerable<ExtractedParameter> Outputs { get; set; }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index bf3a977c37..19b43b2e49 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -520,5 +520,95 @@ public static string ExtractInterface_TitleLabel {
                 return ResourceManager.GetString("ExtractInterface_TitleLabel", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Accessibility:.
+        /// </summary>
+        public static string ExtractMethod_AccessibilityLabel {
+            get {
+                return ResourceManager.GetString("ExtractMethod_AccessibilityLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Extract Method.
+        /// </summary>
+        public static string ExtractMethod_Caption {
+            get {
+                return ResourceManager.GetString("ExtractMethod_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify method name, return type and/or parameters (if applicable), and other options..
+        /// </summary>
+        public static string ExtractMethod_InstructionsText {
+            get {
+                return ResourceManager.GetString("ExtractMethod_InstructionsText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The current selection is not valid..
+        /// </summary>
+        public static string ExtractMethod_InvalidSelectionMessage {
+            get {
+                return ResourceManager.GetString("ExtractMethod_InvalidSelectionMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to (none).
+        /// </summary>
+        public static string ExtractMethod_OutputNone {
+            get {
+                return ResourceManager.GetString("ExtractMethod_OutputNone", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Parameters:.
+        /// </summary>
+        public static string ExtractMethod_ParametersLabel {
+            get {
+                return ResourceManager.GetString("ExtractMethod_ParametersLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Preview:.
+        /// </summary>
+        public static string ExtractMethod_PreviewLabel {
+            get {
+                return ResourceManager.GetString("ExtractMethod_PreviewLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Return:.
+        /// </summary>
+        public static string ExtractMethod_ReturnLabel {
+            get {
+                return ResourceManager.GetString("ExtractMethod_ReturnLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Set.
+        /// </summary>
+        public static string ExtractMethod_SetBoxLabel {
+            get {
+                return ResourceManager.GetString("ExtractMethod_SetBoxLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Extract method.
+        /// </summary>
+        public static string ExtractMethod_TitleText {
+            get {
+                return ResourceManager.GetString("ExtractMethod_TitleText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 4dab61bf76..4b3fce71e3 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -266,4 +266,34 @@ Privání třída může stále implementovat public (veřejný) interface.</val
   <data name="ExtractInterface_TitleLabel" xml:space="preserve">
     <value>Extrahovat Rozhraní</value>
   </data>
+  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
+    <value>Parametry:</value>
+  </data>
+  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
+    <value>Přístupnost:</value>
+  </data>
+  <data name="ExtractMethod_Caption" xml:space="preserve">
+    <value>Rubberduck - Metoda extrakce</value>
+  </data>
+  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
+    <value>Prosím specifikujte jméno metody, return typ a/nebo parametry (pokud je možné aplikovat) a další možnosti.</value>
+  </data>
+  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
+    <value>Aktuální výběr není platný.</value>
+  </data>
+  <data name="ExtractMethod_OutputNone" xml:space="preserve">
+    <value>(žádné)</value>
+  </data>
+  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
+    <value>Náhled:</value>
+  </data>
+  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
+    <value>Vrátit:</value>
+  </data>
+  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
+    <value>Nastavit</value>
+  </data>
+  <data name="ExtractMethod_TitleText" xml:space="preserve">
+    <value>Extrahovat metodu</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 0c96052d97..720f866543 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -272,4 +272,34 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="ExtractInterface_TitleLabel" xml:space="preserve">
     <value>Extrahiere Interface</value>
   </data>
+  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
+    <value>Parameter:</value>
+  </data>
+  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
+    <value>Zugriffsebene:</value>
+  </data>
+  <data name="ExtractMethod_Caption" xml:space="preserve">
+    <value>Rubberduck - Methode Extrahieren</value>
+  </data>
+  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
+    <value>Bitte spezifizieren Sie Methodenname, Rückgabetyp und/oder Parameter (falls anwendbar), sowie andere Optionen.</value>
+  </data>
+  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
+    <value>Die aktuelle Auswahl kann nicht extrahiert werden.</value>
+  </data>
+  <data name="ExtractMethod_OutputNone" xml:space="preserve">
+    <value>(nichts)</value>
+  </data>
+  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
+    <value>Vorschau:</value>
+  </data>
+  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
+    <value>Rückgabe:</value>
+  </data>
+  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
+    <value>Set</value>
+  </data>
+  <data name="ExtractMethod_TitleText" xml:space="preserve">
+    <value>Methode extrahieren</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index f8076b7549..3d9ea5d247 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -266,4 +266,34 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="ExtractInterface_TitleLabel" xml:space="preserve">
     <value>Extraer interfaz</value>
   </data>
+  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
+    <value>Parámetros:</value>
+  </data>
+  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
+    <value>Accesibilidad:</value>
+  </data>
+  <data name="ExtractMethod_Caption" xml:space="preserve">
+    <value>Rubberduck - Extraer procedimiento</value>
+  </data>
+  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
+    <value>Por favor especificar el nombre del método, el tipo de retorno y/o los parámetros (si corresponde) y otras opciones.</value>
+  </data>
+  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
+    <value>La selección actual no es válida.</value>
+  </data>
+  <data name="ExtractMethod_OutputNone" xml:space="preserve">
+    <value>(ninguno)</value>
+  </data>
+  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
+    <value>Vista previa:</value>
+  </data>
+  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
+    <value>Retorno:</value>
+  </data>
+  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
+    <value>Set</value>
+  </data>
+  <data name="ExtractMethod_TitleText" xml:space="preserve">
+    <value>Extraer procedimiento</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 149cb6f897..51445f10b8 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -248,4 +248,34 @@ Une classe privée peut toujours implémenter une interface publique.</value>
   <data name="ExtractInterface_TitleLabel" xml:space="preserve">
     <value>Extraire une interface</value>
   </data>
+  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
+    <value>Paramètres:</value>
+  </data>
+  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
+    <value>Accessibilité:</value>
+  </data>
+  <data name="ExtractMethod_Caption" xml:space="preserve">
+    <value>Rubberduck - Extraire une Méthode</value>
+  </data>
+  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
+    <value>Veuillez spécifier le nom de la méthode, le type de sa valeur de retour et les paramètres (si applicable).</value>
+  </data>
+  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
+    <value>La sélection n'est pas valide.</value>
+  </data>
+  <data name="ExtractMethod_OutputNone" xml:space="preserve">
+    <value>(aucun)</value>
+  </data>
+  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
+    <value>Prévisualisation:</value>
+  </data>
+  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
+    <value>Retour:</value>
+  </data>
+  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
+    <value>Set</value>
+  </data>
+  <data name="ExtractMethod_TitleText" xml:space="preserve">
+    <value>Extraction d'une méthode</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 6d5ec2ef5a..a426cbc96e 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -259,4 +259,34 @@ A private class can still implement a public interface.</value>
   <data name="ExtractInterface_TitleLabel" xml:space="preserve">
     <value>Extract Interface</value>
   </data>
+  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
+    <value>Parameters:</value>
+  </data>
+  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
+    <value>Accessibility:</value>
+  </data>
+  <data name="ExtractMethod_Caption" xml:space="preserve">
+    <value>Rubberduck - Extract Method</value>
+  </data>
+  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
+    <value>Please specify method name, return type and/or parameters (if applicable), and other options.</value>
+  </data>
+  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
+    <value>The current selection is not valid.</value>
+  </data>
+  <data name="ExtractMethod_OutputNone" xml:space="preserve">
+    <value>(none)</value>
+  </data>
+  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
+    <value>Preview:</value>
+  </data>
+  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
+    <value>Return:</value>
+  </data>
+  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
+    <value>Set</value>
+  </data>
+  <data name="ExtractMethod_TitleText" xml:space="preserve">
+    <value>Extract method</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 6086f1f304..43ee1b6afd 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1231,96 +1231,6 @@ public static string ExportAllCommand_SaveAsDialog_Title {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Accessibility:.
-        /// </summary>
-        public static string ExtractMethod_AccessibilityLabel {
-            get {
-                return ResourceManager.GetString("ExtractMethod_AccessibilityLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Extract Method.
-        /// </summary>
-        public static string ExtractMethod_Caption {
-            get {
-                return ResourceManager.GetString("ExtractMethod_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify method name, return type and/or parameters (if applicable), and other options..
-        /// </summary>
-        public static string ExtractMethod_InstructionsText {
-            get {
-                return ResourceManager.GetString("ExtractMethod_InstructionsText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The current selection is not valid..
-        /// </summary>
-        public static string ExtractMethod_InvalidSelectionMessage {
-            get {
-                return ResourceManager.GetString("ExtractMethod_InvalidSelectionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to (none).
-        /// </summary>
-        public static string ExtractMethod_OutputNone {
-            get {
-                return ResourceManager.GetString("ExtractMethod_OutputNone", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameters:.
-        /// </summary>
-        public static string ExtractMethod_ParametersLabel {
-            get {
-                return ResourceManager.GetString("ExtractMethod_ParametersLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Preview:.
-        /// </summary>
-        public static string ExtractMethod_PreviewLabel {
-            get {
-                return ResourceManager.GetString("ExtractMethod_PreviewLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Return:.
-        /// </summary>
-        public static string ExtractMethod_ReturnLabel {
-            get {
-                return ResourceManager.GetString("ExtractMethod_ReturnLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Set.
-        /// </summary>
-        public static string ExtractMethod_SetBoxLabel {
-            get {
-                return ResourceManager.GetString("ExtractMethod_SetBoxLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Extract method.
-        /// </summary>
-        public static string ExtractMethod_TitleText {
-            get {
-                return ResourceManager.GetString("ExtractMethod_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Find.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 388cb3a630..c9367f3f11 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -171,9 +171,6 @@
   <data name="CodeInspections_Inspecting" xml:space="preserve">
     <value>Kontroluji...</value>
   </data>
-  <data name="ExtractMethod_OutputNone" xml:space="preserve">
-    <value>(žádné)</value>
-  </data>
   <data name="Parsing" xml:space="preserve">
     <value>(parsuji...)</value>
   </data>
@@ -186,21 +183,6 @@
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Odstranit parametry</value>
   </data>
-  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
-    <value>Aktuální výběr není platný.</value>
-  </data>
-  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
-    <value>Náhled:</value>
-  </data>
-  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
-    <value>Vrátit:</value>
-  </data>
-  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
-    <value>Nastavit</value>
-  </data>
-  <data name="ExtractMethod_TitleText" xml:space="preserve">
-    <value>Extrahovat metodu</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Třída nebo člen '{0}' ještě není implementován.</value>
   </data>
@@ -333,18 +315,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>Nelze odstranit poslední parametr ze setteru nebo letteru.</value>
   </data>
-  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
-    <value>Přístupnost:</value>
-  </data>
-  <data name="ExtractMethod_Caption" xml:space="preserve">
-    <value>Rubberduck - Metoda extrakce</value>
-  </data>
-  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
-    <value>Prosím specifikujte jméno metody, return typ a/nebo parametry (pokud je možné aplikovat) a další možnosti.</value>
-  </data>
-  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
-    <value>Parametry:</value>
-  </data>
   <data name="LoadConfigError" xml:space="preserve">
     <value>Chyba při načítání konfigurace Rubberducku</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index eb958201c6..da5e6f6bc3 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -190,9 +190,6 @@
   <data name="CodeInspections_Inspecting" xml:space="preserve">
     <value>Inspiziere...</value>
   </data>
-  <data name="ExtractMethod_OutputNone" xml:space="preserve">
-    <value>(nichts)</value>
-  </data>
   <data name="Parsing" xml:space="preserve">
     <value>(Parse...)</value>
   </data>
@@ -244,33 +241,6 @@
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>Kann den letzten Parameter eines Setters oder Letters nicht entfernen.</value>
   </data>
-  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
-    <value>Die aktuelle Auswahl kann nicht extrahiert werden.</value>
-  </data>
-  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
-    <value>Zugriffsebene:</value>
-  </data>
-  <data name="ExtractMethod_Caption" xml:space="preserve">
-    <value>Rubberduck - Methode Extrahieren</value>
-  </data>
-  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
-    <value>Bitte spezifizieren Sie Methodenname, Rückgabetyp und/oder Parameter (falls anwendbar), sowie andere Optionen.</value>
-  </data>
-  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
-    <value>Parameter:</value>
-  </data>
-  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
-    <value>Vorschau:</value>
-  </data>
-  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
-    <value>Rückgabe:</value>
-  </data>
-  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
-    <value>Set</value>
-  </data>
-  <data name="ExtractMethod_TitleText" xml:space="preserve">
-    <value>Methode extrahieren</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Klasse oder Element '{0}' ist nicht implementiert.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index f30e57dfd7..61f3f34012 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -190,9 +190,6 @@
   <data name="CodeInspections_Inspecting" xml:space="preserve">
     <value>Inspeccionando...</value>
   </data>
-  <data name="ExtractMethod_OutputNone" xml:space="preserve">
-    <value>(ninguno)</value>
-  </data>
   <data name="Parsing" xml:space="preserve">
     <value>(analizando ...)</value>
   </data>
@@ -244,33 +241,6 @@
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>No se puede eliminar el último parámetro del Setter o Letter.</value>
   </data>
-  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
-    <value>La selección actual no es válida.</value>
-  </data>
-  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
-    <value>Accesibilidad:</value>
-  </data>
-  <data name="ExtractMethod_Caption" xml:space="preserve">
-    <value>Rubberduck - Extraer procedimiento</value>
-  </data>
-  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
-    <value>Por favor especificar el nombre del método, el tipo de retorno y/o los parámetros (si corresponde) y otras opciones.</value>
-  </data>
-  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
-    <value>Parámetros:</value>
-  </data>
-  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
-    <value>Vista previa:</value>
-  </data>
-  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
-    <value>Retorno:</value>
-  </data>
-  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
-    <value>Set</value>
-  </data>
-  <data name="ExtractMethod_TitleText" xml:space="preserve">
-    <value>Extraer procedimiento</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>La clase o miembro '{0}' no está implementado.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 56f5429fca..60ff711a7d 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -193,9 +193,6 @@
   <data name="CodeInspections_Inspecting" xml:space="preserve">
     <value>Inspection...</value>
   </data>
-  <data name="ExtractMethod_OutputNone" xml:space="preserve">
-    <value>(aucun)</value>
-  </data>
   <data name="Parsing" xml:space="preserve">
     <value>(analyse...)</value>
   </data>
@@ -243,33 +240,6 @@
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>Les accesseurs Property Let et Property Set requièrent au moins un paramètre.</value>
   </data>
-  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
-    <value>La sélection n'est pas valide.</value>
-  </data>
-  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
-    <value>Accessibilité:</value>
-  </data>
-  <data name="ExtractMethod_Caption" xml:space="preserve">
-    <value>Rubberduck - Extraire une Méthode</value>
-  </data>
-  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
-    <value>Veuillez spécifier le nom de la méthode, le type de sa valeur de retour et les paramètres (si applicable).</value>
-  </data>
-  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
-    <value>Paramètres:</value>
-  </data>
-  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
-    <value>Prévisualisation:</value>
-  </data>
-  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
-    <value>Retour:</value>
-  </data>
-  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
-    <value>Set</value>
-  </data>
-  <data name="ExtractMethod_TitleText" xml:space="preserve">
-    <value>Extraction d'une méthode</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Aucune implémentation trouvée pour '{0}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 57eb06803a..205c3d271e 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -193,9 +193,6 @@
   <data name="CodeInspections_Inspecting" xml:space="preserve">
     <value>Inspecting...</value>
   </data>
-  <data name="ExtractMethod_OutputNone" xml:space="preserve">
-    <value>(none)</value>
-  </data>
   <data name="Parsing" xml:space="preserve">
     <value>(parsing...)</value>
   </data>
@@ -247,33 +244,6 @@
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>Cannot remove last parameter from setter or letter.</value>
   </data>
-  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
-    <value>The current selection is not valid.</value>
-  </data>
-  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
-    <value>Accessibility:</value>
-  </data>
-  <data name="ExtractMethod_Caption" xml:space="preserve">
-    <value>Rubberduck - Extract Method</value>
-  </data>
-  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
-    <value>Please specify method name, return type and/or parameters (if applicable), and other options.</value>
-  </data>
-  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
-    <value>Parameters:</value>
-  </data>
-  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
-    <value>Preview:</value>
-  </data>
-  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
-    <value>Return:</value>
-  </data>
-  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
-    <value>Set</value>
-  </data>
-  <data name="ExtractMethod_TitleText" xml:space="preserve">
-    <value>Extract method</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Class or member '{0}' is not implemented.</value>
   </data>

From 70951aeb510ccc955ec1e20217df0eb20d89ad62 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 16:52:37 -0700
Subject: [PATCH 24/64] Migrate EmptyLineHandling_ resources

---
 .../CodeAnalysisUI.Designer.cs                | 225 ++++++++++++++++++
 .../CodeAnalysisUI.cs.resx                    |  12 +
 .../CodeAnalysisUI.de.resx                    |  12 +
 .../CodeAnalysisUI.es.resx                    |  12 +
 .../CodeAnalysisUI.fr.resx                    |  12 +
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   |  12 +
 .../Concrete/MultilineParameterInspection.cs  |   3 +-
 .../EmptyLineHandlingToTextConverter.cs       |   4 +-
 ...neHandlingValueTextToEnumValueConverter.cs |   6 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs |  36 ---
 Rubberduck.Resources/RubberduckUI.cs.resx     |  12 -
 Rubberduck.Resources/RubberduckUI.de.resx     |  12 -
 Rubberduck.Resources/RubberduckUI.es.resx     |  12 -
 Rubberduck.Resources/RubberduckUI.fr.resx     |  12 -
 Rubberduck.Resources/RubberduckUI.resx        |  12 -
 15 files changed, 291 insertions(+), 103 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index 9f02c54ada..ec5e401a1f 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -241,5 +241,230 @@ public static string Command_Reparse_CompileOnDemandEnabled_Caption {
                 return ResourceManager.GetString("Command_Reparse_CompileOnDemandEnabled_Caption", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to runtime expression.
+        /// </summary>
+        public static string DeclarationType_BracketedExpression {
+            get {
+                return ResourceManager.GetString("DeclarationType_BracketedExpression", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to class.
+        /// </summary>
+        public static string DeclarationType_ClassModule {
+            get {
+                return ResourceManager.GetString("DeclarationType_ClassModule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to constant.
+        /// </summary>
+        public static string DeclarationType_Constant {
+            get {
+                return ResourceManager.GetString("DeclarationType_Constant", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to control.
+        /// </summary>
+        public static string DeclarationType_Control {
+            get {
+                return ResourceManager.GetString("DeclarationType_Control", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to enum.
+        /// </summary>
+        public static string DeclarationType_Enumeration {
+            get {
+                return ResourceManager.GetString("DeclarationType_Enumeration", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to enum member.
+        /// </summary>
+        public static string DeclarationType_EnumerationMember {
+            get {
+                return ResourceManager.GetString("DeclarationType_EnumerationMember", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to event.
+        /// </summary>
+        public static string DeclarationType_Event {
+            get {
+                return ResourceManager.GetString("DeclarationType_Event", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to function.
+        /// </summary>
+        public static string DeclarationType_Function {
+            get {
+                return ResourceManager.GetString("DeclarationType_Function", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to library function.
+        /// </summary>
+        public static string DeclarationType_LibraryFunction {
+            get {
+                return ResourceManager.GetString("DeclarationType_LibraryFunction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to library procedure.
+        /// </summary>
+        public static string DeclarationType_LibraryProcedure {
+            get {
+                return ResourceManager.GetString("DeclarationType_LibraryProcedure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to line label.
+        /// </summary>
+        public static string DeclarationType_LineLabel {
+            get {
+                return ResourceManager.GetString("DeclarationType_LineLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to parameter.
+        /// </summary>
+        public static string DeclarationType_Parameter {
+            get {
+                return ResourceManager.GetString("DeclarationType_Parameter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to module.
+        /// </summary>
+        public static string DeclarationType_ProceduralModule {
+            get {
+                return ResourceManager.GetString("DeclarationType_ProceduralModule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to procedure.
+        /// </summary>
+        public static string DeclarationType_Procedure {
+            get {
+                return ResourceManager.GetString("DeclarationType_Procedure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to project.
+        /// </summary>
+        public static string DeclarationType_Project {
+            get {
+                return ResourceManager.GetString("DeclarationType_Project", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to property get accessor.
+        /// </summary>
+        public static string DeclarationType_PropertyGet {
+            get {
+                return ResourceManager.GetString("DeclarationType_PropertyGet", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to property let accessor.
+        /// </summary>
+        public static string DeclarationType_PropertyLet {
+            get {
+                return ResourceManager.GetString("DeclarationType_PropertyLet", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to property set accessor.
+        /// </summary>
+        public static string DeclarationType_PropertySet {
+            get {
+                return ResourceManager.GetString("DeclarationType_PropertySet", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to user-defined type.
+        /// </summary>
+        public static string DeclarationType_UserDefinedType {
+            get {
+                return ResourceManager.GetString("DeclarationType_UserDefinedType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to user-defined type member.
+        /// </summary>
+        public static string DeclarationType_UserDefinedTypeMember {
+            get {
+                return ResourceManager.GetString("DeclarationType_UserDefinedTypeMember", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to variable.
+        /// </summary>
+        public static string DeclarationType_Variable {
+            get {
+                return ResourceManager.GetString("DeclarationType_Variable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You&apos;ve earned the &quot;Continuator&quot; badge!.
+        /// </summary>
+        public static string EasterEgg_Continuator {
+            get {
+                return ResourceManager.GetString("EasterEgg_Continuator", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ignore.
+        /// </summary>
+        public static string EmptyLineHandling_Ignore {
+            get {
+                return ResourceManager.GetString("EmptyLineHandling_Ignore", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent.
+        /// </summary>
+        public static string EmptyLineHandling_Indent {
+            get {
+                return ResourceManager.GetString("EmptyLineHandling_Indent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove.
+        /// </summary>
+        public static string EmptyLineHandling_Remove {
+            get {
+                return ResourceManager.GetString("EmptyLineHandling_Remove", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index be1a84fe1f..d487e6d5fa 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -242,4 +242,16 @@ Nalezeno {1} problémů.</value>
   <data name="DeclarationType_Variable" xml:space="preserve">
     <value>proměnná</value>
   </data>
+  <data name="EasterEgg_Continuator" xml:space="preserve">
+    <value>Získali jste odznak "Continuator"!</value>
+  </data>
+  <data name="EmptyLineHandling_Indent" xml:space="preserve">
+    <value>Odsadit</value>
+  </data>
+  <data name="EmptyLineHandling_Remove" xml:space="preserve">
+    <value>Odstranit</value>
+  </data>
+  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
+    <value>Ignorovat</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 34d11a741d..2893e2e614 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -242,4 +242,16 @@
   <data name="DeclarationType_Variable" xml:space="preserve">
     <value>Variable</value>
   </data>
+  <data name="EasterEgg_Continuator" xml:space="preserve">
+    <value>Sie haben das Abzeichen "Continuator" erhalten!</value>
+  </data>
+  <data name="EmptyLineHandling_Indent" xml:space="preserve">
+    <value>Einrücken</value>
+  </data>
+  <data name="EmptyLineHandling_Remove" xml:space="preserve">
+    <value>Entfernen</value>
+  </data>
+  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
+    <value>Ignorieren</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index 8978e0c124..c815d8c327 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -242,4 +242,16 @@
   <data name="DeclarationType_Variable" xml:space="preserve">
     <value>variable</value>
   </data>
+  <data name="EasterEgg_Continuator" xml:space="preserve">
+    <value>¡Has ganado la insignia de "Continuador"!</value>
+  </data>
+  <data name="EmptyLineHandling_Indent" xml:space="preserve">
+    <value>Indentar</value>
+  </data>
+  <data name="EmptyLineHandling_Remove" xml:space="preserve">
+    <value>Eliminar</value>
+  </data>
+  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
+    <value>Ignorar</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index fa487e4f0c..1209faadef 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -242,4 +242,16 @@
   <data name="DeclarationType_Variable" xml:space="preserve">
     <value>la variable</value>
   </data>
+  <data name="EasterEgg_Continuator" xml:space="preserve">
+    <value>Vous obtenez le badge "Continuator"!</value>
+  </data>
+  <data name="EmptyLineHandling_Indent" xml:space="preserve">
+    <value>Indenter</value>
+  </data>
+  <data name="EmptyLineHandling_Remove" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
+    <value>Ignorer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index 7aa5649115..b712b39d86 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -224,4 +224,16 @@
   <data name="DeclarationType_Variable" xml:space="preserve">
     <value>variable</value>
   </data>
+  <data name="EasterEgg_Continuator" xml:space="preserve">
+    <value>You've earned the "Continuator" badge!</value>
+  </data>
+  <data name="EmptyLineHandling_Indent" xml:space="preserve">
+    <value>Indent</value>
+  </data>
+  <data name="EmptyLineHandling_Remove" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
+    <value>Ignore</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/MultilineParameterInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/MultilineParameterInspection.cs
index 9b21dfa2c1..dd384592e3 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/MultilineParameterInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/MultilineParameterInspection.cs
@@ -3,7 +3,6 @@
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Resources;
 
 namespace Rubberduck.CodeAnalysis.Inspections.Concrete
 {
@@ -48,7 +47,7 @@ protected override string ResultDescription(QualifiedContext<VBAParser.ArgContex
             var parameterText = context.Context.unrestrictedIdentifier().GetText();
             return string.Format(
                 context.Context.GetSelection().LineCount > 3
-                    ? RubberduckUI.EasterEgg_Continuator
+                    ? CodeAnalysisUI.EasterEgg_Continuator
                     : Resources.Inspections.InspectionResults.MultilineParameterInspection,
                 parameterText);
         }
diff --git a/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingToTextConverter.cs b/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingToTextConverter.cs
index 1fab534b1c..c254e2b140 100644
--- a/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingToTextConverter.cs
+++ b/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingToTextConverter.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
-using Rubberduck.Resources;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.SmartIndenter;
 
 namespace Rubberduck.UI.Settings.Converters
@@ -13,7 +13,7 @@ public class EmptyLineHandlingToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var styles = (IEnumerable<EmptyLineHandling>)value;
-            return styles.Select(s => RubberduckUI.ResourceManager.GetString("EmptyLineHandling_" + s, CultureInfo.CurrentUICulture)).ToArray();
+            return styles.Select(s => CodeAnalysisUI.ResourceManager.GetString("EmptyLineHandling_" + s, CultureInfo.CurrentUICulture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingValueTextToEnumValueConverter.cs b/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingValueTextToEnumValueConverter.cs
index c991657977..3b3e23787f 100644
--- a/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingValueTextToEnumValueConverter.cs
+++ b/Rubberduck.Core/UI/Settings/Converters/EmptyLineHandlingValueTextToEnumValueConverter.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
-using Rubberduck.Resources;
+using Rubberduck.CodeAnalysis;
 using Rubberduck.SmartIndenter;
 
 namespace Rubberduck.UI.Settings.Converters
@@ -12,7 +12,7 @@ public class EmptyLineHandlingValueTextToEnumValueConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var enumValue = (EmptyLineHandling)value;
-            return RubberduckUI.ResourceManager.GetString("EmptyLineHandling_" + enumValue, CultureInfo.CurrentUICulture);
+            return CodeAnalysisUI.ResourceManager.GetString("EmptyLineHandling_" + enumValue, CultureInfo.CurrentUICulture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -22,7 +22,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
             var values = Enum.GetValues(typeof(EmptyLineHandling)).OfType<EmptyLineHandling>();
 
             foreach (var v in values.Where(v =>
-                RubberduckUI.ResourceManager.GetString("EmptyLineHandling_" + v, CultureInfo.CurrentUICulture) == selectedString))
+                CodeAnalysisUI.ResourceManager.GetString("EmptyLineHandling_" + v, CultureInfo.CurrentUICulture) == selectedString))
             {
                 return v;
             }
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index a955d98265..7e39227749 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -884,15 +884,6 @@ public static string DeselectAll_Button {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to You&apos;ve earned the &quot;Continuator&quot; badge!.
-        /// </summary>
-        public static string EasterEgg_Continuator {
-            get {
-                return ResourceManager.GetString("EasterEgg_Continuator", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -903,33 +894,6 @@ public static System.Drawing.Bitmap edit_size {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Ignore.
-        /// </summary>
-        public static string EmptyLineHandling_Ignore {
-            get {
-                return ResourceManager.GetString("EmptyLineHandling_Ignore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent.
-        /// </summary>
-        public static string EmptyLineHandling_Indent {
-            get {
-                return ResourceManager.GetString("EmptyLineHandling_Indent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove.
-        /// </summary>
-        public static string EmptyLineHandling_Remove {
-            get {
-                return ResourceManager.GetString("EmptyLineHandling_Remove", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to to parse and process the projects in the VBE..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index bf6036bc8f..f124e06bc9 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -315,9 +315,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="TodoExplorer_Caption" xml:space="preserve">
     <value>Todo Explorer</value>
   </data>
-  <data name="EasterEgg_Continuator" xml:space="preserve">
-    <value>Získali jste odznak "Continuator"!</value>
-  </data>
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Nastavení modulu by měla být specifikována jako první</value>
   </data>
@@ -990,15 +987,6 @@ End Enum</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Čeština</value>
   </data>
-  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
-    <value>Ignorovat</value>
-  </data>
-  <data name="EmptyLineHandling_Indent" xml:space="preserve">
-    <value>Odsadit</value>
-  </data>
-  <data name="EmptyLineHandling_Remove" xml:space="preserve">
-    <value>Odstranit</value>
-  </data>
   <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
     <value>Zacházení s prázdnými řádky:</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 9ca55f3f91..865a58fbf6 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -289,9 +289,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Warning" xml:space="preserve">
     <value>Warnung</value>
   </data>
-  <data name="EasterEgg_Continuator" xml:space="preserve">
-    <value>Sie haben das Abzeichen "Continuator" erhalten!</value>
-  </data>
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Modul-Optionen sollten zuerst deklariert werden</value>
   </data>
@@ -1029,15 +1026,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Tschechisch</value>
   </data>
-  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
-    <value>Ignorieren</value>
-  </data>
-  <data name="EmptyLineHandling_Indent" xml:space="preserve">
-    <value>Einrücken</value>
-  </data>
-  <data name="EmptyLineHandling_Remove" xml:space="preserve">
-    <value>Entfernen</value>
-  </data>
   <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
     <value>Leerzeilenbehandlung:</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index f0812de394..b2869817a1 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -290,9 +290,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Warning" xml:space="preserve">
     <value>Advertencia</value>
   </data>
-  <data name="EasterEgg_Continuator" xml:space="preserve">
-    <value>¡Has ganado la insignia de "Continuador"!</value>
-  </data>
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Las opciones del módulo deben especificarse primero</value>
   </data>
@@ -1043,15 +1040,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Checo</value>
   </data>
-  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
-    <value>Ignorar</value>
-  </data>
-  <data name="EmptyLineHandling_Indent" xml:space="preserve">
-    <value>Indentar</value>
-  </data>
-  <data name="EmptyLineHandling_Remove" xml:space="preserve">
-    <value>Eliminar</value>
-  </data>
   <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
     <value>Manejo de línea vacía:</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 0289cbaa1d..ba33a47a92 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -285,9 +285,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Warning" xml:space="preserve">
     <value>Avertissement</value>
   </data>
-  <data name="EasterEgg_Continuator" xml:space="preserve">
-    <value>Vous obtenez le badge "Continuator"!</value>
-  </data>
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Les options du module devraient être spécifiées en premier</value>
   </data>
@@ -1015,15 +1012,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignorer les lignes vides lors de la recherche du premier bloc de commentaire ou de déclarations</value>
   </data>
-  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
-    <value>Ignorer</value>
-  </data>
-  <data name="EmptyLineHandling_Indent" xml:space="preserve">
-    <value>Indenter</value>
-  </data>
-  <data name="EmptyLineHandling_Remove" xml:space="preserve">
-    <value>Supprimer</value>
-  </data>
   <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
     <value>Traitement des lignes vides:</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 58a6d54be8..25e7312da2 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -293,9 +293,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Warning" xml:space="preserve">
     <value>Warning</value>
   </data>
-  <data name="EasterEgg_Continuator" xml:space="preserve">
-    <value>You've earned the "Continuator" badge!</value>
-  </data>
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Module options should be specified first</value>
   </data>
@@ -1090,15 +1087,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Czech</value>
   </data>
-  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
-    <value>Ignore</value>
-  </data>
-  <data name="EmptyLineHandling_Indent" xml:space="preserve">
-    <value>Indent</value>
-  </data>
-  <data name="EmptyLineHandling_Remove" xml:space="preserve">
-    <value>Remove</value>
-  </data>
   <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
     <value>Empty line handling:</value>
   </data>

From 5bfcdd5b111fe2cedaf4dbe01496b77b32253085 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 20:56:04 -0700
Subject: [PATCH 25/64] Migrate GeneralSettings_ resources

---
 Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs  |   8 +-
 Rubberduck.Core/Rubberduck.Core.csproj        |   9 +
 Rubberduck.Core/Settings/MinimumLogLevel.cs   |   4 +-
 .../Converters/DelimiterToTextConverter.cs    |   4 +-
 .../DelimiterValueToTextConverter.cs          |   6 +-
 .../UI/Settings/GeneralSettings.xaml          |  42 +-
 .../UI/Settings/GeneralSettingsUI.Designer.cs | 371 ++++++++++++++++++
 .../UI/Settings/GeneralSettingsUI.cs.resx     | 224 +++++++++++
 .../UI/Settings/GeneralSettingsUI.de.resx     | 224 +++++++++++
 .../UI/Settings/GeneralSettingsUI.es.resx     | 224 +++++++++++
 .../UI/Settings/GeneralSettingsUI.fr.resx     | 224 +++++++++++
 .../UI/Settings/GeneralSettingsUI.resx        | 204 ++++++++++
 .../UI/Settings/GeneralSettingsViewModel.cs   |   4 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 308 ---------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 104 -----
 Rubberduck.Resources/RubberduckUI.de.resx     | 104 -----
 Rubberduck.Resources/RubberduckUI.es.resx     | 104 -----
 Rubberduck.Resources/RubberduckUI.fr.resx     | 104 -----
 Rubberduck.Resources/RubberduckUI.resx        | 104 -----
 19 files changed, 1513 insertions(+), 863 deletions(-)
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.Designer.cs
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.cs.resx
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.de.resx
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.es.resx
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.fr.resx
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx

diff --git a/Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs b/Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs
index 05d2afa764..85c6e6cccc 100644
--- a/Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs
+++ b/Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 using System.Windows.Forms;
-using Rubberduck.Resources;
+using Rubberduck.UI.Settings;
 
 namespace Rubberduck.Common.Hotkeys
 {
@@ -23,17 +23,17 @@ public override string ToString()
             var builder = new StringBuilder();
             if (Keys.HasFlag(Keys.Alt))
             {
-                builder.Append(RubberduckUI.GeneralSettings_HotkeyAlt);
+                builder.Append(GeneralSettingsUI.HotkeyAlt);
                 builder.Append('+');
             }
             if (Keys.HasFlag(Keys.Control))
             {
-                builder.Append(RubberduckUI.GeneralSettings_HotkeyCtrl);
+                builder.Append(GeneralSettingsUI.HotkeyCtrl);
                 builder.Append('+');
             }
             if (Keys.HasFlag(Keys.Shift))
             {
-                builder.Append(RubberduckUI.GeneralSettings_HotkeyShift);
+                builder.Append(GeneralSettingsUI.HotkeyShift);
                 builder.Append('+');
             }
             
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
index 31fc0e51af..3ec36a358d 100644
--- a/Rubberduck.Core/Rubberduck.Core.csproj
+++ b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -129,12 +129,21 @@
     <Compile Update="UI\Refactorings\RenameFolder\RenameFolderView.xaml.cs">
       <DependentUpon>RenameFolderView.xaml</DependentUpon>
     </Compile>
+    <Compile Update="UI\Settings\GeneralSettingsUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>GeneralSettingsUI.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="UI\Settings\GeneralSettingsUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>GeneralSettingsUI.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Update="Properties\Settings.settings">
diff --git a/Rubberduck.Core/Settings/MinimumLogLevel.cs b/Rubberduck.Core/Settings/MinimumLogLevel.cs
index aec40dc896..fbea44d7b1 100644
--- a/Rubberduck.Core/Settings/MinimumLogLevel.cs
+++ b/Rubberduck.Core/Settings/MinimumLogLevel.cs
@@ -1,5 +1,5 @@
 using System.Globalization;
-using Rubberduck.Resources;
+using Rubberduck.UI.Settings;
 
 namespace Rubberduck.Settings
 {
@@ -8,7 +8,7 @@ public sealed class MinimumLogLevel
         public MinimumLogLevel(int ordinal, string logLevelName)
         {
             Ordinal = ordinal;
-            Name = RubberduckUI.ResourceManager.GetString("GeneralSettings_" + logLevelName + "LogLevel", CultureInfo.CurrentUICulture);
+            Name = GeneralSettingsUI.ResourceManager.GetString(logLevelName + "LogLevel", CultureInfo.CurrentUICulture);
         }
 
         public int Ordinal { get; }
diff --git a/Rubberduck.Core/UI/Settings/Converters/DelimiterToTextConverter.cs b/Rubberduck.Core/UI/Settings/Converters/DelimiterToTextConverter.cs
index ac195e8353..917c2f3033 100644
--- a/Rubberduck.Core/UI/Settings/Converters/DelimiterToTextConverter.cs
+++ b/Rubberduck.Core/UI/Settings/Converters/DelimiterToTextConverter.cs
@@ -3,8 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
-using Rubberduck.Resources;
-
 
 namespace Rubberduck.UI.Settings.Converters
 {
@@ -13,7 +11,7 @@ public class DelimiterToTextConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var modes = (IEnumerable<DelimiterOptions>)value;
-            return modes.Select(s => RubberduckUI.ResourceManager.GetString("GeneralSettings_" + s + "Delimiter", CultureInfo.CurrentUICulture)).ToArray();
+            return modes.Select(s => GeneralSettingsUI.ResourceManager.GetString(s + "Delimiter", CultureInfo.CurrentUICulture)).ToArray();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/Rubberduck.Core/UI/Settings/Converters/DelimiterValueToTextConverter.cs b/Rubberduck.Core/UI/Settings/Converters/DelimiterValueToTextConverter.cs
index 07a02dde81..afb1754afc 100644
--- a/Rubberduck.Core/UI/Settings/Converters/DelimiterValueToTextConverter.cs
+++ b/Rubberduck.Core/UI/Settings/Converters/DelimiterValueToTextConverter.cs
@@ -13,9 +13,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             switch (mode)
             {
                 case DelimiterOptions.Period:
-                    return RubberduckUI.GeneralSettings_PeriodDelimiter;
+                    return GeneralSettingsUI.PeriodDelimiter;
                 case DelimiterOptions.Slash:
-                    return RubberduckUI.GeneralSettings_SlashDelimiter;
+                    return GeneralSettingsUI.SlashDelimiter;
                 default:
                     return value;
             }
@@ -24,7 +24,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var text = (string)value;
-            return text == RubberduckUI.GeneralSettings_PeriodDelimiter
+            return text == GeneralSettingsUI.PeriodDelimiter
                 ? DelimiterOptions.Period
                 : DelimiterOptions.Slash;
         }
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
index 55094ccb1e..cf80c3ab63 100644
--- a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
@@ -72,7 +72,7 @@
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Right"/>
                         </DockPanel>
                     </Label>
-                    <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_LanguageLabel}" FontWeight="SemiBold" />
+                    <Label Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=LanguageLabel}" FontWeight="SemiBold" />
                     <ComboBox Width="210"
                               HorizontalAlignment="Left"
                               Margin="5"
@@ -80,25 +80,25 @@
                               ItemsSource="{Binding Languages, UpdateSourceTrigger=PropertyChanged}"
                               DisplayMemberPath="Name" />
 
-                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ShowSplash}"
+                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=ShowSplash}"
                               IsChecked="{Binding ShowSplashAtStartup}" />
 
-                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_CheckVersion}"
+                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=CheckVersion}"
                               IsChecked="{Binding CheckVersionAtStartup}"
                               x:Name="IsVersionCheckEnabled"/>
-                    <CheckBox Margin="15,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_IncludePreRelease}"
+                    <CheckBox Margin="15,0,0,5" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=IncludePreRelease}"
                               IsChecked="{Binding IncludePreRelease}"
                               IsEnabled="{Binding IsChecked, ElementName=IsVersionCheckEnabled}"/>
-                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_CompileBeforeParse}"
+                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=CompileBeforeParse}"
                               IsChecked="{Binding CompileBeforeParse}" />
-                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_SetDpiUnaware}"
+                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=SetDpiUnaware}"
                               IsEnabled="{Binding SetDpiUnawareEnabled}"  
                               IsChecked="{Binding SetDpiUnaware}" />
-                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_EnableDragAndDrop}"
+                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=EnableDragAndDrop}"
                               IsChecked="{Binding EnableFolderDragAndDrop}" />
                     <StackPanel Orientation="Horizontal"/>
 
-                    <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_MinimumLogLevelLabel}" FontWeight="SemiBold" />
+                    <Label Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=MinimumLogLevelLabel}" FontWeight="SemiBold" />
                     <StackPanel Orientation="Horizontal">
                         <ComboBox Width="210"
                                   HorizontalAlignment="Left"
@@ -107,14 +107,14 @@
                                   ItemsSource="{Binding LogLevels, UpdateSourceTrigger=PropertyChanged}"
                                   DisplayMemberPath="Name"/>
                         <Button 
-                            Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ShowLogFolder}"
+                            Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=ShowLogFolder}"
                             Padding="5"
                             Command="{Binding ShowLogFolderCommand}"/>
                     </StackPanel>
 
                     <DockPanel>
-                        <Label DockPanel.Dock="Left" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeysLabel}" FontWeight="SemiBold" />
-                        <Label DockPanel.Dock="Right" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyRestrictionLabel}"
+                        <Label DockPanel.Dock="Left" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeysLabel}" FontWeight="SemiBold" />
+                        <Label DockPanel.Dock="Right" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyRestrictionLabel}"
                                Visibility="{Binding ShouldDisplayHotkeyModificationLabel, Converter={StaticResource BoolToVisibility}}"
                                Foreground="{StaticResource CaptionErrorBrush}"
                                FontWeight="Bold"/>
@@ -146,11 +146,11 @@
                         </DataGrid.CellStyle>
                         <DataGrid.Columns>
                             <DataGridCheckBoxColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyEnabled}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyEnabled}"
                         Width="Auto"
                         Binding="{Binding IsEnabled}" />
                             <DataGridTextColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyDescription}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyDescription}"
                         Binding="{Binding Prompt}"
                         Width="*"
                         IsReadOnly="True" />
@@ -161,25 +161,25 @@
                                         <Label Visibility="{Binding IsValid, Converter={StaticResource BoolToHiddenVisibility}}"
                                                HorizontalContentAlignment="Center">
                                             <Image Source="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=exclamation}"
-                                                   ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyRestrictionToolTip}"/>
+                                                   ToolTip="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyRestrictionToolTip}"/>
                                         </Label>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
                             <DataGridCheckBoxColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyShift}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyShift}"
                         Width="Auto"
                         Binding="{Binding HasShiftModifier}" />
                             <DataGridCheckBoxColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyAlt}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyAlt}"
                         Width="Auto"
                         Binding="{Binding HasAltModifier}" />
                             <DataGridCheckBoxColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyCtrl}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyCtrl}"
                         Width="Auto"
                         Binding="{Binding HasCtrlModifier}" />
                             <DataGridTemplateColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyKey1}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyKey1}"
                         Width="Auto"
                         SortMemberPath="KeyDisplaySymbol">
                                 <DataGridTemplateColumn.CellTemplate>
@@ -190,7 +190,7 @@
                             </DataGridTemplateColumn>
 
                             <DataGridTemplateColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyKey2}"
+                        Header="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeyKey2}"
                         Width="Auto"
                         SortMemberPath="KeyDisplaySymbol"
                         Visibility="Collapsed">
@@ -202,12 +202,12 @@
                             </DataGridTemplateColumn>
                         </DataGrid.Columns>
                     </DataGrid>
-                    <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ExperimentalFeatures}" FontWeight="SemiBold" />
+                    <Label Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=ExperimentalFeatures}" FontWeight="SemiBold" />
                     <Label Margin="5,0,0,5" FontWeight="Bold"
                            Foreground="{x:Static SystemColors.InfoTextBrush}" 
                            Background="{x:Static SystemColors.InfoBrush}">
                         <Label.Content>
-                            <AccessText TextWrapping="Wrap" Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ExperimentalFeaturesWarning}"/>
+                            <AccessText TextWrapping="Wrap" Text="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=ExperimentalFeaturesWarning}"/>
                         </Label.Content>
                     </Label>
                     <ListView ItemsSource="{Binding ExperimentalFeatures}"
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.Designer.cs b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.Designer.cs
new file mode 100644
index 0000000000..77a3e594d3
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.Designer.cs
@@ -0,0 +1,371 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.UI.Settings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class GeneralSettingsUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal GeneralSettingsUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.UI.Settings.GeneralSettingsUI", typeof(GeneralSettingsUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Check if a newer version is available at startup..
+        /// </summary>
+        public static string CheckVersion {
+            get {
+                return ResourceManager.GetString("CheckVersion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Compile code before parsing.
+        /// </summary>
+        public static string CompileBeforeParse {
+            get {
+                return ResourceManager.GetString("CompileBeforeParse", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The VBE setting &quot;Compile On Demand&quot; is currently enabled. It is strongly recommended that you disable the setting via the VBE Options dialog under General tab in order to use the Compile Before Parse feature. Do you want to disable it now?
+        ///
+        ///NOTE: Restart is required for the setting to take effect..
+        /// </summary>
+        public static string CompileBeforeParse_WarnCompileOnDemandEnabled {
+            get {
+                return ResourceManager.GetString("CompileBeforeParse_WarnCompileOnDemandEnabled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Compile On Demand currently enabled.
+        /// </summary>
+        public static string CompileBeforeParse_WarnCompileOnDemandEnabled_Caption {
+            get {
+                return ResourceManager.GetString("CompileBeforeParse_WarnCompileOnDemandEnabled_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Debug.
+        /// </summary>
+        public static string DebugLogLevel {
+            get {
+                return ResourceManager.GetString("DebugLogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enable drag and drop in Code Explorer.
+        /// </summary>
+        public static string EnableDragAndDrop {
+            get {
+                return ResourceManager.GetString("EnableDragAndDrop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error.
+        /// </summary>
+        public static string ErrorLogLevel {
+            get {
+                return ResourceManager.GetString("ErrorLogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Experimental Features (Requires a restart to take effect):.
+        /// </summary>
+        public static string ExperimentalFeatures {
+            get {
+                return ResourceManager.GetString("ExperimentalFeatures", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Only enable these if you know what you&apos;re doing. Enabling and/or using features from this section may result in things breaking unexpectedly and irrevocable data loss..
+        /// </summary>
+        public static string ExperimentalFeaturesWarning {
+            get {
+                return ResourceManager.GetString("ExperimentalFeaturesWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fatal.
+        /// </summary>
+        public static string FatalLogLevel {
+            get {
+                return ResourceManager.GetString("FatalLogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folder Delimiter:.
+        /// </summary>
+        public static string FolderDelimiterLabel {
+            get {
+                return ResourceManager.GetString("FolderDelimiterLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Alt.
+        /// </summary>
+        public static string HotkeyAlt {
+            get {
+                return ResourceManager.GetString("HotkeyAlt", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ctrl.
+        /// </summary>
+        public static string HotkeyCtrl {
+            get {
+                return ResourceManager.GetString("HotkeyCtrl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Description.
+        /// </summary>
+        public static string HotkeyDescription {
+            get {
+                return ResourceManager.GetString("HotkeyDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enabled.
+        /// </summary>
+        public static string HotkeyEnabled {
+            get {
+                return ResourceManager.GetString("HotkeyEnabled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Key1.
+        /// </summary>
+        public static string HotkeyKey1 {
+            get {
+                return ResourceManager.GetString("HotkeyKey1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Key2.
+        /// </summary>
+        public static string HotkeyKey2 {
+            get {
+                return ResourceManager.GetString("HotkeyKey2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Hotkeys should include either Alt and/or Ctrl..
+        /// </summary>
+        public static string HotkeyRestrictionLabel {
+            get {
+                return ResourceManager.GetString("HotkeyRestrictionLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This hotkey configuration may cause undesirable side effects..
+        /// </summary>
+        public static string HotkeyRestrictionToolTip {
+            get {
+                return ResourceManager.GetString("HotkeyRestrictionToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Shift.
+        /// </summary>
+        public static string HotkeyShift {
+            get {
+                return ResourceManager.GetString("HotkeyShift", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Hotkeys:.
+        /// </summary>
+        public static string HotkeysLabel {
+            get {
+                return ResourceManager.GetString("HotkeysLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Tell me if a newer pre-release build is available..
+        /// </summary>
+        public static string IncludePreRelease {
+            get {
+                return ResourceManager.GetString("IncludePreRelease", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Info.
+        /// </summary>
+        public static string InfoLogLevel {
+            get {
+                return ResourceManager.GetString("InfoLogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Display language:.
+        /// </summary>
+        public static string LanguageLabel {
+            get {
+                return ResourceManager.GetString("LanguageLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Minimum Log Level:.
+        /// </summary>
+        public static string MinimumLogLevelLabel {
+            get {
+                return ResourceManager.GetString("MinimumLogLevelLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modifier Warning.
+        /// </summary>
+        public static string ModifierWarning {
+            get {
+                return ResourceManager.GetString("ModifierWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No Logging.
+        /// </summary>
+        public static string OffLogLevel {
+            get {
+                return ResourceManager.GetString("OffLogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Period (.).
+        /// </summary>
+        public static string PeriodDelimiter {
+            get {
+                return ResourceManager.GetString("PeriodDelimiter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Correction for high-resolution display scalings.
+        /// </summary>
+        public static string SetDpiUnaware {
+            get {
+                return ResourceManager.GetString("SetDpiUnaware", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show Log Folder.
+        /// </summary>
+        public static string ShowLogFolder {
+            get {
+                return ResourceManager.GetString("ShowLogFolder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show splash screen at startup.
+        /// </summary>
+        public static string ShowSplash {
+            get {
+                return ResourceManager.GetString("ShowSplash", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Slash (/).
+        /// </summary>
+        public static string SlashDelimiter {
+            get {
+                return ResourceManager.GetString("SlashDelimiter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Trace.
+        /// </summary>
+        public static string TraceLogLevel {
+            get {
+                return ResourceManager.GetString("TraceLogLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Warn.
+        /// </summary>
+        public static string WarnLogLevel {
+            get {
+                return ResourceManager.GetString("WarnLogLevel", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.cs.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.cs.resx
new file mode 100644
index 0000000000..7d73e4d91c
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.cs.resx
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="HotkeyRestrictionToolTip" xml:space="preserve">
+    <value>Tato konfigurace klávesové zkratky může vyvolat nežádoucí vedlejší účinky.</value>
+  </data>
+  <data name="WarnLogLevel" xml:space="preserve">
+    <value>Varování</value>
+  </data>
+  <data name="TraceLogLevel" xml:space="preserve">
+    <value>Trace</value>
+  </data>
+  <data name="SlashDelimiter" xml:space="preserve">
+    <value>Lomeno (/)</value>
+  </data>
+  <data name="ShowSplash" xml:space="preserve">
+    <value>Zobrazit úvodní obrazovku po spuštění</value>
+  </data>
+  <data name="ShowLogFolder" xml:space="preserve">
+    <value>Otevřít Log Složku</value>
+  </data>
+  <data name="SetDpiUnaware" xml:space="preserve">
+    <value>Korekce pro displaye s vysokým rozlišením a škálováním</value>
+  </data>
+  <data name="PeriodDelimiter" xml:space="preserve">
+    <value>Tečka (.)</value>
+  </data>
+  <data name="OffLogLevel" xml:space="preserve">
+    <value>Žádné Logování</value>
+  </data>
+  <data name="ModifierWarning" xml:space="preserve">
+    <value>Varování Modifikátoru</value>
+  </data>
+  <data name="MinimumLogLevelLabel" xml:space="preserve">
+    <value>Minimální Úroveň Logu:</value>
+  </data>
+  <data name="LanguageLabel" xml:space="preserve">
+    <value>Jazyk zobrazení:</value>
+  </data>
+  <data name="InfoLogLevel" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="IncludePreRelease" xml:space="preserve">
+    <value>Oznámení, pokud je k dispozici novější verze předběžného vydání.</value>
+  </data>
+  <data name="HotkeysLabel" xml:space="preserve">
+    <value>Klávesové Zkratky:</value>
+  </data>
+  <data name="HotkeyShift" xml:space="preserve">
+    <value>Shift</value>
+  </data>
+  <data name="HotkeyRestrictionLabel" xml:space="preserve">
+    <value>Klávesové zkratky by měly obsahovat buď Alt a/nebo Ctrl.</value>
+  </data>
+  <data name="HotkeyKey2" xml:space="preserve">
+    <value>Klíč2</value>
+  </data>
+  <data name="HotkeyKey1" xml:space="preserve">
+    <value>Klíč1</value>
+  </data>
+  <data name="HotkeyEnabled" xml:space="preserve">
+    <value>Povoleno</value>
+  </data>
+  <data name="HotkeyDescription" xml:space="preserve">
+    <value>Popis</value>
+  </data>
+  <data name="HotkeyCtrl" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+  <data name="HotkeyAlt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="FolderDelimiterLabel" xml:space="preserve">
+    <value>Oddělovač složky:</value>
+  </data>
+  <data name="FatalLogLevel" xml:space="preserve">
+    <value>Fatální</value>
+  </data>
+  <data name="ExperimentalFeaturesWarning" xml:space="preserve">
+    <value>Toto nastavení povolte jen pokud více, to děláte. Povolením a/nebo užíváním věcí z této sekce může skončit nečekanými obtížemi, poruchami kódu a nenávratnou ztrátou dat.</value>
+  </data>
+  <data name="ExperimentalFeatures" xml:space="preserve">
+    <value>Experimentální Funkce (Je třeba restartovat Excel, aby se změny projevily):</value>
+  </data>
+  <data name="ErrorLogLevel" xml:space="preserve">
+    <value>Chyba</value>
+  </data>
+  <data name="EnableDragAndDrop" xml:space="preserve">
+    <value>Povolit drag and drop v Code Exploreru</value>
+  </data>
+  <data name="DebugLogLevel" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Zkompilovat na Žádost je aktuálně povoleno</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
+    <value>VBE nastavení "Zkompilovat Na Žádost" je aktuálně povoleno. Je silně doporučeno toto nastavení zakázat přes dialog VBE Nastavení nacházející se v panelu Obecné a změnit na Kompilování Před Parsováním. Přejete si toto nastavení nyní zakázat?
+
+POZNÁMKA: Pro aplikování tohoto nastavení je třeba restartovat Excel.</value>
+  </data>
+  <data name="CompileBeforeParse" xml:space="preserve">
+    <value>Zkompilovat kód před parsováním</value>
+  </data>
+  <data name="CheckVersion" xml:space="preserve">
+    <value>Při startu zkontrolovat, zda je dostupná nová verze.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.de.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.de.resx
new file mode 100644
index 0000000000..6f27a18061
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.de.resx
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="HotkeyRestrictionToolTip" xml:space="preserve">
+    <value>Die aktuellen Tastenkürzeleinstellungen könnten ungewollte Nebeneffekte haben.</value>
+  </data>
+  <data name="WarnLogLevel" xml:space="preserve">
+    <value>Warnung</value>
+  </data>
+  <data name="TraceLogLevel" xml:space="preserve">
+    <value>Spuren</value>
+  </data>
+  <data name="SlashDelimiter" xml:space="preserve">
+    <value>Schrägstrich (/)</value>
+  </data>
+  <data name="ShowSplash" xml:space="preserve">
+    <value>Ein Startlogo zu Beginn zeigen</value>
+  </data>
+  <data name="ShowLogFolder" xml:space="preserve">
+    <value>Logging-Ordner anzeigen</value>
+  </data>
+  <data name="SetDpiUnaware" xml:space="preserve">
+    <value>Korrektur für hochauflösende Displayskalierung</value>
+  </data>
+  <data name="PeriodDelimiter" xml:space="preserve">
+    <value>Punkte (.)</value>
+  </data>
+  <data name="OffLogLevel" xml:space="preserve">
+    <value>Kein Logging</value>
+  </data>
+  <data name="ModifierWarning" xml:space="preserve">
+    <value>Warnung</value>
+  </data>
+  <data name="MinimumLogLevelLabel" xml:space="preserve">
+    <value>Minimale Logging-Empfindlichkeit:</value>
+  </data>
+  <data name="LanguageLabel" xml:space="preserve">
+    <value>Anzeigesprache:</value>
+  </data>
+  <data name="InfoLogLevel" xml:space="preserve">
+    <value>Informationen</value>
+  </data>
+  <data name="IncludePreRelease" xml:space="preserve">
+    <value>Informiere mich, wenn ein neuer Prerelease verfügbar ist.</value>
+  </data>
+  <data name="HotkeysLabel" xml:space="preserve">
+    <value>Tastenkürzel:</value>
+  </data>
+  <data name="HotkeyShift" xml:space="preserve">
+    <value>Umschalt</value>
+  </data>
+  <data name="HotkeyRestrictionLabel" xml:space="preserve">
+    <value>Tastenkürzel sollten Alt und/oder Strg verwenden.</value>
+  </data>
+  <data name="HotkeyKey2" xml:space="preserve">
+    <value>Taste2</value>
+  </data>
+  <data name="HotkeyKey1" xml:space="preserve">
+    <value>Taste1</value>
+  </data>
+  <data name="HotkeyEnabled" xml:space="preserve">
+    <value>Aktiv</value>
+  </data>
+  <data name="HotkeyDescription" xml:space="preserve">
+    <value>Beschreibung</value>
+  </data>
+  <data name="HotkeyCtrl" xml:space="preserve">
+    <value>Strg</value>
+  </data>
+  <data name="HotkeyAlt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="FolderDelimiterLabel" xml:space="preserve">
+    <value>Ordner-Trennzeichen:</value>
+  </data>
+  <data name="FatalLogLevel" xml:space="preserve">
+    <value>Fatal</value>
+  </data>
+  <data name="ExperimentalFeaturesWarning" xml:space="preserve">
+    <value>Auf eigene Verantwortung und Gefahr aktivieren. Aktivierung und / oder Verwendung von Funktionalitäten in dieser Sektion kann zu unvorhergesehenen Fehlern und unwiederbringlichem Datenverlust führen.</value>
+  </data>
+  <data name="ExperimentalFeatures" xml:space="preserve">
+    <value>Experimentelle Funktionalität:</value>
+  </data>
+  <data name="ErrorLogLevel" xml:space="preserve">
+    <value>Fehler</value>
+  </data>
+  <data name="EnableDragAndDrop" xml:space="preserve">
+    <value>Drag and Drop im Code Explorer aktivieren</value>
+  </data>
+  <data name="DebugLogLevel" xml:space="preserve">
+    <value>Debugging</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>"Bei Bedarf Kompilieren" ist aktuell eingeschalten</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
+    <value>Die VBE-Einstellung "Bei Bedarf Kompilieren" ist aktuell eingeschalten. Wir raten stark dazu, diese Option über den Einstellungsdialog unter "Allgemein" auszuschalten, um das "Vor dem Parsen kompilieren"-Feature zu nutzen. Die Einstellung jetzt anpassen?
+
+ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
+  </data>
+  <data name="CompileBeforeParse" xml:space="preserve">
+    <value>Code vor dem Parsen kompilieren</value>
+  </data>
+  <data name="CheckVersion" xml:space="preserve">
+    <value>Beim Start prüfen, ob eine neuere Version verfügbar ist.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.es.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.es.resx
new file mode 100644
index 0000000000..52e51611eb
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.es.resx
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="HotkeyRestrictionToolTip" xml:space="preserve">
+    <value>Esta configuración de teclas de acceso rápido puede causar efectos secundarios no deseados.</value>
+  </data>
+  <data name="WarnLogLevel" xml:space="preserve">
+    <value>Advertir</value>
+  </data>
+  <data name="TraceLogLevel" xml:space="preserve">
+    <value>Rastro</value>
+  </data>
+  <data name="SlashDelimiter" xml:space="preserve">
+    <value>Barra (/)</value>
+  </data>
+  <data name="ShowSplash" xml:space="preserve">
+    <value>Mostrar pantalla de bienvenida al inicio</value>
+  </data>
+  <data name="ShowLogFolder" xml:space="preserve">
+    <value>Mostrar carpeta de registro</value>
+  </data>
+  <data name="SetDpiUnaware" xml:space="preserve">
+    <value>Corrección para escalas de pantalla de alta resolución</value>
+  </data>
+  <data name="PeriodDelimiter" xml:space="preserve">
+    <value>Punto (.)</value>
+  </data>
+  <data name="OffLogLevel" xml:space="preserve">
+    <value>Sin registro</value>
+  </data>
+  <data name="ModifierWarning" xml:space="preserve">
+    <value>Advertencia para modificador</value>
+  </data>
+  <data name="MinimumLogLevelLabel" xml:space="preserve">
+    <value>Nivel de registro mínimo:</value>
+  </data>
+  <data name="LanguageLabel" xml:space="preserve">
+    <value>Idioma de visualización:</value>
+  </data>
+  <data name="InfoLogLevel" xml:space="preserve">
+    <value>Información</value>
+  </data>
+  <data name="IncludePreRelease" xml:space="preserve">
+    <value>Avisarme cuando un pre-release build nuevo esté disponible</value>
+  </data>
+  <data name="HotkeysLabel" xml:space="preserve">
+    <value>Teclas de acceso rápido:</value>
+  </data>
+  <data name="HotkeyShift" xml:space="preserve">
+    <value>Shift</value>
+  </data>
+  <data name="HotkeyRestrictionLabel" xml:space="preserve">
+    <value>Las teclas de acceso rápido deben incluir Alt y / o Ctrl.</value>
+  </data>
+  <data name="HotkeyKey2" xml:space="preserve">
+    <value>Tecla2</value>
+  </data>
+  <data name="HotkeyKey1" xml:space="preserve">
+    <value>Tecla1</value>
+  </data>
+  <data name="HotkeyEnabled" xml:space="preserve">
+    <value>Habilitado</value>
+  </data>
+  <data name="HotkeyDescription" xml:space="preserve">
+    <value>Descripción</value>
+  </data>
+  <data name="HotkeyCtrl" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+  <data name="HotkeyAlt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="FolderDelimiterLabel" xml:space="preserve">
+    <value>Delimitador de carpeta:</value>
+  </data>
+  <data name="FatalLogLevel" xml:space="preserve">
+    <value>Fatal</value>
+  </data>
+  <data name="ExperimentalFeaturesWarning" xml:space="preserve">
+    <value>Solo habilítar si sabe lo que está haciendo. La habilitación y/o el uso de las funciones de esta sección pueden hacer que las cosas se rompan de forma inesperada e irrevocable.</value>
+  </data>
+  <data name="ExperimentalFeatures" xml:space="preserve">
+    <value>Características experimentales (requiere un reinicio para que tenga efecto):</value>
+  </data>
+  <data name="ErrorLogLevel" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="EnableDragAndDrop" xml:space="preserve">
+    <value>Habilitar arrastrar y soltar en Explorador de Código</value>
+  </data>
+  <data name="DebugLogLevel" xml:space="preserve">
+    <value>Depurar</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>"Compilar A Demanda" actualmente habilitado</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
+    <value>La configuración de VBE "Compile On Demand" está actualmente habilitada. Se recomienda encarecidamente que deshabilite la configuración a través del cuadro de diálogo Opciones de VBE en la pestaña General para utilizar la función Compilar antes de analizar. ¿Quieres desactivarlo ahora?
+
+NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
+  </data>
+  <data name="CompileBeforeParse" xml:space="preserve">
+    <value>Compilar código antes de analizar</value>
+  </data>
+  <data name="CheckVersion" xml:space="preserve">
+    <value>Compruebe si hay una versión más nueva disponible en el inicio</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.fr.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.fr.resx
new file mode 100644
index 0000000000..a258f4b59e
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.fr.resx
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="HotkeyRestrictionToolTip" xml:space="preserve">
+    <value>Cette configuration peut entraîner des effets indésirables.</value>
+  </data>
+  <data name="WarnLogLevel" xml:space="preserve">
+    <value>Avertissement</value>
+  </data>
+  <data name="TraceLogLevel" xml:space="preserve">
+    <value>Trace</value>
+  </data>
+  <data name="SlashDelimiter" xml:space="preserve">
+    <value>Barre oblique (/)</value>
+  </data>
+  <data name="ShowSplash" xml:space="preserve">
+    <value>Afficher l'écran d'initialisation</value>
+  </data>
+  <data name="ShowLogFolder" xml:space="preserve">
+    <value>Afficher dans le dossier</value>
+  </data>
+  <data name="SetDpiUnaware" xml:space="preserve">
+    <value>Correction pour l'affichage haute définition</value>
+  </data>
+  <data name="PeriodDelimiter" xml:space="preserve">
+    <value>Point (.)</value>
+  </data>
+  <data name="OffLogLevel" xml:space="preserve">
+    <value>Désactivé</value>
+  </data>
+  <data name="ModifierWarning" xml:space="preserve">
+    <value>Avertissement</value>
+  </data>
+  <data name="MinimumLogLevelLabel" xml:space="preserve">
+    <value>Niveau minimum du journal:</value>
+  </data>
+  <data name="LanguageLabel" xml:space="preserve">
+    <value>Langue d'affichage:</value>
+  </data>
+  <data name="InfoLogLevel" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="IncludePreRelease" xml:space="preserve">
+    <value>M'avertir lorsqu'une nouvelle version "pre-release" est disponible.</value>
+  </data>
+  <data name="HotkeysLabel" xml:space="preserve">
+    <value>Raccourcis:</value>
+  </data>
+  <data name="HotkeyShift" xml:space="preserve">
+    <value>Maj</value>
+  </data>
+  <data name="HotkeyRestrictionLabel" xml:space="preserve">
+    <value>Les raccourcis doivent inclure Alt et/ou Ctrl.</value>
+  </data>
+  <data name="HotkeyKey2" xml:space="preserve">
+    <value>Touche2</value>
+  </data>
+  <data name="HotkeyKey1" xml:space="preserve">
+    <value>Touche1</value>
+  </data>
+  <data name="HotkeyEnabled" xml:space="preserve">
+    <value>Active</value>
+  </data>
+  <data name="HotkeyDescription" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="HotkeyCtrl" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+  <data name="HotkeyAlt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="FolderDelimiterLabel" xml:space="preserve">
+    <value>Délimiteur de dossiers:</value>
+  </data>
+  <data name="FatalLogLevel" xml:space="preserve">
+    <value>Fatal</value>
+  </data>
+  <data name="ExperimentalFeaturesWarning" xml:space="preserve">
+    <value>Ces fonctionnalités sont présentement en phase de tests et/ou diagnostics. Activer ces fonctionnalités peut produire des erreurs inattendues qui peuvent résulter en pertes de données.</value>
+  </data>
+  <data name="ExperimentalFeatures" xml:space="preserve">
+    <value>Fonctionnalités expérimentales:</value>
+  </data>
+  <data name="ErrorLogLevel" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="EnableDragAndDrop" xml:space="preserve">
+    <value>Permettre glisser-déposer dans l'Explorateur de Code</value>
+  </data>
+  <data name="DebugLogLevel" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>'Compile on demand' est activé</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
+    <value>L'option VBE "Compile on demand" est activée. Il est fortement recommandé de désactiver cette option afin d'utiliser l'option "Compiler avant l'analyse". Voulez-vous désactiver "Compile on demand"?
+
+NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configuration prenne effet.</value>
+  </data>
+  <data name="CompileBeforeParse" xml:space="preserve">
+    <value>Compiler le code avant d'analyser</value>
+  </data>
+  <data name="CheckVersion" xml:space="preserve">
+    <value>Vérifier si une nouvelle version est diponible au démarrage.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx
new file mode 100644
index 0000000000..8e76f8b87c
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="HotkeyRestrictionToolTip" xml:space="preserve">
+    <value>This hotkey configuration may cause undesirable side effects.</value>
+  </data>
+  <data name="WarnLogLevel" xml:space="preserve">
+    <value>Warn</value>
+  </data>
+  <data name="TraceLogLevel" xml:space="preserve">
+    <value>Trace</value>
+  </data>
+  <data name="SlashDelimiter" xml:space="preserve">
+    <value>Slash (/)</value>
+  </data>
+  <data name="ShowSplash" xml:space="preserve">
+    <value>Show splash screen at startup</value>
+  </data>
+  <data name="ShowLogFolder" xml:space="preserve">
+    <value>Show Log Folder</value>
+  </data>
+  <data name="SetDpiUnaware" xml:space="preserve">
+    <value>Correction for high-resolution display scalings</value>
+  </data>
+  <data name="PeriodDelimiter" xml:space="preserve">
+    <value>Period (.)</value>
+  </data>
+  <data name="OffLogLevel" xml:space="preserve">
+    <value>No Logging</value>
+  </data>
+  <data name="ModifierWarning" xml:space="preserve">
+    <value>Modifier Warning</value>
+  </data>
+  <data name="MinimumLogLevelLabel" xml:space="preserve">
+    <value>Minimum Log Level:</value>
+  </data>
+  <data name="LanguageLabel" xml:space="preserve">
+    <value>Display language:</value>
+  </data>
+  <data name="InfoLogLevel" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="IncludePreRelease" xml:space="preserve">
+    <value>Tell me if a newer pre-release build is available.</value>
+  </data>
+  <data name="HotkeysLabel" xml:space="preserve">
+    <value>Hotkeys:</value>
+  </data>
+  <data name="HotkeyShift" xml:space="preserve">
+    <value>Shift</value>
+  </data>
+  <data name="HotkeyRestrictionLabel" xml:space="preserve">
+    <value>Hotkeys should include either Alt and/or Ctrl.</value>
+  </data>
+  <data name="HotkeyKey2" xml:space="preserve">
+    <value>Key2</value>
+  </data>
+  <data name="HotkeyKey1" xml:space="preserve">
+    <value>Key1</value>
+  </data>
+  <data name="HotkeyEnabled" xml:space="preserve">
+    <value>Enabled</value>
+  </data>
+  <data name="HotkeyDescription" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="HotkeyCtrl" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+  <data name="HotkeyAlt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="FolderDelimiterLabel" xml:space="preserve">
+    <value>Folder Delimiter:</value>
+  </data>
+  <data name="FatalLogLevel" xml:space="preserve">
+    <value>Fatal</value>
+  </data>
+  <data name="ExperimentalFeaturesWarning" xml:space="preserve">
+    <value>Only enable these if you know what you're doing. Enabling and/or using features from this section may result in things breaking unexpectedly and irrevocable data loss.</value>
+  </data>
+  <data name="ExperimentalFeatures" xml:space="preserve">
+    <value>Experimental Features (Requires a restart to take effect):</value>
+  </data>
+  <data name="ErrorLogLevel" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="EnableDragAndDrop" xml:space="preserve">
+    <value>Enable drag and drop in Code Explorer</value>
+  </data>
+  <data name="DebugLogLevel" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Compile On Demand currently enabled</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
+    <value>The VBE setting "Compile On Demand" is currently enabled. It is strongly recommended that you disable the setting via the VBE Options dialog under General tab in order to use the Compile Before Parse feature. Do you want to disable it now?
+
+NOTE: Restart is required for the setting to take effect.</value>
+  </data>
+  <data name="CompileBeforeParse" xml:space="preserve">
+    <value>Compile code before parsing</value>
+  </data>
+  <data name="CheckVersion" xml:space="preserve">
+    <value>Check if a newer version is available at startup.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
index f441f45b15..ff43bca6f6 100644
--- a/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
@@ -235,8 +235,8 @@ public bool SetDpiUnawareEnabled
 
         private bool SynchronizeVbeSettings()
         {
-            if (!_messageBox.ConfirmYesNo(RubberduckUI.GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled,
-                RubberduckUI.GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption, true))
+            if (!_messageBox.ConfirmYesNo(GeneralSettingsUI.CompileBeforeParse_WarnCompileOnDemandEnabled,
+                GeneralSettingsUI.CompileBeforeParse_WarnCompileOnDemandEnabled_Caption, true))
             {
                 return false;
             }
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ae232e690d..7e3124ea40 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1809,314 +1809,6 @@ public static string Fix {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Check if a newer version is available at startup..
-        /// </summary>
-        public static string GeneralSettings_CheckVersion {
-            get {
-                return ResourceManager.GetString("GeneralSettings_CheckVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Compile code before parsing.
-        /// </summary>
-        public static string GeneralSettings_CompileBeforeParse {
-            get {
-                return ResourceManager.GetString("GeneralSettings_CompileBeforeParse", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The VBE setting &quot;Compile On Demand&quot; is currently enabled. It is strongly recommended that you disable the setting via the VBE Options dialog under General tab in order to use the Compile Before Parse feature. Do you want to disable it now?
-        ///
-        ///NOTE: Restart is required for the setting to take effect..
-        /// </summary>
-        public static string GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled {
-            get {
-                return ResourceManager.GetString("GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Compile On Demand currently enabled.
-        /// </summary>
-        public static string GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption {
-            get {
-                return ResourceManager.GetString("GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Debug.
-        /// </summary>
-        public static string GeneralSettings_DebugLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_DebugLogLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Enable drag and drop in Code Explorer.
-        /// </summary>
-        public static string GeneralSettings_EnableDragAndDrop {
-            get {
-                return ResourceManager.GetString("GeneralSettings_EnableDragAndDrop", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error.
-        /// </summary>
-        public static string GeneralSettings_ErrorLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_ErrorLogLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Experimental Features (Requires a restart to take effect):.
-        /// </summary>
-        public static string GeneralSettings_ExperimentalFeatures {
-            get {
-                return ResourceManager.GetString("GeneralSettings_ExperimentalFeatures", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Only enable these if you know what you&apos;re doing. Enabling and/or using features from this section may result in things breaking unexpectedly and irrevocable data loss..
-        /// </summary>
-        public static string GeneralSettings_ExperimentalFeaturesWarning {
-            get {
-                return ResourceManager.GetString("GeneralSettings_ExperimentalFeaturesWarning", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Fatal.
-        /// </summary>
-        public static string GeneralSettings_FatalLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_FatalLogLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Folder Delimiter:.
-        /// </summary>
-        public static string GeneralSettings_FolderDelimiterLabel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_FolderDelimiterLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Alt.
-        /// </summary>
-        public static string GeneralSettings_HotkeyAlt {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyAlt", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ctrl.
-        /// </summary>
-        public static string GeneralSettings_HotkeyCtrl {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyCtrl", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Description.
-        /// </summary>
-        public static string GeneralSettings_HotkeyDescription {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Enabled.
-        /// </summary>
-        public static string GeneralSettings_HotkeyEnabled {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyEnabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Key1.
-        /// </summary>
-        public static string GeneralSettings_HotkeyKey1 {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyKey1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Key2.
-        /// </summary>
-        public static string GeneralSettings_HotkeyKey2 {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyKey2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hotkeys should include either Alt and/or Ctrl..
-        /// </summary>
-        public static string GeneralSettings_HotkeyRestrictionLabel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyRestrictionLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This hotkey configuration may cause undesirable side effects..
-        /// </summary>
-        public static string GeneralSettings_HotkeyRestrictionToolTip {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyRestrictionToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Shift.
-        /// </summary>
-        public static string GeneralSettings_HotkeyShift {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeyShift", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hotkeys:.
-        /// </summary>
-        public static string GeneralSettings_HotkeysLabel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_HotkeysLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Tell me if a newer pre-release build is available..
-        /// </summary>
-        public static string GeneralSettings_IncludePreRelease {
-            get {
-                return ResourceManager.GetString("GeneralSettings_IncludePreRelease", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Info.
-        /// </summary>
-        public static string GeneralSettings_InfoLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_InfoLogLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Display language:.
-        /// </summary>
-        public static string GeneralSettings_LanguageLabel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_LanguageLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Minimum Log Level:.
-        /// </summary>
-        public static string GeneralSettings_MinimumLogLevelLabel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_MinimumLogLevelLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modifier Warning.
-        /// </summary>
-        public static string GeneralSettings_ModifierWarning {
-            get {
-                return ResourceManager.GetString("GeneralSettings_ModifierWarning", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No Logging.
-        /// </summary>
-        public static string GeneralSettings_OffLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_OffLogLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Period (.).
-        /// </summary>
-        public static string GeneralSettings_PeriodDelimiter {
-            get {
-                return ResourceManager.GetString("GeneralSettings_PeriodDelimiter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Correction for high-resolution display scalings.
-        /// </summary>
-        public static string GeneralSettings_SetDpiUnaware {
-            get {
-                return ResourceManager.GetString("GeneralSettings_SetDpiUnaware", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show Log Folder.
-        /// </summary>
-        public static string GeneralSettings_ShowLogFolder {
-            get {
-                return ResourceManager.GetString("GeneralSettings_ShowLogFolder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show splash screen at startup.
-        /// </summary>
-        public static string GeneralSettings_ShowSplash {
-            get {
-                return ResourceManager.GetString("GeneralSettings_ShowSplash", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Slash (/).
-        /// </summary>
-        public static string GeneralSettings_SlashDelimiter {
-            get {
-                return ResourceManager.GetString("GeneralSettings_SlashDelimiter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Trace.
-        /// </summary>
-        public static string GeneralSettings_TraceLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_TraceLogLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Warn.
-        /// </summary>
-        public static string GeneralSettings_WarnLogLevel {
-            get {
-                return ResourceManager.GetString("GeneralSettings_WarnLogLevel", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Go.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a605648f57..9f7acc0a20 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -276,9 +276,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Language_FR" xml:space="preserve">
     <value>Francouzština</value>
   </data>
-  <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Jazyk zobrazení:</value>
-  </data>
   <data name="Result" xml:space="preserve">
     <value>Výsledek</value>
   </data>
@@ -483,15 +480,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="EndOfLineCommentStyle_AlignInColumn" xml:space="preserve">
     <value>Zarovnej ve sloupci</value>
   </data>
-  <data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
-    <value>Popis</value>
-  </data>
-  <data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
-    <value>Povoleno</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
-    <value>Klíč1</value>
-  </data>
   <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
     <value>Zarovnat komenty s kódem</value>
   </data>
@@ -725,9 +713,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="GroupingStyle_ByOutcome" xml:space="preserve">
     <value>Dle výsledku</value>
   </data>
-  <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
-    <value>Klávesové Zkratky:</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Výsledky Hledání</value>
   </data>
@@ -767,18 +752,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="RubberduckCommandbarRefreshButtonTooltip" xml:space="preserve">
     <value>Parsuj všechny otevřené projekty</value>
   </data>
-  <data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
-    <value>Alt</value>
-  </data>
-  <data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
-    <value>Ctrl</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
-    <value>Klíč2</value>
-  </data>
-  <data name="GeneralSettings_HotkeyShift" xml:space="preserve">
-    <value>Shift</value>
-  </data>
   <data name="CommandDescription_CodeExplorerCommand" xml:space="preserve">
     <value>Code Explorer</value>
   </data>
@@ -818,45 +791,9 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="GroupingStyle_ByMarker" xml:space="preserve">
     <value>Dle značky</value>
   </data>
-  <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
-    <value>Oddělovač složky:</value>
-  </data>
-  <data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
-    <value>Tečka (.)</value>
-  </data>
-  <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Lomeno (/)</value>
-  </data>
   <data name="Parser_ParserError" xml:space="preserve">
     <value>Chyby Parseru</value>
   </data>
-  <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Minimální Úroveň Logu:</value>
-  </data>
-  <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Debug</value>
-  </data>
-  <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
-    <value>Chyba</value>
-  </data>
-  <data name="GeneralSettings_FatalLogLevel" xml:space="preserve">
-    <value>Fatální</value>
-  </data>
-  <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Info</value>
-  </data>
-  <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
-    <value>Žádné Logování</value>
-  </data>
-  <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Trace</value>
-  </data>
-  <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
-    <value>Varování</value>
-  </data>
-  <data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
-    <value>Otevřít Log Složku</value>
-  </data>
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Řeším reference...</value>
   </data>
@@ -899,9 +836,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
     <value>Spustit automaticky inspekce po úspěšném parsování</value>
   </data>
-  <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Zobrazit úvodní obrazovku po spuštění</value>
-  </data>
   <data name="RubberduckReloadFailure_Title" xml:space="preserve">
     <value>Rubberduck nebude obnoven</value>
   </data>
@@ -943,9 +877,6 @@ Chcete-li se podívat na změny a ručně aktualizovat Rubberduck, klikněte na
 
 Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí. Tuto funkci můžete vypnout v Rubberduck &gt; Nastavení.</value>
   </data>
-  <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Při startu zkontrolovat, zda je dostupná nová verze.</value>
-  </data>
   <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
     <value>'{0}' je již přístupný v tomto rozsahu.</value>
   </data>
@@ -973,12 +904,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
     <value>Metoda '{0}' je implementací události '{1}.{2}'. Místo toho přejmenovat událost '{2}'?</value>
   </data>
-  <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
-    <value>Toto nastavení povolte jen pokud více, to děláte. Povolením a/nebo užíváním věcí z této sekce může skončit nečekanými obtížemi, poruchami kódu a nenávratnou ztrátou dat.</value>
-  </data>
-  <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
-    <value>Experimentální Funkce (Je třeba restartovat Excel, aby se změny projevily):</value>
-  </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Vyberte složku pro export zdrojového kódu {0} do:</value>
   </data>
@@ -1026,24 +951,12 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="CodeMetrics_Nesting" xml:space="preserve">
     <value>Maximální Vnoření</value>
   </data>
-  <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
-    <value>Klávesové zkratky by měly obsahovat buď Alt a/nebo Ctrl.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionToolTip" xml:space="preserve">
-    <value>Tato konfigurace klávesové zkratky může vyvolat nežádoucí vedlejší účinky.</value>
-  </data>
-  <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
-    <value>Varování Modifikátoru</value>
-  </data>
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Následující projekt(y) nemohou být zkompilovány, což je s největší pravděpodobností kvůli parsovacím chybám. I přesto pokračovat? {0}</value>
   </data>
   <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
     <value>Není možno zkompilovat pro parsování.</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Zkompilovat kód před parsováním</value>
-  </data>
   <data name="ParserState_Started" xml:space="preserve">
     <value>Zahájeno</value>
   </data>
@@ -1056,14 +969,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>Nastavení Zkompilování Na Žádost</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
-    <value>VBE nastavení "Zkompilovat Na Žádost" je aktuálně povoleno. Je silně doporučeno toto nastavení zakázat přes dialog VBE Nastavení nacházející se v panelu Obecné a změnit na Kompilování Před Parsováním. Přejete si toto nastavení nyní zakázat?
-
-POZNÁMKA: Pro aplikování tohoto nastavení je třeba restartovat Excel.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Zkompilovat na Žádost je aktuálně povoleno</value>
-  </data>
   <data name="SmartIndenter_LegacySettingPrompt" xml:space="preserve">
     <value>Ve vašich registrech bylo nalezeno Chytré Odsazování.
 Přejete si toto nastavení importovat do Rubberducku?</value>
@@ -1229,9 +1134,6 @@ End Enum</value>
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>TODO Průzkumník</value>
   </data>
-  <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Korekce pro displaye s vysokým rozlišením a škálováním</value>
-  </data>
   <data name="References_BrowseFilterAccess" xml:space="preserve">
     <value>Microsoft Access Databáze ({0})|{0}</value>
   </data>
@@ -1428,9 +1330,6 @@ End Enum</value>
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Zvaž použití jiného jména.</value>
   </data>
-  <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>Oznámení, pokud je k dispozici novější verze předběžného vydání.</value>
-  </data>
   <data name="VersionCheck_BuildType_PreRelease" xml:space="preserve">
     <value>předběžné vydání</value>
   </data>
@@ -1596,9 +1495,6 @@ Import přerušen.</value>
   <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
     <value>Deklarace k Anotaci:</value>
   </data>
-  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Povolit drag and drop v Code Exploreru</value>
-  </data>
   <data name="RenameDialog_Folder" xml:space="preserve">
     <value>složka</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e25afdb15e..06dce129a8 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -605,9 +605,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="ImplementInterface_Caption" xml:space="preserve">
     <value>Rubberduck - Interface Implementieren</value>
   </data>
-  <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Anzeigesprache:</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Schweregrad:</value>
   </data>
@@ -623,12 +620,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Standardabstand</value>
   </data>
-  <data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
-    <value>Beschreibung</value>
-  </data>
-  <data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
-    <value>Aktiv</value>
-  </data>
   <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
     <value>Richte Kommentare am Code aus</value>
   </data>
@@ -710,9 +701,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="GroupingStyle_ByOutcome" xml:space="preserve">
     <value>Nach Ergebnis</value>
   </data>
-  <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
-    <value>Tastenkürzel:</value>
-  </data>
   <data name="Settings" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
@@ -767,21 +755,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="RubberduckCommandbarRefreshButtonTooltip" xml:space="preserve">
     <value>Parse alle offenen Projekte</value>
   </data>
-  <data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
-    <value>Strg</value>
-  </data>
-  <data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
-    <value>Alt</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
-    <value>Taste2</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
-    <value>Taste1</value>
-  </data>
-  <data name="GeneralSettings_HotkeyShift" xml:space="preserve">
-    <value>Umschalt</value>
-  </data>
   <data name="CommonHotkey_InvalidKey" xml:space="preserve">
     <value>Ungültiges Zeichen.</value>
   </data>
@@ -803,45 +776,9 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="Find" xml:space="preserve">
     <value>Suchen</value>
   </data>
-  <data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
-    <value>Punkte (.)</value>
-  </data>
-  <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
-    <value>Ordner-Trennzeichen:</value>
-  </data>
-  <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Schrägstrich (/)</value>
-  </data>
   <data name="Parser_ParserError" xml:space="preserve">
     <value>Parserfehler</value>
   </data>
-  <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Minimale Logging-Empfindlichkeit:</value>
-  </data>
-  <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Debugging</value>
-  </data>
-  <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
-    <value>Fehler</value>
-  </data>
-  <data name="GeneralSettings_FatalLogLevel" xml:space="preserve">
-    <value>Fatal</value>
-  </data>
-  <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Informationen</value>
-  </data>
-  <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
-    <value>Kein Logging</value>
-  </data>
-  <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Spuren</value>
-  </data>
-  <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
-    <value>Warnung</value>
-  </data>
-  <data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
-    <value>Logging-Ordner anzeigen</value>
-  </data>
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Löse Referenzen auf...</value>
   </data>
@@ -893,9 +830,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="RubberduckReloadFailure_Title" xml:space="preserve">
     <value>Rubberduck wird nicht neu geladen</value>
   </data>
-  <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Ein Startlogo zu Beginn zeigen</value>
-  </data>
   <data name="CodeInspectionSettings_Misc" xml:space="preserve">
     <value>Verschiedenes</value>
   </data>
@@ -956,9 +890,6 @@ End Sub</value>
     <value>Einstellungen für Smart Indenter wurden in der Registry gefunden.
 Möchten sie die Einstellungen in Rubberduck importieren?</value>
   </data>
-  <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Beim Start prüfen, ob eine neuere Version verfügbar ist.</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Variablenname der Lokalen Kopie festlegen</value>
   </data>
@@ -1033,18 +964,12 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck sieht noch nichts.</value>
   </data>
-  <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
-    <value>Auf eigene Verantwortung und Gefahr aktivieren. Aktivierung und / oder Verwendung von Funktionalitäten in dieser Sektion kann zu unvorhergesehenen Fehlern und unwiederbringlichem Datenverlust führen.</value>
-  </data>
   <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
     <value>Die Methode '{0}' ist eine Implementierung des Ereignisses '{1}.{2}'. Stattdessen Ereignis '{2}' umbenennen?</value>
   </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Einen Ordner als Ziel für den Quellcode von {0} wählen:</value>
   </data>
-  <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
-    <value>Experimentelle Funktionalität:</value>
-  </data>
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>In die Zwischenablage kopieren</value>
   </data>
@@ -1113,38 +1038,18 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="CommandDescription_ExportAllCommand" xml:space="preserve">
     <value>Aktives Projekt exportieren</value>
   </data>
-  <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
-    <value>Tastenkürzel sollten Alt und/oder Strg verwenden.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionToolTip" xml:space="preserve">
-    <value>Die aktuellen Tastenkürzeleinstellungen könnten ungewollte Nebeneffekte haben.</value>
-  </data>
-  <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
-    <value>Warnung</value>
-  </data>
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Folgende(s) Projekt(e) können nicht kompiliert werden. Dies führt höchstwahrscheinlich zu Parserfehlern. Trotzdem fortfahren? {0}</value>
   </data>
   <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
     <value>Konnte nicht vor dem Parsen kompilieren.</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Code vor dem Parsen kompilieren</value>
-  </data>
   <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
     <value>Die VBE-Einstellung "Bei Bedarf Kompilieren" ist aktuell eingeschalten. Dies ist nicht empfohlen, da Kompilierungsfehler und Probleme beim Parsen versteckt werden können. Trotzdem Parsen?</value>
   </data>
   <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>Einstellung "Bei Bedarf Kompilieren"</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
-    <value>Die VBE-Einstellung "Bei Bedarf Kompilieren" ist aktuell eingeschalten. Wir raten stark dazu, diese Option über den Einstellungsdialog unter "Allgemein" auszuschalten, um das "Vor dem Parsen kompilieren"-Feature zu nutzen. Die Einstellung jetzt anpassen?
-
-ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>"Bei Bedarf Kompilieren" ist aktuell eingeschalten</value>
-  </data>
   <data name="Add" xml:space="preserve">
     <value>Hinzufügen</value>
   </data>
@@ -1217,9 +1122,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="References_BrowseFilterAccess" xml:space="preserve">
     <value>Microsoft-Access-Datenbanken({0})|{0}</value>
   </data>
-  <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Korrektur für hochauflösende Displayskalierung</value>
-  </data>
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>TODO Explorer</value>
   </data>
@@ -1460,9 +1362,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Überlegen Sie, einen anderen Namen zu wählen.</value>
   </data>
-  <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>Informiere mich, wenn ein neuer Prerelease verfügbar ist.</value>
-  </data>
   <data name="RegexAssistant_SpelledOut_UnidentifiedWhitespace" xml:space="preserve">
     <value>unerkanntes-Leerzeichen</value>
   </data>
@@ -1722,9 +1621,6 @@ Wollen Sie fortfahren?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Ordner umbenennen</value>
   </data>
-  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Drag and Drop im Code Explorer aktivieren</value>
-  </data>
   <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
     <value>Attribut hinzufügen/anpassen</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 40f3148a42..f38d04d940 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -372,9 +372,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Result" xml:space="preserve">
     <value>Resultado</value>
   </data>
-  <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Idioma de visualización:</value>
-  </data>
   <data name="Language_EN" xml:space="preserve">
     <value>Inglés</value>
   </data>
@@ -646,15 +643,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Gap estándar</value>
   </data>
-  <data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
-    <value>Descripción</value>
-  </data>
-  <data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
-    <value>Habilitado</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
-    <value>Tecla1</value>
-  </data>
   <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
     <value>Alinear comentarios con código</value>
   </data>
@@ -742,9 +730,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="GroupingStyle_ByOutcome" xml:space="preserve">
     <value>Por resultado</value>
   </data>
-  <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
-    <value>Teclas de acceso rápido:</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Resultados de la búsqueda</value>
   </data>
@@ -805,18 +790,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="RubberduckCommandbarRefreshButtonTooltip" xml:space="preserve">
     <value>Analizar todos los proyectos abiertos</value>
   </data>
-  <data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
-    <value>Alt</value>
-  </data>
-  <data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
-    <value>Ctrl</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
-    <value>Tecla2</value>
-  </data>
-  <data name="GeneralSettings_HotkeyShift" xml:space="preserve">
-    <value>Shift</value>
-  </data>
   <data name="CommandDescription_CodeExplorerCommand" xml:space="preserve">
     <value>Explorador de código</value>
   </data>
@@ -859,45 +832,9 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>biblioteca de procedimientos</value>
   </data>
-  <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
-    <value>Delimitador de carpeta:</value>
-  </data>
-  <data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
-    <value>Punto (.)</value>
-  </data>
-  <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Barra (/)</value>
-  </data>
   <data name="Parser_ParserError" xml:space="preserve">
     <value>Errores del analizador</value>
   </data>
-  <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Nivel de registro mínimo:</value>
-  </data>
-  <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Depurar</value>
-  </data>
-  <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="GeneralSettings_FatalLogLevel" xml:space="preserve">
-    <value>Fatal</value>
-  </data>
-  <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Información</value>
-  </data>
-  <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
-    <value>Sin registro</value>
-  </data>
-  <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Rastro</value>
-  </data>
-  <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
-    <value>Advertir</value>
-  </data>
-  <data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
-    <value>Mostrar carpeta de registro</value>
-  </data>
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Resolviendo referencias ...</value>
   </data>
@@ -943,9 +880,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
     <value>Ejecutar inspecciones automáticamente en el análisis exitoso</value>
   </data>
-  <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Mostrar pantalla de bienvenida al inicio</value>
-  </data>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Las ventanas de herramientas no se destruyeron correctamente y/o no se pudieron recrear; El VBE puede no estar en un estado estable. Rubberduck se cargará normalmente la próxima vez que se inicialice el VBE.</value>
   </data>
@@ -1044,9 +978,6 @@ Para revisar el log de cambios y actualizar Rubberduck manualmente haga click en
 
 Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desactivar este comportamiento en Rubberduck &gt; Ajustes.</value>
   </data>
-  <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Compruebe si hay una versión más nueva disponible en el inicio</value>
-  </data>
   <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
     <value>'{0}' ya está accesible para este ámbito.</value>
     <comment>{0} = nombre de la variable propuesta.</comment>
@@ -1078,12 +1009,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
     <value>El método '{0}' es una implementación del evento '{1}. {2}'. ¿Renombrar el evento '{2}' en su lugar?</value>
     <comment>0: identificador de objetivo seleccionado; 1: Evento Padre; 2: nombre del evento</comment>
   </data>
-  <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
-    <value>Solo habilítar si sabe lo que está haciendo. La habilitación y/o el uso de las funciones de esta sección pueden hacer que las cosas se rompan de forma inesperada e irrevocable.</value>
-  </data>
-  <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
-    <value>Características experimentales (requiere un reinicio para que tenga efecto):</value>
-  </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Elija una carpeta para exportar la fuente de {0} a:</value>
     <comment>{0} VBProject.Name</comment>
@@ -1135,24 +1060,12 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="CodeMetrics_Nesting" xml:space="preserve">
     <value>Anidamiento maximo</value>
   </data>
-  <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
-    <value>Las teclas de acceso rápido deben incluir Alt y / o Ctrl.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionToolTip" xml:space="preserve">
-    <value>Esta configuración de teclas de acceso rápido puede causar efectos secundarios no deseados.</value>
-  </data>
-  <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
-    <value>Advertencia para modificador</value>
-  </data>
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Los siguientes proyectos no pueden compilarse, lo que probablemente resultará en errores del analizador. ¿Continua de todas maneras? {0}</value>
   </data>
   <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
     <value>No se puede compilar para analizar.</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Compilar código antes de analizar</value>
-  </data>
   <data name="ParserState_Started" xml:space="preserve">
     <value>Empezado</value>
   </data>
@@ -1165,14 +1078,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>Ajuste "Compilar A Demanda"</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
-    <value>La configuración de VBE "Compile On Demand" está actualmente habilitada. Se recomienda encarecidamente que deshabilite la configuración a través del cuadro de diálogo Opciones de VBE en la pestaña General para utilizar la función Compilar antes de analizar. ¿Quieres desactivarlo ahora?
-
-NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>"Compilar A Demanda" actualmente habilitado</value>
-  </data>
   <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
     <value>Descripción:</value>
   </data>
@@ -1297,9 +1202,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>Explorador TODO</value>
   </data>
-  <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Corrección para escalas de pantalla de alta resolución</value>
-  </data>
   <data name="References_BrowseFilterAccess" xml:space="preserve">
     <value>Bases de datos de Microsoft Access ({0})|{0}</value>
     <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
@@ -1549,9 +1451,6 @@ Importación cancelada.</value>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>No se puede suspender el analizador para ejecutar la operación de refactorización.</value>
   </data>
-  <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>Avisarme cuando un pre-release build nuevo esté disponible</value>
-  </data>
   <data name="VersionCheck_BuildType_PreRelease" xml:space="preserve">
     <value>pre-release</value>
   </data>
@@ -1797,7 +1696,4 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
     <value>Nueva carpeta completa:</value>
   </data>
-  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Habilitar arrastrar y soltar en Explorador de Código</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c3c4f58fdc..54281573dc 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -636,24 +636,15 @@ Continuer?</value>
   <data name="SearchResults_MemberType" xml:space="preserve">
     <value>Type</value>
   </data>
-  <data name="GeneralSettings_HotkeyShift" xml:space="preserve">
-    <value>Maj</value>
-  </data>
   <data name="SearchResults_MemberName" xml:space="preserve">
     <value>Membre</value>
   </data>
-  <data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
-    <value>Alt</value>
-  </data>
   <data name="EndOfLineCommentStyle_AlignInColumn" xml:space="preserve">
     <value>Aligner dans la colonne</value>
   </data>
   <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
     <value>Par type d'inspection</value>
   </data>
-  <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
-    <value>Raccourcis:</value>
-  </data>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Regroupement</value>
   </data>
@@ -708,9 +699,6 @@ Continuer?</value>
   <data name="ParserState_Pending" xml:space="preserve">
     <value>En attente</value>
   </data>
-  <data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
-    <value>Ctrl</value>
-  </data>
   <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
     <value>Indenter les directives du préprocesseur</value>
   </data>
@@ -723,15 +711,6 @@ Continuer?</value>
   <data name="IndenterSettings_AlignDims" xml:space="preserve">
     <value>Aligner les déclarations (Dim)</value>
   </data>
-  <data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
-    <value>Description</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
-    <value>Touche1</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
-    <value>Touche2</value>
-  </data>
   <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
     <value>Options spéciales</value>
   </data>
@@ -789,9 +768,6 @@ Continuer?</value>
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Espacement standard</value>
   </data>
-  <data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
-    <value>Active</value>
-  </data>
   <data name="Rubberduck" xml:space="preserve">
     <value>Rubberduck</value>
   </data>
@@ -810,60 +786,18 @@ Continuer?</value>
   <data name="SearchResults_ModuleName" xml:space="preserve">
     <value>Module</value>
   </data>
-  <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Langue d'affichage:</value>
-  </data>
-  <data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
-    <value>Point (.)</value>
-  </data>
   <data name="Parser_ParserError" xml:space="preserve">
     <value>Erreurs d'analyse</value>
   </data>
-  <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
-    <value>Avertissement</value>
-  </data>
-  <data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
-    <value>Afficher dans le dossier</value>
-  </data>
-  <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
-    <value>Erreur</value>
-  </data>
   <data name="Find" xml:space="preserve">
     <value>Chercher</value>
   </data>
-  <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Barre oblique (/)</value>
-  </data>
-  <data name="GeneralSettings_FatalLogLevel" xml:space="preserve">
-    <value>Fatal</value>
-  </data>
-  <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Trace</value>
-  </data>
-  <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Debug</value>
-  </data>
-  <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
-    <value>Délimiteur de dossiers:</value>
-  </data>
-  <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Niveau minimum du journal:</value>
-  </data>
-  <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
-    <value>Désactivé</value>
-  </data>
-  <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Info</value>
-  </data>
   <data name="CodeInspectionSettings_Misc" xml:space="preserve">
     <value>Autres options</value>
   </data>
   <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
     <value>Exécuter les inspections automatiquement</value>
   </data>
-  <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Afficher l'écran d'initialisation</value>
-  </data>
   <data name="ParserErrorToolTipText" xml:space="preserve">
     <value>{0} module(s) n'ont pas pu compléter; cliquez pour plus de détails.</value>
   </data>
@@ -965,9 +899,6 @@ End Sub</value>
   <data name="ContextReferences" xml:space="preserve">
     <value>références</value>
   </data>
-  <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Vérifier si une nouvelle version est diponible au démarrage.</value>
-  </data>
   <data name="VersionCheck_NewVersionAvailable" xml:space="preserve">
     <value>Vous utilisez présentement la version {0}.
 Bonne nouvelle, la version {1} ({2}) est maintenant disponible!
@@ -1041,18 +972,12 @@ les projets dans le VBE.</value>
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck ne voit rien pour l'instant.</value>
   </data>
-  <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
-    <value>Ces fonctionnalités sont présentement en phase de tests et/ou diagnostics. Activer ces fonctionnalités peut produire des erreurs inattendues qui peuvent résulter en pertes de données.</value>
-  </data>
   <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
     <value>La méthode '{0}' répond à l'événement '{1}.{2}'. Renommer l'événement '{2}'?</value>
   </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Veuillez sélectionner un dossier où exporter les fichier source de {0}:</value>
   </data>
-  <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
-    <value>Fonctionnalités expérimentales:</value>
-  </data>
   <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
     <value>Impossible de renommer {0}.</value>
   </data>
@@ -1118,24 +1043,12 @@ les projets dans le VBE.</value>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Encapsuler le champ</value>
   </data>
-  <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
-    <value>Les raccourcis doivent inclure Alt et/ou Ctrl.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionToolTip" xml:space="preserve">
-    <value>Cette configuration peut entraîner des effets indésirables.</value>
-  </data>
-  <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
-    <value>Avertissement</value>
-  </data>
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>Les projets suivants ne peuvent être compilés, ce qui causera probablement des erreurs d'analyse. Continuer? {0}</value>
   </data>
   <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
     <value>La compilation a échoué.</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Compiler le code avant d'analyser</value>
-  </data>
   <data name="ParserState_Started" xml:space="preserve">
     <value>Initiée</value>
   </data>
@@ -1148,14 +1061,6 @@ les projets dans le VBE.</value>
   <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>Paramètre "Compile on demand"</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
-    <value>L'option VBE "Compile on demand" est activée. Il est fortement recommandé de désactiver cette option afin d'utiliser l'option "Compiler avant l'analyse". Voulez-vous désactiver "Compile on demand"?
-
-NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configuration prenne effet.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>'Compile on demand' est activé</value>
-  </data>
   <data name="Add" xml:space="preserve">
     <value>Ajouter</value>
   </data>
@@ -1246,9 +1151,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="AllReferences_PerformanceWarning" xml:space="preserve">
     <value>La recherche des utilisations de la référence '{0}' renvoie {1} résultats. Les afficher pourrait dégrader la performance. Continuer?</value>
   </data>
-  <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Correction pour l'affichage haute définition</value>
-  </data>
   <data name="References_Locale" xml:space="preserve">
     <value>Langue:</value>
   </data>
@@ -1387,9 +1289,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="SaveAndClose" xml:space="preserve">
     <value>Enregistrer &amp; Fermer</value>
   </data>
-  <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>M'avertir lorsqu'une nouvelle version "pre-release" est disponible.</value>
-  </data>
   <data name="VersionCheck_BuildType_PreRelease" xml:space="preserve">
     <value>pré-diffusion</value>
   </data>
@@ -1614,9 +1513,6 @@ Mise à jour annulée.</value>
 Si une interface privée est nécessaire, veuillez modifier le mode d'instanciation ("instancing") du module de classe pour 'Private'.
 Une classe privée peut toujours implémenter une interface publique.</value>
   </data>
-  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Permettre glisser-déposer dans l'Explorateur de Code</value>
-  </data>
   <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
     <value>Le fichier binaire '{1}' associé à '{0}' est manquant, et le module cible '{2}' n'existe pas déjà dans le projet.
 
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9445c6b439..494d4cf1a2 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -375,9 +375,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Result" xml:space="preserve">
     <value>Result</value>
   </data>
-  <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Display language:</value>
-  </data>
   <data name="Language_EN" xml:space="preserve">
     <value>English</value>
   </data>
@@ -655,15 +652,6 @@ Do you want to proceed with this rename?</value>
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Standard Gap</value>
   </data>
-  <data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
-    <value>Description</value>
-  </data>
-  <data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
-    <value>Enabled</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
-    <value>Key1</value>
-  </data>
   <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
     <value>Align comments with code</value>
   </data>
@@ -751,9 +739,6 @@ Do you want to proceed with this rename?</value>
   <data name="GroupingStyle_ByOutcome" xml:space="preserve">
     <value>By outcome</value>
   </data>
-  <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
-    <value>Hotkeys:</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Search Results</value>
   </data>
@@ -814,18 +799,6 @@ Do you want to proceed with this rename?</value>
   <data name="RubberduckCommandbarRefreshButtonTooltip" xml:space="preserve">
     <value>Parse all opened projects</value>
   </data>
-  <data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
-    <value>Alt</value>
-  </data>
-  <data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
-    <value>Ctrl</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
-    <value>Key2</value>
-  </data>
-  <data name="GeneralSettings_HotkeyShift" xml:space="preserve">
-    <value>Shift</value>
-  </data>
   <data name="CommandDescription_CodeExplorerCommand" xml:space="preserve">
     <value>Code Explorer</value>
   </data>
@@ -868,45 +841,9 @@ Do you want to proceed with this rename?</value>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>library procedure</value>
   </data>
-  <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
-    <value>Folder Delimiter:</value>
-  </data>
-  <data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
-    <value>Period (.)</value>
-  </data>
-  <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Slash (/)</value>
-  </data>
   <data name="Parser_ParserError" xml:space="preserve">
     <value>Parser Errors</value>
   </data>
-  <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Minimum Log Level:</value>
-  </data>
-  <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Debug</value>
-  </data>
-  <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="GeneralSettings_FatalLogLevel" xml:space="preserve">
-    <value>Fatal</value>
-  </data>
-  <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Info</value>
-  </data>
-  <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
-    <value>No Logging</value>
-  </data>
-  <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Trace</value>
-  </data>
-  <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
-    <value>Warn</value>
-  </data>
-  <data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
-    <value>Show Log Folder</value>
-  </data>
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Resolving references...</value>
   </data>
@@ -952,9 +889,6 @@ Do you want to proceed with this rename?</value>
   <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
     <value>Run inspections automatically on successful parse</value>
   </data>
-  <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Show splash screen at startup</value>
-  </data>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Toolwindows were not correctly destroyed and/or could not be recreated; the VBE may not be in a stable state. Rubberduck will load normally next time the VBE is initialized.</value>
   </data>
@@ -1054,9 +988,6 @@ To review the change log and manually upgrade Rubberduck, click 'Yes'.
 This dialog is showing because version checks are enabled. You can turn off this feature in Rubberduck &gt; Settings.</value>
     <comment>{0}=local; {1}=latest; {2}=buildtype (release/pre-release)</comment>
   </data>
-  <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Check if a newer version is available at startup.</value>
-  </data>
   <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
     <value>'{0}' is already accessible to this scope.</value>
     <comment>{0} = proposed variable name.</comment>
@@ -1088,12 +1019,6 @@ This dialog is showing because version checks are enabled. You can turn off this
     <value>Method '{0}' is an implementation of event '{1}.{2}'.  Rename event '{2}' instead?</value>
     <comment>0: Selected target Identifier; 1: Event Parent; 2: Event name</comment>
   </data>
-  <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
-    <value>Only enable these if you know what you're doing. Enabling and/or using features from this section may result in things breaking unexpectedly and irrevocable data loss.</value>
-  </data>
-  <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
-    <value>Experimental Features (Requires a restart to take effect):</value>
-  </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Select a folder to export the source of {0} to:</value>
     <comment>{0} VBProject.Name</comment>
@@ -1145,24 +1070,12 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="CodeMetrics_Nesting" xml:space="preserve">
     <value>Maximum Nesting</value>
   </data>
-  <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
-    <value>Hotkeys should include either Alt and/or Ctrl.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionToolTip" xml:space="preserve">
-    <value>This hotkey configuration may cause undesirable side effects.</value>
-  </data>
-  <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
-    <value>Modifier Warning</value>
-  </data>
   <data name="Command_Reparse_CannotCompile" xml:space="preserve">
     <value>The following project(s) cannot be compiled, which will most likely result in parser errors. Continue anyway? {0}</value>
   </data>
   <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
     <value>Unable to compile for parsing.</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Compile code before parsing</value>
-  </data>
   <data name="ParserState_Started" xml:space="preserve">
     <value>Started</value>
   </data>
@@ -1175,14 +1088,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>Compile On Demand Setting</value>
   </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
-    <value>The VBE setting "Compile On Demand" is currently enabled. It is strongly recommended that you disable the setting via the VBE Options dialog under General tab in order to use the Compile Before Parse feature. Do you want to disable it now?
-
-NOTE: Restart is required for the setting to take effect.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Compile On Demand currently enabled</value>
-  </data>
   <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
     <value>Description:</value>
   </data>
@@ -1377,9 +1282,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>TODO Explorer</value>
   </data>
-  <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Correction for high-resolution display scalings</value>
-  </data>
   <data name="References_BrowseFilterAccess" xml:space="preserve">
     <value>Microsoft Access Databases({0})|{0}</value>
     <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
@@ -1658,9 +1560,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>Unable to suspend the Parser to perform the refactoring operation.</value>
   </data>
-  <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>Tell me if a newer pre-release build is available.</value>
-  </data>
   <data name="VersionCheck_BuildType_PreRelease" xml:space="preserve">
     <value>pre-release</value>
   </data>
@@ -1950,9 +1849,6 @@ Do you want to proceed?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Rename folder</value>
   </data>
-  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Enable drag and drop in Code Explorer</value>
-  </data>
   <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
     <value>Add/Adjust attribute</value>
   </data>

From c743899bfa0332780ca125f8ddf678a1e243d6d6 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 21:13:26 -0700
Subject: [PATCH 26/64] Migrate GroupingGrid_ resources

---
 .../CodeAnalysisUI.Designer.cs                | 18 +++++++++++++
 .../CodeAnalysisUI.cs.resx                    |  6 +++++
 .../CodeAnalysisUI.de.resx                    |  6 +++++
 .../CodeAnalysisUI.es.resx                    |  6 +++++
 .../CodeAnalysisUI.fr.resx                    |  6 +++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx   |  6 +++++
 .../Inspections/InspectionResultsControl.xaml |  4 +--
 Rubberduck.Resources/RubberduckUI.Designer.cs | 27 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.de.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.es.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.resx        |  9 -------
 13 files changed, 50 insertions(+), 74 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index ec5e401a1f..336fba17e1 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -466,5 +466,23 @@ public static string EmptyLineHandling_Remove {
                 return ResourceManager.GetString("EmptyLineHandling_Remove", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Filter.
+        /// </summary>
+        public static string GroupingGrid_Filter {
+            get {
+                return ResourceManager.GetString("GroupingGrid_Filter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Grouping.
+        /// </summary>
+        public static string GroupingGrid_GroupingStyle {
+            get {
+                return ResourceManager.GetString("GroupingGrid_GroupingStyle", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index d487e6d5fa..1b5a8e6663 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -254,4 +254,10 @@ Nalezeno {1} problémů.</value>
   <data name="EmptyLineHandling_Ignore" xml:space="preserve">
     <value>Ignorovat</value>
   </data>
+  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
+    <value>Seskupení</value>
+  </data>
+  <data name="GroupingGrid_Filter" xml:space="preserve">
+    <value>Filtr</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 2893e2e614..0a0f85cd5b 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -254,4 +254,10 @@
   <data name="EmptyLineHandling_Ignore" xml:space="preserve">
     <value>Ignorieren</value>
   </data>
+  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
+    <value>Gruppierung</value>
+  </data>
+  <data name="GroupingGrid_Filter" xml:space="preserve">
+    <value>Filter</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index c815d8c327..0f9d493adf 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -254,4 +254,10 @@
   <data name="EmptyLineHandling_Ignore" xml:space="preserve">
     <value>Ignorar</value>
   </data>
+  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
+    <value>Agrupamiento</value>
+  </data>
+  <data name="GroupingGrid_Filter" xml:space="preserve">
+    <value>Filtro</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index 1209faadef..b43a2251ed 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -254,4 +254,10 @@
   <data name="EmptyLineHandling_Ignore" xml:space="preserve">
     <value>Ignorer</value>
   </data>
+  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
+    <value>Regroupement</value>
+  </data>
+  <data name="GroupingGrid_Filter" xml:space="preserve">
+    <value>Filtrer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index b712b39d86..9fff79ef3e 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -236,4 +236,10 @@
   <data name="EmptyLineHandling_Ignore" xml:space="preserve">
     <value>Ignore</value>
   </data>
+  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
+    <value>Grouping</value>
+  </data>
+  <data name="GroupingGrid_Filter" xml:space="preserve">
+    <value>Filter</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
index 58ab2c361b..70942a9941 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
@@ -121,7 +121,7 @@
 
                 <Separator />
 
-                <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalContentAlignment="Center" />
+                <Label Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=GroupingStyle}" VerticalContentAlignment="Center" />
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
                               ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByInspectionType}"
@@ -151,7 +151,7 @@
 
                 <Image Source="{StaticResource FilterImage}" />
 
-                <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_Filter}" VerticalContentAlignment="Center" />
+                <Label Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=Filter}" VerticalContentAlignment="Center" />
 
                 <controls:SearchBox Width="100"
                                     Text="{Binding InspectionDescriptionFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Delay=400}" />
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 7e39227749..43f2bb4487 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1602,33 +1602,6 @@ public static string Go {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Filter.
-        /// </summary>
-        public static string GroupingGrid_Filter {
-            get {
-                return ResourceManager.GetString("GroupingGrid_Filter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Filter by.
-        /// </summary>
-        public static string GroupingGrid_FilterBy {
-            get {
-                return ResourceManager.GetString("GroupingGrid_FilterBy", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Grouping.
-        /// </summary>
-        public static string GroupingGrid_GroupingStyle {
-            get {
-                return ResourceManager.GetString("GroupingGrid_GroupingStyle", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to By category.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index f124e06bc9..97924a8e07 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -604,9 +604,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="CommandDescription_IndentCurrentProcedureCommand" xml:space="preserve">
     <value>Odsadit Proceduru</value>
   </data>
-  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
-    <value>Seskupení</value>
-  </data>
   <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
     <value>Dle typu inspekce</value>
   </data>
@@ -978,9 +975,6 @@ End Enum</value>
   <data name="InspectionResults_FilterByWarning" xml:space="preserve">
     <value>Varování</value>
   </data>
-  <data name="GroupingGrid_FilterBy" xml:space="preserve">
-    <value>Filtrovat</value>
-  </data>
   <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
     <value>Závažnost:</value>
   </data>
@@ -1159,9 +1153,6 @@ End Enum</value>
   <data name="GroupingStyle_ByName" xml:space="preserve">
     <value>Dle inspekce</value>
   </data>
-  <data name="GroupingGrid_Filter" xml:space="preserve">
-    <value>Filtr</value>
-  </data>
   <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
     <value>Metoda používající '{0}' má již jinou deklaraci '{1}' stejného jména v rozsahu.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 865a58fbf6..885bbbc271 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -576,9 +576,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
     <value>Spezielle Optionen</value>
   </data>
-  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
-    <value>Gruppierung</value>
-  </data>
   <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
     <value>Nach Inspektionstyp</value>
   </data>
@@ -1011,9 +1008,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="InspectionResults_FilterByWarning" xml:space="preserve">
     <value>Warnung</value>
   </data>
-  <data name="GroupingGrid_FilterBy" xml:space="preserve">
-    <value>Filtern nach</value>
-  </data>
   <data name="GroupingStyle_ByCategory" xml:space="preserve">
     <value>Nach Kategorie</value>
   </data>
@@ -1224,9 +1218,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
     <value>Der Typ des Ziels '{0}'ist '{1}' anstatt eines der erwarteten Typen '{2}'.</value>
   </data>
-  <data name="GroupingGrid_Filter" xml:space="preserve">
-    <value>Filter</value>
-  </data>
   <data name="GroupingStyle_ByName" xml:space="preserve">
     <value>Nach Codeuntersuchung</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index b2869817a1..858b33a376 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -603,9 +603,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="CommandDescription_IndentCurrentProcedureCommand" xml:space="preserve">
     <value>Indentar procedimiento</value>
   </data>
-  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
-    <value>Agrupamiento</value>
-  </data>
   <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
     <value>Por tipo de inspección</value>
   </data>
@@ -1025,9 +1022,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="InspectionResults_FilterByWarning" xml:space="preserve">
     <value>Advertencia</value>
   </data>
-  <data name="GroupingGrid_FilterBy" xml:space="preserve">
-    <value>Filtrado por</value>
-  </data>
   <data name="GroupingStyle_ByCategory" xml:space="preserve">
     <value>Por categoria</value>
   </data>
@@ -1217,9 +1211,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
     <value>El método que usa '{0}' ya posee la declaración '{1}' de igual nombre en el ámbito.</value>
   </data>
-  <data name="GroupingGrid_Filter" xml:space="preserve">
-    <value>Filtro</value>
-  </data>
   <data name="GroupingStyle_ByName" xml:space="preserve">
     <value>Por inspección</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index ba33a47a92..875f79bb14 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -540,9 +540,6 @@ Continuer?</value>
   <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
     <value>Raccourcis:</value>
   </data>
-  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
-    <value>Regroupement</value>
-  </data>
   <data name="ParserState_Parsed" xml:space="preserve">
     <value>Analyse complétée</value>
   </data>
@@ -1003,9 +1000,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
     <value>Sévérité:</value>
   </data>
-  <data name="GroupingGrid_FilterBy" xml:space="preserve">
-    <value>Filtrer par</value>
-  </data>
   <data name="GroupingStyle_ByCategory" xml:space="preserve">
     <value>Par catégorie</value>
   </data>
@@ -1183,9 +1177,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
     <value>La procédure qui utilise '{0}' contient déjà une déclaration '{1}' utilisant cet identifiant.</value>
   </data>
-  <data name="GroupingGrid_Filter" xml:space="preserve">
-    <value>Filtrer</value>
-  </data>
   <data name="GroupingStyle_ByName" xml:space="preserve">
     <value>Par inspection</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 25e7312da2..814dbaa46d 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -612,9 +612,6 @@ Do you want to proceed with this rename?</value>
   <data name="CommandDescription_IndentCurrentProcedureCommand" xml:space="preserve">
     <value>Indent Procedure</value>
   </data>
-  <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
-    <value>Grouping</value>
-  </data>
   <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
     <value>By inspection type</value>
   </data>
@@ -1072,9 +1069,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="InspectionResults_FilterByWarning" xml:space="preserve">
     <value>Warning</value>
   </data>
-  <data name="GroupingGrid_FilterBy" xml:space="preserve">
-    <value>Filter by</value>
-  </data>
   <data name="GroupingStyle_ByCategory" xml:space="preserve">
     <value>By category</value>
   </data>
@@ -1326,9 +1320,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>The method using '{0}' already has the declaration '{1}' of the same name in scope.</value>
     <comment>{0}: Variable Name; {1}: name of conflicting declaration</comment>
   </data>
-  <data name="GroupingGrid_Filter" xml:space="preserve">
-    <value>Filter</value>
-  </data>
   <data name="GroupingStyle_ByName" xml:space="preserve">
     <value>By inspection</value>
   </data>

From b7dc32a79e034a575e64448cdf0d0bb7d2815309 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 21:33:54 -0700
Subject: [PATCH 27/64] Migrate GroupingStyle_ resources

---
 Rubberduck.Core/Rubberduck.Core.csproj        |  27 ++++
 .../Inspections/InspectionResultsControl.xaml |   8 +-
 .../InspectionResultsUI.Designer.cs           |  90 ++++++++++++
 .../Inspections/InspectionResultsUI.cs.resx   | 129 ++++++++++++++++++
 .../Inspections/InspectionResultsUI.de.resx   | 129 ++++++++++++++++++
 .../Inspections/InspectionResultsUI.es.resx   | 129 ++++++++++++++++++
 .../Inspections/InspectionResultsUI.fr.resx   | 129 ++++++++++++++++++
 .../UI/Inspections/InspectionResultsUI.resx   | 109 +++++++++++++++
 .../UI/ToDoItems/ToDoExplorerControl.xaml     |   4 +-
 .../UI/ToDoItems/ToDoExplorerUI.Designer.cs   |  72 ++++++++++
 .../UI/ToDoItems/ToDoExplorerUI.cs.resx       | 123 +++++++++++++++++
 .../UI/ToDoItems/ToDoExplorerUI.de.resx       | 123 +++++++++++++++++
 .../UI/ToDoItems/ToDoExplorerUI.es.resx       | 123 +++++++++++++++++
 .../UI/ToDoItems/ToDoExplorerUI.fr.resx       | 123 +++++++++++++++++
 .../UI/ToDoItems/ToDoExplorerUI.resx          | 103 ++++++++++++++
 .../UI/UnitTesting/TestExplorerControl.xaml   |   6 +-
 .../UI/UnitTesting/TestExplorerUI.Designer.cs |  81 +++++++++++
 .../UI/UnitTesting/TestExplorerUI.cs.resx     | 126 +++++++++++++++++
 .../UI/UnitTesting/TestExplorerUI.de.resx     | 126 +++++++++++++++++
 .../UI/UnitTesting/TestExplorerUI.es.resx     | 126 +++++++++++++++++
 .../UI/UnitTesting/TestExplorerUI.fr.resx     | 126 +++++++++++++++++
 .../UI/UnitTesting/TestExplorerUI.resx        | 106 ++++++++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs |  54 --------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  24 +---
 Rubberduck.Resources/RubberduckUI.de.resx     |  24 +---
 Rubberduck.Resources/RubberduckUI.es.resx     |  24 +---
 Rubberduck.Resources/RubberduckUI.fr.resx     |  24 +---
 Rubberduck.Resources/RubberduckUI.resx        |  24 +---
 28 files changed, 2124 insertions(+), 168 deletions(-)
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx
 create mode 100644 Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.Designer.cs
 create mode 100644 Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.cs.resx
 create mode 100644 Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.de.resx
 create mode 100644 Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.es.resx
 create mode 100644 Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.fr.resx
 create mode 100644 Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.resx
 create mode 100644 Rubberduck.Core/UI/UnitTesting/TestExplorerUI.Designer.cs
 create mode 100644 Rubberduck.Core/UI/UnitTesting/TestExplorerUI.cs.resx
 create mode 100644 Rubberduck.Core/UI/UnitTesting/TestExplorerUI.de.resx
 create mode 100644 Rubberduck.Core/UI/UnitTesting/TestExplorerUI.es.resx
 create mode 100644 Rubberduck.Core/UI/UnitTesting/TestExplorerUI.fr.resx
 create mode 100644 Rubberduck.Core/UI/UnitTesting/TestExplorerUI.resx

diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
index 3ec36a358d..d9676250e5 100644
--- a/Rubberduck.Core/Rubberduck.Core.csproj
+++ b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -117,6 +117,11 @@
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>
+    <Compile Update="UI\Inspections\InspectionResultsUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>InspectionResultsUI.resx</DependentUpon>
+    </Compile>
     <Compile Update="UI\Refactorings\AnnotateDeclaration\AnnotateDeclarationView.xaml.cs">
       <DependentUpon>AnnotateDeclarationView.xaml</DependentUpon>
     </Compile>
@@ -134,16 +139,38 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>GeneralSettingsUI.resx</DependentUpon>
     </Compile>
+    <Compile Update="UI\ToDoItems\ToDoExplorerUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ToDoExplorerUI.resx</DependentUpon>
+    </Compile>
+    <Compile Update="UI\UnitTesting\TestExplorerUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>TestExplorerUI.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="UI\Inspections\InspectionResultsUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>InspectionResultsUI.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Update="UI\Settings\GeneralSettingsUI.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>GeneralSettingsUI.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="UI\ToDoItems\ToDoExplorerUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>ToDoExplorerUI.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="UI\UnitTesting\TestExplorerUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>TestExplorerUI.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Update="Properties\Settings.settings">
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
index fb7b6636fe..386d456340 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
@@ -124,25 +124,25 @@
                 <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalContentAlignment="Center" />
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByInspectionType}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=GroupingStyle_ByInspectionType}"
                               IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Type}}">
                     <Image Source="{StaticResource GroupByInspectionTypeImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByName}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=GroupingStyle_ByName}"
                               IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Name}}">
                     <Image Source="{StaticResource GroupByInspectionImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByLocation}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=GroupingStyle_ByLocation}"
                               IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Location}}">
                     <Image Source="{StaticResource GroupByLocationImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_BySeverity}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=GroupingStyle_BySeverity}"
                               IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Severity}}">
                     <Image Source="{StaticResource GroupBySeverityImage}" />
                 </ToggleButton>
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs
new file mode 100644
index 0000000000..b779a46423
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.UI.Inspections {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class InspectionResultsUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal InspectionResultsUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.UI.Inspections.InspectionResultsUI", typeof(InspectionResultsUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to By inspection type.
+        /// </summary>
+        public static string GroupingStyle_ByInspectionType {
+            get {
+                return ResourceManager.GetString("GroupingStyle_ByInspectionType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to By inspection.
+        /// </summary>
+        public static string GroupingStyle_ByName {
+            get {
+                return ResourceManager.GetString("GroupingStyle_ByName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to By severity.
+        /// </summary>
+        public static string GroupingStyle_BySeverity {
+            get {
+                return ResourceManager.GetString("GroupingStyle_BySeverity", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx
new file mode 100644
index 0000000000..77c250d7df
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
+    <value>Dle typu inspekce</value>
+  </data>
+  <data name="GroupingStyle_ByName" xml:space="preserve">
+    <value>Dle inspekce</value>
+  </data>
+  <data name="GroupingStyle_BySeverity" xml:space="preserve">
+    <value>Dle závažnosti</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx
new file mode 100644
index 0000000000..2907aa70c1
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
+    <value>Nach Inspektionstyp</value>
+  </data>
+  <data name="GroupingStyle_ByName" xml:space="preserve">
+    <value>Nach Codeuntersuchung</value>
+  </data>
+  <data name="GroupingStyle_BySeverity" xml:space="preserve">
+    <value>Nach Schweregrad</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx
new file mode 100644
index 0000000000..7b34f9bfa9
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
+    <value>Por tipo de inspección</value>
+  </data>
+  <data name="GroupingStyle_ByName" xml:space="preserve">
+    <value>Por inspección</value>
+  </data>
+  <data name="GroupingStyle_BySeverity" xml:space="preserve">
+    <value>Por severidad</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx
new file mode 100644
index 0000000000..46142b1dbe
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
+    <value>Par type d'inspection</value>
+  </data>
+  <data name="GroupingStyle_ByName" xml:space="preserve">
+    <value>Par inspection</value>
+  </data>
+  <data name="GroupingStyle_BySeverity" xml:space="preserve">
+    <value>Par sévérité</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx
new file mode 100644
index 0000000000..f36479d708
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
+    <value>By inspection type</value>
+  </data>
+  <data name="GroupingStyle_ByName" xml:space="preserve">
+    <value>By inspection</value>
+  </data>
+  <data name="GroupingStyle_BySeverity" xml:space="preserve">
+    <value>By severity</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
index c585a9c707..c9c3766842 100644
--- a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
@@ -63,13 +63,13 @@
                 <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalContentAlignment="Center" />
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByMarker}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.ToDoItems.ToDoExplorerUI, Key=GroupingStyle_ByMarker}"
                               IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupByMarkerConverter}, ConverterParameter={x:Static toDoItems:ToDoItemGrouping.Marker}}">
                     <Image Source="{StaticResource GroupByMarkerImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByLocation}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.ToDoItems.ToDoExplorerUI, Key=GroupingStyle_ByLocation}"
                               IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupByLocationConverter}, ConverterParameter={x:Static toDoItems:ToDoItemGrouping.Location}}">
                     <Image Source="{StaticResource GroupByLocationImage}" />
                 </ToggleButton>
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.Designer.cs b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.Designer.cs
new file mode 100644
index 0000000000..4f0cba8fae
--- /dev/null
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.Designer.cs
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.UI.ToDoItems {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class ToDoExplorerUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal ToDoExplorerUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.UI.ToDoItems.ToDoExplorerUI", typeof(ToDoExplorerUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to By marker.
+        /// </summary>
+        public static string GroupingStyle_ByMarker {
+            get {
+                return ResourceManager.GetString("GroupingStyle_ByMarker", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.cs.resx b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.cs.resx
new file mode 100644
index 0000000000..c9582b48e8
--- /dev/null
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.cs.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByMarker" xml:space="preserve">
+    <value>Dle značky</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.de.resx b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.de.resx
new file mode 100644
index 0000000000..fba2b2f7ec
--- /dev/null
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.de.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByMarker" xml:space="preserve">
+    <value>Nach Markierung</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.es.resx b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.es.resx
new file mode 100644
index 0000000000..aeebb59b82
--- /dev/null
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.es.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByMarker" xml:space="preserve">
+    <value>Por marcador</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.fr.resx b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.fr.resx
new file mode 100644
index 0000000000..efc59bcd77
--- /dev/null
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.fr.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByMarker" xml:space="preserve">
+    <value>Par marqueur</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.resx b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.resx
new file mode 100644
index 0000000000..cd1cfda5d1
--- /dev/null
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerUI.resx
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByMarker" xml:space="preserve">
+    <value>By marker</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
index 27a910a09c..f25e39636e 100644
--- a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
@@ -186,19 +186,19 @@
                 <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalContentAlignment="Center" />
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByOutcome}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.UnitTesting.TestExplorerUI, Key=GroupingStyle_ByOutcome}"
                               IsChecked="{Binding Path=TestGrouping, Converter={StaticResource OutcomeConverter}, ConverterParameter={x:Static local:TestExplorerGrouping.Outcome}}">
                     <Image Source="{StaticResource GroupByOutcomeImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByLocation}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.UnitTesting.TestExplorerUI, Key=GroupingStyle_ByLocation}"
                               IsChecked="{Binding Path=TestGrouping, Converter={StaticResource LocationConverter}, ConverterParameter={x:Static local:TestExplorerGrouping.Location}}">
                     <Image Source="{StaticResource GroupByLocationImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByCategory}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.UnitTesting.TestExplorerUI, Key=GroupingStyle_ByCategory}"
                               IsChecked="{Binding Path=TestGrouping, Converter={StaticResource CategoryConverter}, ConverterParameter={x:Static local:TestExplorerGrouping.Category}}">
                     <Image Source="{StaticResource GroupByCategoryImage}" />
                 </ToggleButton>
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.Designer.cs b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.Designer.cs
new file mode 100644
index 0000000000..424f60bd1f
--- /dev/null
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.UI.UnitTesting {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class TestExplorerUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal TestExplorerUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.UI.UnitTesting.TestExplorerUI", typeof(TestExplorerUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to By category.
+        /// </summary>
+        public static string GroupingStyle_ByCategory {
+            get {
+                return ResourceManager.GetString("GroupingStyle_ByCategory", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to By outcome.
+        /// </summary>
+        public static string GroupingStyle_ByOutcome {
+            get {
+                return ResourceManager.GetString("GroupingStyle_ByOutcome", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.cs.resx b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.cs.resx
new file mode 100644
index 0000000000..71802d8010
--- /dev/null
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.cs.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByCategory" xml:space="preserve">
+    <value>Dle kategorie</value>
+  </data>
+  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
+    <value>Dle výsledku</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.de.resx b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.de.resx
new file mode 100644
index 0000000000..608eb912bf
--- /dev/null
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.de.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByCategory" xml:space="preserve">
+    <value>Nach Kategorie</value>
+  </data>
+  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
+    <value>Nach Ergebnis</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.es.resx b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.es.resx
new file mode 100644
index 0000000000..b610357e5b
--- /dev/null
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.es.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByCategory" xml:space="preserve">
+    <value>Por categoria</value>
+  </data>
+  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
+    <value>Por resultado</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.fr.resx b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.fr.resx
new file mode 100644
index 0000000000..a2a4ff86b1
--- /dev/null
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.fr.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByCategory" xml:space="preserve">
+    <value>Par catégorie</value>
+  </data>
+  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
+    <value>Par résultat</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.resx b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.resx
new file mode 100644
index 0000000000..4017bae5c6
--- /dev/null
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerUI.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="GroupingStyle_ByCategory" xml:space="preserve">
+    <value>By category</value>
+  </data>
+  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
+    <value>By outcome</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 7e3124ea40..ce837cefb5 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1845,24 +1845,6 @@ public static string GroupingGrid_GroupingStyle {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to By category.
-        /// </summary>
-        public static string GroupingStyle_ByCategory {
-            get {
-                return ResourceManager.GetString("GroupingStyle_ByCategory", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to By inspection type.
-        /// </summary>
-        public static string GroupingStyle_ByInspectionType {
-            get {
-                return ResourceManager.GetString("GroupingStyle_ByInspectionType", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to By location.
         /// </summary>
@@ -1872,42 +1854,6 @@ public static string GroupingStyle_ByLocation {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to By marker.
-        /// </summary>
-        public static string GroupingStyle_ByMarker {
-            get {
-                return ResourceManager.GetString("GroupingStyle_ByMarker", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to By inspection.
-        /// </summary>
-        public static string GroupingStyle_ByName {
-            get {
-                return ResourceManager.GetString("GroupingStyle_ByName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to By outcome.
-        /// </summary>
-        public static string GroupingStyle_ByOutcome {
-            get {
-                return ResourceManager.GetString("GroupingStyle_ByOutcome", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to By severity.
-        /// </summary>
-        public static string GroupingStyle_BySeverity {
-            get {
-                return ResourceManager.GetString("GroupingStyle_BySeverity", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Home.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 9f7acc0a20..643a4d217f 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -704,15 +704,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Seskupení</value>
   </data>
-  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
-    <value>Dle typu inspekce</value>
-  </data>
-  <data name="GroupingStyle_ByLocation" xml:space="preserve">
-    <value>Dle lokace</value>
-  </data>
-  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
-    <value>Dle výsledku</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Výsledky Hledání</value>
   </data>
@@ -788,9 +779,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="CommandDescription_ReparseCommand" xml:space="preserve">
     <value>Obnovit stav parseru</value>
   </data>
-  <data name="GroupingStyle_ByMarker" xml:space="preserve">
-    <value>Dle značky</value>
-  </data>
   <data name="Parser_ParserError" xml:space="preserve">
     <value>Chyby Parseru</value>
   </data>
@@ -1029,9 +1017,6 @@ End Enum</value>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Zaneprázdněný</value>
   </data>
-  <data name="GroupingStyle_ByCategory" xml:space="preserve">
-    <value>Dle kategorie</value>
-  </data>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignoruj prázdné řádky při vyhledávání prvních poznámek a deklaračních bloků</value>
   </data>
@@ -1231,12 +1216,6 @@ End Enum</value>
   <data name="InspectionResults_ExpandAll" xml:space="preserve">
     <value>Rozbalit vše</value>
   </data>
-  <data name="GroupingStyle_BySeverity" xml:space="preserve">
-    <value>Dle závažnosti</value>
-  </data>
-  <data name="GroupingStyle_ByName" xml:space="preserve">
-    <value>Dle inspekce</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
@@ -1621,4 +1600,7 @@ Chcete pokračovat?</value>
   <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
     <value>Obalit Pole Privátním Typem</value>
   </data>
+  <data name="GroupingStyle_ByLocation" xml:space="preserve">
+    <value>Dle lokace</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 06dce129a8..d1cfffe657 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -692,15 +692,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Gruppierung</value>
   </data>
-  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
-    <value>Nach Inspektionstyp</value>
-  </data>
-  <data name="GroupingStyle_ByLocation" xml:space="preserve">
-    <value>Nach Ort</value>
-  </data>
-  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
-    <value>Nach Ergebnis</value>
-  </data>
   <data name="Settings" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
@@ -767,9 +758,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="CommonHotkey_KeyNotRegistered" xml:space="preserve">
     <value>Hotkey ({0}) ist nicht registriert.</value>
   </data>
-  <data name="GroupingStyle_ByMarker" xml:space="preserve">
-    <value>Nach Markierung</value>
-  </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>Bibliotheksprozedur</value>
   </data>
@@ -1086,9 +1074,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtern nach</value>
   </data>
-  <data name="GroupingStyle_ByCategory" xml:space="preserve">
-    <value>Nach Kategorie</value>
-  </data>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Leerzeilen bei der Suche nach dem ersten Kommentar und nach Deklarationsblöcken ignorieren</value>
   </data>
@@ -1305,12 +1290,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
-  <data name="GroupingStyle_ByName" xml:space="preserve">
-    <value>Nach Codeuntersuchung</value>
-  </data>
-  <data name="GroupingStyle_BySeverity" xml:space="preserve">
-    <value>Nach Schweregrad</value>
-  </data>
   <data name="InspectionResults_CollapseAll" xml:space="preserve">
     <value>Alle einklappen</value>
   </data>
@@ -1662,4 +1641,7 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
     <value>Sichtbarkeit</value>
   </data>
+  <data name="GroupingStyle_ByLocation" xml:space="preserve">
+    <value>Nach Ort</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index f38d04d940..75448fb28a 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -721,15 +721,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Agrupamiento</value>
   </data>
-  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
-    <value>Por tipo de inspección</value>
-  </data>
-  <data name="GroupingStyle_ByLocation" xml:space="preserve">
-    <value>Por localizacion</value>
-  </data>
-  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
-    <value>Por resultado</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Resultados de la búsqueda</value>
   </data>
@@ -826,9 +817,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="CommandDescription_ReparseCommand" xml:space="preserve">
     <value>Actualizar el estado del analizador</value>
   </data>
-  <data name="GroupingStyle_ByMarker" xml:space="preserve">
-    <value>Por marcador</value>
-  </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>biblioteca de procedimientos</value>
   </data>
@@ -1105,9 +1093,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtrado por</value>
   </data>
-  <data name="GroupingStyle_ByCategory" xml:space="preserve">
-    <value>Por categoria</value>
-  </data>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignore las líneas vacías al ubicar los bloques de primer comentario y declaración</value>
   </data>
@@ -1303,12 +1288,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtro</value>
   </data>
-  <data name="GroupingStyle_ByName" xml:space="preserve">
-    <value>Por inspección</value>
-  </data>
-  <data name="GroupingStyle_BySeverity" xml:space="preserve">
-    <value>Por severidad</value>
-  </data>
   <data name="InspectionResults_CollapseAll" xml:space="preserve">
     <value>Colapsar todo</value>
   </data>
@@ -1696,4 +1675,7 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
     <value>Nueva carpeta completa:</value>
   </data>
+  <data name="GroupingStyle_ByLocation" xml:space="preserve">
+    <value>Por localizacion</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 54281573dc..1cfd2b55e9 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -651,9 +651,6 @@ Continuer?</value>
   <data name="ParserState_Parsed" xml:space="preserve">
     <value>Analyse complétée</value>
   </data>
-  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
-    <value>Par résultat</value>
-  </data>
   <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
     <value>Aligner les options</value>
   </data>
@@ -690,9 +687,6 @@ Continuer?</value>
   <data name="RubberduckCommandbarRefreshButtonTooltip" xml:space="preserve">
     <value>Analyser tous les projets ouverts</value>
   </data>
-  <data name="GroupingStyle_ByLocation" xml:space="preserve">
-    <value>Par emplacement</value>
-  </data>
   <data name="CommonHotkey_KeyNotRegistered" xml:space="preserve">
     <value>La combinaison ({0}) n'est pas enregistrée.</value>
   </data>
@@ -741,9 +735,6 @@ Continuer?</value>
   <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
     <value>Indenter le contenu entier de la procédure</value>
   </data>
-  <data name="GroupingStyle_ByMarker" xml:space="preserve">
-    <value>Par marqueur</value>
-  </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>la procédure externe</value>
   </data>
@@ -771,9 +762,6 @@ Continuer?</value>
   <data name="Rubberduck" xml:space="preserve">
     <value>Rubberduck</value>
   </data>
-  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
-    <value>Par type d'inspection</value>
-  </data>
   <data name="ParserState_Parsing" xml:space="preserve">
     <value>Analyse…</value>
   </data>
@@ -1082,9 +1070,6 @@ les projets dans le VBE.</value>
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtrer par</value>
   </data>
-  <data name="GroupingStyle_ByCategory" xml:space="preserve">
-    <value>Par catégorie</value>
-  </data>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignorer les lignes vides lors de la recherche du premier bloc de commentaire ou de déclarations</value>
   </data>
@@ -1268,12 +1253,6 @@ les projets dans le VBE.</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtrer</value>
   </data>
-  <data name="GroupingStyle_ByName" xml:space="preserve">
-    <value>Par inspection</value>
-  </data>
-  <data name="GroupingStyle_BySeverity" xml:space="preserve">
-    <value>Par sévérité</value>
-  </data>
   <data name="InspectionResults_CollapseAll" xml:space="preserve">
     <value>Réduire tout</value>
   </data>
@@ -1602,4 +1581,7 @@ Procéder?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renommer le dossier</value>
   </data>
+  <data name="GroupingStyle_ByLocation" xml:space="preserve">
+    <value>Par emplacement</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 494d4cf1a2..c30ec3ac84 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -730,15 +730,6 @@ Do you want to proceed with this rename?</value>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Grouping</value>
   </data>
-  <data name="GroupingStyle_ByInspectionType" xml:space="preserve">
-    <value>By inspection type</value>
-  </data>
-  <data name="GroupingStyle_ByLocation" xml:space="preserve">
-    <value>By location</value>
-  </data>
-  <data name="GroupingStyle_ByOutcome" xml:space="preserve">
-    <value>By outcome</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Search Results</value>
   </data>
@@ -835,9 +826,6 @@ Do you want to proceed with this rename?</value>
   <data name="CommandDescription_ReparseCommand" xml:space="preserve">
     <value>Refresh parser state</value>
   </data>
-  <data name="GroupingStyle_ByMarker" xml:space="preserve">
-    <value>By marker</value>
-  </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>library procedure</value>
   </data>
@@ -1152,9 +1140,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filter by</value>
   </data>
-  <data name="GroupingStyle_ByCategory" xml:space="preserve">
-    <value>By category</value>
-  </data>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignore empty lines when locating first comment and declaration blocks</value>
   </data>
@@ -1412,12 +1397,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
-  <data name="GroupingStyle_ByName" xml:space="preserve">
-    <value>By inspection</value>
-  </data>
-  <data name="GroupingStyle_BySeverity" xml:space="preserve">
-    <value>By severity</value>
-  </data>
   <data name="InspectionResults_CollapseAll" xml:space="preserve">
     <value>Collapse all</value>
   </data>
@@ -1855,4 +1834,7 @@ Do you want to proceed?</value>
   <data name="TestOutcome_Ignored" xml:space="preserve">
     <value>Ignored</value>
   </data>
+  <data name="GroupingStyle_ByLocation" xml:space="preserve">
+    <value>By location</value>
+  </data>
 </root>
\ No newline at end of file

From c426b644892e033742da6c2559d806c0c9a1c47b Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 21:47:57 -0700
Subject: [PATCH 28/64] Migrate ImplementInterface resources

---
 .../ImplementInterfaceFailedNotifier.cs       |  5 ++--
 .../RefactoringsUI.Designer.cs                | 18 +++++++++++++
 .../RefactoringsUI.cs.resx                    |  6 +++++
 .../RefactoringsUI.de.resx                    |  6 +++++
 .../RefactoringsUI.es.resx                    |  6 +++++
 .../RefactoringsUI.fr.resx                    |  6 +++++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  6 +++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 27 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.de.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.es.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.resx        |  9 -------
 13 files changed, 51 insertions(+), 74 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs
index fd1ff7471c..b7642f3e06 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.ImplementInterface;
 
@@ -11,7 +12,7 @@ public ImplementInterfaceFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.ImplementInterface_Caption;
+        protected override string Caption => RefactoringsUI.ImplementInterface_Caption;
 
         protected override string Message(RefactoringException exception)
         {
@@ -19,7 +20,7 @@ protected override string Message(RefactoringException exception)
             {
                 case NoImplementsStatementSelectedException noImplementsStatementSelected:
                     Logger.Warn(noImplementsStatementSelected);
-                    return Resources.RubberduckUI.ImplementInterfaceFailed_NoImplementsStatementSelected;
+                    return RefactoringsUI.ImplementInterfaceFailed_NoImplementsStatementSelected;
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
                     return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 19b43b2e49..6eea9395f9 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -610,5 +610,23 @@ public static string ExtractMethod_TitleText {
                 return ResourceManager.GetString("ExtractMethod_TitleText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Implement Interface.
+        /// </summary>
+        public static string ImplementInterface_Caption {
+            get {
+                return ResourceManager.GetString("ImplementInterface_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No implements selected..
+        /// </summary>
+        public static string ImplementInterfaceFailed_NoImplementsStatementSelected {
+            get {
+                return ResourceManager.GetString("ImplementInterfaceFailed_NoImplementsStatementSelected", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 4b3fce71e3..6697af4d7f 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -296,4 +296,10 @@ Privání třída může stále implementovat public (veřejný) interface.</val
   <data name="ExtractMethod_TitleText" xml:space="preserve">
     <value>Extrahovat metodu</value>
   </data>
+  <data name="ImplementInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Implementovat Rozhraní</value>
+  </data>
+  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
+    <value>Nebyl vybrán žádný příkaz implementace.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 720f866543..cb3d1ff386 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -302,4 +302,10 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="ExtractMethod_TitleText" xml:space="preserve">
     <value>Methode extrahieren</value>
   </data>
+  <data name="ImplementInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Interface Implementieren</value>
+  </data>
+  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
+    <value>Es ist keine Implements-Anweisung ausgewählt.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 3d9ea5d247..3a65bee59c 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -296,4 +296,10 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="ExtractMethod_TitleText" xml:space="preserve">
     <value>Extraer procedimiento</value>
   </data>
+  <data name="ImplementInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Implementar interfaz</value>
+  </data>
+  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
+    <value>No se seleccionaron implementaciones.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 51445f10b8..46bbfb04b6 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -278,4 +278,10 @@ Une classe privée peut toujours implémenter une interface publique.</value>
   <data name="ExtractMethod_TitleText" xml:space="preserve">
     <value>Extraction d'une méthode</value>
   </data>
+  <data name="ImplementInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Implémenter une interface</value>
+  </data>
+  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
+    <value>Une instruction 'Implements' doit être sélectionnée.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index a426cbc96e..9fa8ffee10 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -289,4 +289,10 @@ A private class can still implement a public interface.</value>
   <data name="ExtractMethod_TitleText" xml:space="preserve">
     <value>Extract method</value>
   </data>
+  <data name="ImplementInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Implement Interface</value>
+  </data>
+  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
+    <value>No implements selected.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 43ee1b6afd..b5cb4c553f 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1684,33 +1684,6 @@ public static System.Drawing.Bitmap hourglass {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Implement Interface.
-        /// </summary>
-        public static string ImplementInterface_Caption {
-            get {
-                return ResourceManager.GetString("ImplementInterface_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The current selection is not valid..
-        /// </summary>
-        public static string ImplementInterface_InvalidSelectionMessage {
-            get {
-                return ResourceManager.GetString("ImplementInterface_InvalidSelectionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No implements selected..
-        /// </summary>
-        public static string ImplementInterfaceFailed_NoImplementsStatementSelected {
-            get {
-                return ResourceManager.GetString("ImplementInterfaceFailed_NoImplementsStatementSelected", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to For file &apos;{0}&apos;, the required binary file(s) &apos;{1}&apos; are missing and the target component &apos;{2}&apos; does not already exists.
         ///
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index c9367f3f11..e9e3ad5dcc 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -590,12 +590,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
     <value>Metoda '{0}' implementuje '{1}.{2}'. Změnit podpis rozhraní? (Rozšíří se na všechny implementace.)</value>
   </data>
-  <data name="ImplementInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Implementovat Rozhraní</value>
-  </data>
-  <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
-    <value>Aktuální výběr není platný.</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Vážnost:</value>
   </data>
@@ -1284,9 +1278,6 @@ End Enum</value>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
     <value>Cílová deklarace je 'Null'.</value>
   </data>
-  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
-    <value>Nebyl vybrán žádný příkaz implementace.</value>
-  </data>
   <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
     <value>Cílový control '{0}' nebyl nalezen.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index da5e6f6bc3..4fb97eac45 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -542,12 +542,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Ungültige Auswahl.</value>
   </data>
-  <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
-    <value>Die aktuelle Auswahl ist ungültig.</value>
-  </data>
-  <data name="ImplementInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Interface Implementieren</value>
-  </data>
   <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
     <value>Anzeigesprache:</value>
   </data>
@@ -1319,9 +1313,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
     <value>Der Typ des Ziels '{0}'ist '{1}' anstatt des erwarteten Typs '{2}'.</value>
   </data>
-  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
-    <value>Es ist keine Implements-Anweisung ausgewählt.</value>
-  </data>
   <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
     <value>Das Ziel '{0}' ist bereits ein Feld.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 61f3f34012..b022505e30 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -556,12 +556,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
     <value>El método '{0}' implementa '{1}. {2}'. ¿Cambiar la firma de la interfaz? (Se propagará a todas las implementaciones.)</value>
     <comment>0: objetivo seleccionado; 1: nombre de la interfaz; 2: nombre del miembro de la interfaz</comment>
   </data>
-  <data name="ImplementInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Implementar interfaz</value>
-  </data>
-  <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
-    <value>La selección actual no es válida.</value>
-  </data>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Selección invalida.</value>
   </data>
@@ -1409,9 +1403,6 @@ Importación cancelada.</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renombrar carpeta</value>
   </data>
-  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
-    <value>No se seleccionaron implementaciones.</value>
-  </data>
   <data name="RegexAssistant_SpelledOut_CarriageReturn" xml:space="preserve">
     <value>retorno-carro</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 60ff711a7d..c8d56e5540 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -510,9 +510,6 @@ Continuer?</value>
   <data name="RegexSearchReplace_SearchLabel" xml:space="preserve">
     <value>Rechercher:</value>
   </data>
-  <data name="ImplementInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Implémenter une interface</value>
-  </data>
   <data name="RegexSearchReplace_ReplaceLabel" xml:space="preserve">
     <value>Remplacement:</value>
   </data>
@@ -534,9 +531,6 @@ Continuer?</value>
   <data name="RegexSearchReplaceScope_AllOpenProjects" xml:space="preserve">
     <value>Tous les projets ouverts</value>
   </data>
-  <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
-    <value>La sélection courante n'est pas valide pour cette opération.</value>
-  </data>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>La sélection n'est pas une variable.</value>
   </data>
@@ -1351,9 +1345,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
     <value>Le type de déclaration de la cible '{0}' est '{1}', plutôt que '{2}' tel qu'attendu.</value>
   </data>
-  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
-    <value>Une instruction 'Implements' doit être sélectionnée.</value>
-  </data>
   <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
     <value>La cible '{0}' est déjà un champ.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 205c3d271e..80df15e9b3 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -559,12 +559,6 @@ Do you want to proceed with this rename?</value>
     <value>Method '{0}' implements '{1}.{2}'. Change interface signature? (Will propagate to all implementations.)</value>
     <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
   </data>
-  <data name="ImplementInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Implement Interface</value>
-  </data>
-  <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
-    <value>The current selection is not valid.</value>
-  </data>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Invalid Selection.</value>
   </data>
@@ -1492,9 +1486,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>Declaration type of target '{0}' is '{1}' instead of the expected '{2}'.</value>
     <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration type</comment>
   </data>
-  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
-    <value>No implements selected.</value>
-  </data>
   <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
     <value>The target '{0}' is already a field.</value>
     <comment>{0}: name of target</comment>

From 68ddf529d900034a0b7c30a9b4d7c9b7d58f592e Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 22:04:00 -0700
Subject: [PATCH 29/64] Migrate ImportCommand_ resources

---
 .../UI/CodeExplorer/Commands/ImportCommand.cs | 17 ++--
 .../CodeExplorer/CodeExplorerUI.Designer.cs   | 82 +++++++++++++++++++
 .../CodeExplorer/CodeExplorerUI.cs.resx       | 34 ++++++++
 .../CodeExplorer/CodeExplorerUI.de.resx       | 34 ++++++++
 .../CodeExplorer/CodeExplorerUI.es.resx       | 34 ++++++++
 .../CodeExplorer/CodeExplorerUI.fr.resx       | 34 ++++++++
 .../CodeExplorer/CodeExplorerUI.resx          | 39 +++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 82 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 34 --------
 Rubberduck.Resources/RubberduckUI.de.resx     | 34 --------
 Rubberduck.Resources/RubberduckUI.es.resx     | 34 --------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 27 +-----
 Rubberduck.Resources/RubberduckUI.resx        | 39 ---------
 13 files changed, 269 insertions(+), 255 deletions(-)

diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
index 7327f39adc..f9d424b7b4 100644
--- a/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
+++ b/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
@@ -10,6 +10,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.VBA.DeclarationCaching;
 using Rubberduck.Resources;
+using Rubberduck.Resources.CodeExplorer;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.Events;
@@ -157,8 +158,8 @@ protected virtual ICollection<string> FilesToImport(object parameter)
                 dialog.ShowHelp = false;
                 dialog.Title = DialogsTitle;
                 dialog.Filter =
-                    $"{RubberduckUI.ImportCommand_OpenDialog_Filter_VBFiles} ({FilterExtension})|{FilterExtension}|" +
-                    $"{RubberduckUI.ImportCommand_OpenDialog_Filter_AllFiles}, (*.*)|*.*";
+                    $"{CodeExplorerUI.ImportCommand_OpenDialog_Filter_VBFiles} ({FilterExtension})|{FilterExtension}|" +
+                    $"{CodeExplorerUI.ImportCommand_OpenDialog_Filter_AllFiles}, (*.*)|*.*";
 
                 if (dialog.ShowDialog() != DialogResult.OK)
                 {
@@ -177,14 +178,14 @@ protected virtual ICollection<string> FilesToImport(object parameter)
             }
         }
 
-        protected virtual string DialogsTitle => RubberduckUI.ImportCommand_OpenDialog_Title;
+        protected virtual string DialogsTitle => CodeExplorerUI.ImportCommand_OpenDialog_Title;
 
         //TODO: Gather all conflicts and report them in one error dialog instead of reporting them one at a time.
         private void NotifyUserAboutAbortDueToUnsupportedFileExtensions(IEnumerable<string> fileNames)
         {
             var firstUnsupportedFile = fileNames.First(filename => !ImportableExtensions.Contains(Path.GetExtension(filename)));
             var unsupportedFileName = Path.GetFileName(firstUnsupportedFile);
-            var message = string.Format(RubberduckUI.ImportCommand_UnsupportedFileExtensions, unsupportedFileName);
+            var message = string.Format(CodeExplorerUI.ImportCommand_UnsupportedFileExtensions, unsupportedFileName);
             MessageBox.NotifyWarn(message, DialogsTitle);
         }
 
@@ -452,7 +453,7 @@ private void NotifyUserAboutAbortDueToDuplicateComponent(IDictionary<string, str
                 .GroupBy(kvp => kvp.Value)
                 .First(moduleNameGroup => moduleNameGroup.Count() > 1)
                 .Key;
-            var message = string.Format(RubberduckUI.ImportCommand_DuplicateModule, firstDuplicateModuleName);
+            var message = string.Format(CodeExplorerUI.ImportCommand_DuplicateModule, firstDuplicateModuleName);
             MessageBox.NotifyWarn(message, DialogsTitle);
         }
 
@@ -475,7 +476,7 @@ private void NotifyUserAboutAbortDueToNonExistingDocument(ICollection<string> do
             var firstNonExistingDocumentFilename = documentFiles.First(filename => !existingModules.ContainsKey(filename));
             var firstNonExistingDocumentModuleName = moduleNames[firstNonExistingDocumentFilename];
             var message = string.Format(
-                RubberduckUI.ImportCommand_DocumentDoesNotExist,
+                CodeExplorerUI.ImportCommand_DocumentDoesNotExist,
                 firstNonExistingDocumentModuleName,
                 firstNonExistingDocumentFilename);
             MessageBox.NotifyWarn(message, DialogsTitle);
@@ -486,7 +487,7 @@ private void NotifyUserAboutAbortDueToNonExistingBinaryFile(ICollection<string>
             var firstFilenameForFileWithoutBinaryAndComponent = filesWithoutBinary.First();
             var missingBinariesOfFirstFilenameWithoutBinaryAndComponent = string.Join(", ", missingBinaries[firstFilenameForFileWithoutBinaryAndComponent]);
             var message = string.Format(
-                RubberduckUI.ImportCommand_BinaryDoesNotExist,
+                CodeExplorerUI.ImportCommand_BinaryDoesNotExist,
                 firstFilenameForFileWithoutBinaryAndComponent,
                 missingBinariesOfFirstFilenameWithoutBinaryAndComponent);
             MessageBox.NotifyWarn(message, DialogsTitle);
@@ -498,7 +499,7 @@ private void NotifyUserAboutAbortDueToNonExistingBinaryFileAndComponent(ICollect
             var moduleNameOfFirstFilenameWithoutBinaryAndComponent = moduleNames[firstFilenameForFileWithoutBinaryAndComponent];
             var missingBinariesOfFirstFilenameWithoutBinaryAndComponent = string.Join("', '", missingBinaries[firstFilenameForFileWithoutBinaryAndComponent]);
             var message = string.Format(
-                RubberduckUI.ImportCommand_BinaryAndComponentDoNotExist,
+                CodeExplorerUI.ImportCommand_BinaryAndComponentDoNotExist,
                 firstFilenameForFileWithoutBinaryAndComponent,
                 moduleNameOfFirstFilenameWithoutBinaryAndComponent,
                 missingBinariesOfFirstFilenameWithoutBinaryAndComponent);
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
index 1f58086ca7..f2bded625d 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
@@ -788,6 +788,88 @@ public static System.Drawing.Bitmap FolderOpen {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to For file &apos;{0}&apos;, the required binary file(s) &apos;{1}&apos; are missing and the target component &apos;{2}&apos; does not already exists.
+        ///
+        ///Import aborted..
+        /// </summary>
+        public static string ImportCommand_BinaryAndComponentDoNotExist {
+            get {
+                return ResourceManager.GetString("ImportCommand_BinaryAndComponentDoNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to For file &apos;{0}&apos;, the requires binary file(s) &apos;{1}&apos; are missing.
+        ///
+        ///Import aborted..
+        /// </summary>
+        public static string ImportCommand_BinaryDoesNotExist {
+            get {
+                return ResourceManager.GetString("ImportCommand_BinaryDoesNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to There is no existing document module with name &apos;{0}&apos;; file &apos;{1}&apos; cannot be imported.
+        ///
+        ///Import aborted..
+        /// </summary>
+        public static string ImportCommand_DocumentDoesNotExist {
+            get {
+                return ResourceManager.GetString("ImportCommand_DocumentDoesNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Multiple files contain code for the component &apos;{0}&apos;.
+        ///
+        ///Import aborted..
+        /// </summary>
+        public static string ImportCommand_DuplicateModule {
+            get {
+                return ResourceManager.GetString("ImportCommand_DuplicateModule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to All Files.
+        /// </summary>
+        public static string ImportCommand_OpenDialog_Filter_AllFiles {
+            get {
+                return ResourceManager.GetString("ImportCommand_OpenDialog_Filter_AllFiles", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to VB Files.
+        /// </summary>
+        public static string ImportCommand_OpenDialog_Filter_VBFiles {
+            get {
+                return ResourceManager.GetString("ImportCommand_OpenDialog_Filter_VBFiles", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Import Source Files.
+        /// </summary>
+        public static string ImportCommand_OpenDialog_Title {
+            get {
+                return ResourceManager.GetString("ImportCommand_OpenDialog_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The extension of the file &apos;{0}&apos; is not supported.
+        ///
+        ///Import aborted..
+        /// </summary>
+        public static string ImportCommand_UnsupportedFileExtensions {
+            get {
+                return ResourceManager.GetString("ImportCommand_UnsupportedFileExtensions", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.cs.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.cs.resx
index 8b22f190dd..7db6d9a1b4 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.cs.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.cs.resx
@@ -334,4 +334,38 @@ Pokračovat?</value>
   <data name="CodeExplorer_Annotate" xml:space="preserve">
     <value>Okomentovat</value>
   </data>
+  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
+    <value>Neexistuje žádný modul dokumentu s názvem '{0}'; soubor '{1}' nelze importovat.
+
+Import přerušen.</value>
+  </data>
+  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
+    <value>Pro soubor '{0}' chybí požadované binární soubor(y) '{1}' a cílová komponenta '{2}' ještě neexistuje.
+
+Import přerušen.</value>
+  </data>
+  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
+    <value>U souboru '{0}' chybí požadované binární soubory '{1}'.
+
+Import přerušen.</value>
+  </data>
+  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
+    <value>Kód pro komponentu '{0}' obsahuje více souborů.
+
+Import přerušen.</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
+    <value>Všechny Soubory</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
+    <value>VB Soubory</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
+    <value>Importovat Zdrojové Soubory</value>
+  </data>
+  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
+    <value>Přípona souboru '{0}' není podporována.
+
+Import přerušen.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.de.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.de.resx
index 4b9ec95609..5741057c78 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.de.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.de.resx
@@ -331,4 +331,38 @@ Fortfahren?</value>
   <data name="CodeExplorer_Annotate" xml:space="preserve">
     <value>Annotation hinzufügen</value>
   </data>
+  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
+    <value>Es existiert kein Dokumentenmodul namens '{0}', weshalb die Datei '{1}' nicht importiert werden kann.
+
+Import abgebrochen.</value>
+  </data>
+  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
+    <value>Für die Datei '{0}' fehlen die benötigte(n) Binärdatei(en) '{1}' und die Zielkomponente '{2}' existiert noch nicht.
+
+Import abgebrochen.</value>
+  </data>
+  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
+    <value>Für die Datei '{0}' fehlen die benötigte(n) Binärdatei(en) '{1}'.
+
+Import abgebrochen.</value>
+  </data>
+  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
+    <value>Mehrere Dateien enthalten Code für die Komponente '{0}'.
+
+Import abgebrochen.</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
+    <value>Alle Dateien</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
+    <value>VB Dateien</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
+    <value>Quellcode aus Datei importieren</value>
+  </data>
+  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
+    <value>Die Dateierweiterung der Datei '{0}' wird nicht unterstützt.
+
+Import abgebrochen.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.es.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.es.resx
index 9c1d19a193..6a7079f3b8 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.es.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.es.resx
@@ -331,4 +331,38 @@
   <data name="CodeExplorer_Annotate" xml:space="preserve">
     <value>Anotar</value>
   </data>
+  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
+    <value>No existe ningún documento de módulo con el nombre '{0}'; el arcivo '{1}' no se puede importar.
+
+Importación cancelada.</value>
+  </data>
+  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
+    <value>Para el archivo '{0}', faltan los archivos binarios '{1}' y el componente destino '{2}' no existía.
+
+Importación cancelada.</value>
+  </data>
+  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
+    <value>Para el archivo '{0}', faltan los archivos binarios requeridos '{1}'.
+
+Importación cancelada.</value>
+  </data>
+  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
+    <value>Multiples archivos contienen código para el componente '{0}'.
+
+Importación cancelada.</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
+    <value>Todos los archivos</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
+    <value>Archivos VB</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
+    <value>Importar archivos fuente</value>
+  </data>
+  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
+    <value>La extensión del archivo '{0}' no está soportada.
+
+Importación cancelada.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx
index 44e866e623..70846bdc76 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx
@@ -328,4 +328,38 @@ Continuer?</value>
   <data name="CodeExplorer_MoveToFolder" xml:space="preserve">
     <value>Déplacer vers le dossier...</value>
   </data>
+  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
+    <value>Aucun module document existant avec le nom '{0}'; le fichier '{1}' ne pourra pas être importé.
+
+Échec de l'importation.</value>
+  </data>
+  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
+    <value>Le fichier binaire '{1}' associé à '{0}' est manquant, et le module cible '{2}' n'existe pas déjà dans le projet.
+
+Échec de l'importation.</value>
+  </data>
+  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
+    <value>Le fichier '{0}' requiert le fichier binaire '{1}', qui est manquant.
+
+Échec de l'importation.</value>
+  </data>
+  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
+    <value>Plus d'un fichier contient du code pour le componsant '{0}'.
+
+Échec de l'importation.</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
+    <value>Tous les fichiers</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
+    <value>Fichiers VB</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
+    <value>Importer fichiers source</value>
+  </data>
+  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
+    <value>L'extension du fichier '{0}' n'est pas prise en charge.
+
+Importation annulée.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx
index c6337af7be..b790d6cdca 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx
@@ -461,4 +461,43 @@ Continue?</value>
   <data name="CodeExplorer_Annotate" xml:space="preserve">
     <value>Annotate</value>
   </data>
+  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
+    <value>There is no existing document module with name '{0}'; file '{1}' cannot be imported.
+
+Import aborted.</value>
+    <comment>{0} module name, {1} filename</comment>
+  </data>
+  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
+    <value>For file '{0}', the required binary file(s) '{1}' are missing and the target component '{2}' does not already exists.
+
+Import aborted.</value>
+    <comment>{0} filename, {1} binaries, {2} module name</comment>
+  </data>
+  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
+    <value>For file '{0}', the requires binary file(s) '{1}' are missing.
+
+Import aborted.</value>
+    <comment>{0} filename, {1} binaries</comment>
+  </data>
+  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
+    <value>Multiple files contain code for the component '{0}'.
+
+Import aborted.</value>
+    <comment>{0} module name</comment>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
+    <value>All Files</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
+    <value>VB Files</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
+    <value>Import Source Files</value>
+  </data>
+  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
+    <value>The extension of the file '{0}' is not supported.
+
+Import aborted.</value>
+    <comment>{0} filename of unsupported file</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ae232e690d..ee1d4c7d40 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2262,88 +2262,6 @@ public static string ImplementInterfaceFailed_NoImplementsStatementSelected {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to For file &apos;{0}&apos;, the required binary file(s) &apos;{1}&apos; are missing and the target component &apos;{2}&apos; does not already exists.
-        ///
-        ///Import aborted..
-        /// </summary>
-        public static string ImportCommand_BinaryAndComponentDoNotExist {
-            get {
-                return ResourceManager.GetString("ImportCommand_BinaryAndComponentDoNotExist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to For file &apos;{0}&apos;, the requires binary file(s) &apos;{1}&apos; are missing.
-        ///
-        ///Import aborted..
-        /// </summary>
-        public static string ImportCommand_BinaryDoesNotExist {
-            get {
-                return ResourceManager.GetString("ImportCommand_BinaryDoesNotExist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There is no existing document module with name &apos;{0}&apos;; file &apos;{1}&apos; cannot be imported.
-        ///
-        ///Import aborted..
-        /// </summary>
-        public static string ImportCommand_DocumentDoesNotExist {
-            get {
-                return ResourceManager.GetString("ImportCommand_DocumentDoesNotExist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Multiple files contain code for the component &apos;{0}&apos;.
-        ///
-        ///Import aborted..
-        /// </summary>
-        public static string ImportCommand_DuplicateModule {
-            get {
-                return ResourceManager.GetString("ImportCommand_DuplicateModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to All Files.
-        /// </summary>
-        public static string ImportCommand_OpenDialog_Filter_AllFiles {
-            get {
-                return ResourceManager.GetString("ImportCommand_OpenDialog_Filter_AllFiles", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to VB Files.
-        /// </summary>
-        public static string ImportCommand_OpenDialog_Filter_VBFiles {
-            get {
-                return ResourceManager.GetString("ImportCommand_OpenDialog_Filter_VBFiles", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Import Source Files.
-        /// </summary>
-        public static string ImportCommand_OpenDialog_Title {
-            get {
-                return ResourceManager.GetString("ImportCommand_OpenDialog_Title", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The extension of the file &apos;{0}&apos; is not supported.
-        ///
-        ///Import aborted..
-        /// </summary>
-        public static string ImportCommand_UnsupportedFileExtensions {
-            get {
-                return ResourceManager.GetString("ImportCommand_UnsupportedFileExtensions", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Current Project.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a605648f57..821fc1698d 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -985,15 +985,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="CommandDescription_ExportAllCommand" xml:space="preserve">
     <value>Exportovat Aktivní Projekt</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
-    <value>Všechny Soubory</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
-    <value>VB Soubory</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
-    <value>Importovat Zdrojové Soubory</value>
-  </data>
   <data name="EmptyUIRefreshMessage" xml:space="preserve">
     <value>pro parsování a zpracování projektů ve VBE.</value>
   </data>
@@ -1452,11 +1443,6 @@ End Enum</value>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>Nelze přerušit Parser k provedení operace refaktoringu.</value>
   </data>
-  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
-    <value>Přípona souboru '{0}' není podporována.
-
-Import přerušen.</value>
-  </data>
   <data name="RegexAssistant_SpelledOut_CarriageReturn" xml:space="preserve">
     <value>carriage-return (CR)</value>
   </data>
@@ -1472,29 +1458,9 @@ Import přerušen.</value>
   <data name="UpdateFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Update Komponentů ze Souborů</value>
   </data>
-  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
-    <value>Kód pro komponentu '{0}' obsahuje více souborů.
-
-Import přerušen.</value>
-  </data>
   <data name="UpdateFromFilesCommand_DifferentComponentType" xml:space="preserve">
     <value>Typ komponenty z existující komponenty '{0}' nesouhlasí s typem označeným příponou souboru '{1}'.
 
-Import přerušen.</value>
-  </data>
-  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
-    <value>Neexistuje žádný modul dokumentu s názvem '{0}'; soubor '{1}' nelze importovat.
-
-Import přerušen.</value>
-  </data>
-  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
-    <value>Pro soubor '{0}' chybí požadované binární soubor(y) '{1}' a cílová komponenta '{2}' ještě neexistuje.
-
-Import přerušen.</value>
-  </data>
-  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
-    <value>U souboru '{0}' chybí požadované binární soubory '{1}'.
-
 Import přerušen.</value>
   </data>
   <data name="ComponentType_ClassModule" xml:space="preserve">
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e25afdb15e..84882d5d8b 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1015,21 +1015,12 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="EmptyUIRefreshMessage" xml:space="preserve">
     <value>Um die Projekte in der VBE zu parsen und zu analysieren.</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
-    <value>VB Dateien</value>
-  </data>
   <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
     <value>{0} {1} kann nicht geändert werden.</value>
   </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>Methode '{0}' ist ein EventHandler für die Schaltfläche '{1}'. Nur die Schaltfläche kann umbenannt werden. Stattdessen '{1}' umbennen?</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
-    <value>Alle Dateien</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
-    <value>Quellcode aus Datei importieren</value>
-  </data>
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck sieht noch nichts.</value>
   </data>
@@ -1484,11 +1475,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="VersionCheck_BuildType_Release" xml:space="preserve">
     <value>Release</value>
   </data>
-  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
-    <value>Die Dateierweiterung der Datei '{0}' wird nicht unterstützt.
-
-Import abgebrochen.</value>
-  </data>
   <data name="ReplaceProjectContentsFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Projektinhalt durch Inhalt von Dateien ersetzen</value>
   </data>
@@ -1498,29 +1484,9 @@ Import abgebrochen.</value>
   <data name="UpdateFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Komponenten aus Dateien aktualisieren</value>
   </data>
-  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
-    <value>Mehrere Dateien enthalten Code für die Komponente '{0}'.
-
-Import abgebrochen.</value>
-  </data>
   <data name="UpdateFromFilesCommand_DifferentComponentType" xml:space="preserve">
     <value>Der Komponententyp der existierenden Komponente '{0}' stimmt nicht mit dem dem zur Dateierweiterung der Datei '{1}' gehörenden überein.
 
-Import abgebrochen.</value>
-  </data>
-  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
-    <value>Es existiert kein Dokumentenmodul namens '{0}', weshalb die Datei '{1}' nicht importiert werden kann.
-
-Import abgebrochen.</value>
-  </data>
-  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
-    <value>Für die Datei '{0}' fehlen die benötigte(n) Binärdatei(en) '{1}' und die Zielkomponente '{2}' existiert noch nicht.
-
-Import abgebrochen.</value>
-  </data>
-  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
-    <value>Für die Datei '{0}' fehlen die benötigte(n) Binärdatei(en) '{1}'.
-
 Import abgebrochen.</value>
   </data>
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 40f3148a42..6b0f10d19d 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1091,15 +1091,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="CommandDescription_ExportAllCommand" xml:space="preserve">
     <value>Exportar proyecto activo</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
-    <value>Todos los archivos</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
-    <value>Archivos VB</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
-    <value>Importar archivos fuente</value>
-  </data>
   <data name="EmptyUIRefreshMessage" xml:space="preserve">
     <value>Analizar y procesar los proyectos en el VBE.</value>
     <comment>Sigue el texto para "Actualizar"</comment>
@@ -1467,11 +1458,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
     <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de una de las esperadas '{2}'.</value>
   </data>
-  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
-    <value>Para el archivo '{0}', faltan los archivos binarios '{1}' y el componente destino '{2}' no existía.
-
-Importación cancelada.</value>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>No se especificó un destino.</value>
   </data>
@@ -1558,11 +1544,6 @@ Importación cancelada.</value>
   <data name="VersionCheck_BuildType_Release" xml:space="preserve">
     <value>release</value>
   </data>
-  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
-    <value>La extensión del archivo '{0}' no está soportada.
-
-Importación cancelada.</value>
-  </data>
   <data name="ReplaceProjectContentsFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Reemplazar el contenido del proyecto desde los archivos</value>
   </data>
@@ -1572,24 +1553,9 @@ Importación cancelada.</value>
   <data name="UpdateFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Actualizar componentes desde Archivos</value>
   </data>
-  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
-    <value>Multiples archivos contienen código para el componente '{0}'.
-
-Importación cancelada.</value>
-  </data>
   <data name="UpdateFromFilesCommand_DifferentComponentType" xml:space="preserve">
     <value>El tipo del componente existente '{0}' no concuerda con el indicado por la extensión del archivo '{1}'.
 
-Importación cancelada.</value>
-  </data>
-  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
-    <value>No existe ningún documento de módulo con el nombre '{0}'; el arcivo '{1}' no se puede importar.
-
-Importación cancelada.</value>
-  </data>
-  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
-    <value>Para el archivo '{0}', faltan los archivos binarios requeridos '{1}'.
-
 Importación cancelada.</value>
   </data>
   <data name="ComponentType_ActiveXDesigner" xml:space="preserve">
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c3c4f58fdc..cddf98846e 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1023,21 +1023,12 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
     <value>pour analyser et traiter
 les projets dans le VBE.</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
-    <value>Fichiers VB</value>
-  </data>
   <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
     <value>{0}{1} ne peut être renommé.</value>
   </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>La méthode {0} répond aux événements du contrôle '{1}'. Renommer '{1}'?</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
-    <value>Tous les fichiers</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
-    <value>Importer fichiers source</value>
-  </data>
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck ne voit rien pour l'instant.</value>
   </data>
@@ -1495,11 +1486,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>Impossible de suspendre l'analyse en cours pour effectuer le refactoring.</value>
   </data>
-  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
-    <value>L'extension du fichier '{0}' n'est pas prise en charge.
-
-Importation annulée.</value>
-  </data>
   <data name="ReplaceProjectContentsFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Remplacer le contenu du projet</value>
   </data>
@@ -1510,20 +1496,10 @@ Confirmer?</value>
   <data name="UpdateFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Mettre à jour les modules...</value>
   </data>
-  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
-    <value>Plus d'un fichier contient du code pour le componsant '{0}'.
-
-Échec de l'importation.</value>
-  </data>
   <data name="UpdateFromFilesCommand_DifferentComponentType" xml:space="preserve">
     <value>Le type de composant de '{0}' ne correspond pas au type indiqué par l'extension du fichier '{1}'.
 
 Mise à jour annulée.</value>
-  </data>
-  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
-    <value>Aucun module document existant avec le nom '{0}'; le fichier '{1}' ne pourra pas être importé.
-
-Échec de l'importation.</value>
   </data>
   <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
     <value>Ajouter</value>
@@ -1614,6 +1590,7 @@ Mise à jour annulée.</value>
 Si une interface privée est nécessaire, veuillez modifier le mode d'instanciation ("instancing") du module de classe pour 'Private'.
 Une classe privée peut toujours implémenter une interface publique.</value>
   </data>
+<<<<<<< Updated upstream
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Permettre glisser-déposer dans l'Explorateur de Code</value>
   </data>
@@ -1627,6 +1604,8 @@ Une classe privée peut toujours implémenter une interface publique.</value>
 
 Échec de l'importation.</value>
   </data>
+=======
+>>>>>>> Stashed changes
   <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
     <value>Dossier:</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9445c6b439..4532eeef5a 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1101,15 +1101,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="CommandDescription_ExportAllCommand" xml:space="preserve">
     <value>Export Active Project</value>
   </data>
-  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
-    <value>All Files</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
-    <value>VB Files</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
-    <value>Import Source Files</value>
-  </data>
   <data name="EmptyUIRefreshMessage" xml:space="preserve">
     <value>to parse and process the projects in the VBE.</value>
     <comment>Follows the text for "Refresh"</comment>
@@ -1667,12 +1658,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="VersionCheck_BuildType_Release" xml:space="preserve">
     <value>release</value>
   </data>
-  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
-    <value>The extension of the file '{0}' is not supported.
-
-Import aborted.</value>
-    <comment>{0} filename of unsupported file</comment>
-  </data>
   <data name="ReplaceProjectContentsFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Replace Project Content from Files</value>
   </data>
@@ -1683,36 +1668,12 @@ Import aborted.</value>
   <data name="UpdateFromFilesCommand_DialogCaption" xml:space="preserve">
     <value>Update Components from Files</value>
   </data>
-  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
-    <value>Multiple files contain code for the component '{0}'.
-
-Import aborted.</value>
-    <comment>{0} module name</comment>
-  </data>
   <data name="UpdateFromFilesCommand_DifferentComponentType" xml:space="preserve">
     <value>The component type of the existing component '{0}' does not agree with that indicated by the extension of file '{1}'.
 
 Import aborted.</value>
     <comment>{0} module name, {1} filename</comment>
   </data>
-  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
-    <value>There is no existing document module with name '{0}'; file '{1}' cannot be imported.
-
-Import aborted.</value>
-    <comment>{0} module name, {1} filename</comment>
-  </data>
-  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
-    <value>For file '{0}', the required binary file(s) '{1}' are missing and the target component '{2}' does not already exists.
-
-Import aborted.</value>
-    <comment>{0} filename, {1} binaries, {2} module name</comment>
-  </data>
-  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
-    <value>For file '{0}', the requires binary file(s) '{1}' are missing.
-
-Import aborted.</value>
-    <comment>{0} filename, {1} binaries</comment>
-  </data>
   <data name="ComponentType_ActiveXDesigner" xml:space="preserve">
     <value>ActiveX Designer</value>
   </data>

From af46d030566d1757670016e712b8529fb556b5e1 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 22:24:48 -0700
Subject: [PATCH 30/64] Migrate IndenterSettings_ resources

---
 .../UI/Settings/IndenterSettings.xaml         | 142 +++-----
 .../Settings/IndenterSettingsUI.Designer.cs   | 310 ++++++++++++++++++
 .../UI/Settings/IndenterSettingsUI.cs.resx    | 199 +++++++++++
 .../UI/Settings/IndenterSettingsUI.de.resx    | 233 +++++++++++++
 .../UI/Settings/IndenterSettingsUI.es.resx    | 233 +++++++++++++
 .../UI/Settings/IndenterSettingsUI.fr.resx    | 233 +++++++++++++
 .../UI/Settings/IndenterSettingsUI.resx       | 213 ++++++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 247 --------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  79 -----
 Rubberduck.Resources/RubberduckUI.de.resx     | 113 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 113 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 113 -------
 Rubberduck.Resources/RubberduckUI.resx        | 113 -------
 13 files changed, 1466 insertions(+), 875 deletions(-)
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.Designer.cs
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.es.resx
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx

diff --git a/Rubberduck.Core/UI/Settings/IndenterSettings.xaml b/Rubberduck.Core/UI/Settings/IndenterSettings.xaml
index d6320b1edf..67b58ce0a9 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/IndenterSettings.xaml
@@ -98,86 +98,61 @@
                          BorderBrush="{StaticResource ExpanderBorderBrush}"
                          Margin="0,0,0,3">
                     <Expander.Header>
-                        <Label FontWeight="SemiBold">
-                            <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentOptionsLabel"/>
-                        </Label>
+                        <Label FontWeight="SemiBold"
+                               Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentOptionsLabel}"/>
                     </Expander.Header>
                     <StackPanel Margin="75,5,0,5">
                         <CheckBox Name="IndentProcedureCheckBox"
                                      Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding IndentEntireProcedureBody,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentEntireProcedureBody"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentEntireProcedureBody}" />
                         </CheckBox>
                         <CheckBox Margin="25,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsEnabled="{Binding ElementName=IndentProcedureCheckBox,Path=IsChecked}"
                                      IsChecked="{Binding IndentFirstCommentBlock,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentFirstCommentBlock"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentFirstCommentBlock}" />
                         </CheckBox>
                         <CheckBox Margin="25,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsEnabled="{Binding ElementName=IndentProcedureCheckBox,Path=IsChecked}"
                                      IsChecked="{Binding IndentFirstDeclarationBlock,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentFirstDeclarationBlock"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentFirstDeclarationBlock}" />
                         </CheckBox>
                         <CheckBox Margin="25,0,0,5"
                                   HorizontalAlignment="Left"
                                   IsEnabled="{Binding ElementName=IndentProcedureCheckBox,Path=IsChecked}"
                                   IsChecked="{Binding IgnoreEmptyLinesInFirstBlocks,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IgnoreEmptyLinesInFirstBlocks"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IgnoreEmptyLinesInFirstBlocks}" />
                         </CheckBox>
                         <CheckBox Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding IndentEnumTypeAsProcedure,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentEnumTypeAsProcedure"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentEnumTypeAsProcedure}" />
                         </CheckBox>
                         <CheckBox Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding IndentCase,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentCase"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentCase}" />
                         </CheckBox>
                         <CheckBox Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding IndentCompilerDirectives,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentCompilerDirectives"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentCompilerDirectives}" />
                         </CheckBox>
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Margin="5,0,0,5"
-                                         HorizontalAlignment="Left"
-                                         TextWrapping="WrapWithOverflow">
-                                <TextBlock.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IndentSpaces"/>
-                                </TextBlock.Text>
-                            </TextBlock>
+                                       HorizontalAlignment="Left"
+                                       TextWrapping="WrapWithOverflow"
+                                       Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IndentSpaces}" />
                             <controls:NumberPicker Margin="0,-6,0,0"
                                          MinNumber="0"
                                          MaxNumber="{x:Static smartIndenter:IndenterSettings.MaximumIndentSpaces}"
@@ -191,41 +166,31 @@
                          BorderBrush="{StaticResource ExpanderBorderBrush}"
                          Margin="0,0,0,3">
                     <Expander.Header>
-                        <Label FontWeight="SemiBold">
-                            <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_AlignmentOptionsLabel"/>
-                        </Label>
+                        <Label FontWeight="SemiBold"
+                               Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=AlignmentOptionsLabel}" />
                     </Expander.Header>
                     <StackPanel Margin="75,5,0,5">
                         <CheckBox Name="AlignContinuationsCheckBox"
                                      Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding AlignContinuations,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_AlignContinuations"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=AlignContinuations}" />
                         </CheckBox>
                         <CheckBox Margin="25,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsEnabled="{Binding ElementName=AlignContinuationsCheckBox,Path=IsChecked}"
                                      IsChecked="{Binding IgnoreOperatorsInContinuations,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_IgnoreOperators"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=IgnoreOperators}" />
                         </CheckBox>
                         <WrapPanel Orientation="Horizontal">
                             <CheckBox Name="AlignDimColumn"
                                          Margin="5,0,0,5"
                                          HorizontalAlignment="Left"
                                          IsChecked="{Binding AlignDims,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <AccessText TextWrapping="WrapWithOverflow">
-                                    <AccessText.Text>
-                                        <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_AlignDims"/>
-                                    </AccessText.Text>
-                                </AccessText>
+                                <AccessText TextWrapping="WrapWithOverflow"
+                                            Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=AlignDims}" />
                             </CheckBox>
                             <controls:NumberPicker Margin="0,-6,0,0"
                                          HorizontalAlignment="Left"
@@ -237,16 +202,12 @@
                         <CheckBox Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding AlignCommentsWithCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_AlignCommentsWithCode"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=AlignCommentsWithCode}" />
                         </CheckBox>
                         <StackPanel Margin="0,0,0,22">
-                            <Label FontWeight="SemiBold" HorizontalAlignment="Left">
-                                <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_EndOfLineCommentStyle"/>
-                            </Label>
+                            <Label FontWeight="SemiBold" HorizontalAlignment="Left"
+                                   Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=EndOfLineCommentStyle}" />
                             <StackPanel Orientation="Horizontal">
                                 <ComboBox Margin="5,0,0,5"
                                              Width="210"
@@ -269,20 +230,16 @@
                          BorderBrush="{StaticResource ExpanderBorderBrush}"
                          Margin="0,0,0,3">
                     <Expander.Header>
-                        <Label FontWeight="SemiBold">
-                            <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_SpecialOptionsLabel"/>
-                        </Label>
+                        <Label FontWeight="SemiBold"
+                               Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=SpecialOptionsLabel}" />
                     </Expander.Header>
                     <StackPanel Margin="75,5,0,5">
                         <CheckBox Margin="5,0,0,5"
                                      Name="ForceDebugStatementsInColumn1"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding ForceDebugStatementsInColumn1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_ForceDebugDirectivesToColumn1"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=ForceDebugDirectivesToColumn1}" />
                         </CheckBox>
                         <CheckBox Margin="25,0,0,5"
                                   HorizontalAlignment="Left"
@@ -311,15 +268,11 @@
                         <CheckBox Margin="5,0,0,5"
                                      HorizontalAlignment="Left"
                                      IsChecked="{Binding ForceCompilerDirectivesInColumn1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                            <AccessText TextWrapping="WrapWithOverflow">
-                                <AccessText.Text>
-                                    <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_ForceCompilerDirectivesToColumn1"/>
-                                </AccessText.Text>
-                            </AccessText>
+                            <AccessText TextWrapping="WrapWithOverflow"
+                                        Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=ForceCompilerDirectivesToColumn1}" />
                         </CheckBox>
-                        <Label FontWeight="SemiBold" HorizontalAlignment="Left">
-                            <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_EmptyLineHeading"/>
-                        </Label>
+                        <Label FontWeight="SemiBold" HorizontalAlignment="Left"
+                               Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=EmptyLineHeading}" />
                         <ComboBox Margin="5,0,0,5"
                                   HorizontalAlignment="Left"
                                   ItemsSource="{Binding Source={StaticResource EmptyLineOptions},Converter={StaticResource LocalizedEmptyLineHandlers},UpdateSourceTrigger=PropertyChanged}"
@@ -332,9 +285,8 @@
                          BorderBrush="{StaticResource ExpanderBorderBrush}"
                          Margin="0,0,0,3">
                     <Expander.Header>
-                        <Label FontWeight="SemiBold">
-                            <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_VerticalSpacingLabel"/>
-                        </Label>
+                        <Label FontWeight="SemiBold"
+                               Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=VerticalSpacingLabel}" />
                     </Expander.Header>
                     <StackPanel Margin="75,5,0,5">
                         <WrapPanel Orientation="Horizontal">
@@ -342,11 +294,8 @@
                                          Margin="5,0,0,5"
                                          HorizontalAlignment="Left"
                                          IsChecked="{Binding VerticallySpaceProcedures,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <AccessText TextWrapping="WrapWithOverflow">
-                                    <AccessText.Text>
-                                        <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_VerticalSpacing"/>
-                                    </AccessText.Text>
-                                </AccessText>
+                                <AccessText TextWrapping="WrapWithOverflow"
+                                            Text="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=VerticalSpacing}" />
                             </CheckBox>
                             <controls:NumberPicker Margin="0,-6,0,0"
                                          HorizontalAlignment="Left"
@@ -363,9 +312,8 @@
                          BorderBrush="{StaticResource ExpanderBorderBrush}"
                          Margin="0,0,0,3">
                     <Expander.Header>
-                        <Label FontWeight="SemiBold">
-                            <Resx ResxName="Rubberduck.Resources.RubberduckUI" Key="IndenterSettings_CodeSampleHeader"/>
-                        </Label>
+                        <Label FontWeight="SemiBold"
+                               Content="{Resx ResxName=Rubberduck.UI.Settings.IndenterSettingsUI, Key=CodeSampleHeader}" />
                     </Expander.Header>
                     <controls:BindableTextEditor
                                Margin="10,10,10,10"
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.Designer.cs b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.Designer.cs
new file mode 100644
index 0000000000..f84e4d6bd0
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.Designer.cs
@@ -0,0 +1,310 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.UI.Settings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class IndenterSettingsUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal IndenterSettingsUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.UI.Settings.IndenterSettingsUI", typeof(IndenterSettingsUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Align comments with code.
+        /// </summary>
+        internal static string AlignCommentsWithCode {
+            get {
+                return ResourceManager.GetString("AlignCommentsWithCode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Align continuations.
+        /// </summary>
+        internal static string AlignContinuations {
+            get {
+                return ResourceManager.GetString("AlignContinuations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Align dims.
+        /// </summary>
+        internal static string AlignDims {
+            get {
+                return ResourceManager.GetString("AlignDims", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Alignment Options.
+        /// </summary>
+        internal static string AlignmentOptionsLabel {
+            get {
+                return ResourceManager.GetString("AlignmentOptionsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indented Code Sample.
+        /// </summary>
+        internal static string CodeSampleHeader {
+            get {
+                return ResourceManager.GetString("CodeSampleHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Empty line handling:.
+        /// </summary>
+        internal static string EmptyLineHeading {
+            get {
+                return ResourceManager.GetString("EmptyLineHeading", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enable Options.
+        /// </summary>
+        internal static string EnableOptionsLabel {
+            get {
+                return ResourceManager.GetString("EnableOptionsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enable undo.
+        /// </summary>
+        internal static string EnableUndo {
+            get {
+                return ResourceManager.GetString("EnableUndo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to End-of-line comment style:.
+        /// </summary>
+        internal static string EndOfLineCommentStyle {
+            get {
+                return ResourceManager.GetString("EndOfLineCommentStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Force compiler directives to column 1.
+        /// </summary>
+        internal static string ForceCompilerDirectivesToColumn1 {
+            get {
+                return ResourceManager.GetString("ForceCompilerDirectivesToColumn1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Force debug directives to column 1.
+        /// </summary>
+        internal static string ForceDebugDirectivesToColumn1 {
+            get {
+                return ResourceManager.GetString("ForceDebugDirectivesToColumn1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ignore empty lines when locating first comment and declaration blocks.
+        /// </summary>
+        internal static string IgnoreEmptyLinesInFirstBlocks {
+            get {
+                return ResourceManager.GetString("IgnoreEmptyLinesInFirstBlocks", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ignore operators.
+        /// </summary>
+        internal static string IgnoreOperators {
+            get {
+                return ResourceManager.GetString("IgnoreOperators", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent case.
+        /// </summary>
+        internal static string IndentCase {
+            get {
+                return ResourceManager.GetString("IndentCase", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent compiler directives.
+        /// </summary>
+        internal static string IndentCompilerDirectives {
+            get {
+                return ResourceManager.GetString("IndentCompilerDirectives", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent entire procedure body.
+        /// </summary>
+        internal static string IndentEntireProcedureBody {
+            get {
+                return ResourceManager.GetString("IndentEntireProcedureBody", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent comments in Enum and Type blocks like in procedures.
+        /// </summary>
+        internal static string IndentEnumTypeAsProcedure {
+            get {
+                return ResourceManager.GetString("IndentEnumTypeAsProcedure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent first comment block.
+        /// </summary>
+        internal static string IndentFirstCommentBlock {
+            get {
+                return ResourceManager.GetString("IndentFirstCommentBlock", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent first declaration block.
+        /// </summary>
+        internal static string IndentFirstDeclarationBlock {
+            get {
+                return ResourceManager.GetString("IndentFirstDeclarationBlock", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent Options.
+        /// </summary>
+        internal static string IndentOptionsLabel {
+            get {
+                return ResourceManager.GetString("IndentOptionsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indent spaces:.
+        /// </summary>
+        internal static string IndentSpaces {
+            get {
+                return ResourceManager.GetString("IndentSpaces", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Public Enum ExampleEnum
+        ///&apos; Enum comment.
+        ///Foo
+        ///Bar &apos; Member comment.
+        ///End Enum
+        ///
+        ///&apos; Example Procedure
+        ///Sub ExampleProc()
+        ///
+        ///&apos; SMART INDENTER
+        ///&apos; Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
+        ///&apos; © 2016 by Rubberduck VBA.
+        ///
+        ///Dim count As Integer
+        ///Static name As String
+        ///
+        ///If YouLikeRubberduck Then
+        ///&apos; Star us on GitHub http://github.com/rubberduck-vba/Rubberduck
+        ///&apos; Follow us on Twitter @rubberduckvba
+        ///&apos; Visit http://rubberduckvba.com for news and updates
+        ///
+        ///Select Case X
+        ///Case  [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string PreviewCode {
+            get {
+                return ResourceManager.GetString("PreviewCode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Special Options.
+        /// </summary>
+        internal static string SpecialOptionsLabel {
+            get {
+                return ResourceManager.GetString("SpecialOptionsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Maintain vertical spacing.
+        /// </summary>
+        internal static string VerticalSpacing {
+            get {
+                return ResourceManager.GetString("VerticalSpacing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Vertical Spacing.
+        /// </summary>
+        internal static string VerticalSpacingLabel {
+            get {
+                return ResourceManager.GetString("VerticalSpacingLabel", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx
new file mode 100644
index 0000000000..1e97c9ba49
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="IgnoreOperators" xml:space="preserve">
+    <value>Ignorovat operátory</value>
+  </data>
+  <data name="AlignCommentsWithCode" xml:space="preserve">
+    <value>Zarovnat komenty s kódem</value>
+  </data>
+  <data name="AlignContinuations" xml:space="preserve">
+    <value>Zarovnat pokračování</value>
+  </data>
+  <data name="AlignDims" xml:space="preserve">
+    <value>Zarovnat 'dimy'</value>
+  </data>
+  <data name="AlignmentOptionsLabel" xml:space="preserve">
+    <value>Nastavení Zarovnání</value>
+  </data>
+  <data name="CodeSampleHeader" xml:space="preserve">
+    <value>Příklad Odsazeného Kódu</value>
+  </data>
+  <data name="EmptyLineHeading" xml:space="preserve">
+    <value>Zacházení s prázdnými řádky:</value>
+  </data>
+  <data name="EnableOptionsLabel" xml:space="preserve">
+    <value>Povolit Nastavení</value>
+  </data>
+  <data name="EnableUndo" xml:space="preserve">
+    <value>Povolit 'zpět'</value>
+  </data>
+  <data name="EndOfLineCommentStyle" xml:space="preserve">
+    <value>Styl komentářů na konci řádku:</value>
+  </data>
+  <data name="ForceCompilerDirectivesToColumn1" xml:space="preserve">
+    <value>Vynutit pokyny kompilátoru do sloupce 1</value>
+  </data>
+  <data name="ForceDebugDirectivesToColumn1" xml:space="preserve">
+    <value>Vynutit debugovací pokyny do sloupce 1</value>
+  </data>
+  <data name="IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
+    <value>Ignoruj prázdné řádky při vyhledávání prvních poznámek a deklaračních bloků</value>
+  </data>
+  <data name="IndentCase" xml:space="preserve">
+    <value>Odsadit 'Case'</value>
+  </data>
+  <data name="IndentCompilerDirectives" xml:space="preserve">
+    <value>Odsadit pokyny kompilátoru</value>
+  </data>
+  <data name="IndentEntireProcedureBody" xml:space="preserve">
+    <value>Odsadit celý vnitřek procedury</value>
+  </data>
+  <data name="IndentEnumTypeAsProcedure" xml:space="preserve">
+    <value>Odsadit komentáře v Enum a Type blocích tak, jako v procedurách</value>
+  </data>
+  <data name="IndentFirstCommentBlock" xml:space="preserve">
+    <value>Odsadit první blok komentáře</value>
+  </data>
+  <data name="IndentFirstDeclarationBlock" xml:space="preserve">
+    <value>Odsadit první blok deklarace</value>
+  </data>
+  <data name="IndentOptionsLabel" xml:space="preserve">
+    <value>Nastavení odsazení</value>
+  </data>
+  <data name="IndentSpaces" xml:space="preserve">
+    <value>Odsadit mezery:</value>
+  </data>
+  <data name="PreviewCode" xml:space="preserve">
+    <value>Public Enum ExampleEnum
+' Enum komentář.
+Foo
+Bar ' Komentář člena.
+End Enum</value>
+  </data>
+  <data name="SpecialOptionsLabel" xml:space="preserve">
+    <value>Speciální nastavení</value>
+  </data>
+  <data name="VerticalSpacing" xml:space="preserve">
+    <value>Udržovat vertikální vzdálenosti</value>
+  </data>
+  <data name="VerticalSpacingLabel" xml:space="preserve">
+    <value>Vertikální vzdálenosti</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx
new file mode 100644
index 0000000000..f0cfc5695a
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="IgnoreOperators" xml:space="preserve">
+    <value>Ignoriere Operatoren</value>
+  </data>
+  <data name="AlignCommentsWithCode" xml:space="preserve">
+    <value>Richte Kommentare am Code aus</value>
+  </data>
+  <data name="AlignContinuations" xml:space="preserve">
+    <value>Richte Fortsetzung aus</value>
+  </data>
+  <data name="AlignDims" xml:space="preserve">
+    <value>Ausrichtung der Deklarationen</value>
+  </data>
+  <data name="AlignmentOptionsLabel" xml:space="preserve">
+    <value>Ausrichtungsoptionen</value>
+  </data>
+  <data name="CodeSampleHeader" xml:space="preserve">
+    <value>Eingerücktes Codebeispiel</value>
+  </data>
+  <data name="EmptyLineHeading" xml:space="preserve">
+    <value>Leerzeilenbehandlung:</value>
+  </data>
+  <data name="EnableOptionsLabel" xml:space="preserve">
+    <value>Optionen freigeben</value>
+  </data>
+  <data name="EnableUndo" xml:space="preserve">
+    <value>Rückgängig freigeben</value>
+  </data>
+  <data name="EndOfLineCommentStyle" xml:space="preserve">
+    <value>Zeilenende Kommentarstil:</value>
+  </data>
+  <data name="ForceCompilerDirectivesToColumn1" xml:space="preserve">
+    <value>Erzwinge Kompilerdirektiven in Spalte 1</value>
+  </data>
+  <data name="ForceDebugDirectivesToColumn1" xml:space="preserve">
+    <value>Erzwinge Debugdirektiven in Spalte 1</value>
+  </data>
+  <data name="IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
+    <value>Leerzeilen bei der Suche nach dem ersten Kommentar und nach Deklarationsblöcken ignorieren</value>
+  </data>
+  <data name="IndentCase" xml:space="preserve">
+    <value>Rücke 'Case' ein</value>
+  </data>
+  <data name="IndentCompilerDirectives" xml:space="preserve">
+    <value>Rücke Kompilerdirektiven ein</value>
+  </data>
+  <data name="IndentEntireProcedureBody" xml:space="preserve">
+    <value>Rücke gesamten Prozedurblock ein</value>
+  </data>
+  <data name="IndentEnumTypeAsProcedure" xml:space="preserve">
+    <value>Kommentare in Enums und Typen wie in Prozeduren einrücken</value>
+  </data>
+  <data name="IndentFirstCommentBlock" xml:space="preserve">
+    <value>Rücke ersten Kommentarblock ein</value>
+  </data>
+  <data name="IndentFirstDeclarationBlock" xml:space="preserve">
+    <value>Rücke ersten Deklarationsblock ein</value>
+  </data>
+  <data name="IndentOptionsLabel" xml:space="preserve">
+    <value>Rücke Optionen ein</value>
+  </data>
+  <data name="IndentSpaces" xml:space="preserve">
+    <value>Einrückungsleerzeichen:</value>
+  </data>
+  <data name="PreviewCode" xml:space="preserve">
+    <value>Public Enum BeispielEnum
+' Enum Kommentar.
+Foo
+Bar ' Element-Kommentar.
+End Enum
+
+' Beispielprozedur
+Sub BeispielProc()
+
+' SMART INDENTER
+' Der originale VB6-Code wurde Rubberduck gnädigerweise von Stephen Bullen &amp; Rob Bovey angeboten
+' © 2016 by Rubberduck VBA.
+
+Dim zaehler As Integer
+Static name As String
+
+If SieMoegenRubberduck Then
+' Einen Stern auf GitHub geben: http://github.com/rubberduck-vba/Rubberduck
+' Auf Twitter folgen @rubberduckvba
+' http://rubberduckvba.com für Neuigkeiten und Aktualisierungen
+
+Select Case X
+Case "A"
+' Falls sie Kommentare oder Vorschläge haben, _
+oder validen VBA code gefunden haben, der nicht korrekt eingerückt wird,
+
+#If VBA6 Then
+MsgBox "Kontaktieren Sie contact@rubberduck-vba.com"
+#End If
+
+Case "Fortgeführte Strings und Parameter können" _
+&amp; "zur Lesbarkeit aufgereiht werden. Optional können" _
+&amp; "beliebige Operatoren (&amp;+, usw.) am Zeilenbeginn ignoriert werden."
+
+Debug.Print "X&lt;&gt;1"
+End Select      'Case X
+End If      'Mehr Werkzeuge? Vorschläge an http://github.com/rubberduck-vba/Rubberduck/Issues/New
+
+End Sub</value>
+  </data>
+  <data name="SpecialOptionsLabel" xml:space="preserve">
+    <value>Spezielle Optionen</value>
+  </data>
+  <data name="VerticalSpacing" xml:space="preserve">
+    <value>Vertikalen Abstand aufrecht erhalten</value>
+  </data>
+  <data name="VerticalSpacingLabel" xml:space="preserve">
+    <value>Vertikalen Abstand</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.es.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.es.resx
new file mode 100644
index 0000000000..1ccd0fe394
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.es.resx
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="IgnoreOperators" xml:space="preserve">
+    <value>Ignorar a los operadores</value>
+  </data>
+  <data name="AlignCommentsWithCode" xml:space="preserve">
+    <value>Alinear comentarios con código</value>
+  </data>
+  <data name="AlignContinuations" xml:space="preserve">
+    <value>Alinear continuaciones</value>
+  </data>
+  <data name="AlignDims" xml:space="preserve">
+    <value>Alinear dims</value>
+  </data>
+  <data name="AlignmentOptionsLabel" xml:space="preserve">
+    <value>Opciones de alineación</value>
+  </data>
+  <data name="CodeSampleHeader" xml:space="preserve">
+    <value>Ejemplo de código indentado</value>
+  </data>
+  <data name="EmptyLineHeading" xml:space="preserve">
+    <value>Manejo de línea vacía:</value>
+  </data>
+  <data name="EnableOptionsLabel" xml:space="preserve">
+    <value>Habilitar opciones</value>
+  </data>
+  <data name="EnableUndo" xml:space="preserve">
+    <value>Habilitar Deshacer</value>
+  </data>
+  <data name="EndOfLineCommentStyle" xml:space="preserve">
+    <value>Estilo de comentario de fin de línea:</value>
+  </data>
+  <data name="ForceCompilerDirectivesToColumn1" xml:space="preserve">
+    <value>Forzar las directivas del compilador a la columna 1</value>
+  </data>
+  <data name="ForceDebugDirectivesToColumn1" xml:space="preserve">
+    <value>Forzar las directivas de depuración a la columna 1</value>
+  </data>
+  <data name="IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
+    <value>Ignore las líneas vacías al ubicar los bloques de primer comentario y declaración</value>
+  </data>
+  <data name="IndentCase" xml:space="preserve">
+    <value>Indentar case</value>
+  </data>
+  <data name="IndentCompilerDirectives" xml:space="preserve">
+    <value>Indentar directivas de compilación</value>
+  </data>
+  <data name="IndentEntireProcedureBody" xml:space="preserve">
+    <value>Indentar todo el cuerpo del procedimiento</value>
+  </data>
+  <data name="IndentEnumTypeAsProcedure" xml:space="preserve">
+    <value>Indentar comentarios en bloques Enum y Type como en procedimientos</value>
+  </data>
+  <data name="IndentFirstCommentBlock" xml:space="preserve">
+    <value>Indentar primer bloque de comentarios</value>
+  </data>
+  <data name="IndentFirstDeclarationBlock" xml:space="preserve">
+    <value>Indentar primer bloque de declaración</value>
+  </data>
+  <data name="IndentOptionsLabel" xml:space="preserve">
+    <value>Opciones de indentación</value>
+  </data>
+  <data name="IndentSpaces" xml:space="preserve">
+    <value>Indentar espacios:</value>
+  </data>
+  <data name="PreviewCode" xml:space="preserve">
+    <value>Public Enum ExampleEnum
+' Enum comment.
+Foo
+Bar ' Member comment.
+End Enum
+
+' Example Procedure
+Sub ExampleProc()
+
+' SMART INDENTER
+' Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
+' © 2016 by Rubberduck VBA.
+
+Dim count As Integer
+Static name As String
+
+If YouLikeRubberduck Then
+' Star us on GitHub http://github.com/rubberduck-vba/Rubberduck
+' Follow us on Twitter @rubberduckvba
+' Visit http://rubberduckvba.com for news and updates
+
+Select Case X
+Case "A"
+' If you have any comments or suggestions, _
+or find valid VBA code that isn't indented correctly,
+
+#If VBA6 Then
+MsgBox "Contact contact@rubberduck-vba.com"
+#End If
+
+Case "Continued strings and parameters can be" _
+&amp; "lined up for easier reading, optionally ignoring" _
+&amp; "any operators (&amp;+, etc) at the start of the line."
+
+Debug.Print "X&lt;&gt;1"
+End Select      'Case X
+End If      'More Tools? Suggestions http://github.com/rubberduck-vba/Rubberduck/Issues/New
+
+End Sub</value>
+  </data>
+  <data name="SpecialOptionsLabel" xml:space="preserve">
+    <value>Opciones especiales</value>
+  </data>
+  <data name="VerticalSpacing" xml:space="preserve">
+    <value>Mantener el espaciamiento vertical</value>
+  </data>
+  <data name="VerticalSpacingLabel" xml:space="preserve">
+    <value>Espaciamiento vertical</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx
new file mode 100644
index 0000000000..a6ec6c056d
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="IgnoreOperators" xml:space="preserve">
+    <value>Ignorer les opérateurs</value>
+  </data>
+  <data name="AlignCommentsWithCode" xml:space="preserve">
+    <value>Aligner les commentaires avec le code</value>
+  </data>
+  <data name="AlignContinuations" xml:space="preserve">
+    <value>Aligner les continuations</value>
+  </data>
+  <data name="AlignDims" xml:space="preserve">
+    <value>Aligner les déclarations (Dim)</value>
+  </data>
+  <data name="AlignmentOptionsLabel" xml:space="preserve">
+    <value>Aligner les options</value>
+  </data>
+  <data name="CodeSampleHeader" xml:space="preserve">
+    <value>Échantillon de code indenté</value>
+  </data>
+  <data name="EmptyLineHeading" xml:space="preserve">
+    <value>Traitement des lignes vides:</value>
+  </data>
+  <data name="EnableOptionsLabel" xml:space="preserve">
+    <value>Activer les options</value>
+  </data>
+  <data name="EnableUndo" xml:space="preserve">
+    <value>Activer l'annulation</value>
+  </data>
+  <data name="EndOfLineCommentStyle" xml:space="preserve">
+    <value>Style des commentaires de fin de ligne:</value>
+  </data>
+  <data name="ForceCompilerDirectivesToColumn1" xml:space="preserve">
+    <value>Forcer les directives du préprocesseur à la colonne 1</value>
+  </data>
+  <data name="ForceDebugDirectivesToColumn1" xml:space="preserve">
+    <value>Forcer les instructions Debug à la ligne 1</value>
+  </data>
+  <data name="IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
+    <value>Ignorer les lignes vides lors de la recherche du premier bloc de commentaire ou de déclarations</value>
+  </data>
+  <data name="IndentCase" xml:space="preserve">
+    <value>Indenter les blocs Case</value>
+  </data>
+  <data name="IndentCompilerDirectives" xml:space="preserve">
+    <value>Indenter les directives du préprocesseur</value>
+  </data>
+  <data name="IndentEntireProcedureBody" xml:space="preserve">
+    <value>Indenter le contenu entier de la procédure</value>
+  </data>
+  <data name="IndentEnumTypeAsProcedure" xml:space="preserve">
+    <value>Indenter les commentaires des blocs Enum et Type comme dans les procédures</value>
+  </data>
+  <data name="IndentFirstCommentBlock" xml:space="preserve">
+    <value>Indenter le premier bloc de commentaires</value>
+  </data>
+  <data name="IndentFirstDeclarationBlock" xml:space="preserve">
+    <value>Indenter le premier bloc de déclarations</value>
+  </data>
+  <data name="IndentOptionsLabel" xml:space="preserve">
+    <value>Indenter les options</value>
+  </data>
+  <data name="IndentSpaces" xml:space="preserve">
+    <value>Nombre d'espaces:</value>
+  </data>
+  <data name="PreviewCode" xml:space="preserve">
+    <value>Public Enum ExempleEnum
+' commentaire enum.
+Foo
+Bar ' commentaire membre enum.
+End Enum
+
+' Procédure exemple
+Sub ExampleProc()
+
+' SMART INDENTER
+' Code VB6 original gracieusement offert au projet Rubberduck par Stephen Bullen et Rob Bovey
+' © 2016 Rubberduck VBA.
+
+Dim count As Integer
+Static name As String
+
+If VousAimezRubberduck Then
+' Donnez-nous une étoile sur GitHub http://github.com/rubberduck-vba/Rubberduck
+' Suivez-nous sur Twitter @rubberduckvba
+' Visitez http://rubberduckvba.com pour les nouvelles et mises à jour
+
+Select Case X
+Case "A"
+' Si vous avez des commentaires ou suggestions, _
+ou si vous trouvez du code VBA valide qui ne s'indente pas correctement,
+
+#If VBA6 Then
+MsgBox "Contactez contact@rubberduck-vba.com"
+#End If
+
+Case "Les chaînes de caractères et paramètres peuvent être" _
+&amp; "alignés pour une lecture plus facile, en ignorant facultativement" _
+&amp; "les opérateurs (&amp;+, etc) au début d'une ligne."
+
+Debug.Print "X&lt;&gt;1"
+End Select      'Case X
+End If      'Plus d'outils? Suggestions http://github.com/rubberduck-vba/Rubberduck/Issues/New
+
+End Sub</value>
+  </data>
+  <data name="SpecialOptionsLabel" xml:space="preserve">
+    <value>Options spéciales</value>
+  </data>
+  <data name="VerticalSpacing" xml:space="preserve">
+    <value>Maintenir l'espacement vertical</value>
+  </data>
+  <data name="VerticalSpacingLabel" xml:space="preserve">
+    <value>Espacement vertical</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx
new file mode 100644
index 0000000000..61e6a67adc
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="IgnoreOperators" xml:space="preserve">
+    <value>Ignore operators</value>
+  </data>
+  <data name="AlignCommentsWithCode" xml:space="preserve">
+    <value>Align comments with code</value>
+  </data>
+  <data name="AlignContinuations" xml:space="preserve">
+    <value>Align continuations</value>
+  </data>
+  <data name="AlignDims" xml:space="preserve">
+    <value>Align dims</value>
+  </data>
+  <data name="AlignmentOptionsLabel" xml:space="preserve">
+    <value>Alignment Options</value>
+  </data>
+  <data name="CodeSampleHeader" xml:space="preserve">
+    <value>Indented Code Sample</value>
+  </data>
+  <data name="EmptyLineHeading" xml:space="preserve">
+    <value>Empty line handling:</value>
+  </data>
+  <data name="EnableOptionsLabel" xml:space="preserve">
+    <value>Enable Options</value>
+  </data>
+  <data name="EnableUndo" xml:space="preserve">
+    <value>Enable undo</value>
+  </data>
+  <data name="EndOfLineCommentStyle" xml:space="preserve">
+    <value>End-of-line comment style:</value>
+  </data>
+  <data name="ForceCompilerDirectivesToColumn1" xml:space="preserve">
+    <value>Force compiler directives to column 1</value>
+  </data>
+  <data name="ForceDebugDirectivesToColumn1" xml:space="preserve">
+    <value>Force debug directives to column 1</value>
+  </data>
+  <data name="IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
+    <value>Ignore empty lines when locating first comment and declaration blocks</value>
+  </data>
+  <data name="IndentCase" xml:space="preserve">
+    <value>Indent case</value>
+  </data>
+  <data name="IndentCompilerDirectives" xml:space="preserve">
+    <value>Indent compiler directives</value>
+  </data>
+  <data name="IndentEntireProcedureBody" xml:space="preserve">
+    <value>Indent entire procedure body</value>
+  </data>
+  <data name="IndentEnumTypeAsProcedure" xml:space="preserve">
+    <value>Indent comments in Enum and Type blocks like in procedures</value>
+  </data>
+  <data name="IndentFirstCommentBlock" xml:space="preserve">
+    <value>Indent first comment block</value>
+  </data>
+  <data name="IndentFirstDeclarationBlock" xml:space="preserve">
+    <value>Indent first declaration block</value>
+  </data>
+  <data name="IndentOptionsLabel" xml:space="preserve">
+    <value>Indent Options</value>
+  </data>
+  <data name="IndentSpaces" xml:space="preserve">
+    <value>Indent spaces:</value>
+  </data>
+  <data name="PreviewCode" xml:space="preserve">
+    <value>Public Enum ExampleEnum
+' Enum comment.
+Foo
+Bar ' Member comment.
+End Enum
+
+' Example Procedure
+Sub ExampleProc()
+
+' SMART INDENTER
+' Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
+' © 2016 by Rubberduck VBA.
+
+Dim count As Integer
+Static name As String
+
+If YouLikeRubberduck Then
+' Star us on GitHub http://github.com/rubberduck-vba/Rubberduck
+' Follow us on Twitter @rubberduckvba
+' Visit http://rubberduckvba.com for news and updates
+
+Select Case X
+Case "A"
+' If you have any comments or suggestions, _
+or find valid VBA code that isn't indented correctly,
+
+#If VBA6 Then
+MsgBox "Contact contact@rubberduck-vba.com"
+#End If
+
+Case "Continued strings and parameters can be" _
+&amp; "lined up for easier reading, optionally ignoring" _
+&amp; "any operators (&amp;+, etc) at the start of the line."
+
+Debug.Print "X&lt;&gt;1"
+End Select      'Case X
+End If      'More Tools? Suggestions http://github.com/rubberduck-vba/Rubberduck/Issues/New
+
+End Sub</value>
+  </data>
+  <data name="SpecialOptionsLabel" xml:space="preserve">
+    <value>Special Options</value>
+  </data>
+  <data name="VerticalSpacing" xml:space="preserve">
+    <value>Maintain vertical spacing</value>
+  </data>
+  <data name="VerticalSpacingLabel" xml:space="preserve">
+    <value>Vertical Spacing</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ce837cefb5..9bace61c9d 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -1991,253 +1991,6 @@ public static string IndentCurrentProject {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Align comments with code.
-        /// </summary>
-        public static string IndenterSettings_AlignCommentsWithCode {
-            get {
-                return ResourceManager.GetString("IndenterSettings_AlignCommentsWithCode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Align continuations.
-        /// </summary>
-        public static string IndenterSettings_AlignContinuations {
-            get {
-                return ResourceManager.GetString("IndenterSettings_AlignContinuations", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Align dims.
-        /// </summary>
-        public static string IndenterSettings_AlignDims {
-            get {
-                return ResourceManager.GetString("IndenterSettings_AlignDims", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Alignment Options.
-        /// </summary>
-        public static string IndenterSettings_AlignmentOptionsLabel {
-            get {
-                return ResourceManager.GetString("IndenterSettings_AlignmentOptionsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indented Code Sample.
-        /// </summary>
-        public static string IndenterSettings_CodeSampleHeader {
-            get {
-                return ResourceManager.GetString("IndenterSettings_CodeSampleHeader", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty line handling:.
-        /// </summary>
-        public static string IndenterSettings_EmptyLineHeading {
-            get {
-                return ResourceManager.GetString("IndenterSettings_EmptyLineHeading", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Enable Options.
-        /// </summary>
-        public static string IndenterSettings_EnableOptionsLabel {
-            get {
-                return ResourceManager.GetString("IndenterSettings_EnableOptionsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Enable undo.
-        /// </summary>
-        public static string IndenterSettings_EnableUndo {
-            get {
-                return ResourceManager.GetString("IndenterSettings_EnableUndo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to End-of-line comment style:.
-        /// </summary>
-        public static string IndenterSettings_EndOfLineCommentStyle {
-            get {
-                return ResourceManager.GetString("IndenterSettings_EndOfLineCommentStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Force compiler directives to column 1.
-        /// </summary>
-        public static string IndenterSettings_ForceCompilerDirectivesToColumn1 {
-            get {
-                return ResourceManager.GetString("IndenterSettings_ForceCompilerDirectivesToColumn1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Force debug directives to column 1.
-        /// </summary>
-        public static string IndenterSettings_ForceDebugDirectivesToColumn1 {
-            get {
-                return ResourceManager.GetString("IndenterSettings_ForceDebugDirectivesToColumn1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ignore empty lines when locating first comment and declaration blocks.
-        /// </summary>
-        public static string IndenterSettings_IgnoreEmptyLinesInFirstBlocks {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IgnoreEmptyLinesInFirstBlocks", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ignore operators.
-        /// </summary>
-        public static string IndenterSettings_IgnoreOperators {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IgnoreOperators", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent case.
-        /// </summary>
-        public static string IndenterSettings_IndentCase {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentCase", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent compiler directives.
-        /// </summary>
-        public static string IndenterSettings_IndentCompilerDirectives {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentCompilerDirectives", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent entire procedure body.
-        /// </summary>
-        public static string IndenterSettings_IndentEntireProcedureBody {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentEntireProcedureBody", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent comments in Enum and Type blocks like in procedures.
-        /// </summary>
-        public static string IndenterSettings_IndentEnumTypeAsProcedure {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentEnumTypeAsProcedure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent first comment block.
-        /// </summary>
-        public static string IndenterSettings_IndentFirstCommentBlock {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentFirstCommentBlock", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent first declaration block.
-        /// </summary>
-        public static string IndenterSettings_IndentFirstDeclarationBlock {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentFirstDeclarationBlock", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent Options.
-        /// </summary>
-        public static string IndenterSettings_IndentOptionsLabel {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentOptionsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indent spaces:.
-        /// </summary>
-        public static string IndenterSettings_IndentSpaces {
-            get {
-                return ResourceManager.GetString("IndenterSettings_IndentSpaces", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Public Enum ExampleEnum
-        ///&apos; Enum comment.
-        ///Foo
-        ///Bar &apos; Member comment.
-        ///End Enum
-        ///
-        ///&apos; Example Procedure
-        ///Sub ExampleProc()
-        ///
-        ///&apos; SMART INDENTER
-        ///&apos; Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
-        ///&apos; © 2016 by Rubberduck VBA.
-        ///
-        ///Dim count As Integer
-        ///Static name As String
-        ///
-        ///If YouLikeRubberduck Then
-        ///&apos; Star us on GitHub http://github.com/rubberduck-vba/Rubberduck
-        ///&apos; Follow us on Twitter @rubberduckvba
-        ///&apos; Visit http://rubberduckvba.com for news and updates
-        ///
-        ///Select Case X
-        ///Case  [rest of string was truncated]&quot;;.
-        /// </summary>
-        public static string IndenterSettings_PreviewCode {
-            get {
-                return ResourceManager.GetString("IndenterSettings_PreviewCode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Special Options.
-        /// </summary>
-        public static string IndenterSettings_SpecialOptionsLabel {
-            get {
-                return ResourceManager.GetString("IndenterSettings_SpecialOptionsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Maintain vertical spacing.
-        /// </summary>
-        public static string IndenterSettings_VerticalSpacing {
-            get {
-                return ResourceManager.GetString("IndenterSettings_VerticalSpacing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vertical Spacing.
-        /// </summary>
-        public static string IndenterSettings_VerticalSpacingLabel {
-            get {
-                return ResourceManager.GetString("IndenterSettings_VerticalSpacingLabel", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Inspect.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 643a4d217f..a3a2d5992a 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -480,15 +480,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="EndOfLineCommentStyle_AlignInColumn" xml:space="preserve">
     <value>Zarovnej ve sloupci</value>
   </data>
-  <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
-    <value>Zarovnat komenty s kódem</value>
-  </data>
-  <data name="IndenterSettings_IndentSpaces" xml:space="preserve">
-    <value>Odsadit mezery:</value>
-  </data>
-  <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
-    <value>Nastavení odsazení</value>
-  </data>
   <data name="CodeInspectionResults_Type" xml:space="preserve">
     <value>Typ</value>
   </data>
@@ -653,36 +644,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Standardní Mezera</value>
   </data>
-  <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
-    <value>Zarovnat pokračování</value>
-  </data>
-  <data name="IndenterSettings_AlignDims" xml:space="preserve">
-    <value>Zarovnat 'dimy'</value>
-  </data>
-  <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
-    <value>Nastavení Zarovnání</value>
-  </data>
-  <data name="IndenterSettings_EnableOptionsLabel" xml:space="preserve">
-    <value>Povolit Nastavení</value>
-  </data>
-  <data name="IndenterSettings_EnableUndo" xml:space="preserve">
-    <value>Povolit 'zpět'</value>
-  </data>
-  <data name="IndenterSettings_EndOfLineCommentStyle" xml:space="preserve">
-    <value>Styl komentářů na konci řádku:</value>
-  </data>
-  <data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
-    <value>Ignorovat operátory</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstCommentBlock" xml:space="preserve">
-    <value>Odsadit první blok komentáře</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
-    <value>Odsadit první blok deklarace</value>
-  </data>
-  <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
-    <value>Speciální nastavení</value>
-  </data>
   <data name="CommandDescription_IndentCurrentModuleCommand" xml:space="preserve">
     <value>Odsadit Modul</value>
   </data>
@@ -836,12 +797,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="ContextReferences" xml:space="preserve">
     <value>reference</value>
   </data>
-  <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
-    <value>Udržovat vertikální vzdálenosti</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
-    <value>Vertikální vzdálenosti</value>
-  </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>procedura knihovny</value>
   </data>
@@ -854,9 +809,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Specifikujte Název Kopie Lokální Proměnné</value>
   </data>
-  <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
-    <value>Příklad Odsazeného Kódu</value>
-  </data>
   <data name="VersionCheck_NewVersionAvailable" xml:space="preserve">
     <value>Momentálně používáte Rubberduck verzi {0}.
 Dobré zprávy! Verze {1} ({2}) je nyní k dispozici.
@@ -967,16 +919,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="ContextMultipleControlsSelection" xml:space="preserve">
     <value>multiple controls</value>
   </data>
-  <data name="IndenterSettings_PreviewCode" xml:space="preserve">
-    <value>Public Enum ExampleEnum
-' Enum komentář.
-Foo
-Bar ' Komentář člena.
-End Enum</value>
-  </data>
-  <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
-    <value>Odsadit komentáře v Enum a Type blocích tak, jako v procedurách</value>
-  </data>
   <data name="DeclarationType_PropertyGet" xml:space="preserve">
     <value>Get accessor vlastnosti</value>
   </data>
@@ -993,21 +935,6 @@ End Enum</value>
     <value>Rubberduck Inspekce Kódu - {0}
 {1} problém nalezen.</value>
   </data>
-  <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
-    <value>Vynutit pokyny kompilátoru do sloupce 1</value>
-  </data>
-  <data name="IndenterSettings_ForceDebugDirectivesToColumn1" xml:space="preserve">
-    <value>Vynutit debugovací pokyny do sloupce 1</value>
-  </data>
-  <data name="IndenterSettings_IndentCase" xml:space="preserve">
-    <value>Odsadit 'Case'</value>
-  </data>
-  <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
-    <value>Odsadit pokyny kompilátoru</value>
-  </data>
-  <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
-    <value>Odsadit celý vnitřek procedury</value>
-  </data>
   <data name="RubberduckFatalError" xml:space="preserve">
     <value>Rubberduck zaznamenal chybu. Uložte vaši práci a restartujte program; jestliže máte povoleno logování, můžete log, který se nachází v: '%AppData%Roaming\Rubberduck\Logs\RubberduckLog.txt', uploadovat do nového GitHub Issue na 'https://github.com/rubberduck-vba/Rubberduck/issues/new' a reportovat jako bug.</value>
   </data>
@@ -1017,9 +944,6 @@ End Enum</value>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Zaneprázdněný</value>
   </data>
-  <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
-    <value>Ignoruj prázdné řádky při vyhledávání prvních poznámek a deklaračních bloků</value>
-  </data>
   <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
     <value>Popis:</value>
   </data>
@@ -1053,9 +977,6 @@ End Enum</value>
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Odstranit</value>
   </data>
-  <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
-    <value>Zacházení s prázdnými řádky:</value>
-  </data>
   <data name="References" xml:space="preserve">
     <value>Reference</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index d1cfffe657..d47d5769c5 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -620,60 +620,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Standardabstand</value>
   </data>
-  <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
-    <value>Richte Kommentare am Code aus</value>
-  </data>
-  <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
-    <value>Richte Fortsetzung aus</value>
-  </data>
-  <data name="IndenterSettings_AlignDims" xml:space="preserve">
-    <value>Ausrichtung der Deklarationen</value>
-  </data>
-  <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
-    <value>Ausrichtungsoptionen</value>
-  </data>
-  <data name="IndenterSettings_EnableOptionsLabel" xml:space="preserve">
-    <value>Optionen freigeben</value>
-  </data>
-  <data name="IndenterSettings_EnableUndo" xml:space="preserve">
-    <value>Rückgängig freigeben</value>
-  </data>
-  <data name="IndenterSettings_EndOfLineCommentStyle" xml:space="preserve">
-    <value>Zeilenende Kommentarstil:</value>
-  </data>
-  <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
-    <value>Erzwinge Kompilerdirektiven in Spalte 1</value>
-  </data>
-  <data name="IndenterSettings_ForceDebugDirectivesToColumn1" xml:space="preserve">
-    <value>Erzwinge Debugdirektiven in Spalte 1</value>
-  </data>
-  <data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
-    <value>Ignoriere Operatoren</value>
-  </data>
-  <data name="IndenterSettings_IndentCase" xml:space="preserve">
-    <value>Rücke 'Case' ein</value>
-  </data>
-  <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
-    <value>Rücke Kompilerdirektiven ein</value>
-  </data>
-  <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
-    <value>Rücke gesamten Prozedurblock ein</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstCommentBlock" xml:space="preserve">
-    <value>Rücke ersten Kommentarblock ein</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
-    <value>Rücke ersten Deklarationsblock ein</value>
-  </data>
-  <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
-    <value>Rücke Optionen ein</value>
-  </data>
-  <data name="IndenterSettings_IndentSpaces" xml:space="preserve">
-    <value>Einrückungsleerzeichen:</value>
-  </data>
-  <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
-    <value>Spezielle Optionen</value>
-  </data>
   <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
     <value>Nach Modul</value>
   </data>
@@ -809,9 +755,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="RegexAssistant_RegexPatternLabel" xml:space="preserve">
     <value>Ausdruck</value>
   </data>
-  <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
-    <value>Kommentare in Enums und Typen wie in Prozeduren einrücken</value>
-  </data>
   <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
     <value>Inspektionen nach erfolgreichem Parsen automatisch starten</value>
   </data>
@@ -824,47 +767,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Werkzeugfenster wurden nicht korrekt entfernt und/oder konnten nicht wieder hergestellt werden; Die VBE könnte instabil sein. Rubberduck wird beim nächsten Start der VBE normal laden.</value>
   </data>
-  <data name="IndenterSettings_PreviewCode" xml:space="preserve">
-    <value>Public Enum BeispielEnum
-' Enum Kommentar.
-Foo
-Bar ' Element-Kommentar.
-End Enum
-
-' Beispielprozedur
-Sub BeispielProc()
-
-' SMART INDENTER
-' Der originale VB6-Code wurde Rubberduck gnädigerweise von Stephen Bullen &amp; Rob Bovey angeboten
-' © 2016 by Rubberduck VBA.
-
-Dim zaehler As Integer
-Static name As String
-
-If SieMoegenRubberduck Then
-' Einen Stern auf GitHub geben: http://github.com/rubberduck-vba/Rubberduck
-' Auf Twitter folgen @rubberduckvba
-' http://rubberduckvba.com für Neuigkeiten und Aktualisierungen
-
-Select Case X
-Case "A"
-' Falls sie Kommentare oder Vorschläge haben, _
-oder validen VBA code gefunden haben, der nicht korrekt eingerückt wird,
-
-#If VBA6 Then
-MsgBox "Kontaktieren Sie contact@rubberduck-vba.com"
-#End If
-
-Case "Fortgeführte Strings und Parameter können" _
-&amp; "zur Lesbarkeit aufgereiht werden. Optional können" _
-&amp; "beliebige Operatoren (&amp;+, usw.) am Zeilenbeginn ignoriert werden."
-
-Debug.Print "X&lt;&gt;1"
-End Select      'Case X
-End If      'Mehr Werkzeuge? Vorschläge an http://github.com/rubberduck-vba/Rubberduck/Issues/New
-
-End Sub</value>
-  </data>
   <data name="ParserErrorToolTipText" xml:space="preserve">
     <value>{0} Modul(e) konnten nicht geparsed werden; Klicken Sie für Details.</value>
   </data>
@@ -881,18 +783,9 @@ Möchten sie die Einstellungen in Rubberduck importieren?</value>
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Variablenname der Lokalen Kopie festlegen</value>
   </data>
-  <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
-    <value>Eingerücktes Codebeispiel</value>
-  </data>
   <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
     <value>Bitte geben Sie einen Namen für die lokale Kopie von ByVal {0} '{1}'.</value>
   </data>
-  <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
-    <value>Vertikalen Abstand aufrecht erhalten</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
-    <value>Vertikalen Abstand</value>
-  </data>
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>Laufzeitausdruck</value>
   </data>
@@ -1074,9 +967,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtern nach</value>
   </data>
-  <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
-    <value>Leerzeilen bei der Suche nach dem ersten Kommentar und nach Deklarationsblöcken ignorieren</value>
-  </data>
   <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
     <value>Schweregrad:</value>
   </data>
@@ -1092,9 +982,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Entfernen</value>
   </data>
-  <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
-    <value>Leerzeilenbehandlung:</value>
-  </data>
   <data name="References_BrowseFilterAllFiles" xml:space="preserve">
     <value>Alle Dateien(*.*)|*.*</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 75448fb28a..d630261a1d 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -643,60 +643,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Gap estándar</value>
   </data>
-  <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
-    <value>Alinear comentarios con código</value>
-  </data>
-  <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
-    <value>Alinear continuaciones</value>
-  </data>
-  <data name="IndenterSettings_AlignDims" xml:space="preserve">
-    <value>Alinear dims</value>
-  </data>
-  <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
-    <value>Opciones de alineación</value>
-  </data>
-  <data name="IndenterSettings_EnableOptionsLabel" xml:space="preserve">
-    <value>Habilitar opciones</value>
-  </data>
-  <data name="IndenterSettings_EnableUndo" xml:space="preserve">
-    <value>Habilitar Deshacer</value>
-  </data>
-  <data name="IndenterSettings_EndOfLineCommentStyle" xml:space="preserve">
-    <value>Estilo de comentario de fin de línea:</value>
-  </data>
-  <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
-    <value>Forzar las directivas del compilador a la columna 1</value>
-  </data>
-  <data name="IndenterSettings_ForceDebugDirectivesToColumn1" xml:space="preserve">
-    <value>Forzar las directivas de depuración a la columna 1</value>
-  </data>
-  <data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
-    <value>Ignorar a los operadores</value>
-  </data>
-  <data name="IndenterSettings_IndentCase" xml:space="preserve">
-    <value>Indentar case</value>
-  </data>
-  <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
-    <value>Indentar directivas de compilación</value>
-  </data>
-  <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
-    <value>Indentar todo el cuerpo del procedimiento</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstCommentBlock" xml:space="preserve">
-    <value>Indentar primer bloque de comentarios</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
-    <value>Indentar primer bloque de declaración</value>
-  </data>
-  <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
-    <value>Opciones de indentación</value>
-  </data>
-  <data name="IndenterSettings_IndentSpaces" xml:space="preserve">
-    <value>Indentar espacios:</value>
-  </data>
-  <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
-    <value>Opciones especiales</value>
-  </data>
   <data name="CommandDescription_IndentCurrentModuleCommand" xml:space="preserve">
     <value>Indentar modulo</value>
   </data>
@@ -880,50 +826,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="ReparseToolTipText" xml:space="preserve">
     <value>{0}. Haga clic para actualizar.</value>
   </data>
-  <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
-    <value>Indentar comentarios en bloques Enum y Type como en procedimientos</value>
-  </data>
-  <data name="IndenterSettings_PreviewCode" xml:space="preserve">
-    <value>Public Enum ExampleEnum
-' Enum comment.
-Foo
-Bar ' Member comment.
-End Enum
-
-' Example Procedure
-Sub ExampleProc()
-
-' SMART INDENTER
-' Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
-' © 2016 by Rubberduck VBA.
-
-Dim count As Integer
-Static name As String
-
-If YouLikeRubberduck Then
-' Star us on GitHub http://github.com/rubberduck-vba/Rubberduck
-' Follow us on Twitter @rubberduckvba
-' Visit http://rubberduckvba.com for news and updates
-
-Select Case X
-Case "A"
-' If you have any comments or suggestions, _
-or find valid VBA code that isn't indented correctly,
-
-#If VBA6 Then
-MsgBox "Contact contact@rubberduck-vba.com"
-#End If
-
-Case "Continued strings and parameters can be" _
-&amp; "lined up for easier reading, optionally ignoring" _
-&amp; "any operators (&amp;+, etc) at the start of the line."
-
-Debug.Print "X&lt;&gt;1"
-End Select      'Case X
-End If      'More Tools? Suggestions http://github.com/rubberduck-vba/Rubberduck/Issues/New
-
-End Sub</value>
-  </data>
   <data name="ContextReferences" xml:space="preserve">
     <value>referencias</value>
     <comment>Se utiliza para mostrar el número de referencias en la selección de contexto de la barra de comandos</comment>
@@ -936,12 +838,6 @@ End Sub</value>
     <value>Se encontraron ajustes de Smart Indenter en su registro.
 ¿Le gustaría importarlos a Rubberduck?</value>
   </data>
-  <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
-    <value>Mantener el espaciamiento vertical</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
-    <value>Espaciamiento vertical</value>
-  </data>
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>expresión en tiempo de ejecución</value>
   </data>
@@ -955,9 +851,6 @@ End Sub</value>
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Especifique el nombre de la variable de copia local</value>
   </data>
-  <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
-    <value>Ejemplo de código indentado</value>
-  </data>
   <data name="VersionCheck_NewVersionAvailable" xml:space="preserve">
     <value>Usted está usando Rubberduck version {0}.
 Buenas noticias! La version {1} ({2}) ya está disponible.
@@ -1093,9 +986,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtrado por</value>
   </data>
-  <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
-    <value>Ignore las líneas vacías al ubicar los bloques de primer comentario y declaración</value>
-  </data>
   <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
     <value>Severidad:</value>
   </data>
@@ -1111,9 +1001,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Eliminar</value>
   </data>
-  <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
-    <value>Manejo de línea vacía:</value>
-  </data>
   <data name="References" xml:space="preserve">
     <value>Referencias</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 1cfd2b55e9..1f5adc79f8 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -624,9 +624,6 @@ Continuer?</value>
   <data name="EndOfLineCommentStyle_Absolute" xml:space="preserve">
     <value>Absolut</value>
   </data>
-  <data name="IndenterSettings_EnableOptionsLabel" xml:space="preserve">
-    <value>Activer les options</value>
-  </data>
   <data name="ParserState_Error" xml:space="preserve">
     <value>Erreur d'analyse</value>
   </data>
@@ -651,36 +648,15 @@ Continuer?</value>
   <data name="ParserState_Parsed" xml:space="preserve">
     <value>Analyse complétée</value>
   </data>
-  <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
-    <value>Aligner les options</value>
-  </data>
-  <data name="IndenterSettings_ForceDebugDirectivesToColumn1" xml:space="preserve">
-    <value>Forcer les instructions Debug à la ligne 1</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstCommentBlock" xml:space="preserve">
-    <value>Indenter le premier bloc de commentaires</value>
-  </data>
-  <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
-    <value>Indenter les options</value>
-  </data>
   <data name="CommonHotkey_HookDetached" xml:space="preserve">
     <value>L'attache est déjà désactivée.</value>
   </data>
-  <data name="IndenterSettings_EnableUndo" xml:space="preserve">
-    <value>Activer l'annulation</value>
-  </data>
   <data name="ParserState_Ready" xml:space="preserve">
     <value>Prêt</value>
   </data>
   <data name="Settings" xml:space="preserve">
     <value>Paramètres</value>
   </data>
-  <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
-    <value>Forcer les directives du préprocesseur à la colonne 1</value>
-  </data>
-  <data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
-    <value>Ignorer les opérateurs</value>
-  </data>
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Résultats de recherche</value>
   </data>
@@ -693,30 +669,12 @@ Continuer?</value>
   <data name="ParserState_Pending" xml:space="preserve">
     <value>En attente</value>
   </data>
-  <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
-    <value>Indenter les directives du préprocesseur</value>
-  </data>
   <data name="SearchResults_Context" xml:space="preserve">
     <value>Contexte</value>
   </data>
   <data name="EndOfLineCommentStyle_SameGap" xml:space="preserve">
     <value>Même espacement</value>
   </data>
-  <data name="IndenterSettings_AlignDims" xml:space="preserve">
-    <value>Aligner les déclarations (Dim)</value>
-  </data>
-  <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
-    <value>Options spéciales</value>
-  </data>
-  <data name="IndenterSettings_IndentCase" xml:space="preserve">
-    <value>Indenter les blocs Case</value>
-  </data>
-  <data name="IndenterSettings_EndOfLineCommentStyle" xml:space="preserve">
-    <value>Style des commentaires de fin de ligne:</value>
-  </data>
-  <data name="IndenterSettings_IndentSpaces" xml:space="preserve">
-    <value>Nombre d'espaces:</value>
-  </data>
   <data name="CommonHotkey_InvalidKey" xml:space="preserve">
     <value>Touche invalide.</value>
   </data>
@@ -726,21 +684,12 @@ Continuer?</value>
   <data name="CodeInspectionResults_Issue" xml:space="preserve">
     <value>Problème</value>
   </data>
-  <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
-    <value>Indenter le premier bloc de déclarations</value>
-  </data>
   <data name="CommonHotkey_HookAttached" xml:space="preserve">
     <value>L'attache est déjà active.</value>
   </data>
-  <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
-    <value>Indenter le contenu entier de la procédure</value>
-  </data>
   <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
     <value>la procédure externe</value>
   </data>
-  <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
-    <value>Aligner les commentaires avec le code</value>
-  </data>
   <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
     <value>Par module</value>
   </data>
@@ -750,9 +699,6 @@ Continuer?</value>
   <data name="CodeInspectionResults_Type" xml:space="preserve">
     <value>Type</value>
   </data>
-  <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
-    <value>Aligner les continuations</value>
-  </data>
   <data name="SearchResults_AllReferencesTabFormat" xml:space="preserve">
     <value>Références: '{0}'</value>
   </data>
@@ -792,47 +738,6 @@ Continuer?</value>
   <data name="ReparseToolTipText" xml:space="preserve">
     <value>{0}. Cliquez pour rafraîchir.</value>
   </data>
-  <data name="IndenterSettings_PreviewCode" xml:space="preserve">
-    <value>Public Enum ExempleEnum
-' commentaire enum.
-Foo
-Bar ' commentaire membre enum.
-End Enum
-
-' Procédure exemple
-Sub ExampleProc()
-
-' SMART INDENTER
-' Code VB6 original gracieusement offert au projet Rubberduck par Stephen Bullen et Rob Bovey
-' © 2016 Rubberduck VBA.
-
-Dim count As Integer
-Static name As String
-
-If VousAimezRubberduck Then
-' Donnez-nous une étoile sur GitHub http://github.com/rubberduck-vba/Rubberduck
-' Suivez-nous sur Twitter @rubberduckvba
-' Visitez http://rubberduckvba.com pour les nouvelles et mises à jour
-
-Select Case X
-Case "A"
-' Si vous avez des commentaires ou suggestions, _
-ou si vous trouvez du code VBA valide qui ne s'indente pas correctement,
-
-#If VBA6 Then
-MsgBox "Contactez contact@rubberduck-vba.com"
-#End If
-
-Case "Les chaînes de caractères et paramètres peuvent être" _
-&amp; "alignés pour une lecture plus facile, en ignorant facultativement" _
-&amp; "les opérateurs (&amp;+, etc) au début d'une ligne."
-
-Debug.Print "X&lt;&gt;1"
-End Select      'Case X
-End If      'Plus d'outils? Suggestions http://github.com/rubberduck-vba/Rubberduck/Issues/New
-
-End Sub</value>
-  </data>
   <data name="RegexAssistant_NoPatternError" xml:space="preserve">
     <value>(pas d'expression)</value>
   </data>
@@ -881,9 +786,6 @@ End Sub</value>
   <data name="RubberduckFatalError" xml:space="preserve">
     <value>Rubberduck a rencontré un problème. Veuillez enregistrer votre travail et redémarrer l'application hôte. Si le journal est activé, vous pouvez téléverser le fichier journal '%AppData%\Roaming\Rubberduck\Logs\RubberduckLog.txt' dans un nouveau ticket sur GitHub, au 'https://github.com/rubberduck-vba/Rubberduck/issues/new'.</value>
   </data>
-  <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
-    <value>Indenter les commentaires des blocs Enum et Type comme dans les procédures</value>
-  </data>
   <data name="ContextReferences" xml:space="preserve">
     <value>références</value>
   </data>
@@ -905,9 +807,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Nommer la variable locale</value>
   </data>
-  <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
-    <value>Échantillon de code indenté</value>
-  </data>
   <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
     <value>Veuillez sélectionner 1 seul contrôle à renommer.</value>
   </data>
@@ -917,12 +816,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
     <value>Veuillez spécifier le nom à utiliser pour la copie locale du paramètre {0} '{1}'.</value>
   </data>
-  <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
-    <value>Maintenir l'espacement vertical</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
-    <value>Espacement vertical</value>
-  </data>
   <data name="ConfirmRemoveAssignmentWithUnusedDeclaration" xml:space="preserve">
     <value>La varaible '{0}' est assignée. Supprimer l'/les assignation(s)?</value>
   </data>
@@ -1070,9 +963,6 @@ les projets dans le VBE.</value>
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtrer par</value>
   </data>
-  <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
-    <value>Ignorer les lignes vides lors de la recherche du premier bloc de commentaire ou de déclarations</value>
-  </data>
   <data name="EmptyLineHandling_Ignore" xml:space="preserve">
     <value>Ignorer</value>
   </data>
@@ -1082,9 +972,6 @@ les projets dans le VBE.</value>
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Supprimer</value>
   </data>
-  <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
-    <value>Traitement des lignes vides:</value>
-  </data>
   <data name="Language_CS" xml:space="preserve">
     <value>Tchèque</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index c30ec3ac84..17b8a42653 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -652,60 +652,6 @@ Do you want to proceed with this rename?</value>
   <data name="EndOfLineCommentStyle_StandardGap" xml:space="preserve">
     <value>Standard Gap</value>
   </data>
-  <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
-    <value>Align comments with code</value>
-  </data>
-  <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
-    <value>Align continuations</value>
-  </data>
-  <data name="IndenterSettings_AlignDims" xml:space="preserve">
-    <value>Align dims</value>
-  </data>
-  <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
-    <value>Alignment Options</value>
-  </data>
-  <data name="IndenterSettings_EnableOptionsLabel" xml:space="preserve">
-    <value>Enable Options</value>
-  </data>
-  <data name="IndenterSettings_EnableUndo" xml:space="preserve">
-    <value>Enable undo</value>
-  </data>
-  <data name="IndenterSettings_EndOfLineCommentStyle" xml:space="preserve">
-    <value>End-of-line comment style:</value>
-  </data>
-  <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
-    <value>Force compiler directives to column 1</value>
-  </data>
-  <data name="IndenterSettings_ForceDebugDirectivesToColumn1" xml:space="preserve">
-    <value>Force debug directives to column 1</value>
-  </data>
-  <data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
-    <value>Ignore operators</value>
-  </data>
-  <data name="IndenterSettings_IndentCase" xml:space="preserve">
-    <value>Indent case</value>
-  </data>
-  <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
-    <value>Indent compiler directives</value>
-  </data>
-  <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
-    <value>Indent entire procedure body</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstCommentBlock" xml:space="preserve">
-    <value>Indent first comment block</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
-    <value>Indent first declaration block</value>
-  </data>
-  <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
-    <value>Indent Options</value>
-  </data>
-  <data name="IndenterSettings_IndentSpaces" xml:space="preserve">
-    <value>Indent spaces:</value>
-  </data>
-  <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
-    <value>Special Options</value>
-  </data>
   <data name="CommandDescription_IndentCurrentModuleCommand" xml:space="preserve">
     <value>Indent Module</value>
   </data>
@@ -889,50 +835,6 @@ Do you want to proceed with this rename?</value>
   <data name="ReparseToolTipText" xml:space="preserve">
     <value>{0}. Click to refresh.</value>
   </data>
-  <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
-    <value>Indent comments in Enum and Type blocks like in procedures</value>
-  </data>
-  <data name="IndenterSettings_PreviewCode" xml:space="preserve">
-    <value>Public Enum ExampleEnum
-' Enum comment.
-Foo
-Bar ' Member comment.
-End Enum
-
-' Example Procedure
-Sub ExampleProc()
-
-' SMART INDENTER
-' Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
-' © 2016 by Rubberduck VBA.
-
-Dim count As Integer
-Static name As String
-
-If YouLikeRubberduck Then
-' Star us on GitHub http://github.com/rubberduck-vba/Rubberduck
-' Follow us on Twitter @rubberduckvba
-' Visit http://rubberduckvba.com for news and updates
-
-Select Case X
-Case "A"
-' If you have any comments or suggestions, _
-or find valid VBA code that isn't indented correctly,
-
-#If VBA6 Then
-MsgBox "Contact contact@rubberduck-vba.com"
-#End If
-
-Case "Continued strings and parameters can be" _
-&amp; "lined up for easier reading, optionally ignoring" _
-&amp; "any operators (&amp;+, etc) at the start of the line."
-
-Debug.Print "X&lt;&gt;1"
-End Select      'Case X
-End If      'More Tools? Suggestions http://github.com/rubberduck-vba/Rubberduck/Issues/New
-
-End Sub</value>
-  </data>
   <data name="ContextReferences" xml:space="preserve">
     <value>references</value>
     <comment>Used to display number of references in commandbar's context selection</comment>
@@ -945,12 +847,6 @@ End Sub</value>
     <value>Smart Indenter settings were found in your registry.
 Would you like to import them to Rubberduck?</value>
   </data>
-  <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
-    <value>Maintain vertical spacing</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
-    <value>Vertical Spacing</value>
-  </data>
   <data name="DeclarationType_BracketedExpression" xml:space="preserve">
     <value>runtime expression</value>
   </data>
@@ -964,9 +860,6 @@ Would you like to import them to Rubberduck?</value>
   <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
     <value>Specify Local Copy Variable Name</value>
   </data>
-  <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
-    <value>Indented Code Sample</value>
-  </data>
   <data name="VersionCheck_NewVersionAvailable" xml:space="preserve">
     <value>You are currently running Rubberduck version {0}.
 Good news! Version {1} ({2}) is now available.
@@ -1140,9 +1033,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filter by</value>
   </data>
-  <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
-    <value>Ignore empty lines when locating first comment and declaration blocks</value>
-  </data>
   <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
     <value>Severity:</value>
   </data>
@@ -1158,9 +1048,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Remove</value>
   </data>
-  <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
-    <value>Empty line handling:</value>
-  </data>
   <data name="References" xml:space="preserve">
     <value>References</value>
   </data>

From 55c3fa5aaf6dadf002d27e67a262ce6ecf8c2f1a Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 22:44:20 -0700
Subject: [PATCH 31/64] Migrate InspectionResults_ resources

---
 .../Inspections/InspectionResultsControl.xaml | 12 ++---
 .../InspectionResultsUI.Designer.cs           | 54 +++++++++++++++++++
 .../Inspections/InspectionResultsUI.cs.resx   | 18 +++++++
 .../Inspections/InspectionResultsUI.de.resx   | 18 +++++++
 .../Inspections/InspectionResultsUI.es.resx   | 18 +++++++
 .../Inspections/InspectionResultsUI.fr.resx   | 18 +++++++
 .../UI/Inspections/InspectionResultsUI.resx   | 18 +++++++
 .../UI/ToDoItems/ToDoExplorerControl.xaml     |  4 +-
 .../UI/UnitTesting/TestExplorerControl.xaml   |  4 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 54 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 18 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 18 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 18 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 18 -------
 Rubberduck.Resources/RubberduckUI.resx        | 18 -------
 15 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
index 386d456340..61c56e28de 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
@@ -159,25 +159,25 @@
                 <Label Content="{Resx ResxName=Rubberduck.Resources.Inspections.InspectionsUI ,Key=CodeInspection_SeverityFilter}" />
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterByError}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterByError}"
                               IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Error}}">
                     <Image Source="{StaticResource FilterByErrorImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterByWarning}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterByWarning}"
                               IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Warning}}">
                     <Image Source="{StaticResource FilterByWarningImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterBySuggestion}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterBySuggestion}"
                               IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Suggestion}}">
                     <Image Source="{StaticResource FilterBySuggestionImage}" />
                 </ToggleButton>
 
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterByHint}"
+                              ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterByHint}"
                               IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Hint}}">
                     <Image Source="{StaticResource FilterByHintImage}" />
                 </ToggleButton>
@@ -185,12 +185,12 @@
                 <Separator />
 
                 <Button Name="CollapseAll" Command="{Binding CollapseAllCommand}" Margin="2"
-                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_CollapseAll}">
+                        ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=CollapseAll}">
                     <Image Source="{StaticResource CollapseAllImage}" />
                 </Button>
 
                 <Button Name="ExpandAll" Command="{Binding ExpandAllCommand}" Margin="2"
-                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_ExpandAll}">
+                        ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=ExpandAll}">
                     <Image Source="{StaticResource ExpandAllImage}" />
                 </Button>
 
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs
index b779a46423..0666c9c9d6 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.Designer.cs
@@ -60,6 +60,60 @@ internal InspectionResultsUI() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Collapse all.
+        /// </summary>
+        public static string CollapseAll {
+            get {
+                return ResourceManager.GetString("CollapseAll", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Expand all.
+        /// </summary>
+        public static string ExpandAll {
+            get {
+                return ResourceManager.GetString("ExpandAll", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error.
+        /// </summary>
+        public static string FilterByError {
+            get {
+                return ResourceManager.GetString("FilterByError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Hint.
+        /// </summary>
+        public static string FilterByHint {
+            get {
+                return ResourceManager.GetString("FilterByHint", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Suggestion.
+        /// </summary>
+        public static string FilterBySuggestion {
+            get {
+                return ResourceManager.GetString("FilterBySuggestion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Warning.
+        /// </summary>
+        public static string FilterByWarning {
+            get {
+                return ResourceManager.GetString("FilterByWarning", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to By inspection type.
         /// </summary>
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx
index 77c250d7df..70df5e1df3 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.cs.resx
@@ -126,4 +126,22 @@
   <data name="GroupingStyle_BySeverity" xml:space="preserve">
     <value>Dle závažnosti</value>
   </data>
+  <data name="CollapseAll" xml:space="preserve">
+    <value>Sbalit vše</value>
+  </data>
+  <data name="ExpandAll" xml:space="preserve">
+    <value>Rozbalit vše</value>
+  </data>
+  <data name="FilterByError" xml:space="preserve">
+    <value>Chyba</value>
+  </data>
+  <data name="FilterByHint" xml:space="preserve">
+    <value>Nápověda</value>
+  </data>
+  <data name="FilterBySuggestion" xml:space="preserve">
+    <value>Návrh</value>
+  </data>
+  <data name="FilterByWarning" xml:space="preserve">
+    <value>Varování</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx
index 2907aa70c1..7b7aa45ac5 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.de.resx
@@ -126,4 +126,22 @@
   <data name="GroupingStyle_BySeverity" xml:space="preserve">
     <value>Nach Schweregrad</value>
   </data>
+  <data name="CollapseAll" xml:space="preserve">
+    <value>Alle einklappen</value>
+  </data>
+  <data name="ExpandAll" xml:space="preserve">
+    <value>Alle ausklappen</value>
+  </data>
+  <data name="FilterByError" xml:space="preserve">
+    <value>Fehler</value>
+  </data>
+  <data name="FilterByHint" xml:space="preserve">
+    <value>Tipp</value>
+  </data>
+  <data name="FilterBySuggestion" xml:space="preserve">
+    <value>Vorschlag</value>
+  </data>
+  <data name="FilterByWarning" xml:space="preserve">
+    <value>Warnung</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx
index 7b34f9bfa9..7a057ba190 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.es.resx
@@ -126,4 +126,22 @@
   <data name="GroupingStyle_BySeverity" xml:space="preserve">
     <value>Por severidad</value>
   </data>
+  <data name="CollapseAll" xml:space="preserve">
+    <value>Colapsar todo</value>
+  </data>
+  <data name="ExpandAll" xml:space="preserve">
+    <value>Expandir todo</value>
+  </data>
+  <data name="FilterByError" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="FilterByHint" xml:space="preserve">
+    <value>Consejo</value>
+  </data>
+  <data name="FilterBySuggestion" xml:space="preserve">
+    <value>Sugerencia</value>
+  </data>
+  <data name="FilterByWarning" xml:space="preserve">
+    <value>Advertencia</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx
index 46142b1dbe..13af1d4b0c 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.fr.resx
@@ -126,4 +126,22 @@
   <data name="GroupingStyle_BySeverity" xml:space="preserve">
     <value>Par sévérité</value>
   </data>
+  <data name="CollapseAll" xml:space="preserve">
+    <value>Réduire tout</value>
+  </data>
+  <data name="ExpandAll" xml:space="preserve">
+    <value>Développer tout</value>
+  </data>
+  <data name="FilterByError" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="FilterByHint" xml:space="preserve">
+    <value>Note</value>
+  </data>
+  <data name="FilterBySuggestion" xml:space="preserve">
+    <value>Suggestion</value>
+  </data>
+  <data name="FilterByWarning" xml:space="preserve">
+    <value>Avertissement</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx
index f36479d708..5500755441 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.resx
@@ -106,4 +106,22 @@
   <data name="GroupingStyle_BySeverity" xml:space="preserve">
     <value>By severity</value>
   </data>
+  <data name="CollapseAll" xml:space="preserve">
+    <value>Collapse all</value>
+  </data>
+  <data name="ExpandAll" xml:space="preserve">
+    <value>Expand all</value>
+  </data>
+  <data name="FilterByError" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="FilterByHint" xml:space="preserve">
+    <value>Hint</value>
+  </data>
+  <data name="FilterBySuggestion" xml:space="preserve">
+    <value>Suggestion</value>
+  </data>
+  <data name="FilterByWarning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
index c9c3766842..8c79ee7171 100644
--- a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
@@ -77,12 +77,12 @@
                 <Separator />
 
                 <Button Name="CollapseAll" Command="{Binding CollapseAllCommand}"
-                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_CollapseAll}">
+                        ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=CollapseAll}">
                     <Image Source="{StaticResource CollapseAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
 
                 <Button Name="ExpandAll" Command="{Binding ExpandAllCommand}"
-                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_ExpandAll}">
+                        ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=ExpandAll}">
                     <Image Source="{StaticResource ExpandAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
 
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
index f25e39636e..de9d579735 100644
--- a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
@@ -241,12 +241,12 @@
                 <Separator />
 
                 <Button Name="CollapseAll" Command="{Binding CollapseAllCommand}" Margin="2"
-                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_CollapseAll}">
+                        ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=CollapseAll}">
                     <Image Source="{StaticResource CollapseAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
 
                 <Button Name="ExpandAll" Command="{Binding ExpandAllCommand}" Margin="2"
-                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_ExpandAll}">
+                        ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=ExpandAll}">
                     <Image Source="{StaticResource ExpandAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
 
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 9bace61c9d..117b328f32 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2000,60 +2000,6 @@ public static string Inspect {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Collapse all.
-        /// </summary>
-        public static string InspectionResults_CollapseAll {
-            get {
-                return ResourceManager.GetString("InspectionResults_CollapseAll", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Expand all.
-        /// </summary>
-        public static string InspectionResults_ExpandAll {
-            get {
-                return ResourceManager.GetString("InspectionResults_ExpandAll", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error.
-        /// </summary>
-        public static string InspectionResults_FilterByError {
-            get {
-                return ResourceManager.GetString("InspectionResults_FilterByError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hint.
-        /// </summary>
-        public static string InspectionResults_FilterByHint {
-            get {
-                return ResourceManager.GetString("InspectionResults_FilterByHint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Suggestion.
-        /// </summary>
-        public static string InspectionResults_FilterBySuggestion {
-            get {
-                return ResourceManager.GetString("InspectionResults_FilterBySuggestion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Warning.
-        /// </summary>
-        public static string InspectionResults_FilterByWarning {
-            get {
-                return ResourceManager.GetString("InspectionResults_FilterByWarning", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Description:.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a3a2d5992a..e44d78352f 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -947,18 +947,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
     <value>Popis:</value>
   </data>
-  <data name="InspectionResults_FilterByError" xml:space="preserve">
-    <value>Chyba</value>
-  </data>
-  <data name="InspectionResults_FilterByHint" xml:space="preserve">
-    <value>Nápověda</value>
-  </data>
-  <data name="InspectionResults_FilterBySuggestion" xml:space="preserve">
-    <value>Návrh</value>
-  </data>
-  <data name="InspectionResults_FilterByWarning" xml:space="preserve">
-    <value>Varování</value>
-  </data>
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtrovat</value>
   </data>
@@ -1131,12 +1119,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Procházet...</value>
   </data>
-  <data name="InspectionResults_CollapseAll" xml:space="preserve">
-    <value>Sbalit vše</value>
-  </data>
-  <data name="InspectionResults_ExpandAll" xml:space="preserve">
-    <value>Rozbalit vše</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index d47d5769c5..e410d05a5a 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -952,18 +952,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Beschäftigt</value>
   </data>
-  <data name="InspectionResults_FilterByError" xml:space="preserve">
-    <value>Fehler</value>
-  </data>
-  <data name="InspectionResults_FilterByHint" xml:space="preserve">
-    <value>Tipp</value>
-  </data>
-  <data name="InspectionResults_FilterBySuggestion" xml:space="preserve">
-    <value>Vorschlag</value>
-  </data>
-  <data name="InspectionResults_FilterByWarning" xml:space="preserve">
-    <value>Warnung</value>
-  </data>
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtern nach</value>
   </data>
@@ -1177,12 +1165,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
-  <data name="InspectionResults_CollapseAll" xml:space="preserve">
-    <value>Alle einklappen</value>
-  </data>
-  <data name="InspectionResults_ExpandAll" xml:space="preserve">
-    <value>Alle ausklappen</value>
-  </data>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Durchsuchen...</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index d630261a1d..226f673273 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -971,18 +971,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="Settings" xml:space="preserve">
     <value>Ajustes</value>
   </data>
-  <data name="InspectionResults_FilterByError" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="InspectionResults_FilterByHint" xml:space="preserve">
-    <value>Consejo</value>
-  </data>
-  <data name="InspectionResults_FilterBySuggestion" xml:space="preserve">
-    <value>Sugerencia</value>
-  </data>
-  <data name="InspectionResults_FilterByWarning" xml:space="preserve">
-    <value>Advertencia</value>
-  </data>
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filtrado por</value>
   </data>
@@ -1175,12 +1163,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtro</value>
   </data>
-  <data name="InspectionResults_CollapseAll" xml:space="preserve">
-    <value>Colapsar todo</value>
-  </data>
-  <data name="InspectionResults_ExpandAll" xml:space="preserve">
-    <value>Expandir todo</value>
-  </data>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 1f5adc79f8..c8a1d95221 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -975,18 +975,6 @@ les projets dans le VBE.</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Tchèque</value>
   </data>
-  <data name="InspectionResults_FilterByError" xml:space="preserve">
-    <value>Erreur</value>
-  </data>
-  <data name="InspectionResults_FilterByHint" xml:space="preserve">
-    <value>Note</value>
-  </data>
-  <data name="InspectionResults_FilterBySuggestion" xml:space="preserve">
-    <value>Suggestion</value>
-  </data>
-  <data name="InspectionResults_FilterByWarning" xml:space="preserve">
-    <value>Avertissement</value>
-  </data>
   <data name="References" xml:space="preserve">
     <value>Références</value>
   </data>
@@ -1140,15 +1128,9 @@ les projets dans le VBE.</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtrer</value>
   </data>
-  <data name="InspectionResults_CollapseAll" xml:space="preserve">
-    <value>Réduire tout</value>
-  </data>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Parcourir...</value>
   </data>
-  <data name="InspectionResults_ExpandAll" xml:space="preserve">
-    <value>Développer tout</value>
-  </data>
   <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
     <value>'{0}' est accessible globalement, et est utilisé.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 17b8a42653..249c092b7e 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1018,18 +1018,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="InspectionResults_FilterByError" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="InspectionResults_FilterByHint" xml:space="preserve">
-    <value>Hint</value>
-  </data>
-  <data name="InspectionResults_FilterBySuggestion" xml:space="preserve">
-    <value>Suggestion</value>
-  </data>
-  <data name="InspectionResults_FilterByWarning" xml:space="preserve">
-    <value>Warning</value>
-  </data>
   <data name="GroupingGrid_FilterBy" xml:space="preserve">
     <value>Filter by</value>
   </data>
@@ -1284,12 +1272,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
-  <data name="InspectionResults_CollapseAll" xml:space="preserve">
-    <value>Collapse all</value>
-  </data>
-  <data name="InspectionResults_ExpandAll" xml:space="preserve">
-    <value>Expand all</value>
-  </data>
   <data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

From 0eeb0dcbeab208c60c0cda06c44829610be65d53 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 22:53:29 -0700
Subject: [PATCH 32/64] Correct typo

---
 Rubberduck.Core/UI/Settings/InspectionSettings.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
index beb3bfb235..f8e0796c69 100644
--- a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -52,7 +52,7 @@
                     <DockPanel FlowDirection="LeftToRight">
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                             <Label Style="{StaticResource HeaderText}"
-                                Content="{Resx ResxName=Rubberduck.CodeAnalysus.CodeAnalysisUI,Key=CodeInspectionSettingsPage_InspectionSeveritySettingsLabel}" Margin="5,5,0,5" Width="127" />
+                                Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI,Key=CodeInspectionSettingsPage_InspectionSeveritySettingsLabel}" Margin="5,5,0,5" Width="127" />
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
                                 <StackPanel.Resources>
                                     <Style BasedOn="{StaticResource HeaderText}" TargetType="Label">

From f0b3ea5ad8535a52a205a48b718bb7bad269521b Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 23:01:22 -0700
Subject: [PATCH 33/64] Migrate InspectionSettings_ resources

---
 .../CodeAnalysisUI.Designer.cs                 | 18 ++++++++++++++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx |  6 ++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx |  6 ++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx |  6 ++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx |  6 ++++++
 Rubberduck.CodeAnalysis/CodeAnalysisUI.resx    |  6 ++++++
 .../UI/Settings/InspectionSettings.xaml        |  4 ++--
 Rubberduck.Resources/RubberduckUI.cs.resx      |  6 ------
 Rubberduck.Resources/RubberduckUI.de.resx      |  6 ------
 Rubberduck.Resources/RubberduckUI.es.resx      |  6 ------
 Rubberduck.Resources/RubberduckUI.fr.resx      |  6 ------
 Rubberduck.Resources/RubberduckUI.resx         |  6 ------
 12 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
index 336fba17e1..a1451d5789 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs
@@ -125,6 +125,24 @@ public static string CodeInspections_NumberOfIssuesFound_Singular {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Description:.
+        /// </summary>
+        public static string CodeInspectionSettingsPage_FilterByDescription {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_FilterByDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Severity:.
+        /// </summary>
+        public static string CodeInspectionSettingsPage_FilterBySeverity {
+            get {
+                return ResourceManager.GetString("CodeInspectionSettingsPage_FilterBySeverity", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Inspection Severities.
         /// </summary>
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
index 1b5a8e6663..5f8be2f4f0 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.cs.resx
@@ -260,4 +260,10 @@ Nalezeno {1} problémů.</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
+  <data name="CodeInspectionSettingsPage_FilterByDescription" xml:space="preserve">
+    <value>Popis:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterBySeverity" xml:space="preserve">
+    <value>Závažnost:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
index 0a0f85cd5b..c77cda4421 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.de.resx
@@ -260,4 +260,10 @@
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
+  <data name="CodeInspectionSettingsPage_FilterByDescription" xml:space="preserve">
+    <value>Beschreibung:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterBySeverity" xml:space="preserve">
+    <value>Schweregrad:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
index 0f9d493adf..8b64b31886 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.es.resx
@@ -260,4 +260,10 @@
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtro</value>
   </data>
+  <data name="CodeInspectionSettingsPage_FilterByDescription" xml:space="preserve">
+    <value>Descripción:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterBySeverity" xml:space="preserve">
+    <value>Severidad:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
index b43a2251ed..01f9deff51 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.fr.resx
@@ -260,4 +260,10 @@
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtrer</value>
   </data>
+  <data name="CodeInspectionSettingsPage_FilterByDescription" xml:space="preserve">
+    <value>Description:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterBySeverity" xml:space="preserve">
+    <value>Sévérité:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
index 9fff79ef3e..c6f97c1d8f 100644
--- a/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.resx
@@ -242,4 +242,10 @@
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
+  <data name="CodeInspectionSettingsPage_FilterByDescription" xml:space="preserve">
+    <value>Description:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterBySeverity" xml:space="preserve">
+    <value>Severity:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
index f8e0796c69..3055993812 100644
--- a/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/InspectionSettings.xaml
@@ -61,11 +61,11 @@
                                 </StackPanel.Resources>
                                 <Label Content="-" />
                                 <Image Source="{StaticResource FilterImage}" Width="19" />
-                                <Label Content="{Resx Key=InspectionSettings_FilterByDescription, ResxName=Rubberduck.Resources.RubberduckUI}" />
+                                <Label Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_FilterByDescription}" />
                                 <controls:SearchBox Width="100"
                                                     Text="{Binding InspectionSettingsDescriptionFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="26" />
                                 <Border Width="10" />
-                                <Label Content="{Resx Key=InspectionSettings_FilterBySeverity, ResxName=Rubberduck.Resources.RubberduckUI}" />
+                                <Label Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=CodeInspectionSettingsPage_FilterBySeverity}" />
                                 <ComboBox Width="100"
                                           ItemsSource="{Binding SeverityFilters, UpdateSourceTrigger=PropertyChanged}"
                                           SelectedItem="{Binding SelectedSeverityFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 97924a8e07..24977fbed6 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -960,9 +960,6 @@ End Enum</value>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignoruj prázdné řádky při vyhledávání prvních poznámek a deklaračních bloků</value>
   </data>
-  <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Popis:</value>
-  </data>
   <data name="InspectionResults_FilterByError" xml:space="preserve">
     <value>Chyba</value>
   </data>
@@ -975,9 +972,6 @@ End Enum</value>
   <data name="InspectionResults_FilterByWarning" xml:space="preserve">
     <value>Varování</value>
   </data>
-  <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Závažnost:</value>
-  </data>
   <data name="Language_CS" xml:space="preserve">
     <value>Čeština</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 885bbbc271..3161dc8af5 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -990,9 +990,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="IndentCurrentProject" xml:space="preserve">
     <value>Aktuelles Projekt</value>
   </data>
-  <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Beschreibung:</value>
-  </data>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Beschäftigt</value>
   </data>
@@ -1014,9 +1011,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Leerzeilen bei der Suche nach dem ersten Kommentar und nach Deklarationsblöcken ignorieren</value>
   </data>
-  <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Schweregrad:</value>
-  </data>
   <data name="Language_CS" xml:space="preserve">
     <value>Tschechisch</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 858b33a376..138d7afa84 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -998,9 +998,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>"Compilar A Demanda" actualmente habilitado</value>
   </data>
-  <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Descripción:</value>
-  </data>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Ocupado</value>
   </data>
@@ -1028,9 +1025,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignore las líneas vacías al ubicar los bloques de primer comentario y declaración</value>
   </data>
-  <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Severidad:</value>
-  </data>
   <data name="Language_CS" xml:space="preserve">
     <value>Checo</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 875f79bb14..ff6da4d259 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -991,15 +991,9 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="CommandDescription_ExportAllCommand" xml:space="preserve">
     <value>Exporter le projet actif</value>
   </data>
-  <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Description:</value>
-  </data>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Occupé</value>
   </data>
-  <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Sévérité:</value>
-  </data>
   <data name="GroupingStyle_ByCategory" xml:space="preserve">
     <value>Par catégorie</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 814dbaa46d..2ff4842b14 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1008,9 +1008,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
     <value>Compile On Demand currently enabled</value>
   </data>
-  <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Description:</value>
-  </data>
   <data name="ParserState_Busy" xml:space="preserve">
     <value>Busy</value>
   </data>
@@ -1075,9 +1072,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
     <value>Ignore empty lines when locating first comment and declaration blocks</value>
   </data>
-  <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Severity:</value>
-  </data>
   <data name="Language_CS" xml:space="preserve">
     <value>Czech</value>
   </data>

From fd8b130ea5219ff1b26ab8ac79c0d11eb4816134 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 23:13:56 -0700
Subject: [PATCH 34/64] Migrate Introduce resources

---
 .../Notifiers/IntroduceFieldFailedNotifier.cs |  5 ++-
 .../IntroduceParameterFailedNotifier.cs       |  5 ++-
 .../IntroduceParameterRefactoring.cs          |  5 ++-
 .../RefactoringsUI.Designer.cs                | 45 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 15 +++++++
 .../RefactoringsUI.de.resx                    | 15 +++++++
 .../RefactoringsUI.es.resx                    | 15 +++++++
 .../RefactoringsUI.fr.resx                    | 15 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 18 ++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 45 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 16 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.resx        | 18 --------
 15 files changed, 132 insertions(+), 130 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs
index 29f3549f1e..13fa0649ad 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.IntroduceField;
 
@@ -11,7 +12,7 @@ public IntroduceFieldFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.IntroduceField_Caption;
+        protected override string Caption => RefactoringsUI.IntroduceField_Caption;
 
         protected override string Message(RefactoringException exception)
         {
@@ -19,7 +20,7 @@ protected override string Message(RefactoringException exception)
             {
                 case TargetIsAlreadyAFieldException isAlreadyAField:
                     Logger.Warn(isAlreadyAField);
-                    return string.Format(Resources.RubberduckUI.IntroduceFieldFailed_TargetIsAlreadyAField,
+                    return string.Format(RefactoringsUI.IntroduceFieldFailed_TargetIsAlreadyAField,
                         isAlreadyAField.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs
index 3abcc6cb02..83335f0736 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
 using Rubberduck.CodeAnalysis.Inspections.Extensions;
@@ -12,7 +13,7 @@ public IntroduceParameterFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.IntroduceParameter_Caption;
+        protected override string Caption => RefactoringsUI.IntroduceParameter_Caption;
 
         protected override string Message(RefactoringException exception)
         {
@@ -20,7 +21,7 @@ protected override string Message(RefactoringException exception)
             {
                 case TargetDeclarationIsNotContainedInAMethodException targetNotInMethod:
                     Logger.Warn(targetNotInMethod);
-                    return string.Format(Resources.RubberduckUI.IntroduceParameterFailed_TargetNotContainedInMethod,
+                    return string.Format(RefactoringsUI.IntroduceParameterFailed_TargetNotContainedInMethod,
                         targetNotInMethod.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
diff --git a/Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs
index 55476dc64d..82e1c6fdaa 100644
--- a/Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs
+++ b/Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs
@@ -1,6 +1,7 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
 using Rubberduck.Resources;
@@ -92,11 +93,11 @@ private bool PromptIfMethodImplementsInterface(Declaration targetVariable)
                 return true;
             }
 
-            var message = string.Format(RubberduckUI.IntroduceParameter_PromptIfTargetIsInterface,
+            var message = string.Format(RefactoringsUI.IntroduceParameter_PromptIfTargetIsInterface,
                 functionDeclaration.IdentifierName, interfaceImplementation.ComponentName,
                 interfaceImplementation.IdentifierName);
 
-            return _messageBox.Question(message, RubberduckUI.IntroduceParameter_Caption);
+            return _messageBox.Question(message, RefactoringsUI.IntroduceParameter_Caption);
         }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 6eea9395f9..8b9bfe80b2 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -628,5 +628,50 @@ public static string ImplementInterfaceFailed_NoImplementsStatementSelected {
                 return ResourceManager.GetString("ImplementInterfaceFailed_NoImplementsStatementSelected", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Introduce Field.
+        /// </summary>
+        public static string IntroduceField_Caption {
+            get {
+                return ResourceManager.GetString("IntroduceField_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The target &apos;{0}&apos; is already a field..
+        /// </summary>
+        public static string IntroduceFieldFailed_TargetIsAlreadyAField {
+            get {
+                return ResourceManager.GetString("IntroduceFieldFailed_TargetIsAlreadyAField", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Introduce Parameter.
+        /// </summary>
+        public static string IntroduceParameter_Caption {
+            get {
+                return ResourceManager.GetString("IntroduceParameter_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Method &apos;{0}&apos; implements &apos;{1}.{2}&apos;. Change interface signature? (Will propagate to all implementations.).
+        /// </summary>
+        public static string IntroduceParameter_PromptIfTargetIsInterface {
+            get {
+                return ResourceManager.GetString("IntroduceParameter_PromptIfTargetIsInterface", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The target &apos;{0}&apos; is not contained in a method..
+        /// </summary>
+        public static string IntroduceParameterFailed_TargetNotContainedInMethod {
+            get {
+                return ResourceManager.GetString("IntroduceParameterFailed_TargetNotContainedInMethod", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 6697af4d7f..d77292341f 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -302,4 +302,19 @@ Privání třída může stále implementovat public (veřejný) interface.</val
   <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
     <value>Nebyl vybrán žádný příkaz implementace.</value>
   </data>
+  <data name="IntroduceField_Caption" xml:space="preserve">
+    <value>Rubberduck - Představ Pole</value>
+  </data>
+  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
+    <value>Metoda '{0}' implementuje '{1}.{2}'. Změnit podpis rozhraní? (Rozšíří se na všechny implementace.)</value>
+  </data>
+  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
+    <value>Cíl '{0}' je již pole.</value>
+  </data>
+  <data name="IntroduceParameter_Caption" xml:space="preserve">
+    <value>Rubberduck - Představ Vlastnost</value>
+  </data>
+  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
+    <value>Cíl '{0}' není obsažen v metodě.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index cb3d1ff386..60fe7cdefe 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -308,4 +308,19 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
     <value>Es ist keine Implements-Anweisung ausgewählt.</value>
   </data>
+  <data name="IntroduceField_Caption" xml:space="preserve">
+    <value>Rubberduck - Feld einfügen</value>
+  </data>
+  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
+    <value>Methode '{0}' implementiert '{1}.{2}'. Ändern der Interface Signatur? (Wird auf alle Implementierungen angewendet.)</value>
+  </data>
+  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
+    <value>Das Ziel '{0}' ist bereits ein Feld.</value>
+  </data>
+  <data name="IntroduceParameter_Caption" xml:space="preserve">
+    <value>Rubberduck - Parameter einfügen</value>
+  </data>
+  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
+    <value>Das Ziel '{0}' ist nicht in einer Methode enthalten.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 3a65bee59c..d8320804a5 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -302,4 +302,19 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
     <value>No se seleccionaron implementaciones.</value>
   </data>
+  <data name="IntroduceField_Caption" xml:space="preserve">
+    <value>Rubberduck - Introducir campo</value>
+  </data>
+  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
+    <value>El método '{0}' implementa '{1}. {2}'. ¿Cambiar la firma de la interfaz? (Se propagará a todas las implementaciones.)</value>
+  </data>
+  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
+    <value>El destino '{0}' ya es un campo.</value>
+  </data>
+  <data name="IntroduceParameter_Caption" xml:space="preserve">
+    <value>Rubberduck - Introducir Parámetro</value>
+  </data>
+  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
+    <value>El destino '{0}' no está contenido en un método.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 46bbfb04b6..3de8583e26 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -284,4 +284,19 @@ Une classe privée peut toujours implémenter une interface publique.</value>
   <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
     <value>Une instruction 'Implements' doit être sélectionnée.</value>
   </data>
+  <data name="IntroduceField_Caption" xml:space="preserve">
+    <value>Rubberduck - Introduire un champ</value>
+  </data>
+  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
+    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier la signature de l'interface? (se propagera à toutes les implémentations)</value>
+  </data>
+  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
+    <value>La cible '{0}' est déjà un champ.</value>
+  </data>
+  <data name="IntroduceParameter_Caption" xml:space="preserve">
+    <value>Rubberduck - Introduire un paramètre</value>
+  </data>
+  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
+    <value>La cible '{0}' n'est pas contenue dans une procédure.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 9fa8ffee10..eadbb60bf2 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -295,4 +295,22 @@ A private class can still implement a public interface.</value>
   <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
     <value>No implements selected.</value>
   </data>
+  <data name="IntroduceField_Caption" xml:space="preserve">
+    <value>Rubberduck - Introduce Field</value>
+  </data>
+  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
+    <value>Method '{0}' implements '{1}.{2}'. Change interface signature? (Will propagate to all implementations.)</value>
+    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
+  </data>
+  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
+    <value>The target '{0}' is already a field.</value>
+    <comment>{0}: name of target</comment>
+  </data>
+  <data name="IntroduceParameter_Caption" xml:space="preserve">
+    <value>Rubberduck - Introduce Parameter</value>
+  </data>
+  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
+    <value>The target '{0}' is not contained in a method.</value>
+    <comment>{0}: name of target</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index b5cb4c553f..11f1531ff9 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2103,51 +2103,6 @@ public static string InspectionSettings_FilterBySeverity {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Introduce Field.
-        /// </summary>
-        public static string IntroduceField_Caption {
-            get {
-                return ResourceManager.GetString("IntroduceField_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The target &apos;{0}&apos; is already a field..
-        /// </summary>
-        public static string IntroduceFieldFailed_TargetIsAlreadyAField {
-            get {
-                return ResourceManager.GetString("IntroduceFieldFailed_TargetIsAlreadyAField", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Introduce Parameter.
-        /// </summary>
-        public static string IntroduceParameter_Caption {
-            get {
-                return ResourceManager.GetString("IntroduceParameter_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Method &apos;{0}&apos; implements &apos;{1}.{2}&apos;. Change interface signature? (Will propagate to all implementations.).
-        /// </summary>
-        public static string IntroduceParameter_PromptIfTargetIsInterface {
-            get {
-                return ResourceManager.GetString("IntroduceParameter_PromptIfTargetIsInterface", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The target &apos;{0}&apos; is not contained in a method..
-        /// </summary>
-        public static string IntroduceParameterFailed_TargetNotContainedInMethod {
-            get {
-                return ResourceManager.GetString("IntroduceParameterFailed_TargetNotContainedInMethod", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to &apos;{0}&apos; does not start with a letter..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index e9e3ad5dcc..969951f96e 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -581,15 +581,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' má odkazy ve více metodách.</value>
   </data>
-  <data name="IntroduceField_Caption" xml:space="preserve">
-    <value>Rubberduck - Představ Pole</value>
-  </data>
-  <data name="IntroduceParameter_Caption" xml:space="preserve">
-    <value>Rubberduck - Představ Vlastnost</value>
-  </data>
-  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
-    <value>Metoda '{0}' implementuje '{1}.{2}'. Změnit podpis rozhraní? (Rozšíří se na všechny implementace.)</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Vážnost:</value>
   </data>
@@ -1290,12 +1281,6 @@ End Enum</value>
   <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
     <value>Cíl není uživatelsky definován.</value>
   </data>
-  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
-    <value>Cíl '{0}' je již pole.</value>
-  </data>
-  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
-    <value>Cíl '{0}' není obsažen v metodě.</value>
-  </data>
   <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
     <value>Deklarace typu cíle '{0}' je '{1}' namísto očekávaného '{2}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 4fb97eac45..5972455283 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -527,15 +527,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' hat Referenzen in mehrere Methoden.</value>
   </data>
-  <data name="IntroduceField_Caption" xml:space="preserve">
-    <value>Rubberduck - Feld einfügen</value>
-  </data>
-  <data name="IntroduceParameter_Caption" xml:space="preserve">
-    <value>Rubberduck - Parameter einfügen</value>
-  </data>
-  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
-    <value>Methode '{0}' implementiert '{1}.{2}'. Ändern der Interface Signatur? (Wird auf alle Implementierungen angewendet.)</value>
-  </data>
   <data name="MoveCloserToUsage_Caption" xml:space="preserve">
     <value>Rubberduck - Näher an die Nutzung führen</value>
   </data>
@@ -1313,12 +1304,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
     <value>Der Typ des Ziels '{0}'ist '{1}' anstatt des erwarteten Typs '{2}'.</value>
   </data>
-  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
-    <value>Das Ziel '{0}' ist bereits ein Feld.</value>
-  </data>
-  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
-    <value>Das Ziel '{0}' ist nicht in einer Methode enthalten.</value>
-  </data>
   <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
     <value>Der Typ des Ziels '{0}'ist '{1}' anstatt eines der erwarteten Typen '{2}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index b022505e30..0386b9479b 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -546,16 +546,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
     <value>'{0}' tiene referencias en múltiples métodos.</value>
     <comment>{0}: Nombre de la variable</comment>
   </data>
-  <data name="IntroduceField_Caption" xml:space="preserve">
-    <value>Rubberduck - Introducir campo</value>
-  </data>
-  <data name="IntroduceParameter_Caption" xml:space="preserve">
-    <value>Rubberduck - Introducir Parámetro</value>
-  </data>
-  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
-    <value>El método '{0}' implementa '{1}. {2}'. ¿Cambiar la firma de la interfaz? (Se propagará a todas las implementaciones.)</value>
-    <comment>0: objetivo seleccionado; 1: nombre de la interfaz; 2: nombre del miembro de la interfaz</comment>
-  </data>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Selección invalida.</value>
   </data>
@@ -1372,12 +1362,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
     <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de la esperada '{2}'.</value>
   </data>
-  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
-    <value>El destino '{0}' ya es un campo.</value>
-  </data>
-  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
-    <value>El destino '{0}' no está contenido en un método.</value>
-  </data>
   <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
     <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de una de las esperadas '{2}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c8d56e5540..e01ed67c05 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -495,9 +495,6 @@ Continuer?</value>
   <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
     <value>'{0}' n'est jamais utilisé.</value>
   </data>
-  <data name="IntroduceParameter_Caption" xml:space="preserve">
-    <value>Rubberduck - Introduire un paramètre</value>
-  </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Désélectionner tout</value>
   </data>
@@ -549,12 +546,6 @@ Continuer?</value>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Sélection invalide.</value>
   </data>
-  <data name="IntroduceField_Caption" xml:space="preserve">
-    <value>Rubberduck - Introduire un champ</value>
-  </data>
-  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
-    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier la signature de l'interface? (se propagera à toutes les implémentations)</value>
-  </data>
   <data name="ParserState_ResolverError" xml:space="preserve">
     <value>Erreur de résolution</value>
   </data>
@@ -1345,12 +1336,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
     <value>Le type de déclaration de la cible '{0}' est '{1}', plutôt que '{2}' tel qu'attendu.</value>
   </data>
-  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
-    <value>La cible '{0}' est déjà un champ.</value>
-  </data>
-  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
-    <value>La cible '{0}' n'est pas contenue dans une procédure.</value>
-  </data>
   <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
     <value>Le type de déclaration de la cible '{0}' est '{1}', mais le type attendu était '{2}'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 80df15e9b3..10ba973958 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -549,16 +549,6 @@ Do you want to proceed with this rename?</value>
     <value>'{0}' has references in multiple methods.</value>
     <comment>{0}: Variable Name</comment>
   </data>
-  <data name="IntroduceField_Caption" xml:space="preserve">
-    <value>Rubberduck - Introduce Field</value>
-  </data>
-  <data name="IntroduceParameter_Caption" xml:space="preserve">
-    <value>Rubberduck - Introduce Parameter</value>
-  </data>
-  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
-    <value>Method '{0}' implements '{1}.{2}'. Change interface signature? (Will propagate to all implementations.)</value>
-    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
-  </data>
   <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
     <value>Invalid Selection.</value>
   </data>
@@ -1486,14 +1476,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>Declaration type of target '{0}' is '{1}' instead of the expected '{2}'.</value>
     <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration type</comment>
   </data>
-  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
-    <value>The target '{0}' is already a field.</value>
-    <comment>{0}: name of target</comment>
-  </data>
-  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
-    <value>The target '{0}' is not contained in a method.</value>
-    <comment>{0}: name of target</comment>
-  </data>
   <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
     <value>Declaration type of target '{0}' is '{1}' instead of one of the expected '{2}'.</value>
     <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration types</comment>

From 3dbcd2394650803fdbffcc8f60bcb4cd09b714cd Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 23:20:56 -0700
Subject: [PATCH 35/64] Migrate InvalidNameCriteria_ resources

---
 .../Common/VBAIdentifierValidator.cs          | 28 ++++++------
 .../RefactoringsUI.Designer.cs                | 45 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 15 +++++++
 .../RefactoringsUI.de.resx                    | 15 +++++++
 .../RefactoringsUI.es.resx                    | 15 +++++++
 .../RefactoringsUI.fr.resx                    | 15 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 19 ++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 45 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.resx        | 19 --------
 .../EncapsulateFieldValidatorTests.cs         |  3 +-
 14 files changed, 139 insertions(+), 140 deletions(-)

diff --git a/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs b/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs
index ab73c78335..48a4db2790 100644
--- a/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs
+++ b/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs
@@ -84,21 +84,21 @@ public static bool TryMatchInvalidIdentifierCriteria(string name, DeclarationTyp
 
             if (string.IsNullOrEmpty(name))
             {
-                criteriaMatchMessage = RubberduckUI.InvalidNameCriteria_IsNullOrEmpty;
+                criteriaMatchMessage = RefactoringsUI.InvalidNameCriteria_IsNullOrEmpty;
                 return true;
             }
 
             //Does not start with a letter
             if (!char.IsLetter(name.First()))
             {
-                criteriaMatchMessage = string.Format(RubberduckUI.InvalidNameCriteria_DoesNotStartWithLetterFormat, name);
+                criteriaMatchMessage = string.Format(RefactoringsUI.InvalidNameCriteria_DoesNotStartWithLetterFormat, name);
                 return true;
             }
 
             //Has special characters
             if (name.Any(c => !char.IsLetterOrDigit(c) && c != '_'))
             {
-                criteriaMatchMessage = string.Format(RubberduckUI.InvalidNameCriteria_InvalidCharactersFormat, name);
+                criteriaMatchMessage = string.Format(RefactoringsUI.InvalidNameCriteria_InvalidCharactersFormat, name);
                 return true;
             }
 
@@ -107,7 +107,7 @@ public static bool TryMatchInvalidIdentifierCriteria(string name, DeclarationTyp
             {
                 if (ReservedIdentifiers.Contains(name, StringComparer.InvariantCultureIgnoreCase))
                 {
-                    criteriaMatchMessage = string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, name);
+                    criteriaMatchMessage = string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, name);
                     return true;
                 }
             }
@@ -122,7 +122,7 @@ public static bool TryMatchInvalidIdentifierCriteria(string name, DeclarationTyp
 
                 if (invalidUDTArrayIdentifiers.Contains(name, StringComparer.InvariantCultureIgnoreCase))
                 {
-                    criteriaMatchMessage = string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, name);
+                    criteriaMatchMessage = string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, name);
                     return true;
                 }
             }
@@ -131,14 +131,14 @@ public static bool TryMatchInvalidIdentifierCriteria(string name, DeclarationTyp
             if (declarationType.HasFlag(DeclarationType.Project)
                 && name.Equals("VBA", StringComparison.InvariantCultureIgnoreCase))
             {
-                criteriaMatchMessage = string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, name);
+                criteriaMatchMessage = string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, name);
                 return true;
             }
 
             //Exceeds max length
             if (name.Length > maxNameLength)
             {
-                criteriaMatchMessage = string.Format(RubberduckUI.InvalidNameCriteria_ExceedsMaximumLengthFormat, name);
+                criteriaMatchMessage = string.Format(RefactoringsUI.InvalidNameCriteria_ExceedsMaximumLengthFormat, name);
                 return true;
             }
             return false;
@@ -158,19 +158,19 @@ public static IReadOnlyList<string> SatisfiedInvalidIdentifierCriteria(string na
 
             if (string.IsNullOrEmpty(name))
             {
-                criteriaMatchMessages.Add(RubberduckUI.InvalidNameCriteria_IsNullOrEmpty);
+                criteriaMatchMessages.Add(RefactoringsUI.InvalidNameCriteria_IsNullOrEmpty);
             }
 
             //Does not start with a letter
             if (!char.IsLetter(name.First()))
             {
-                criteriaMatchMessages.Add(string.Format(RubberduckUI.InvalidNameCriteria_DoesNotStartWithLetterFormat, name));
+                criteriaMatchMessages.Add(string.Format(RefactoringsUI.InvalidNameCriteria_DoesNotStartWithLetterFormat, name));
             }
 
             //Has special characters
             if (name.Any(c => !char.IsLetterOrDigit(c) && c != '_'))
             {
-                criteriaMatchMessages.Add(string.Format(RubberduckUI.InvalidNameCriteria_InvalidCharactersFormat, name));
+                criteriaMatchMessages.Add(string.Format(RefactoringsUI.InvalidNameCriteria_InvalidCharactersFormat, name));
             }
 
             //Is a reserved identifier
@@ -178,7 +178,7 @@ public static IReadOnlyList<string> SatisfiedInvalidIdentifierCriteria(string na
             {
                 if (ReservedIdentifiers.Contains(name, StringComparer.InvariantCultureIgnoreCase))
                 {
-                    criteriaMatchMessages.Add(string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, name));
+                    criteriaMatchMessages.Add(string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, name));
                 }
             }
             else if (isArrayDeclaration) //is a DeclarationType.UserDefinedTypeMember
@@ -192,7 +192,7 @@ public static IReadOnlyList<string> SatisfiedInvalidIdentifierCriteria(string na
 
                 if (invalidUDTArrayIdentifiers.Contains(name, StringComparer.InvariantCultureIgnoreCase))
                 {
-                    criteriaMatchMessages.Add(string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, name));
+                    criteriaMatchMessages.Add(string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, name));
                 }
             }
 
@@ -200,13 +200,13 @@ public static IReadOnlyList<string> SatisfiedInvalidIdentifierCriteria(string na
             if (declarationType.HasFlag(DeclarationType.Project)
                 && name.Equals("VBA", StringComparison.InvariantCultureIgnoreCase))
             {
-                criteriaMatchMessages.Add(string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, name));
+                criteriaMatchMessages.Add(string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, name));
             }
 
             //Exceeds max length
             if (name.Length > maxNameLength)
             {
-                criteriaMatchMessages.Add(string.Format(RubberduckUI.InvalidNameCriteria_ExceedsMaximumLengthFormat, name));
+                criteriaMatchMessages.Add(string.Format(RefactoringsUI.InvalidNameCriteria_ExceedsMaximumLengthFormat, name));
             }
 
             return criteriaMatchMessages;
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 8b9bfe80b2..e4bdb70584 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -673,5 +673,50 @@ public static string IntroduceParameterFailed_TargetNotContainedInMethod {
                 return ResourceManager.GetString("IntroduceParameterFailed_TargetNotContainedInMethod", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; does not start with a letter..
+        /// </summary>
+        public static string InvalidNameCriteria_DoesNotStartWithLetterFormat {
+            get {
+                return ResourceManager.GetString("InvalidNameCriteria_DoesNotStartWithLetterFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; exceeds the maximum allowed string length..
+        /// </summary>
+        public static string InvalidNameCriteria_ExceedsMaximumLengthFormat {
+            get {
+                return ResourceManager.GetString("InvalidNameCriteria_ExceedsMaximumLengthFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; contains special character(s) other than underscores..
+        /// </summary>
+        public static string InvalidNameCriteria_InvalidCharactersFormat {
+            get {
+                return ResourceManager.GetString("InvalidNameCriteria_InvalidCharactersFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to VBA Identifiers cannot be null or zero-length..
+        /// </summary>
+        public static string InvalidNameCriteria_IsNullOrEmpty {
+            get {
+                return ResourceManager.GetString("InvalidNameCriteria_IsNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is a reserved keyword..
+        /// </summary>
+        public static string InvalidNameCriteria_IsReservedKeywordFormat {
+            get {
+                return ResourceManager.GetString("InvalidNameCriteria_IsReservedKeywordFormat", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index d77292341f..e3acfe3f46 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -317,4 +317,19 @@ Privání třída může stále implementovat public (veřejný) interface.</val
   <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
     <value>Cíl '{0}' není obsažen v metodě.</value>
   </data>
+  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
+    <value>Identifikátory VBA nemohou být prázdné, nebo mít nulovou délku.</value>
+  </data>
+  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
+    <value>'{0}' nezačíná písmenem.</value>
+  </data>
+  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
+    <value>'{0}' překročil maximální povolenou délku řetězce.</value>
+  </data>
+  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
+    <value>'{0}' obsahuje speciální znak(y) jiné než podtržítka.</value>
+  </data>
+  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
+    <value>'{0}' je vyhrazené klíčové slovo.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 60fe7cdefe..8a3158395c 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -323,4 +323,19 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
     <value>Das Ziel '{0}' ist nicht in einer Methode enthalten.</value>
   </data>
+  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
+    <value>Bezeichner in VBA können nicht Null sein oder Länge Null haben.</value>
+  </data>
+  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
+    <value>'{0}' beginnt nicht mit einem Buchstaben.</value>
+  </data>
+  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
+    <value>'{0}' überschreitet die maximal erlaubte Länge.</value>
+  </data>
+  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
+    <value>'{0}' enthält mindestens ein anderes Sonderzeichen als der Unterstrich.</value>
+  </data>
+  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
+    <value>'{0}' ist ein reserviertes Schlüsselwort.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index d8320804a5..74c92b85f2 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -317,4 +317,19 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
     <value>El destino '{0}' no está contenido en un método.</value>
   </data>
+  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
+    <value>Los identificadores VBA no pueden ser nulos o de longitud cero.</value>
+  </data>
+  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
+    <value>'{0}' no comienza con una letra.</value>
+  </data>
+  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
+    <value>'{0}' excede el máximo de caracteres permitido.</value>
+  </data>
+  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
+    <value>'{0}' contiene caracteres especiales distintos al guión bajo '_'.</value>
+  </data>
+  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
+    <value>'{0}' es una palabra reservada.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 3de8583e26..9968932207 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -299,4 +299,19 @@ Une classe privée peut toujours implémenter une interface publique.</value>
   <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
     <value>La cible '{0}' n'est pas contenue dans une procédure.</value>
   </data>
+  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
+    <value>Un identifiant vide n'est pas valide en VBA.</value>
+  </data>
+  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
+    <value>'{0}' doit débuter par une lettre.</value>
+  </data>
+  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
+    <value>'{0}' excède la longueur maximale permise.</value>
+  </data>
+  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
+    <value>'{0}' contient des caractères spéciaux autres que la barre de soulignement.</value>
+  </data>
+  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
+    <value>'{0}' est un mot-clé réservé.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index eadbb60bf2..5b7aa15aa9 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -313,4 +313,23 @@ A private class can still implement a public interface.</value>
     <value>The target '{0}' is not contained in a method.</value>
     <comment>{0}: name of target</comment>
   </data>
+  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
+    <value>VBA Identifiers cannot be null or zero-length.</value>
+  </data>
+  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
+    <value>'{0}' does not start with a letter.</value>
+    <comment>{0} = code element name</comment>
+  </data>
+  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
+    <value>'{0}' exceeds the maximum allowed string length.</value>
+    <comment>{0} = code element name</comment>
+  </data>
+  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
+    <value>'{0}' contains special character(s) other than underscores.</value>
+    <comment>{0} = code element name</comment>
+  </data>
+  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
+    <value>'{0}' is a reserved keyword.</value>
+    <comment>{0} = code element name</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 11f1531ff9..ddd1bf0621 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2103,51 +2103,6 @@ public static string InspectionSettings_FilterBySeverity {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; does not start with a letter..
-        /// </summary>
-        public static string InvalidNameCriteria_DoesNotStartWithLetterFormat {
-            get {
-                return ResourceManager.GetString("InvalidNameCriteria_DoesNotStartWithLetterFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; exceeds the maximum allowed string length..
-        /// </summary>
-        public static string InvalidNameCriteria_ExceedsMaximumLengthFormat {
-            get {
-                return ResourceManager.GetString("InvalidNameCriteria_ExceedsMaximumLengthFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; contains special character(s) other than underscores..
-        /// </summary>
-        public static string InvalidNameCriteria_InvalidCharactersFormat {
-            get {
-                return ResourceManager.GetString("InvalidNameCriteria_InvalidCharactersFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to VBA Identifiers cannot be null or zero-length..
-        /// </summary>
-        public static string InvalidNameCriteria_IsNullOrEmpty {
-            get {
-                return ResourceManager.GetString("InvalidNameCriteria_IsNullOrEmpty", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is a reserved keyword..
-        /// </summary>
-        public static string InvalidNameCriteria_IsReservedKeywordFormat {
-            get {
-                return ResourceManager.GetString("InvalidNameCriteria_IsReservedKeywordFormat", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Issue.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 969951f96e..610138b45c 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1314,21 +1314,6 @@ End Enum</value>
   <data name="TestOutcome_Inconclusive" xml:space="preserve">
     <value>Bezvýsledný</value>
   </data>
-  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
-    <value>'{0}' nezačíná písmenem.</value>
-  </data>
-  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
-    <value>'{0}' překročil maximální povolenou délku řetězce.</value>
-  </data>
-  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
-    <value>'{0}' obsahuje speciální znak(y) jiné než podtržítka.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
-    <value>Identifikátory VBA nemohou být prázdné, nebo mít nulovou délku.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
-    <value>'{0}' je vyhrazené klíčové slovo.</value>
-  </data>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>Identifikátor '{0}' zobrazí inspekci 'Použij Smysluplnější Slovo'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 5972455283..6b309c3aa7 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1346,21 +1346,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="TestOutcome_Inconclusive" xml:space="preserve">
     <value>Uneindeutig</value>
   </data>
-  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
-    <value>'{0}' beginnt nicht mit einem Buchstaben.</value>
-  </data>
-  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
-    <value>'{0}' überschreitet die maximal erlaubte Länge.</value>
-  </data>
-  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
-    <value>'{0}' enthält mindestens ein anderes Sonderzeichen als der Unterstrich.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
-    <value>Bezeichner in VBA können nicht Null sein oder Länge Null haben.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
-    <value>'{0}' ist ein reserviertes Schlüsselwort.</value>
-  </data>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>Der Name '{0}' wird die "Sinnige Namen verwenden"-Inspektion auslösen.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 0386b9479b..b6c2d0c60c 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1420,21 +1420,6 @@ Importación cancelada.</value>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>La descripción contiene espacios en blanco</value>
   </data>
-  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
-    <value>'{0}' no comienza con una letra.</value>
-  </data>
-  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
-    <value>'{0}' excede el máximo de caracteres permitido.</value>
-  </data>
-  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
-    <value>'{0}' contiene caracteres especiales distintos al guión bajo '_'.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
-    <value>Los identificadores VBA no pueden ser nulos o de longitud cero.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
-    <value>'{0}' es una palabra reservada.</value>
-  </data>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>El identificador '{0}' disparará un resultado de inspección 'Usar nombres significativos'.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index e01ed67c05..198fa1626b 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1372,21 +1372,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="TestOutcome_Unknown" xml:space="preserve">
     <value>Inconnu</value>
   </data>
-  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
-    <value>'{0}' doit débuter par une lettre.</value>
-  </data>
-  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
-    <value>'{0}' excède la longueur maximale permise.</value>
-  </data>
-  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
-    <value>'{0}' contient des caractères spéciaux autres que la barre de soulignement.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
-    <value>Un identifiant vide n'est pas valide en VBA.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
-    <value>'{0}' est un mot-clé réservé.</value>
-  </data>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>L'identifiant '{0}' chatouillera l'inspection suggérant d'utiliser un nom conférant signification et importance.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 10ba973958..c582bfd920 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1517,25 +1517,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="TestOutcome_Unknown" xml:space="preserve">
     <value>Unknown</value>
   </data>
-  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
-    <value>'{0}' does not start with a letter.</value>
-    <comment>{0} = code element name</comment>
-  </data>
-  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
-    <value>'{0}' exceeds the maximum allowed string length.</value>
-    <comment>{0} = code element name</comment>
-  </data>
-  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
-    <value>'{0}' contains special character(s) other than underscores.</value>
-    <comment>{0} = code element name</comment>
-  </data>
-  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
-    <value>VBA Identifiers cannot be null or zero-length.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
-    <value>'{0}' is a reserved keyword.</value>
-    <comment>{0} = code element name</comment>
-  </data>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>The identifier '{0}' will trigger a 'Use Meaningful Name' inspection result.</value>
     <comment>{0} = code element name</comment>
diff --git a/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldValidatorTests.cs b/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldValidatorTests.cs
index 6a1d02a925..eda72f3e00 100644
--- a/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldValidatorTests.cs
+++ b/RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldValidatorTests.cs
@@ -8,7 +8,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor.SafeComWrappers;
 using System.Linq;
-using Rubberduck.Resources;
 
 namespace RubberduckTests.Refactoring.EncapsulateField
 {
@@ -495,7 +494,7 @@ public void UDTReservedMemberArrayIdentifier()
 
             Assert.AreEqual(false, model[fieldName].TryValidateEncapsulationAttributes(out var errorMessage), errorMessage);
 
-            var expectedMessage = string.Format(RubberduckUI.InvalidNameCriteria_IsReservedKeywordFormat, fieldName);
+            var expectedMessage = string.Format(RefactoringsUI.InvalidNameCriteria_IsReservedKeywordFormat, fieldName);
             Assert.AreEqual(expectedMessage, errorMessage);
         }
 

From a6c236c9f290e0c9f64bdcafc563c80c46c8e7b2 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 23:30:18 -0700
Subject: [PATCH 36/64] Migrate MoveClosureToUsage resources

---
 .../MoveCloserToUsageFailedNotifier.cs        | 15 ++--
 .../RefactoringsUI.Designer.cs                | 81 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 27 +++++++
 .../RefactoringsUI.de.resx                    | 27 +++++++
 .../RefactoringsUI.es.resx                    | 27 +++++++
 .../RefactoringsUI.fr.resx                    | 27 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 34 ++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 81 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 28 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 27 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 29 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 27 -------
 Rubberduck.Resources/RubberduckUI.resx        | 34 --------
 13 files changed, 231 insertions(+), 233 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs
index e8e6bcdfe6..a619416b78 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.MoveCloserToUsage;
 
@@ -11,7 +12,7 @@ public MoveCloserToUsageFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         {}
 
-        protected override string Caption => Resources.RubberduckUI.MoveCloserToUsage_Caption;
+        protected override string Caption => RefactoringsUI.MoveCloserToUsage_Caption;
 
         protected override string Message(RefactoringException exception)
         {
@@ -19,28 +20,28 @@ protected override string Message(RefactoringException exception)
             {
                 case TargetDeclarationConflictsWithPreexistingDeclaration conflictWithPreexistingDeclaration:
                     Logger.Warn(conflictWithPreexistingDeclaration);
-                    return string.Format(Resources.RubberduckUI.MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope,
+                    return string.Format(RefactoringsUI.MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope,
                         conflictWithPreexistingDeclaration.TargetDeclaration.QualifiedName,
                         conflictWithPreexistingDeclaration.ConflictingDeclaration.QualifiedName);
                 case TargetDeclarationNonPrivateInNonStandardModule nonPrivateInNonStandardModule:
                     Logger.Warn(nonPrivateInNonStandardModule);
-                    return string.Format(Resources.RubberduckUI.MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule,
+                    return string.Format(RefactoringsUI.MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule,
                         nonPrivateInNonStandardModule.TargetDeclaration.QualifiedName);
                 case TargetDeclarationInDifferentNonStandardModuleException inDifferentNonStandardModule:
                     Logger.Warn(inDifferentNonStandardModule);
-                    return string.Format(Resources.RubberduckUI.MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule,
+                    return string.Format(RefactoringsUI.MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule,
                         inDifferentNonStandardModule.TargetDeclaration.QualifiedName);
                 case TargetDeclarationInDifferentProjectThanUses inDifferentProject:
                     Logger.Warn(inDifferentProject);
-                    return string.Format(Resources.RubberduckUI.MoveCloserToUsageFailure_TargetIsInDifferentProject,
+                    return string.Format(RefactoringsUI.MoveCloserToUsageFailure_TargetIsInDifferentProject,
                         inDifferentProject.TargetDeclaration.QualifiedName);
                 case TargetDeclarationUsedInMultipleMethodsException usedInMultiple:
                     Logger.Warn(usedInMultiple);
-                    return string.Format(Resources.RubberduckUI.MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods,
+                    return string.Format(RefactoringsUI.MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods,
                         usedInMultiple.TargetDeclaration.QualifiedName);
                 case TargetDeclarationNotUserDefinedException notUsed:
                     Logger.Warn(notUsed);
-                    return string.Format(Resources.RubberduckUI.MoveCloserToUsageFailure_TargetHasNoReferences,
+                    return string.Format(RefactoringsUI.MoveCloserToUsageFailure_TargetHasNoReferences,
                         notUsed.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index e4bdb70584..4b13d01349 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -718,5 +718,86 @@ public static string InvalidNameCriteria_IsReservedKeywordFormat {
                 return ResourceManager.GetString("InvalidNameCriteria_IsReservedKeywordFormat", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Move Closer To Usage.
+        /// </summary>
+        public static string MoveCloserToUsage_Caption {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsage_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid Selection..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_InvalidSelection {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_InvalidSelection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The method using &apos;{0}&apos; already has the declaration &apos;{1}&apos; of the same name in scope..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is not used anywhere..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_TargetHasNoReferences {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetHasNoReferences", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is not defined in the same project it is used..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_TargetIsInDifferentProject {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsInDifferentProject", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is defined neither in the component component it is used nor in a standard module..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is a public member of of a class, form or document..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is built-in..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_TargetIsNotUserDefined {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsNotUserDefined", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; has references in multiple methods..
+        /// </summary>
+        public static string MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods {
+            get {
+                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index e3acfe3f46..8233dd322e 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -332,4 +332,31 @@ Privání třída může stále implementovat public (veřejný) interface.</val
   <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
     <value>'{0}' je vyhrazené klíčové slovo.</value>
   </data>
+  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
+    <value>Rubberduck - Přesuň na Místo Použití</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
+    <value>Neplatný výběr.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
+    <value>Metoda používající '{0}' má již jinou deklaraci '{1}' stejného jména v rozsahu.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
+    <value>'{0}' není nikde použito.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
+    <value>'{0}' není definováno ve stejném projektu, ve kterém je používáno.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
+    <value>'{0}' není definováno ani v komponentě komponenty, ve které je použito, ani ve standardním modulu.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
+    <value>'{0}' je globálně přístupno a je využíváno.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
+    <value>'{0}' je vestavěná proměnná.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
+    <value>'{0}' má odkazy ve více metodách.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 8a3158395c..0c62354d77 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -338,4 +338,31 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
     <value>'{0}' ist ein reserviertes Schlüsselwort.</value>
   </data>
+  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
+    <value>Rubberduck - Näher an die Nutzung führen</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
+    <value>Ungültige Auswahl.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
+    <value>In der Methode, die '{0}' verwendet, referenziert der Name dieser Variable bereits die Deklaration '{1}.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
+    <value>'{0}' hat keine Referenzen.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
+    <value>Die Variable '{0}' ist nicht im selben Projekt definiert, in dem sie verwendet wird.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
+    <value>Die Variable '{0}' ist weder in der Komponente definiert, in der sie verwendet wir, noch in einem Standardmodul.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
+    <value>'{0}' ist eine nicht private Modulvariable außerhalb eines Standardmoduls.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
+    <value>'{0}' ist keine Nutzerdeklaration.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
+    <value>'{0}' hat Referenzen in mehrere Methoden.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 74c92b85f2..5c264e948d 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -332,4 +332,31 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
     <value>'{0}' es una palabra reservada.</value>
   </data>
+  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
+    <value>Rubberduck - Acercar al uso</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
+    <value>Selección invalida.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
+    <value>El método que usa '{0}' ya posee la declaración '{1}' de igual nombre en el ámbito.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
+    <value>'{0}' no se usa en ninguna parte.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
+    <value>'{0}' no está definido en el mismo proyecto que se usa.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
+    <value>'{0}' no está definido en el componente que se usa ni en un módulo estándar.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
+    <value>'{0}' es un miembro público de una clase, formulario o documento.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
+    <value>'{0}' está incorporado.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
+    <value>'{0}' tiene referencias en múltiples métodos.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 9968932207..ff61f30ac7 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -314,4 +314,31 @@ Une classe privée peut toujours implémenter une interface publique.</value>
   <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
     <value>'{0}' est un mot-clé réservé.</value>
   </data>
+  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
+    <value>Rubberduck - Rapprocher la déclaration de son utilisation</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
+    <value>Sélection invalide.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
+    <value>La procédure qui utilise '{0}' contient déjà une déclaration '{1}' utilisant cet identifiant.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
+    <value>'{0}' n'est jamais utilisé.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
+    <value>'{0}' doit être défini dans le même projet que la cible.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
+    <value>'{0}' n'est utilisé ni dans le module où il est défini, ni dans un module standard.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
+    <value>'{0}' est accessible globalement, et est utilisé.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
+    <value>'{0}' n'est pas défini par l'utilisateur.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
+    <value>'{0}' est utilisé dans plus d'une méthode.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 5b7aa15aa9..87e36420ef 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -332,4 +332,38 @@ A private class can still implement a public interface.</value>
     <value>'{0}' is a reserved keyword.</value>
     <comment>{0} = code element name</comment>
   </data>
+  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
+    <value>Rubberduck - Move Closer To Usage</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
+    <value>Invalid Selection.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
+    <value>The method using '{0}' already has the declaration '{1}' of the same name in scope.</value>
+    <comment>{0}: Variable Name; {1}: name of conflicting declaration</comment>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
+    <value>'{0}' is not used anywhere.</value>
+    <comment>{0}: Variable Name</comment>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
+    <value>'{0}' is not defined in the same project it is used.</value>
+    <comment>{0}: Variable Name</comment>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
+    <value>'{0}' is defined neither in the component component it is used nor in a standard module.</value>
+    <comment>{0}: Variable Name</comment>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
+    <value>'{0}' is a public member of of a class, form or document.</value>
+    <comment>{0}: Variable Name</comment>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
+    <value>'{0}' is built-in.</value>
+    <comment>{0}: Variable Name</comment>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
+    <value>'{0}' has references in multiple methods.</value>
+    <comment>{0}: Variable Name</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ddd1bf0621..bd6180c419 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2297,87 +2297,6 @@ public static string ModuleOptionsNotSpecifiedFirst {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Move Closer To Usage.
-        /// </summary>
-        public static string MoveCloserToUsage_Caption {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsage_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Selection..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_InvalidSelection {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_InvalidSelection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The method using &apos;{0}&apos; already has the declaration &apos;{1}&apos; of the same name in scope..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is not used anywhere..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_TargetHasNoReferences {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetHasNoReferences", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is not defined in the same project it is used..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_TargetIsInDifferentProject {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsInDifferentProject", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is defined neither in the component component it is used nor in a standard module..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is a public member of of a class, form or document..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is built-in..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_TargetIsNotUserDefined {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsNotUserDefined", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; has references in multiple methods..
-        /// </summary>
-        public static string MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods {
-            get {
-                return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Please specify a new parent folder for the subfolder &apos;{0}&apos; of &apos;{1}&apos;..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 610138b45c..1e4a36b1d3 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -435,9 +435,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Odznačit vše</value>
   </data>
-  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
-    <value>Neplatný výběr.</value>
-  </data>
   <data name="EndOfLineCommentStyle_Absolute" xml:space="preserve">
     <value>Absolutní</value>
   </data>
@@ -572,15 +569,6 @@ Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>Výběr není proměnná.</value>
   </data>
-  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
-    <value>Rubberduck - Přesuň na Místo Použití</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
-    <value>'{0}' není nikde použito.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
-    <value>'{0}' má odkazy ve více metodách.</value>
-  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Vážnost:</value>
   </data>
@@ -1205,10 +1193,6 @@ End Enum</value>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
-    <value>'{0}' je globálně přístupno a je využíváno.</value>
-    <comment>FIXME: needs rewording/clarification</comment>
-  </data>
   <data name="MemberAttributeRecoveryFailureCaption" xml:space="preserve">
     <value>Selhání obnovy atributu člena</value>
   </data>
@@ -1227,15 +1211,6 @@ End Enum</value>
   <data name="PerformanceWarningCaption" xml:space="preserve">
     <value>Varování o výkonu</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
-    <value>'{0}' je vestavěná proměnná.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
-    <value>'{0}' není definováno ve stejném projektu, ve kterém je používáno.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
-    <value>'{0}' není definováno ani v komponentě komponenty, ve které je použito, ani ve standardním modulu.</value>
-  </data>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Procházet...</value>
   </data>
@@ -1254,9 +1229,6 @@ End Enum</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
-  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
-    <value>Metoda používající '{0}' má již jinou deklaraci '{1}' stejného jména v rozsahu.</value>
-  </data>
   <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
     <value>Refaktorování selhalo.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 6b309c3aa7..62fe9b2192 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -521,18 +521,6 @@ Wollen Sie trotzdem fortfahren?</value>
   <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
     <value>Die Auswahl ist keine Variable.</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
-    <value>'{0}' hat keine Referenzen.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
-    <value>'{0}' hat Referenzen in mehrere Methoden.</value>
-  </data>
-  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
-    <value>Rubberduck - Näher an die Nutzung führen</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
-    <value>Ungültige Auswahl.</value>
-  </data>
   <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
     <value>Anzeigesprache:</value>
   </data>
@@ -1259,21 +1247,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="PerformanceWarningCaption" xml:space="preserve">
     <value>Performancewarnung</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
-    <value>'{0}' ist keine Nutzerdeklaration.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
-    <value>Die Variable '{0}' ist nicht im selben Projekt definiert, in dem sie verwendet wird.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
-    <value>Die Variable '{0}' ist weder in der Komponente definiert, in der sie verwendet wir, noch in einem Standardmodul.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
-    <value>'{0}' ist eine nicht private Modulvariable außerhalb eines Standardmoduls.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
-    <value>In der Methode, die '{0}' verwendet, referenziert der Name dieser Variable bereits die Deklaration '{1}.</value>
-  </data>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index b6c2d0c60c..3aab28817f 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -535,20 +535,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
     <value>La selección no es una variable.</value>
     <comment>Utilizado tanto en Introducir parámetro como en Introducir campo</comment>
   </data>
-  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
-    <value>Rubberduck - Acercar al uso</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
-    <value>'{0}' no se usa en ninguna parte.</value>
-    <comment>{0}: Nombre de la variable</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
-    <value>'{0}' tiene referencias en múltiples métodos.</value>
-    <comment>{0}: Nombre de la variable</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
-    <value>Selección invalida.</value>
-  </data>
   <data name="SelectAll_Button" xml:space="preserve">
     <value>Seleccionar todo</value>
   </data>
@@ -1296,21 +1282,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="PerformanceWarningCaption" xml:space="preserve">
     <value>Advertencia de rendimiento</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
-    <value>'{0}' está incorporado.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
-    <value>'{0}' no está definido en el mismo proyecto que se usa.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
-    <value>'{0}' no está definido en el componente que se usa ni en un módulo estándar.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
-    <value>'{0}' es un miembro público de una clase, formulario o documento.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
-    <value>El método que usa '{0}' ya posee la declaración '{1}' de igual nombre en el ámbito.</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtro</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 198fa1626b..7d0e015680 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -489,12 +489,6 @@ Continuer?</value>
   <data name="RegexSearchReplaceScope_Selection" xml:space="preserve">
     <value>Sélection</value>
   </data>
-  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
-    <value>Rubberduck - Rapprocher la déclaration de son utilisation</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
-    <value>'{0}' n'est jamais utilisé.</value>
-  </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Désélectionner tout</value>
   </data>
@@ -537,15 +531,9 @@ Continuer?</value>
   <data name="FindSymbolDialog_Caption" xml:space="preserve">
     <value>Rechercher un symbole</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
-    <value>'{0}' est utilisé dans plus d'une méthode.</value>
-  </data>
   <data name="RegexSearchReplace_ReplaceAllButtonLabel" xml:space="preserve">
     <value>Remplacer tout</value>
   </data>
-  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
-    <value>Sélection invalide.</value>
-  </data>
   <data name="ParserState_ResolverError" xml:space="preserve">
     <value>Erreur de résolution</value>
   </data>
@@ -1267,18 +1255,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="MemberAttributeRecoveryFailureCaption" xml:space="preserve">
     <value>Échec de la récupération des attributs</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
-    <value>'{0}' n'est pas défini par l'utilisateur.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
-    <value>'{0}' doit être défini dans le même projet que la cible.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
-    <value>'{0}' n'est utilisé ni dans le module où il est défini, ni dans un module standard.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
-    <value>La procédure qui utilise '{0}' contient déjà une déclaration '{1}' utilisant cet identifiant.</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtrer</value>
   </data>
@@ -1297,9 +1273,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="InspectionResults_ExpandAll" xml:space="preserve">
     <value>Développer tout</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
-    <value>'{0}' est accessible globalement, et est utilisé.</value>
-  </data>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Enregistrer &amp; Fermer</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index c582bfd920..cdaaf2815a 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -538,20 +538,6 @@ Do you want to proceed with this rename?</value>
     <value>Selection is not a variable.</value>
     <comment>Used in both Introduce Parameter and Introduce Field</comment>
   </data>
-  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
-    <value>Rubberduck - Move Closer To Usage</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
-    <value>'{0}' is not used anywhere.</value>
-    <comment>{0}: Variable Name</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
-    <value>'{0}' has references in multiple methods.</value>
-    <comment>{0}: Variable Name</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
-    <value>Invalid Selection.</value>
-  </data>
   <data name="SelectAll_Button" xml:space="preserve">
     <value>Select All</value>
   </data>
@@ -1394,26 +1380,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="PerformanceWarningCaption" xml:space="preserve">
     <value>Performance Warning</value>
   </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
-    <value>'{0}' is built-in.</value>
-    <comment>{0}: Variable Name</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
-    <value>'{0}' is not defined in the same project it is used.</value>
-    <comment>{0}: Variable Name</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
-    <value>'{0}' is defined neither in the component component it is used nor in a standard module.</value>
-    <comment>{0}: Variable Name</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
-    <value>'{0}' is a public member of of a class, form or document.</value>
-    <comment>{0}: Variable Name</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
-    <value>The method using '{0}' already has the declaration '{1}' of the same name in scope.</value>
-    <comment>{0}: Variable Name; {1}: name of conflicting declaration</comment>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>

From f235d91a658f28de89eb07a01b60a73d6a90d462 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 23:41:28 -0700
Subject: [PATCH 37/64] Migrate MoveCloserToUsage resources

---
 ...eExplorerMoveToFolderDragAndDropCommand.cs |  7 +-
 .../MoveMultipleFoldersViewModel.cs           | 21 ++--
 .../MoveMultipleToFolderViewModel.cs          |  5 +-
 .../RenameFolder/RenameFolderViewModel.cs     |  7 +-
 .../RefactoringsUI.Designer.cs                | 93 ++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 33 +++++++
 .../RefactoringsUI.de.resx                    | 33 +++++++
 .../RefactoringsUI.es.resx                    | 33 +++++++
 .../RefactoringsUI.fr.resx                    | 33 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 36 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 95 +------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 33 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 33 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 33 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 33 -------
 Rubberduck.Resources/RubberduckUI.resx        | 36 -------
 16 files changed, 285 insertions(+), 279 deletions(-)

diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs
index f9a4cb40a7..45471253b4 100644
--- a/Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs
+++ b/Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.MoveFolder;
 using Rubberduck.Refactorings.MoveToFolder;
@@ -109,7 +110,7 @@ private List<string> FoldersMergedWithTargetFolders(MoveMultipleFoldersModel mod
         private bool UserConfirmsToProceedWithFolderMerge(string targetFolder, List<string> mergedTargetFolders)
         {
             var message = FolderMergeUserConfirmationMessage(targetFolder, mergedTargetFolders);
-            return _messageBox?.ConfirmYesNo(message, RubberduckUI.MoveFoldersDialog_Caption) ?? false;
+            return _messageBox?.ConfirmYesNo(message, RefactoringsUI.MoveFoldersDialog_Caption) ?? false;
         }
 
         private string FolderMergeUserConfirmationMessage(string targetFolder, List<string> mergedTargetFolders)
@@ -117,14 +118,14 @@ private string FolderMergeUserConfirmationMessage(string targetFolder, List<stri
             if (mergedTargetFolders.Count == 1)
             {
                 return string.Format(
-                    RubberduckUI.MoveFolders_SameNameSubfolder,
+                    RefactoringsUI.MoveFolders_SameNameSubfolder,
                     targetFolder,
                     mergedTargetFolders.Single());
             }
 
             var subfolders = $"'{string.Join("', '", mergedTargetFolders)}'";
             return string.Format(
-                RubberduckUI.MoveFolders_SameNameSubfolders,
+                RefactoringsUI.MoveFolders_SameNameSubfolders,
                 targetFolder,
                 subfolders);
         }
diff --git a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs
index 427c8eb277..0c8f41fd7c 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.MoveFolder;
 using Rubberduck.Resources;
 using Rubberduck.JunkDrawer.Extensions;
@@ -43,10 +44,10 @@ public string Instructions
                         return string.Format(RubberduckUI.MoveRootFolderDialog_InstructionsLabelText, sourceFolder);
                     }
 
-                    return string.Format(RubberduckUI.MoveFolderDialog_InstructionsLabelText, sourceFolder, sourceParent);
+                    return string.Format(RefactoringsUI.MoveFolderDialog_InstructionsLabelText, sourceFolder, sourceParent);
                 }
 
-                return string.Format(RubberduckUI.MoveFoldersDialog_InstructionsLabelText);
+                return string.Format(RefactoringsUI.MoveFoldersDialog_InstructionsLabelText);
             }
         }
 
@@ -68,18 +69,18 @@ private void ValidateFolder()
 
             if (string.IsNullOrEmpty(NewFolder))
             {
-                errors.Add(RubberduckUI.MoveFolders_EmptyFolderName);
+                errors.Add(RefactoringsUI.MoveFolders_EmptyFolderName);
             }
             else
             {
                 if (NewFolder.Any(char.IsControl))
                 {
-                    errors.Add(RubberduckUI.MoveFolders_ControlCharacter);
+                    errors.Add(RefactoringsUI.MoveFolders_ControlCharacter);
                 }
 
                 if (NewFolder.Split(FolderExtensions.FolderDelimiter).Any(string.IsNullOrEmpty))
                 {
-                    errors.Add(RubberduckUI.MoveFolders_EmptySubfolderName);
+                    errors.Add(RefactoringsUI.MoveFolders_EmptySubfolderName);
                 }
             }
 
@@ -130,8 +131,8 @@ private bool MergesSourceFolders()
 
         private bool UserConfirmsToProceedWithSourceFolderMerge()
         {
-            var message = RubberduckUI.MoveFolders_SameNameSourceFolders;
-            return _messageBox?.ConfirmYesNo(message, RubberduckUI.MoveFoldersDialog_Caption) ?? false;
+            var message = RefactoringsUI.MoveFolders_SameNameSourceFolders;
+            return _messageBox?.ConfirmYesNo(message, RefactoringsUI.MoveFoldersDialog_Caption) ?? false;
         }
 
         private List<string> FoldersMergedWithTargetFolders()
@@ -157,7 +158,7 @@ private List<string> FoldersMergedWithTargetFolders()
         private bool UserConfirmsToProceedWithFolderMerge(string targetFolder, List<string> mergedTargetFolders)
         {
             var message = FolderMergeUserConfirmationMessage(targetFolder, mergedTargetFolders);
-            return _messageBox?.ConfirmYesNo(message, RubberduckUI.MoveFoldersDialog_Caption) ?? false;
+            return _messageBox?.ConfirmYesNo(message, RefactoringsUI.MoveFoldersDialog_Caption) ?? false;
         }
 
         private string FolderMergeUserConfirmationMessage(string targetFolder, List<string> mergedTargetFolders)
@@ -165,14 +166,14 @@ private string FolderMergeUserConfirmationMessage(string targetFolder, List<stri
             if (mergedTargetFolders.Count == 1)
             {
                 return string.Format(
-                    RubberduckUI.MoveFolders_SameNameSubfolder, 
+                    RefactoringsUI.MoveFolders_SameNameSubfolder, 
                     targetFolder,
                     mergedTargetFolders.Single());
             }
 
             var subfolders = $"'{string.Join("', '", mergedTargetFolders)}'";
             return string.Format(
-                RubberduckUI.MoveFolders_SameNameSubfolders,
+                RefactoringsUI.MoveFolders_SameNameSubfolders,
                 targetFolder,
                 subfolders);
         }
diff --git a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
index 0f057e87e5..d45bae5796 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using Rubberduck.JunkDrawer.Extensions;
+using Rubberduck.Refactorings;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Resources;
 using Rubberduck.Refactorings.MoveToFolder;
@@ -56,13 +57,13 @@ private void ValidateFolder()
             
             if (string.IsNullOrEmpty(NewFolder))
             {
-                errors.Add(RubberduckUI.MoveFolders_EmptyFolderName);
+                errors.Add(RefactoringsUI.MoveFolders_EmptyFolderName);
             }
             else
             {
                 if (NewFolder.Any(char.IsControl))
                 {
-                    errors.Add(RubberduckUI.MoveFolders_ControlCharacter);
+                    errors.Add(RefactoringsUI.MoveFolders_ControlCharacter);
                 }
 
                 if (NewFolder.Split(FolderExtensions.FolderDelimiter).Any(string.IsNullOrEmpty))
diff --git a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs
index 9920d14c27..ac56fde36e 100644
--- a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs
@@ -4,6 +4,7 @@
 using Rubberduck.JunkDrawer.Extensions;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.RenameFolder;
 using Rubberduck.Resources;
 
@@ -63,18 +64,18 @@ private void ValidateFolder()
             if (string.IsNullOrEmpty(NewFolderName))
             {
                 //We generally already rename a subfolder, here.
-                errors.Add(RubberduckUI.MoveFolders_EmptySubfolderName);
+                errors.Add(RefactoringsUI.MoveFolders_EmptySubfolderName);
             }
             else
             {
                 if (NewFolderName.Any(char.IsControl))
                 {
-                    errors.Add(RubberduckUI.MoveFolders_ControlCharacter);
+                    errors.Add(RefactoringsUI.MoveFolders_ControlCharacter);
                 }
 
                 if (NewFolderName.Split(FolderExtensions.FolderDelimiter).Any(string.IsNullOrEmpty))
                 {
-                    errors.Add(RubberduckUI.MoveFolders_EmptySubfolderName);
+                    errors.Add(RefactoringsUI.MoveFolders_EmptySubfolderName);
                 }
             }
 
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 4b13d01349..9425055ea4 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -799,5 +799,98 @@ public static string MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods {
                 return ResourceManager.GetString("MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify a new parent folder for the subfolder &apos;{0}&apos; of &apos;{1}&apos;..
+        /// </summary>
+        public static string MoveFolderDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("MoveFolderDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folder names cannot contain control characters like e.g. new lines..
+        /// </summary>
+        public static string MoveFolders_ControlCharacter {
+            get {
+                return ResourceManager.GetString("MoveFolders_ControlCharacter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A folder name cannot be empty..
+        /// </summary>
+        public static string MoveFolders_EmptyFolderName {
+            get {
+                return ResourceManager.GetString("MoveFolders_EmptyFolderName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The names of individual subfolders cannot be empty..
+        /// </summary>
+        public static string MoveFolders_EmptySubfolderName {
+            get {
+                return ResourceManager.GetString("MoveFolders_EmptySubfolderName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Several folders with the same name are being moved. This will merge them.
+        ///Do you want to proceed?.
+        /// </summary>
+        public static string MoveFolders_SameNameSourceFolders {
+            get {
+                return ResourceManager.GetString("MoveFolders_SameNameSourceFolders", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The target folder &apos;{0}&apos; already contains a subfolder &apos;{1}&apos;. Moving the folder will merge it with the existing folder.
+        ///Do you want to proceed?.
+        /// </summary>
+        public static string MoveFolders_SameNameSubfolder {
+            get {
+                return ResourceManager.GetString("MoveFolders_SameNameSubfolder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The target folder &apos;{0}&apos; already contains subfolders {1}. Moving the folders will merge them with the existing folders with corresponding names.
+        ///Do you want to proceed?.
+        /// </summary>
+        public static string MoveFolders_SameNameSubfolders {
+            get {
+                return ResourceManager.GetString("MoveFolders_SameNameSubfolders", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Move Folders.
+        /// </summary>
+        public static string MoveFoldersDialog_Caption {
+            get {
+                return ResourceManager.GetString("MoveFoldersDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify a new parent folder for the folders..
+        /// </summary>
+        public static string MoveFoldersDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("MoveFoldersDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move Folders.
+        /// </summary>
+        public static string MoveFoldersDialog_TitleText {
+            get {
+                return ResourceManager.GetString("MoveFoldersDialog_TitleText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 8233dd322e..815400deec 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -359,4 +359,37 @@ Privání třída může stále implementovat public (veřejný) interface.</val
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' má odkazy ve více metodách.</value>
   </data>
+  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
+    <value>Cílová složka '{0}' již obsahuje podložku '{1}'. Přemístění složky ji sloučí s existující složkou.
+Chcete pokračovat?</value>
+  </data>
+  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte novou nadřazenou složku '{1}' pro podsložku '{0}'.</value>
+  </data>
+  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
+    <value>Název složky nemůže obsahovat control charaktery, např. nové řádky.</value>
+  </data>
+  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
+    <value>Jméno složky nemůže být prázdné.</value>
+  </data>
+  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
+    <value>Názvy individuálních podsložek nemohou být prázdná.</value>
+  </data>
+  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
+    <value>Je přesunováno několik složek se tejným jménem. Toto je spojí.
+Chcete pokračovat?</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
+    <value>Cílová složka '{0}' již obsahuje podsložky '{1}'. Přemístění složek je sloučí s existujícími složkami s korespondujícími jmény.
+Chcete pokračovat?</value>
+  </data>
+  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Přesunout Složky</value>
+  </data>
+  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte novou nadřazenou složku pro složky.</value>
+  </data>
+  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
+    <value>Přesunout Složky</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 0c62354d77..aa59f205b9 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -365,4 +365,37 @@ Eine private Klasse kann eine private Schnittstelle implementieren.</value>
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' hat Referenzen in mehrere Methoden.</value>
   </data>
+  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
+    <value>Der Zielordner '{0}' enthält bereits einen Unterordner '{1}'. Die Ordner werden zusammengelegt, wenn der Ordner verschoben wird.
+Wollen Sie fortfahren?</value>
+  </data>
+  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen Ordner an, in den der Unterordner '{0}' des Ordners '{1}' verschoben werden soll.</value>
+  </data>
+  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
+    <value>Ordnernamen dürfen keine Kontrollzeichen wie etwa Zeilenumbrüche enthalten.</value>
+  </data>
+  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
+    <value>Ordnernamen dürfen nicht leer sein.</value>
+  </data>
+  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
+    <value>Die Namen individueller Unterordner dürfen nicht leer sein.</value>
+  </data>
+  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
+    <value>Mehrere Ordner mit demselben Namen werden verschoben. Dies wird Sie zusammenlegen.
+Wollen Sie fortfahren?</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
+    <value>Der Zielordner '{0}' enthält bereits die Unterordner {1}. Gleichnamige Ordner werden verschmolzen, wenn die Ordner verschoben werden.
+Wollen Sie fortfahren?</value>
+  </data>
+  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Ordner verschieben</value>
+  </data>
+  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen Ordner an, in den die Ordner verschoben werden sollen.</value>
+  </data>
+  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
+    <value>Ordner verschieben</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 5c264e948d..4f6e78677b 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -359,4 +359,37 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' tiene referencias en múltiples métodos.</value>
   </data>
+  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
+    <value>La carpeta destino '{0}' ya contiene una subcarpeta '{1}'. Mover la carpeta la combinará con la carpeta existente.
+¿Desea continuar?</value>
+  </data>
+  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Por favor especificar una nueva carpeta padre para la subcarpeta '{0}' de '{1}'.</value>
+  </data>
+  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
+    <value>Los nombres de carpetas no pueden contener caracteres de control como, por ejemplo, saltos de línea.</value>
+  </data>
+  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
+    <value>Una carpeta no puede estar vacía.</value>
+  </data>
+  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
+    <value>El nombre de las carpetas individuales no puede estar vacío.</value>
+  </data>
+  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
+    <value>Se están moviendo varias carpetas con el mismo nombre. Esto las combinará en una sola.
+¿Desea continuar?</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
+    <value>La carpeta destino '{0}' ya contiene subcarpetas '{1}'. Mover las carpetas las combinará con las carpetas existentes cuyos nombres coincidan.
+¿Desea continuar?</value>
+  </data>
+  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Mover Carpetas</value>
+  </data>
+  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Por favor especificar una nueva carpeta padre para las carpetas.</value>
+  </data>
+  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
+    <value>Mover Carpetas</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index ff61f30ac7..305dbea074 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -341,4 +341,37 @@ Une classe privée peut toujours implémenter une interface publique.</value>
   <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
     <value>'{0}' est utilisé dans plus d'une méthode.</value>
   </data>
+  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
+    <value>Le dossier cible '{0}' contient déjà un sous-dossier nommé '{1}'. Déplacer ce dossier le fusionnera au dossier existant.
+Procéder?</value>
+  </data>
+  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier un nouveau dossier parent pour le sous-dossier '{0}' de '{1}'.</value>
+  </data>
+  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
+    <value>Un nom de dossier ne peut pas contenir certains caractères de contrôle, tels qu'un saut de ligne.</value>
+  </data>
+  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
+    <value>Un nom de dossier ne peut être vide.</value>
+  </data>
+  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
+    <value>Les noms des sous-dossiers ne peuvent pas être vides.</value>
+  </data>
+  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
+    <value>Plusieurs dossiers portant le même nom seront déplacés. Cette action les fusionnera.
+Procéder?</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
+    <value>Le dossier cible '{0}' contient déjà les dossiers {1}. Déplacer ces dossiers les fusionnera aux dossiers existants.
+Procéder?</value>
+  </data>
+  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Déplacer les Dossiers</value>
+  </data>
+  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier un nouveau dossier parent.</value>
+  </data>
+  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
+    <value>Déplacer les dossiers</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 87e36420ef..8649db1b7f 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -366,4 +366,40 @@ A private class can still implement a public interface.</value>
     <value>'{0}' has references in multiple methods.</value>
     <comment>{0}: Variable Name</comment>
   </data>
+  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
+    <value>The target folder '{0}' already contains a subfolder '{1}'. Moving the folder will merge it with the existing folder.
+Do you want to proceed?</value>
+    <comment>{0} target folder; {1} subfolder</comment>
+  </data>
+  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify a new parent folder for the subfolder '{0}' of '{1}'.</value>
+    <comment>{0} folder; {1} parent folder</comment>
+  </data>
+  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
+    <value>Folder names cannot contain control characters like e.g. new lines.</value>
+  </data>
+  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
+    <value>A folder name cannot be empty.</value>
+  </data>
+  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
+    <value>The names of individual subfolders cannot be empty.</value>
+  </data>
+  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
+    <value>Several folders with the same name are being moved. This will merge them.
+Do you want to proceed?</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
+    <value>The target folder '{0}' already contains subfolders {1}. Moving the folders will merge them with the existing folders with corresponding names.
+Do you want to proceed?</value>
+    <comment>{0} target folder; {1} subfolder</comment>
+  </data>
+  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Move Folders</value>
+  </data>
+  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify a new parent folder for the folders.</value>
+  </data>
+  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
+    <value>Move Folders</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index bd6180c419..52ecf770e2 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2297,99 +2297,6 @@ public static string ModuleOptionsNotSpecifiedFirst {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify a new parent folder for the subfolder &apos;{0}&apos; of &apos;{1}&apos;..
-        /// </summary>
-        public static string MoveFolderDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("MoveFolderDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Folder names cannot contain control characters like e.g. new lines..
-        /// </summary>
-        public static string MoveFolders_ControlCharacter {
-            get {
-                return ResourceManager.GetString("MoveFolders_ControlCharacter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A folder name cannot be empty..
-        /// </summary>
-        public static string MoveFolders_EmptyFolderName {
-            get {
-                return ResourceManager.GetString("MoveFolders_EmptyFolderName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The names of individual subfolders cannot be empty..
-        /// </summary>
-        public static string MoveFolders_EmptySubfolderName {
-            get {
-                return ResourceManager.GetString("MoveFolders_EmptySubfolderName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Several folders with the same name are being moved. This will merge them.
-        ///Do you want to proceed?.
-        /// </summary>
-        public static string MoveFolders_SameNameSourceFolders {
-            get {
-                return ResourceManager.GetString("MoveFolders_SameNameSourceFolders", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The target folder &apos;{0}&apos; already contains a subfolder &apos;{1}&apos;. Moving the folder will merge it with the existing folder.
-        ///Do you want to proceed?.
-        /// </summary>
-        public static string MoveFolders_SameNameSubfolder {
-            get {
-                return ResourceManager.GetString("MoveFolders_SameNameSubfolder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The target folder &apos;{0}&apos; already contains subfolders {1}. Moving the folders will merge them with the existing folders with corresponding names.
-        ///Do you want to proceed?.
-        /// </summary>
-        public static string MoveFolders_SameNameSubfolders {
-            get {
-                return ResourceManager.GetString("MoveFolders_SameNameSubfolders", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Move Folders.
-        /// </summary>
-        public static string MoveFoldersDialog_Caption {
-            get {
-                return ResourceManager.GetString("MoveFoldersDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify a new parent folder for the folders..
-        /// </summary>
-        public static string MoveFoldersDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("MoveFoldersDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Move Folders.
-        /// </summary>
-        public static string MoveFoldersDialog_TitleText {
-            get {
-                return ResourceManager.GetString("MoveFoldersDialog_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Please specify new folder for the components..
         /// </summary>
@@ -4443,5 +4350,7 @@ public static string WindowSettings_StartupVisibilityHeader {
                 return ResourceManager.GetString("WindowSettings_StartupVisibilityHeader", resourceCulture);
             }
         }
+
+        public static string MoveFolders_EmptySubfolderName { get; set; }
     }
 }
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 1e4a36b1d3..262cec77e2 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1397,9 +1397,6 @@ Import přerušen.</value>
   <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
     <value>{0} {1} {2} {3} {4} {5}</value>
   </data>
-  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
-    <value>Jméno složky nemůže být prázdné.</value>
-  </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Povolit drag and drop v Code Exploreru</value>
   </data>
@@ -1412,18 +1409,12 @@ Import přerušen.</value>
   <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
     <value>Složka:</value>
   </data>
-  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
-    <value>Název složky nemůže obsahovat control charaktery, např. nové řádky.</value>
-  </data>
   <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
     <value>Plná nová složka:</value>
   </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>Ve VBA není možné změnit pouze počáteční písmeno identifikátoru (jazyk ignoruje velká/malá písmena).</value>
   </data>
-  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
-    <value>Přesunout Složky</value>
-  </data>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>Přesunout do Složky</value>
   </data>
@@ -1439,25 +1430,12 @@ Import přerušen.</value>
   <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Prosím specifikujte novou nadřazenou složku pro složku '{0}'.</value>
   </data>
-  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte novou nadřazenou složku pro složky.</value>
-  </data>
-  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte novou nadřazenou složku '{1}' pro podsložku '{0}'.</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Přejmenovat složku</value>
   </data>
-  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Přesunout Složky</value>
-  </data>
   <data name="MoveToFolderDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Přesunout do Složky</value>
   </data>
-  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
-    <value>Je přesunováno několik složek se tejným jménem. Toto je spojí.
-Chcete pokračovat?</value>
-  </data>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Komponenta '{0}' by byla ovlivněna refactorováním, avšak její stav v paměti Rubberducku je zastaralý. Prosím obnovte Rubberduck a zkuste to znovu.</value>
   </data>
@@ -1465,18 +1443,7 @@ Chcete pokračovat?</value>
     <value>Složka '{0}' již existuje. Přejmenování '{1}' na '{2}' vyústí ve sloučení s existující složkou.
 Chcete pokračovat?</value>
   </data>
-  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
-    <value>Názvy individuálních podsložek nemohou být prázdná.</value>
-  </data>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>Refaktorování může anotovat pouze komponenty, členy a proměnné, avšak cílový objekt má typ '{0}'.</value>
   </data>
-  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
-    <value>Cílová složka '{0}' již obsahuje podložku '{1}'. Přemístění složky ji sloučí s existující složkou.
-Chcete pokračovat?</value>
-  </data>
-  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
-    <value>Cílová složka '{0}' již obsahuje podsložky '{1}'. Přemístění složek je sloučí s existujícími složkami s korespondujícími jmény.
-Chcete pokračovat?</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 62fe9b2192..fc29feda56 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1448,21 +1448,9 @@ Import abgebrochen.</value>
   <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Bitte geben Sie einen neuen Ordner für die Komponenten an.</value>
   </data>
-  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen Ordner an, in den der Unterordner '{0}' des Ordners '{1}' verschoben werden soll.</value>
-  </data>
-  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen Ordner an, in den die Ordner verschoben werden sollen.</value>
-  </data>
   <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Bitte geben Sie einen Ordner an, in den der Ordner '{0}' verschoben werden soll.</value>
   </data>
-  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Ordner verschieben</value>
-  </data>
-  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
-    <value>Ordner verschieben</value>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>Es wurde kein Zielordner festgelegt.</value>
   </data>
@@ -1475,27 +1463,6 @@ Import abgebrochen.</value>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>Es ist in VBA nicht möglich nur die Groß- und Kleinschreibung eines Namens zu ändern.</value>
   </data>
-  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
-    <value>Der Zielordner '{0}' enthält bereits einen Unterordner '{1}'. Die Ordner werden zusammengelegt, wenn der Ordner verschoben wird.
-Wollen Sie fortfahren?</value>
-  </data>
-  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
-    <value>Der Zielordner '{0}' enthält bereits die Unterordner {1}. Gleichnamige Ordner werden verschmolzen, wenn die Ordner verschoben werden.
-Wollen Sie fortfahren?</value>
-  </data>
-  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
-    <value>Mehrere Ordner mit demselben Namen werden verschoben. Dies wird Sie zusammenlegen.
-Wollen Sie fortfahren?</value>
-  </data>
-  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
-    <value>Ordnernamen dürfen nicht leer sein.</value>
-  </data>
-  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
-    <value>Ordnernamen dürfen keine Kontrollzeichen wie etwa Zeilenumbrüche enthalten.</value>
-  </data>
-  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
-    <value>Die Namen individueller Unterordner dürfen nicht leer sein.</value>
-  </data>
   <data name="RenameDialog_Folder" xml:space="preserve">
     <value>Ordner</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 3aab28817f..4cc39f3305 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1347,14 +1347,6 @@ Importación cancelada.</value>
   <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
     <value>La refactorización solo puede anotar componentes, miembros y variables, pero el destino tenía tipo '{0}'.</value>
   </data>
-  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
-    <value>La carpeta destino '{0}' ya contiene una subcarpeta '{1}'. Mover la carpeta la combinará con la carpeta existente.
-¿Desea continuar?</value>
-  </data>
-  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
-    <value>La carpeta destino '{0}' ya contiene subcarpetas '{1}'. Mover las carpetas las combinará con las carpetas existentes cuyos nombres coincidan.
-¿Desea continuar?</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renombrar carpeta</value>
   </data>
@@ -1503,37 +1495,12 @@ Importación cancelada.</value>
   <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Por favor especificar una nueva carpeta padre para la carpeta '{0}'.</value>
   </data>
-  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Por favor especificar una nueva carpeta padre para las carpetas.</value>
-  </data>
-  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Por favor especificar una nueva carpeta padre para la subcarpeta '{0}' de '{1}'.</value>
-  </data>
-  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Mover Carpetas</value>
-  </data>
-  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
-    <value>Mover Carpetas</value>
-  </data>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>El componente '{0}' habría sido afectado por la refactorización, pero su estado en la memoria de Rubberduck está desactualizado. Por favor actualice el estado de Rubberduck e intente de nuevo.</value>
   </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
   </data>
-  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
-    <value>Se están moviendo varias carpetas con el mismo nombre. Esto las combinará en una sola.
-¿Desea continuar?</value>
-  </data>
-  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
-    <value>Una carpeta no puede estar vacía.</value>
-  </data>
-  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
-    <value>Los nombres de carpetas no pueden contener caracteres de control como, por ejemplo, saltos de línea.</value>
-  </data>
-  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
-    <value>El nombre de las carpetas individuales no puede estar vacío.</value>
-  </data>
   <data name="RenameDialog_Folder" xml:space="preserve">
     <value>carpeta</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 7d0e015680..f8b007b16f 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1412,39 +1412,6 @@ Mise à jour annulée.</value>
   <data name="MoveToFolderDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Déplacer vers un Dossier</value>
   </data>
-  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
-    <value>Déplacer les dossiers</value>
-  </data>
-  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Déplacer les Dossiers</value>
-  </data>
-  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier un nouveau dossier parent pour le sous-dossier '{0}' de '{1}'.</value>
-  </data>
-  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
-    <value>Un nom de dossier ne peut pas contenir certains caractères de contrôle, tels qu'un saut de ligne.</value>
-  </data>
-  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
-    <value>Un nom de dossier ne peut être vide.</value>
-  </data>
-  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
-    <value>Les noms des sous-dossiers ne peuvent pas être vides.</value>
-  </data>
-  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
-    <value>Plusieurs dossiers portant le même nom seront déplacés. Cette action les fusionnera.
-Procéder?</value>
-  </data>
-  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
-    <value>Le dossier cible '{0}' contient déjà un sous-dossier nommé '{1}'. Déplacer ce dossier le fusionnera au dossier existant.
-Procéder?</value>
-  </data>
-  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
-    <value>Le dossier cible '{0}' contient déjà les dossiers {1}. Déplacer ces dossiers les fusionnera aux dossiers existants.
-Procéder?</value>
-  </data>
-  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier un nouveau dossier parent.</value>
-  </data>
   <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
     <value>Veuillez spécifier le dossier où déplacer ces composants.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index cdaaf2815a..57f9dfeef4 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1614,19 +1614,6 @@ Import aborted.</value>
     <value>Please specify a new parent folder for the folder '{0}'.</value>
     <comment>{0} folder</comment>
   </data>
-  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify a new parent folder for the folders.</value>
-  </data>
-  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify a new parent folder for the subfolder '{0}' of '{1}'.</value>
-    <comment>{0} folder; {1} parent folder</comment>
-  </data>
-  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Move Folders</value>
-  </data>
-  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
-    <value>Move Folders</value>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>No target has been specified.</value>
   </data>
@@ -1641,29 +1628,6 @@ Import aborted.</value>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>It is not possible to change only the case of an identifier in VBA (language is case-insensitive).</value>
   </data>
-  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
-    <value>The target folder '{0}' already contains a subfolder '{1}'. Moving the folder will merge it with the existing folder.
-Do you want to proceed?</value>
-    <comment>{0} target folder; {1} subfolder</comment>
-  </data>
-  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
-    <value>The target folder '{0}' already contains subfolders {1}. Moving the folders will merge them with the existing folders with corresponding names.
-Do you want to proceed?</value>
-    <comment>{0} target folder; {1} subfolder</comment>
-  </data>
-  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
-    <value>Several folders with the same name are being moved. This will merge them.
-Do you want to proceed?</value>
-  </data>
-  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
-    <value>A folder name cannot be empty.</value>
-  </data>
-  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
-    <value>Folder names cannot contain control characters like e.g. new lines.</value>
-  </data>
-  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
-    <value>The names of individual subfolders cannot be empty.</value>
-  </data>
   <data name="RenameDialog_Folder" xml:space="preserve">
     <value>folder</value>
   </data>

From 58b64ff8fd87d57e3bc9e9c4b686dca0c4445ad5 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Thu, 29 Oct 2020 23:53:43 -0700
Subject: [PATCH 38/64] Migrate MoveToFolder resources

---
 ...ntainingFolderRefactoringFailedNotifier.cs |  3 +-
 .../MoveToFolderRefactoringFailedNotifier.cs  |  3 +-
 .../MoveFolder/MoveMultipleFoldersView.xaml   |  4 +-
 .../MoveMultipleFoldersViewModel.cs           |  3 +-
 .../MoveMultipleToFolderViewModel.cs          |  6 +-
 .../RefactoringsUI.Designer.cs                | 54 ++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 18 ++++++
 .../RefactoringsUI.de.resx                    | 18 ++++++
 .../RefactoringsUI.es.resx                    | 18 ++++++
 .../RefactoringsUI.fr.resx                    | 18 ++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 20 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 56 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 18 ------
 Rubberduck.Resources/RubberduckUI.de.resx     | 18 ------
 Rubberduck.Resources/RubberduckUI.es.resx     | 18 ------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 18 ------
 Rubberduck.Resources/RubberduckUI.resx        | 20 -------
 17 files changed, 156 insertions(+), 157 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs
index d2c4e084bb..87af98600c 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.MoveToFolder;
 
@@ -11,7 +12,7 @@ public MoveContainingFolderRefactoringFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         {}
 
-        protected override string Caption => Resources.RubberduckUI.MoveFoldersDialog_Caption;
+        protected override string Caption => RefactoringsUI.MoveFoldersDialog_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs
index b674a64c84..e1e67eb350 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.MoveToFolder;
 
@@ -11,7 +12,7 @@ public MoveToFolderRefactoringFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         {}
 
-        protected override string Caption => Resources.RubberduckUI.MoveToFolderDialog_Caption;
+        protected override string Caption => RefactoringsUI.MoveToFolderDialog_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersView.xaml b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersView.xaml
index 627462c46f..fa9738e811 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersView.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=MoveFoldersDialog_TitleText}" FontWeight="Bold" />
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=MoveFoldersDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
         <Grid Grid.Row="1" Margin="5,10,10,5">
@@ -28,7 +28,7 @@
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=MoveToFolderDialog_FolderLabelText}"
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=MoveToFolderDialog_FolderLabelText}"
                        VerticalAlignment="Top"
                        Margin="0,0,5,0" />
             <TextBox Name="MoveToFolderTextBox"
diff --git a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs
index 0c8f41fd7c..2cb86b184b 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersViewModel.cs
@@ -4,7 +4,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.MoveFolder;
-using Rubberduck.Resources;
 using Rubberduck.JunkDrawer.Extensions;
 using Rubberduck.Parsing.VBA;
 
@@ -41,7 +40,7 @@ public string Instructions
 
                     if (sourceParent.Length == 0)
                     {
-                        return string.Format(RubberduckUI.MoveRootFolderDialog_InstructionsLabelText, sourceFolder);
+                        return string.Format(RefactoringsUI.MoveRootFolderDialog_InstructionsLabelText, sourceFolder);
                     }
 
                     return string.Format(RefactoringsUI.MoveFolderDialog_InstructionsLabelText, sourceFolder, sourceParent);
diff --git a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
index d45bae5796..953a53ac69 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderViewModel.cs
@@ -32,10 +32,10 @@ public string Instructions
                     var moduleName = target.IdentifierName;
                     var declarationType = RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, CultureInfo.CurrentUICulture);
                     var currentFolder = target.CustomFolder;
-                    return string.Format(RubberduckUI.MoveToFolderDialog_InstructionsLabelText, declarationType, moduleName, currentFolder);
+                    return string.Format(RefactoringsUI.MoveToFolderDialog_InstructionsLabelText, declarationType, moduleName, currentFolder);
                 }
 
-                return string.Format(RubberduckUI.MoveMultipleToFolderDialog_InstructionsLabelText);
+                return string.Format(RefactoringsUI.MoveMultipleToFolderDialog_InstructionsLabelText);
             }
         }
 
@@ -68,7 +68,7 @@ private void ValidateFolder()
 
                 if (NewFolder.Split(FolderExtensions.FolderDelimiter).Any(string.IsNullOrEmpty))
                 {
-                    errors.Add(RubberduckUI.MoveFolders_EmptySubfolderName);
+                    errors.Add(RefactoringsUI.MoveFolders_EmptySubfolderName);
                 }
             }
 
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 9425055ea4..88a94217aa 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -892,5 +892,59 @@ public static string MoveFoldersDialog_TitleText {
                 return ResourceManager.GetString("MoveFoldersDialog_TitleText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify new folder for the components..
+        /// </summary>
+        public static string MoveMultipleToFolderDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("MoveMultipleToFolderDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify a new parent folder for the folder &apos;{0}&apos;..
+        /// </summary>
+        public static string MoveRootFolderDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("MoveRootFolderDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Move to Folder.
+        /// </summary>
+        public static string MoveToFolderDialog_Caption {
+            get {
+                return ResourceManager.GetString("MoveToFolderDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folder:.
+        /// </summary>
+        public static string MoveToFolderDialog_FolderLabelText {
+            get {
+                return ResourceManager.GetString("MoveToFolderDialog_FolderLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify a new folder for {0} &apos;{1}&apos; in folder &apos;{2}&apos;..
+        /// </summary>
+        public static string MoveToFolderDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("MoveToFolderDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move to Folder.
+        /// </summary>
+        public static string MoveToFolderDialog_TitleText {
+            get {
+                return ResourceManager.GetString("MoveToFolderDialog_TitleText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 815400deec..b54cb1aa61 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -392,4 +392,22 @@ Chcete pokračovat?</value>
   <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
     <value>Přesunout Složky</value>
   </data>
+  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte novou složku pro komponenty.</value>
+  </data>
+  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte novou nadřazenou složku pro složku '{0}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Přesunout do Složky</value>
+  </data>
+  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
+    <value>Složka:</value>
+  </data>
+  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte novou složku pro {0} '{1}' ve složce '{2}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
+    <value>Přesunout do Složky</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index aa59f205b9..468e7b8416 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -398,4 +398,22 @@ Wollen Sie fortfahren?</value>
   <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
     <value>Ordner verschieben</value>
   </data>
+  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen neuen Ordner für die Komponenten an.</value>
+  </data>
+  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen Ordner an, in den der Ordner '{0}' verschoben werden soll.</value>
+  </data>
+  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - In Ordner verschieben</value>
+  </data>
+  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
+    <value>Ordner:</value>
+  </data>
+  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen neuen Ordner für {0} '{1}' im Ordner '{2}' an.</value>
+  </data>
+  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
+    <value>In Ordner verschieben</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 4f6e78677b..b2b9c383f7 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -392,4 +392,22 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
     <value>Mover Carpetas</value>
   </data>
+  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Por favor especificar nueva carpeta para los componentes.</value>
+  </data>
+  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Por favor especificar una nueva carpeta padre para la carpeta '{0}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Mover a Carpeta</value>
+  </data>
+  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
+    <value>Carpeta:</value>
+  </data>
+  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Por favor especificar una nueva carpeta para {0} '{1}' en la carpeta '{2}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
+    <value>Mover hacia carpeta</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 305dbea074..4067a5da75 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -374,4 +374,22 @@ Procéder?</value>
   <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
     <value>Déplacer les dossiers</value>
   </data>
+  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier le dossier où déplacer ces composants.</value>
+  </data>
+  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier un nouveau dossier parent pour '{0}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Déplacer vers un Dossier</value>
+  </data>
+  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
+    <value>Dossier:</value>
+  </data>
+  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier un nouveau dossier pour {0} '{1}' dans le dossier '{2}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
+    <value>Déplacer vers un dossier</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 8649db1b7f..d4118dd8b1 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -402,4 +402,24 @@ Do you want to proceed?</value>
   <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
     <value>Move Folders</value>
   </data>
+  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify new folder for the components.</value>
+  </data>
+  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify a new parent folder for the folder '{0}'.</value>
+    <comment>{0} folder</comment>
+  </data>
+  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Move to Folder</value>
+  </data>
+  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
+    <value>Folder:</value>
+  </data>
+  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify a new folder for {0} '{1}' in folder '{2}'.</value>
+    <comment>{0} DeclarationType; {1} IdentifierName; {2} current folder</comment>
+  </data>
+  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
+    <value>Move to Folder</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 52ecf770e2..a90413fbbd 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2297,60 +2297,6 @@ public static string ModuleOptionsNotSpecifiedFirst {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify new folder for the components..
-        /// </summary>
-        public static string MoveMultipleToFolderDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("MoveMultipleToFolderDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify a new parent folder for the folder &apos;{0}&apos;..
-        /// </summary>
-        public static string MoveRootFolderDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("MoveRootFolderDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Move to Folder.
-        /// </summary>
-        public static string MoveToFolderDialog_Caption {
-            get {
-                return ResourceManager.GetString("MoveToFolderDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Folder:.
-        /// </summary>
-        public static string MoveToFolderDialog_FolderLabelText {
-            get {
-                return ResourceManager.GetString("MoveToFolderDialog_FolderLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify a new folder for {0} &apos;{1}&apos; in folder &apos;{2}&apos;..
-        /// </summary>
-        public static string MoveToFolderDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("MoveToFolderDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Move to Folder.
-        /// </summary>
-        public static string MoveToFolderDialog_TitleText {
-            get {
-                return ResourceManager.GetString("MoveToFolderDialog_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Name.
         /// </summary>
@@ -4350,7 +4296,5 @@ public static string WindowSettings_StartupVisibilityHeader {
                 return ResourceManager.GetString("WindowSettings_StartupVisibilityHeader", resourceCulture);
             }
         }
-
-        public static string MoveFolders_EmptySubfolderName { get; set; }
     }
 }
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 262cec77e2..3df1cd123f 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1406,36 +1406,18 @@ Import přerušen.</value>
   <data name="RenameDialog_FolderLabel" xml:space="preserve">
     <value>Složka:</value>
   </data>
-  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
-    <value>Složka:</value>
-  </data>
   <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
     <value>Plná nová složka:</value>
   </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>Ve VBA není možné změnit pouze počáteční písmeno identifikátoru (jazyk ignoruje velká/malá písmena).</value>
   </data>
-  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
-    <value>Přesunout do Složky</value>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>Cíl nebyl specifikován.</value>
   </data>
-  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte novou složku pro komponenty.</value>
-  </data>
-  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte novou složku pro {0} '{1}' ve složce '{2}'.</value>
-  </data>
-  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte novou nadřazenou složku pro složku '{0}'.</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Přejmenovat složku</value>
   </data>
-  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Přesunout do Složky</value>
-  </data>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Komponenta '{0}' by byla ovlivněna refactorováním, avšak její stav v paměti Rubberducku je zastaralý. Prosím obnovte Rubberduck a zkuste to znovu.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index fc29feda56..6b837667d5 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1433,24 +1433,6 @@ Import abgebrochen.</value>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>Es war nicht möglich den Parser zum Ausführen des Refactorings temporär zu deaktivieren.</value>
   </data>
-  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - In Ordner verschieben</value>
-  </data>
-  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen neuen Ordner für {0} '{1}' im Ordner '{2}' an.</value>
-  </data>
-  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
-    <value>In Ordner verschieben</value>
-  </data>
-  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
-    <value>Ordner:</value>
-  </data>
-  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen neuen Ordner für die Komponenten an.</value>
-  </data>
-  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen Ordner an, in den der Ordner '{0}' verschoben werden soll.</value>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>Es wurde kein Zielordner festgelegt.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 4cc39f3305..d1d751df7d 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1477,24 +1477,6 @@ Importación cancelada.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>Formulario VB</value>
   </data>
-  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Mover a Carpeta</value>
-  </data>
-  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Por favor especificar una nueva carpeta para {0} '{1}' en la carpeta '{2}'.</value>
-  </data>
-  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
-    <value>Mover hacia carpeta</value>
-  </data>
-  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
-    <value>Carpeta:</value>
-  </data>
-  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Por favor especificar nueva carpeta para los componentes.</value>
-  </data>
-  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Por favor especificar una nueva carpeta padre para la carpeta '{0}'.</value>
-  </data>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>El componente '{0}' habría sido afectado por la refactorización, pero su estado en la memoria de Rubberduck está desactualizado. Por favor actualice el estado de Rubberduck e intente de nuevo.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index f8b007b16f..a54ad1e553 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1400,24 +1400,6 @@ Mise à jour annulée.</value>
 
 Échec de l'importation.</value>
   </data>
-  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
-    <value>Dossier:</value>
-  </data>
-  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
-    <value>Déplacer vers un dossier</value>
-  </data>
-  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier un nouveau dossier pour {0} '{1}' dans le dossier '{2}'.</value>
-  </data>
-  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Déplacer vers un Dossier</value>
-  </data>
-  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier le dossier où déplacer ces composants.</value>
-  </data>
-  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier un nouveau dossier parent pour '{0}'.</value>
-  </data>
   <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
     <value>Le composant '{0}' aurait été affecté par la refactorisation, mais sa représentation interne à Rubberduck est périmée. Veuillez actualiser Rubberduck et réessayer.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 57f9dfeef4..6856f1c65d 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1594,26 +1594,6 @@ Import aborted.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>VB Form</value>
   </data>
-  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Move to Folder</value>
-  </data>
-  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify a new folder for {0} '{1}' in folder '{2}'.</value>
-    <comment>{0} DeclarationType; {1} IdentifierName; {2} current folder</comment>
-  </data>
-  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
-    <value>Move to Folder</value>
-  </data>
-  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
-    <value>Folder:</value>
-  </data>
-  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify new folder for the components.</value>
-  </data>
-  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify a new parent folder for the folder '{0}'.</value>
-    <comment>{0} folder</comment>
-  </data>
   <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
     <value>No target has been specified.</value>
   </data>

From cf905ee33978d073165b287a59719e10c1eae817 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Fri, 30 Oct 2020 00:12:32 -0700
Subject: [PATCH 39/64] Migrate RefactoringFailure_ resources

---
 .../AnnotateDeclarationFailedNotifier.cs      |   2 +-
 .../EncapsulateFieldFailedNotifier.cs         |   2 +-
 .../ExtractInterfaceFailedNotifier.cs         |   2 +-
 .../ImplementInterfaceFailedNotifier.cs       |   2 +-
 .../Notifiers/IntroduceFieldFailedNotifier.cs |   2 +-
 .../IntroduceParameterFailedNotifier.cs       |   2 +-
 .../MoveCloserToUsageFailedNotifier.cs        |   2 +-
 ...ntainingFolderRefactoringFailedNotifier.cs |   4 +-
 .../MoveToFolderRefactoringFailedNotifier.cs  |   4 +-
 .../RefactoringFailureNotifierBase.cs         |  15 +--
 .../RemoveParameterFailedNotifier.cs          |   3 +-
 .../ReorderParametersFailedNotifier.cs        |   3 +-
 .../RemoveParametersPresenter.cs              |   3 +-
 .../RefactoringsUI.Designer.cs                | 108 ++++++++++++++++++
 .../RefactoringsUI.cs.resx                    |  36 ++++++
 .../RefactoringsUI.de.resx                    |  36 ++++++
 .../RefactoringsUI.es.resx                    |  36 ++++++
 .../RefactoringsUI.fr.resx                    |  36 ++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  42 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 108 ------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  36 ------
 Rubberduck.Resources/RubberduckUI.de.resx     |  37 ------
 Rubberduck.Resources/RubberduckUI.es.resx     |  37 ------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  37 ------
 Rubberduck.Resources/RubberduckUI.resx        |  42 -------
 25 files changed, 319 insertions(+), 318 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs
index aec9c9c435..066e60b424 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/AnnotateDeclarationFailedNotifier.cs
@@ -20,7 +20,7 @@ protected override string Message(RefactoringException exception)
             {
                 Logger.Warn(invalidTypeException);
                 return string.Format(
-                    RubberduckUI.RefactoringFailure_AnnotateDeclaration_InvalidType,
+                    RefactoringsUI.RefactoringFailure_AnnotateDeclaration_InvalidType,
                     invalidTypeException.TargetDeclaration.DeclarationType.ToLocalizedString());
             }
 
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs
index 2496dcc045..9558932310 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/EncapsulateFieldFailedNotifier.cs
@@ -19,7 +19,7 @@ protected override string Message(RefactoringException exception)
             {
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.Variable);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs
index 1886b96474..eaa88bbdd0 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ExtractInterfaceFailedNotifier.cs
@@ -19,7 +19,7 @@ protected override string Message(RefactoringException exception)
             {
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType, 
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType, 
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.ClassModule);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs
index b7642f3e06..83da31733d 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ImplementInterfaceFailedNotifier.cs
@@ -23,7 +23,7 @@ protected override string Message(RefactoringException exception)
                     return RefactoringsUI.ImplementInterfaceFailed_NoImplementsStatementSelected;
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.ClassModule);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs
index 13fa0649ad..3f3bbd630b 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceFieldFailedNotifier.cs
@@ -24,7 +24,7 @@ protected override string Message(RefactoringException exception)
                         isAlreadyAField.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.Variable);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs
index 83335f0736..4a998e1b3a 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs
@@ -25,7 +25,7 @@ protected override string Message(RefactoringException exception)
                         targetNotInMethod.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType.ToLocalizedString(),
                         DeclarationType.Variable.ToLocalizedString());
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs
index a619416b78..0527cf93e4 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveCloserToUsageFailedNotifier.cs
@@ -45,7 +45,7 @@ protected override string Message(RefactoringException exception)
                         notUsed.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.Variable);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs
index 87af98600c..2442d8f0bd 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveContainingFolderRefactoringFailedNotifier.cs
@@ -21,12 +21,12 @@ protected override string Message(RefactoringException exception)
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
                     return string.Format(
-                        Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                        RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.Module);
                 case NoTargetFolderException noTargetFolder:
-                    return Resources.RubberduckUI.RefactoringFailure_NoTargetFolder;
+                    return RefactoringsUI.RefactoringFailure_NoTargetFolder;
                 default:
                     return base.Message(exception);
             }
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs
index e1e67eb350..3126cda3a7 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/MoveToFolderRefactoringFailedNotifier.cs
@@ -21,12 +21,12 @@ protected override string Message(RefactoringException exception)
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
                     return string.Format(
-                        Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                        RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.Module);
                 case NoTargetFolderException noTargetFolder:
-                    return Resources.RubberduckUI.RefactoringFailure_NoTargetFolder;
+                    return RefactoringsUI.RefactoringFailure_NoTargetFolder;
                 default:
                     return base.Message(exception);
             }
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RefactoringFailureNotifierBase.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RefactoringFailureNotifierBase.cs
index 5ce8c70e89..ff3475b67c 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RefactoringFailureNotifierBase.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RefactoringFailureNotifierBase.cs
@@ -1,6 +1,7 @@
 using System;
 using NLog;
 using Rubberduck.Interaction;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
@@ -22,7 +23,7 @@ protected RefactoringFailureNotifierBase(IMessageBox messageBox)
 
         public void Notify(RefactoringException exception)
         {
-            var message = $"{Resources.RubberduckUI.RefactoringFailure_BaseMessage}{Environment.NewLine}{Environment.NewLine}{Message(exception)}";
+            var message = $"{RefactoringsUI.RefactoringFailure_BaseMessage}{Environment.NewLine}{Environment.NewLine}{Message(exception)}";
             _messageBox.NotifyWarn(message, Caption);
         }
 
@@ -32,21 +33,21 @@ protected virtual string Message(RefactoringException exception)
             {
                 case NoActiveSelectionException noActiveSelection:
                     Logger.Error(noActiveSelection);
-                    return Resources.RubberduckUI.RefactoringFailure_NoActiveSelection; 
+                    return RefactoringsUI.RefactoringFailure_NoActiveSelection; 
                 case NoDeclarationForSelectionException noDeclarationForSelection:
                     Logger.Warn(noDeclarationForSelection);
-                    return Resources.RubberduckUI.RefactoringFailure_NoTargetDeclarationForSelection;
+                    return RefactoringsUI.RefactoringFailure_NoTargetDeclarationForSelection;
                 case TargetDeclarationIsNullException targetNull:
                     Logger.Error(targetNull);
-                    return Resources.RubberduckUI.RefactoringFailure_TargetNull;
+                    return RefactoringsUI.RefactoringFailure_TargetNull;
                 case TargetDeclarationNotUserDefinedException targetBuiltIn:
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_TargetNotUserDefined, targetBuiltIn.TargetDeclaration.QualifiedName);
+                    return string.Format(RefactoringsUI.RefactoringFailure_TargetNotUserDefined, targetBuiltIn.TargetDeclaration.QualifiedName);
                 case SuspendParserFailureException suspendParserFailure:
                     Logger.Warn(suspendParserFailure);
-                    return Resources.RubberduckUI.RefactoringFailure_SuspendParserFailure;
+                    return RefactoringsUI.RefactoringFailure_SuspendParserFailure;
                 case AffectedModuleIsStaleException affectedModuleIsStale:
                     return string.Format(
-                        Resources.RubberduckUI.RefactoringFailure_AffectedModuleIsStale,
+                        RefactoringsUI.RefactoringFailure_AffectedModuleIsStale,
                         affectedModuleIsStale.StaleModule.ToString());
                 default:
                     Logger.Error(exception);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs
index 60e76e403c..62bdeb8394 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
@@ -18,7 +19,7 @@ protected override string Message(RefactoringException exception)
             {
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType,
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         DeclarationType.Parameter);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs
index c64ca6f36a..3b0c2bfe2b 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
@@ -18,7 +19,7 @@ protected override string Message(RefactoringException exception)
             {
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
-                    return string.Format(Resources.RubberduckUI.RefactoringFailure_InvalidDeclarationType_multipleValid,
+                    return string.Format(RefactoringsUI.RefactoringFailure_InvalidDeclarationType_multipleValid,
                         invalidDeclarationType.TargetDeclaration.QualifiedModuleName,
                         invalidDeclarationType.TargetDeclaration.DeclarationType,
                         $"{DeclarationType.Member}, {DeclarationType.Event}");
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
index 16869e2edd..6918c712d6 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -1,4 +1,5 @@
 using Rubberduck.Interaction;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Resources;
 using Rubberduck.Refactorings.RemoveParameters;
@@ -46,7 +47,7 @@ public override RemoveParametersModel Show()
 
         private bool UserConfirmsInterfaceTarget(RemoveParametersModel model)
         {
-            var message = string.Format(RubberduckUI.Refactoring_TargetIsInterfaceMemberImplementation,
+            var message = string.Format(RefactoringsUI.Refactoring_TargetIsInterfaceMemberImplementation,
                 model.OriginalTarget.IdentifierName, Model.TargetDeclaration.ComponentName, model.TargetDeclaration.IdentifierName);
             return UserConfirmsNewTarget(message);
         }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 88a94217aa..9194cf80d0 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -946,5 +946,113 @@ public static string MoveToFolderDialog_TitleText {
                 return ResourceManager.GetString("MoveToFolderDialog_TitleText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Method &apos;{0}&apos; implements &apos;{1}.{2}&apos;. Change interface signature? (Will propagate to all implementations.).
+        /// </summary>
+        public static string Refactoring_TargetIsInterfaceMemberImplementation {
+            get {
+                return ResourceManager.GetString("Refactoring_TargetIsInterfaceMemberImplementation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The component &apos;{0}&apos; would have been affected by the refactoring, but its state in Rubberduck&apos;s memory is stale. Please refresh Rubberduck and try again..
+        /// </summary>
+        public static string RefactoringFailure_AffectedModuleIsStale {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_AffectedModuleIsStale", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The refactoring can only annotate components, members and variables, but the target had type &apos;{0}&apos;..
+        /// </summary>
+        public static string RefactoringFailure_AnnotateDeclaration_InvalidType {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_AnnotateDeclaration_InvalidType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Refactoring failed..
+        /// </summary>
+        public static string RefactoringFailure_BaseMessage {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_BaseMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declaration type of target &apos;{0}&apos; is &apos;{1}&apos; instead of the expected &apos;{2}&apos;..
+        /// </summary>
+        public static string RefactoringFailure_InvalidDeclarationType {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_InvalidDeclarationType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Declaration type of target &apos;{0}&apos; is &apos;{1}&apos; instead of one of the expected &apos;{2}&apos;..
+        /// </summary>
+        public static string RefactoringFailure_InvalidDeclarationType_multipleValid {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_InvalidDeclarationType_multipleValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to There is no active selection..
+        /// </summary>
+        public static string RefactoringFailure_NoActiveSelection {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_NoActiveSelection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No viable target selected..
+        /// </summary>
+        public static string RefactoringFailure_NoTargetDeclarationForSelection {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_NoTargetDeclarationForSelection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No target has been specified..
+        /// </summary>
+        public static string RefactoringFailure_NoTargetFolder {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_NoTargetFolder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unable to suspend the Parser to perform the refactoring operation..
+        /// </summary>
+        public static string RefactoringFailure_SuspendParserFailure {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_SuspendParserFailure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The target is not user-defined..
+        /// </summary>
+        public static string RefactoringFailure_TargetNotUserDefined {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_TargetNotUserDefined", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Target declaration is null..
+        /// </summary>
+        public static string RefactoringFailure_TargetNull {
+            get {
+                return ResourceManager.GetString("RefactoringFailure_TargetNull", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index b54cb1aa61..785966138d 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -410,4 +410,40 @@ Chcete pokračovat?</value>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>Přesunout do Složky</value>
   </data>
+  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
+    <value>Typ deklarace cíle '{0}' je '{1}' namísto jednoho z očekávaných '{2}'.</value>
+  </data>
+  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Metoda '{0}' implementuje '{1}.{2}'. Změnit podpis rozhraní? (Rozšíří se na všechny implementace.)</value>
+  </data>
+  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
+    <value>Komponenta '{0}' by byla ovlivněna refactorováním, avšak její stav v paměti Rubberducku je zastaralý. Prosím obnovte Rubberduck a zkuste to znovu.</value>
+  </data>
+  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
+    <value>Refaktorování může anotovat pouze komponenty, členy a proměnné, avšak cílový objekt má typ '{0}'.</value>
+  </data>
+  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
+    <value>Refaktorování selhalo.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
+    <value>Deklarace typu cíle '{0}' je '{1}' namísto očekávaného '{2}'.</value>
+  </data>
+  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
+    <value>Neexistuje žádný aktivní výběr.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
+    <value>Vybraný cíl nejde refaktorovat.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
+    <value>Cíl nebyl specifikován.</value>
+  </data>
+  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
+    <value>Nelze přerušit Parser k provedení operace refaktoringu.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
+    <value>Cíl není uživatelsky definován.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
+    <value>Cílová deklarace je 'Null'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 468e7b8416..5dd48eee39 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -416,4 +416,40 @@ Wollen Sie fortfahren?</value>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>In Ordner verschieben</value>
   </data>
+  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
+    <value>Der Typ des Ziels '{0}'ist '{1}' anstatt eines der erwarteten Typen '{2}'.</value>
+  </data>
+  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Die Methode '{0}' implementiert '{1}.{2}'. Signatur Ändern? (Wird auf alle Implementierungen angewendet)</value>
+  </data>
+  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
+    <value>Die Komponente '{0}' würde durch das Refactoring verändert, aber ihr Inhalt ist in Rubberduck veraltet. Bitte lassen Sie Rubberduck seinen Stand aktualisieren und versuchen Sie es erneut.</value>
+  </data>
+  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
+    <value>Das Refactoring kann Annotationen nur zu Komponenten, Methoden und Variablen hinzufügen. Die Zieldeklaration hatte allerdings den Typ '{0}'.</value>
+  </data>
+  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
+    <value>Refactoring fehlgeschlagen.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
+    <value>Der Typ des Ziels '{0}'ist '{1}' anstatt des erwarteten Typs '{2}'.</value>
+  </data>
+  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
+    <value>Es gibt keine aktive Selektion.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
+    <value>Es ist kein zulässiges Ziel selektiert.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
+    <value>Es wurde kein Zielordner festgelegt.</value>
+  </data>
+  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
+    <value>Es war nicht möglich den Parser zum Ausführen des Refactorings temporär zu deaktivieren.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
+    <value>Das Ziel ist nicht benutzerdefiniert.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
+    <value>Das Ziel des Refactorings ist null.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index b2b9c383f7..8055bb7112 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -410,4 +410,40 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>Mover hacia carpeta</value>
   </data>
+  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
+    <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de una de las esperadas '{2}'.</value>
+  </data>
+  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>El método '{0}' implementa '{1}. {2}'. ¿Cambiar la firma de la interfaz? (Se propagará a todas las implementaciones.)</value>
+  </data>
+  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
+    <value>El componente '{0}' habría sido afectado por la refactorización, pero su estado en la memoria de Rubberduck está desactualizado. Por favor actualice el estado de Rubberduck e intente de nuevo.</value>
+  </data>
+  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
+    <value>La refactorización solo puede anotar componentes, miembros y variables, pero el destino tenía tipo '{0}'.</value>
+  </data>
+  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
+    <value>Refactorización falló.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
+    <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de la esperada '{2}'.</value>
+  </data>
+  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
+    <value>No existe una selección activa.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
+    <value>No se seleccionó un destino viable.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
+    <value>No se especificó un destino.</value>
+  </data>
+  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
+    <value>No se puede suspender el analizador para ejecutar la operación de refactorización.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
+    <value>El destino no está definido por el usuario.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
+    <value>Declaración destino es nula.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 4067a5da75..61cc7753b6 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -392,4 +392,40 @@ Procéder?</value>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>Déplacer vers un dossier</value>
   </data>
+  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
+    <value>Le type de déclaration de la cible '{0}' est '{1}', mais le type attendu était '{2}'.</value>
+  </data>
+  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier la signature de l'interface? (cette modification serait propagée à toutes les implémentations)</value>
+  </data>
+  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
+    <value>Le composant '{0}' aurait été affecté par la refactorisation, mais sa représentation interne à Rubberduck est périmée. Veuillez actualiser Rubberduck et réessayer.</value>
+  </data>
+  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
+    <value>Le refactoring ne peut annoter que les composants, les membres et les variables, mais la cible était de type '{0}'.</value>
+  </data>
+  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
+    <value>Échec du refactoring.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
+    <value>Le type de déclaration de la cible '{0}' est '{1}', plutôt que '{2}' tel qu'attendu.</value>
+  </data>
+  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
+    <value>Cette opération requiert une sélection active.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
+    <value>La sélection ne semble pas contenir de déclaration utilisable.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
+    <value>Aucune cible n'a été spécifiée.</value>
+  </data>
+  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
+    <value>Impossible de suspendre l'analyse en cours pour effectuer le refactoring.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
+    <value>La cible n'est pas définie par l'utilisateur.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
+    <value>La déclaration ciblée est 'null', ...poof?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index d4118dd8b1..a4122cce6b 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -422,4 +422,46 @@ Do you want to proceed?</value>
   <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
     <value>Move to Folder</value>
   </data>
+  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
+    <value>Declaration type of target '{0}' is '{1}' instead of one of the expected '{2}'.</value>
+    <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration types</comment>
+  </data>
+  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Method '{0}' implements '{1}.{2}'. Change interface signature? (Will propagate to all implementations.)</value>
+    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
+  </data>
+  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
+    <value>The component '{0}' would have been affected by the refactoring, but its state in Rubberduck's memory is stale. Please refresh Rubberduck and try again.</value>
+    <comment>{0} stale module</comment>
+  </data>
+  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
+    <value>The refactoring can only annotate components, members and variables, but the target had type '{0}'.</value>
+    <comment>{0} declaration type</comment>
+  </data>
+  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
+    <value>Refactoring failed.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
+    <value>Declaration type of target '{0}' is '{1}' instead of the expected '{2}'.</value>
+    <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration type</comment>
+  </data>
+  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
+    <value>There is no active selection.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
+    <value>No viable target selected.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
+    <value>No target has been specified.</value>
+  </data>
+  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
+    <value>Unable to suspend the Parser to perform the refactoring operation.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
+    <value>The target is not user-defined.</value>
+    <comment>{0}: name of target</comment>
+  </data>
+  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
+    <value>Target declaration is null.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index a90413fbbd..2e3d6bb997 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -2705,114 +2705,6 @@ public static System.Drawing.Bitmap question_white {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Method &apos;{0}&apos; implements &apos;{1}.{2}&apos;. Change interface signature? (Will propagate to all implementations.).
-        /// </summary>
-        public static string Refactoring_TargetIsInterfaceMemberImplementation {
-            get {
-                return ResourceManager.GetString("Refactoring_TargetIsInterfaceMemberImplementation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The component &apos;{0}&apos; would have been affected by the refactoring, but its state in Rubberduck&apos;s memory is stale. Please refresh Rubberduck and try again..
-        /// </summary>
-        public static string RefactoringFailure_AffectedModuleIsStale {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_AffectedModuleIsStale", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The refactoring can only annotate components, members and variables, but the target had type &apos;{0}&apos;..
-        /// </summary>
-        public static string RefactoringFailure_AnnotateDeclaration_InvalidType {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_AnnotateDeclaration_InvalidType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Refactoring failed..
-        /// </summary>
-        public static string RefactoringFailure_BaseMessage {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_BaseMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Declaration type of target &apos;{0}&apos; is &apos;{1}&apos; instead of the expected &apos;{2}&apos;..
-        /// </summary>
-        public static string RefactoringFailure_InvalidDeclarationType {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_InvalidDeclarationType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Declaration type of target &apos;{0}&apos; is &apos;{1}&apos; instead of one of the expected &apos;{2}&apos;..
-        /// </summary>
-        public static string RefactoringFailure_InvalidDeclarationType_multipleValid {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_InvalidDeclarationType_multipleValid", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There is no active selection..
-        /// </summary>
-        public static string RefactoringFailure_NoActiveSelection {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_NoActiveSelection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No viable target selected..
-        /// </summary>
-        public static string RefactoringFailure_NoTargetDeclarationForSelection {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_NoTargetDeclarationForSelection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No target has been specified..
-        /// </summary>
-        public static string RefactoringFailure_NoTargetFolder {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_NoTargetFolder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to suspend the Parser to perform the refactoring operation..
-        /// </summary>
-        public static string RefactoringFailure_SuspendParserFailure {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_SuspendParserFailure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The target is not user-defined..
-        /// </summary>
-        public static string RefactoringFailure_TargetNotUserDefined {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_TargetNotUserDefined", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Target declaration is null..
-        /// </summary>
-        public static string RefactoringFailure_TargetNull {
-            get {
-                return ResourceManager.GetString("RefactoringFailure_TargetNull", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to References.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 3df1cd123f..6e6459a7ac 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -486,9 +486,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Volitelné parametry musejí být specifikovány na konci seznamu parametrů.</value>
   </data>
-  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Metoda '{0}' implementuje '{1}.{2}'. Změnit podpis rozhraní? (Rozšíří se na všechny implementace.)</value>
-  </data>
   <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
     <value>Vyberte parametr a dvojím poklepáním na něj, nebo použitím tlačítek, ho odstraňte nebo obnovte.</value>
   </data>
@@ -1229,18 +1226,6 @@ End Enum</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
-  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
-    <value>Refaktorování selhalo.</value>
-  </data>
-  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
-    <value>Neexistuje žádný aktivní výběr.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
-    <value>Vybraný cíl nejde refaktorovat.</value>
-  </data>
-  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>Cílová deklarace je 'Null'.</value>
-  </data>
   <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
     <value>Cílový control '{0}' nebyl nalezen.</value>
   </data>
@@ -1250,15 +1235,6 @@ End Enum</value>
   <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
     <value>Cíl '{0}' je standardní ovladač událostí, který nemůže být přejmenován.</value>
   </data>
-  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
-    <value>Cíl není uživatelsky definován.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
-    <value>Deklarace typu cíle '{0}' je '{1}' namísto očekávaného '{2}'.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
-    <value>Typ deklarace cíle '{0}' je '{1}' namísto jednoho z očekávaných '{2}'.</value>
-  </data>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Uložit a Zavřít</value>
   </data>
@@ -1310,9 +1286,6 @@ End Enum</value>
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
     <value>Rubberduck: Výsledky Testů - {0}</value>
   </data>
-  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
-    <value>Nelze přerušit Parser k provedení operace refaktoringu.</value>
-  </data>
   <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
     <value>Přípona souboru '{0}' není podporována.
 
@@ -1412,20 +1385,11 @@ Import přerušen.</value>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>Ve VBA není možné změnit pouze počáteční písmeno identifikátoru (jazyk ignoruje velká/malá písmena).</value>
   </data>
-  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
-    <value>Cíl nebyl specifikován.</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Přejmenovat složku</value>
   </data>
-  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
-    <value>Komponenta '{0}' by byla ovlivněna refactorováním, avšak její stav v paměti Rubberducku je zastaralý. Prosím obnovte Rubberduck a zkuste to znovu.</value>
-  </data>
   <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
     <value>Složka '{0}' již existuje. Přejmenování '{1}' na '{2}' vyústí ve sloučení s existující složkou.
 Chcete pokračovat?</value>
   </data>
-  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
-    <value>Refaktorování může anotovat pouze komponenty, členy a proměnné, avšak cílový objekt má typ '{0}'.</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 6b837667d5..938360bd1f 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -234,10 +234,6 @@
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Parameter entfernen</value>
   </data>
-  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Die Methode '{0}' implementiert '{1}.{2}'. Signatur Ändern? (Wird auf alle Implementierungen angewendet)</value>
-    <comment>0: Gewähltes Ziel; 1: Name des Interfaces; 2: Name des Interfacemembers</comment>
-  </data>
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>Kann den letzten Parameter eines Setters oder Letters nicht entfernen.</value>
   </data>
@@ -1250,18 +1246,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
-  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
-    <value>Refactoring fehlgeschlagen.</value>
-  </data>
-  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
-    <value>Es gibt keine aktive Selektion.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
-    <value>Es ist kein zulässiges Ziel selektiert.</value>
-  </data>
-  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>Das Ziel des Refactorings ist null.</value>
-  </data>
   <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
     <value>Es wurde kein Codemodul für das Zielmodul '{0}' gefunden.</value>
   </data>
@@ -1271,15 +1255,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
     <value>Das Ziel '{0}' ist ein Standardeventhandler, welcher nicht umbenannt werden kann.</value>
   </data>
-  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
-    <value>Das Ziel ist nicht benutzerdefiniert.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
-    <value>Der Typ des Ziels '{0}'ist '{1}' anstatt des erwarteten Typs '{2}'.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
-    <value>Der Typ des Ziels '{0}'ist '{1}' anstatt eines der erwarteten Typen '{2}'.</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
@@ -1430,18 +1405,6 @@ Import abgebrochen.</value>
   <data name="ComponentType_UserControl" xml:space="preserve">
     <value>Benutzerkontrollelement</value>
   </data>
-  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
-    <value>Es war nicht möglich den Parser zum Ausführen des Refactorings temporär zu deaktivieren.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
-    <value>Es wurde kein Zielordner festgelegt.</value>
-  </data>
-  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
-    <value>Die Komponente '{0}' würde durch das Refactoring verändert, aber ihr Inhalt ist in Rubberduck veraltet. Bitte lassen Sie Rubberduck seinen Stand aktualisieren und versuchen Sie es erneut.</value>
-  </data>
-  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
-    <value>Das Refactoring kann Annotationen nur zu Komponenten, Methoden und Variablen hinzufügen. Die Zieldeklaration hatte allerdings den Typ '{0}'.</value>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>Es ist in VBA nicht möglich nur die Groß- und Kleinschreibung eines Namens zu ändern.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index d1d751df7d..ef6373a5e7 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -234,10 +234,6 @@
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Eliminar parametros</value>
   </data>
-  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>El método '{0}' implementa '{1}. {2}'. ¿Cambiar la firma de la interfaz? (Se propagará a todas las implementaciones.)</value>
-    <comment>0: objetivo seleccionado; 1: nombre de la interfaz; 2: nombre del miembro de la interfaz</comment>
-  </data>
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>No se puede eliminar el último parámetro del Setter o Letter.</value>
   </data>
@@ -1306,18 +1302,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Guardar y Cerrar</value>
   </data>
-  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
-    <value>Refactorización falló.</value>
-  </data>
-  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
-    <value>No existe una selección activa.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
-    <value>No se seleccionó un destino viable.</value>
-  </data>
-  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>Declaración destino es nula.</value>
-  </data>
   <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
     <value>No se encontró modulo para el módulo destino '{0}'.</value>
   </data>
@@ -1327,26 +1311,11 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
     <value>El destino '{0}' es un manejador de eventos estándar, el cual no puede ser renombrado.</value>
   </data>
-  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
-    <value>El destino no está definido por el usuario.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
-    <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de la esperada '{2}'.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
-    <value>La declaración de tipo del destino '{0}' es '{1}' en lugar de una de las esperadas '{2}'.</value>
-  </data>
   <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
     <value>Para el archivo '{0}', faltan los archivos binarios '{1}' y el componente destino '{2}' no existía.
 
 Importación cancelada.</value>
   </data>
-  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
-    <value>No se especificó un destino.</value>
-  </data>
-  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
-    <value>La refactorización solo puede anotar componentes, miembros y variables, pero el destino tenía tipo '{0}'.</value>
-  </data>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renombrar carpeta</value>
   </data>
@@ -1389,9 +1358,6 @@ Importación cancelada.</value>
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
     <value>Rubberduck Resultados de pruebas - {0}</value>
   </data>
-  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
-    <value>No se puede suspender el analizador para ejecutar la operación de refactorización.</value>
-  </data>
   <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
     <value>Avisarme cuando un pre-release build nuevo esté disponible</value>
   </data>
@@ -1477,9 +1443,6 @@ Importación cancelada.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>Formulario VB</value>
   </data>
-  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
-    <value>El componente '{0}' habría sido afectado por la refactorización, pero su estado en la memoria de Rubberduck está desactualizado. Por favor actualice el estado de Rubberduck e intente de nuevo.</value>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index a54ad1e553..818a9210ff 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -434,10 +434,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Project" xml:space="preserve">
     <value>le projet</value>
   </data>
-  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier la signature de l'interface? (cette modification serait propagée à toutes les implémentations)</value>
-    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
-  </data>
   <data name="Navigation" xml:space="preserve">
     <value>Navigation</value>
   </data>
@@ -1285,33 +1281,12 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="VersionCheck_BuildType_Release" xml:space="preserve">
     <value>officielle</value>
   </data>
-  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
-    <value>Échec du refactoring.</value>
-  </data>
-  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
-    <value>Cette opération requiert une sélection active.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
-    <value>La sélection ne semble pas contenir de déclaration utilisable.</value>
-  </data>
-  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>La déclaration ciblée est 'null', ...poof?</value>
-  </data>
   <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
     <value>Le module ciblé '{0}' n'est plus trouvable!</value>
   </data>
   <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
     <value>La cible '{0}' est une procédure gestionnaire d'événements, impossible de renommer cette pocédure sans briser quelque chose!</value>
   </data>
-  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
-    <value>La cible n'est pas définie par l'utilisateur.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
-    <value>Le type de déclaration de la cible '{0}' est '{1}', plutôt que '{2}' tel qu'attendu.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
-    <value>Le type de déclaration de la cible '{0}' est '{1}', mais le type attendu était '{2}'.</value>
-  </data>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>Indiquer les espaces dans la description</value>
   </data>
@@ -1354,9 +1329,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
     <value>Rubberduck - Résultats des tests : {0}</value>
   </data>
-  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
-    <value>Impossible de suspendre l'analyse en cours pour effectuer le refactoring.</value>
-  </data>
   <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
     <value>L'extension du fichier '{0}' n'est pas prise en charge.
 
@@ -1400,15 +1372,6 @@ Mise à jour annulée.</value>
 
 Échec de l'importation.</value>
   </data>
-  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
-    <value>Le composant '{0}' aurait été affecté par la refactorisation, mais sa représentation interne à Rubberduck est périmée. Veuillez actualiser Rubberduck et réessayer.</value>
-  </data>
-  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
-    <value>Le refactoring ne peut annoter que les composants, les membres et les variables, mais la cible était de type '{0}'.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
-    <value>Aucune cible n'a été spécifiée.</value>
-  </data>
   <data name="RenameDialog_Folder" xml:space="preserve">
     <value>dossier</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 6856f1c65d..e54fbee772 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -237,10 +237,6 @@
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Remove parameters</value>
   </data>
-  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Method '{0}' implements '{1}.{2}'. Change interface signature? (Will propagate to all implementations.)</value>
-    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
-  </data>
   <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
     <value>Cannot remove last parameter from setter or letter.</value>
   </data>
@@ -1410,18 +1406,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Browse...</value>
   </data>
-  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
-    <value>Refactoring failed.</value>
-  </data>
-  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
-    <value>There is no active selection.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
-    <value>No viable target selected.</value>
-  </data>
-  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>Target declaration is null.</value>
-  </data>
   <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
     <value>No code module found for the target module '{0}'.</value>
     <comment>{0}: name of module</comment>
@@ -1434,18 +1418,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>Target '{0}' is a standard event handler, which cannot be renamed.</value>
     <comment>{0}: name of target</comment>
   </data>
-  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
-    <value>The target is not user-defined.</value>
-    <comment>{0}: name of target</comment>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
-    <value>Declaration type of target '{0}' is '{1}' instead of the expected '{2}'.</value>
-    <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration type</comment>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
-    <value>Declaration type of target '{0}' is '{1}' instead of one of the expected '{2}'.</value>
-    <comment>{0}: name of target; {1}: actual declaration type; {2}: expected declaration types</comment>
-  </data>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>Spell out whitespace in the description</value>
   </data>
@@ -1494,9 +1466,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>{0} {1} {2} {3} {4} {5}</value>
     <comment>{0}=Project; {1}=Folder; {2}=Component; {3}=DeclarationType; {4}=Scope; {5}=Name</comment>
   </data>
-  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
-    <value>Unable to suspend the Parser to perform the refactoring operation.</value>
-  </data>
   <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
     <value>Tell me if a newer pre-release build is available.</value>
   </data>
@@ -1594,17 +1563,6 @@ Import aborted.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>VB Form</value>
   </data>
-  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
-    <value>No target has been specified.</value>
-  </data>
-  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
-    <value>The component '{0}' would have been affected by the refactoring, but its state in Rubberduck's memory is stale. Please refresh Rubberduck and try again.</value>
-    <comment>{0} stale module</comment>
-  </data>
-  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
-    <value>The refactoring can only annotate components, members and variables, but the target had type '{0}'.</value>
-    <comment>{0} declaration type</comment>
-  </data>
   <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
     <value>It is not possible to change only the case of an identifier in VBA (language is case-insensitive).</value>
   </data>

From c0c840d56fb2309d7de6f9325a4e171afaf3420e Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Fri, 30 Oct 2020 01:49:04 -0700
Subject: [PATCH 40/64] Migrate Reference resources

---
 .../ReferenceReconciler.cs                    |   4 +-
 .../RegisteredLibraryInfo.cs                  |   7 +-
 Rubberduck.Core/Rubberduck.Core.csproj        |   9 +
 .../AddRemoveReferencesUI.Designer.cs         | 342 ++++++++++++++++++
 .../AddRemoveReferencesUI.cs.resx             | 213 +++++++++++
 .../AddRemoveReferencesUI.de.resx             | 213 +++++++++++
 .../AddRemoveReferencesUI.es.resx             | 213 +++++++++++
 .../AddRemoveReferencesUI.fr.resx             | 213 +++++++++++
 .../AddRemoveReferencesUI.resx                | 202 +++++++++++
 .../AddRemoveReferencesViewModel.cs           |  28 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 279 --------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  93 -----
 Rubberduck.Resources/RubberduckUI.de.resx     |  93 -----
 Rubberduck.Resources/RubberduckUI.es.resx     | 102 ------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  93 -----
 Rubberduck.Resources/RubberduckUI.resx        | 102 ------
 .../ReferenceReconcilerTests.cs               |   5 +-
 17 files changed, 1428 insertions(+), 783 deletions(-)
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.Designer.cs
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.cs.resx
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.de.resx
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.es.resx
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.fr.resx
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.resx

diff --git a/Rubberduck.Core/AddRemoveReferences/ReferenceReconciler.cs b/Rubberduck.Core/AddRemoveReferences/ReferenceReconciler.cs
index a7d37c5b94..e789284aec 100644
--- a/Rubberduck.Core/AddRemoveReferences/ReferenceReconciler.cs
+++ b/Rubberduck.Core/AddRemoveReferences/ReferenceReconciler.cs
@@ -137,7 +137,7 @@ public ReferenceModel TryAddReference(IVBProject project, string path)
                 }
                 catch (COMException ex)
                 {
-                    _messageBox.NotifyWarn(ex.Message, RubberduckUI.References_AddFailedCaption);
+                    _messageBox.NotifyWarn(ex.Message, AddRemoveReferencesUI.AddFailedCaption);
                 }
                 return null;
             }
@@ -158,7 +158,7 @@ public ReferenceModel TryAddReference(IVBProject project, ReferenceModel referen
                 }
                 catch (COMException ex)
                 {
-                    _messageBox.NotifyWarn(ex.Message, RubberduckUI.References_AddFailedCaption);
+                    _messageBox.NotifyWarn(ex.Message, AddRemoveReferencesUI.AddFailedCaption);
                 }
                 return null;
             }
diff --git a/Rubberduck.Core/AddRemoveReferences/RegisteredLibraryInfo.cs b/Rubberduck.Core/AddRemoveReferences/RegisteredLibraryInfo.cs
index 838928889a..b27f8170c0 100644
--- a/Rubberduck.Core/AddRemoveReferences/RegisteredLibraryInfo.cs
+++ b/Rubberduck.Core/AddRemoveReferences/RegisteredLibraryInfo.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices.ComTypes;
+using Rubberduck.UI.AddRemoveReferences;
 
 namespace Rubberduck.AddRemoveReferences
 {
@@ -24,7 +25,7 @@ public class RegisteredLibraryInfo
     {
         private static readonly Dictionary<int, string> NativeLocaleNames = new Dictionary<int, string>
         {
-            { 0, Resources.RubberduckUI.References_DefaultLocale }
+            { 0, AddRemoveReferencesUI.DefaultLocale }
         };
 
         public RegisteredLibraryKey UniqueId { get; }
@@ -54,8 +55,8 @@ public string LocaleName
                 }
                 catch
                 {
-                    NativeLocaleNames.Add(LocaleId, Resources.RubberduckUI.References_DefaultLocale);
-                    return Resources.RubberduckUI.References_DefaultLocale;
+                    NativeLocaleNames.Add(LocaleId, AddRemoveReferencesUI.DefaultLocale);
+                    return AddRemoveReferencesUI.DefaultLocale;
                 }
             }
         }
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
index d9676250e5..dd3c1136f0 100644
--- a/Rubberduck.Core/Rubberduck.Core.csproj
+++ b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -117,6 +117,11 @@
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>
+    <Compile Update="UI\AddRemoveReferences\AddRemoveReferencesUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>AddRemoveReferencesUI.resx</DependentUpon>
+    </Compile>
     <Compile Update="UI\Inspections\InspectionResultsUI.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -155,6 +160,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="UI\AddRemoveReferences\AddRemoveReferencesUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>AddRemoveReferencesUI.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Update="UI\Inspections\InspectionResultsUI.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>InspectionResultsUI.Designer.cs</LastGenOutput>
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.Designer.cs b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.Designer.cs
new file mode 100644
index 0000000000..fea1d9a5c1
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.Designer.cs
@@ -0,0 +1,342 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rubberduck.UI.AddRemoveReferences {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class AddRemoveReferencesUI {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal AddRemoveReferencesUI() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rubberduck.UI.AddRemoveReferences.AddRemoveReferencesUI", typeof(AddRemoveReferencesUI).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Could not add reference.
+        /// </summary>
+        public static string AddFailedCaption {
+            get {
+                return ResourceManager.GetString("AddFailedCaption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add to project.
+        /// </summary>
+        public static string AddToolTip {
+            get {
+                return ResourceManager.GetString("AddToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Browse....
+        /// </summary>
+        public static string BrowseButtonText {
+            get {
+                return ResourceManager.GetString("BrowseButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Browse for reference.
+        /// </summary>
+        public static string BrowseCaption {
+            get {
+                return ResourceManager.GetString("BrowseCaption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Microsoft Access Databases({0})|{0}.
+        /// </summary>
+        public static string BrowseFilterAccess {
+            get {
+                return ResourceManager.GetString("BrowseFilterAccess", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to ActiveX Controls (*.ocx)|*.ocx.
+        /// </summary>
+        public static string BrowseFilterActiveX {
+            get {
+                return ResourceManager.GetString("BrowseFilterActiveX", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to All files (*.*)|*.*.
+        /// </summary>
+        public static string BrowseFilterAllFiles {
+            get {
+                return ResourceManager.GetString("BrowseFilterAllFiles", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Microsoft Excel Files ({0})|{0}.
+        /// </summary>
+        public static string BrowseFilterExcel {
+            get {
+                return ResourceManager.GetString("BrowseFilterExcel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Executable Files (*.exe;*.dll)|*.exe;*.dll.
+        /// </summary>
+        public static string BrowseFilterExecutable {
+            get {
+                return ResourceManager.GetString("BrowseFilterExecutable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Outlook VBA Files ({0})|{0}.
+        /// </summary>
+        public static string BrowseFilterOutlook {
+            get {
+                return ResourceManager.GetString("BrowseFilterOutlook", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PowerPoint Addin Files({0})|{0}.
+        /// </summary>
+        public static string BrowseFilterPowerPoint {
+            get {
+                return ResourceManager.GetString("BrowseFilterPowerPoint", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Publisher Files ({0}|{0}.
+        /// </summary>
+        public static string BrowseFilterPublisher {
+            get {
+                return ResourceManager.GetString("BrowseFilterPublisher", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Type Libraries (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll.
+        /// </summary>
+        public static string BrowseFilterTypes {
+            get {
+                return ResourceManager.GetString("BrowseFilterTypes", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to All Visio Files ({0})|{0}.
+        /// </summary>
+        public static string BrowseFilterVisio {
+            get {
+                return ResourceManager.GetString("BrowseFilterVisio", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Word Documents ({0})|{0}.
+        /// </summary>
+        public static string BrowseFilterWord {
+            get {
+                return ResourceManager.GetString("BrowseFilterWord", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add/Remove References....
+        /// </summary>
+        public static string Caption {
+            get {
+                return ResourceManager.GetString("Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add/Remove References - {0}.
+        /// </summary>
+        public static string CaptionTemplate {
+            get {
+                return ResourceManager.GetString("CaptionTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Standard.
+        /// </summary>
+        public static string DefaultLocale {
+            get {
+                return ResourceManager.GetString("DefaultLocale", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Locale:.
+        /// </summary>
+        public static string Locale {
+            get {
+                return ResourceManager.GetString("Locale", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move down.
+        /// </summary>
+        public static string MoveDownToolTip {
+            get {
+                return ResourceManager.GetString("MoveDownToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move up.
+        /// </summary>
+        public static string MoveUpToolTip {
+            get {
+                return ResourceManager.GetString("MoveUpToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pinned.
+        /// </summary>
+        public static string Pinned {
+            get {
+                return ResourceManager.GetString("Pinned", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pin reference.
+        /// </summary>
+        public static string PinToolTip {
+            get {
+                return ResourceManager.GetString("PinToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Projects.
+        /// </summary>
+        public static string Projects {
+            get {
+                return ResourceManager.GetString("Projects", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Recent.
+        /// </summary>
+        public static string Recent {
+            get {
+                return ResourceManager.GetString("Recent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to References.
+        /// </summary>
+        public static string References {
+            get {
+                return ResourceManager.GetString("References", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove from project.
+        /// </summary>
+        public static string RemoveToolTip {
+            get {
+                return ResourceManager.GetString("RemoveToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search for reference....
+        /// </summary>
+        public static string SearchPlaceholder {
+            get {
+                return ResourceManager.GetString("SearchPlaceholder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select type libraries and VB projects to add or remove..
+        /// </summary>
+        public static string SubCaption {
+            get {
+                return ResourceManager.GetString("SubCaption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Type Libraries.
+        /// </summary>
+        public static string TypeLibs {
+            get {
+                return ResourceManager.GetString("TypeLibs", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Version:.
+        /// </summary>
+        public static string Version {
+            get {
+                return ResourceManager.GetString("Version", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.cs.resx b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.cs.resx
new file mode 100644
index 0000000000..543b345dc9
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.cs.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="References" xml:space="preserve">
+    <value>Reference</value>
+  </data>
+  <data name="AddFailedCaption" xml:space="preserve">
+    <value>Nepovedlo se přidat reference</value>
+  </data>
+  <data name="AddToolTip" xml:space="preserve">
+    <value>Přidat do projektu</value>
+  </data>
+  <data name="BrowseButtonText" xml:space="preserve">
+    <value>Procházet...</value>
+  </data>
+  <data name="BrowseCaption" xml:space="preserve">
+    <value>Procházet pro reference</value>
+  </data>
+  <data name="BrowseFilterAccess" xml:space="preserve">
+    <value>Microsoft Access Databáze ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterActiveX" xml:space="preserve">
+    <value>ActiveX Controls (*.ocx)|*.ocx</value>
+  </data>
+  <data name="BrowseFilterAllFiles" xml:space="preserve">
+    <value>Všechny soubory (*.*)|*.*</value>
+  </data>
+  <data name="BrowseFilterExcel" xml:space="preserve">
+    <value>Microsoft Excel Soubory ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterExecutable" xml:space="preserve">
+    <value>Spustitelné Soubory (*.exe;*.dll)|*.exe;*.dll</value>
+  </data>
+  <data name="BrowseFilterOutlook" xml:space="preserve">
+    <value>Outlook VBA Soubory ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPowerPoint" xml:space="preserve">
+    <value>PowerPoint Addin Soubory ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPublisher" xml:space="preserve">
+    <value>Publisher Soubory ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterTypes" xml:space="preserve">
+    <value>Knihovny (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
+  </data>
+  <data name="BrowseFilterVisio" xml:space="preserve">
+    <value>Všechny Visio Soubory ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterWord" xml:space="preserve">
+    <value>Word Dokumenty ({0})|{0}</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Přidat/Odebrat Reference...</value>
+  </data>
+  <data name="CaptionTemplate" xml:space="preserve">
+    <value>Přidat/Odebrat Reference = {0}</value>
+  </data>
+  <data name="DefaultLocale" xml:space="preserve">
+    <value>Standardní</value>
+  </data>
+  <data name="Locale" xml:space="preserve">
+    <value>Lokalizace:</value>
+  </data>
+  <data name="MoveDownToolTip" xml:space="preserve">
+    <value>Posunout dolů</value>
+  </data>
+  <data name="MoveUpToolTip" xml:space="preserve">
+    <value>Posunout nahorů</value>
+  </data>
+  <data name="Pinned" xml:space="preserve">
+    <value>Připíchnuté</value>
+  </data>
+  <data name="PinToolTip" xml:space="preserve">
+    <value>Přišpendlit referenci</value>
+  </data>
+  <data name="Projects" xml:space="preserve">
+    <value>Projekty</value>
+  </data>
+  <data name="Recent" xml:space="preserve">
+    <value>Nedávné</value>
+  </data>
+  <data name="RemoveToolTip" xml:space="preserve">
+    <value>Odebrat z projektu</value>
+  </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Hledat referenci...</value>
+  </data>
+  <data name="SubCaption" xml:space="preserve">
+    <value>Vybrat knihovny a VB projekty pro přidání nebo odebrání.</value>
+  </data>
+  <data name="TypeLibs" xml:space="preserve">
+    <value>Knihovny</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Verze:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.de.resx b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.de.resx
new file mode 100644
index 0000000000..5a89580922
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.de.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="References" xml:space="preserve">
+    <value>Referenzen</value>
+  </data>
+  <data name="AddFailedCaption" xml:space="preserve">
+    <value>Hinzufügen der Referenz fehlgeschlagen</value>
+  </data>
+  <data name="AddToolTip" xml:space="preserve">
+    <value>Zu Projekt hinzufügen</value>
+  </data>
+  <data name="BrowseButtonText" xml:space="preserve">
+    <value>Durchsuchen...</value>
+  </data>
+  <data name="BrowseCaption" xml:space="preserve">
+    <value>Verzeichnis der Referenz öffnen</value>
+  </data>
+  <data name="BrowseFilterAccess" xml:space="preserve">
+    <value>Microsoft-Access-Datenbanken({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterActiveX" xml:space="preserve">
+    <value>ActiveX-Kontrollelemente (*.ocx)|*.ocx</value>
+  </data>
+  <data name="BrowseFilterAllFiles" xml:space="preserve">
+    <value>Alle Dateien(*.*)|*.*</value>
+  </data>
+  <data name="BrowseFilterExcel" xml:space="preserve">
+    <value>Microsoft-Excel-Dateien ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterExecutable" xml:space="preserve">
+    <value>Ausführbare Dateien (*.exe;*.dll)|*.exe;*.dll</value>
+  </data>
+  <data name="BrowseFilterOutlook" xml:space="preserve">
+    <value>Outlook-VBA-Dateien ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPowerPoint" xml:space="preserve">
+    <value>PowerPoint-Addin-Dateien({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPublisher" xml:space="preserve">
+    <value>Publisher-Dateien ({0}|{0}</value>
+  </data>
+  <data name="BrowseFilterTypes" xml:space="preserve">
+    <value>Typbibliotheken (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
+  </data>
+  <data name="BrowseFilterVisio" xml:space="preserve">
+    <value>Alle Visio-Dateien ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterWord" xml:space="preserve">
+    <value>Word-Dokumente ({0})|{0}</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Referenzen hinzufügen/entfernen...</value>
+  </data>
+  <data name="CaptionTemplate" xml:space="preserve">
+    <value>Referenzen hinzufügen/entfernen - {0}</value>
+  </data>
+  <data name="DefaultLocale" xml:space="preserve">
+    <value>Standard</value>
+  </data>
+  <data name="Locale" xml:space="preserve">
+    <value>Sprache:</value>
+  </data>
+  <data name="MoveDownToolTip" xml:space="preserve">
+    <value>Aufwärts bewegen</value>
+  </data>
+  <data name="MoveUpToolTip" xml:space="preserve">
+    <value>Abwärts bewegen</value>
+  </data>
+  <data name="Pinned" xml:space="preserve">
+    <value>Angeheftet</value>
+  </data>
+  <data name="PinToolTip" xml:space="preserve">
+    <value>Referenz anheften</value>
+  </data>
+  <data name="Projects" xml:space="preserve">
+    <value>Projekte</value>
+  </data>
+  <data name="Recent" xml:space="preserve">
+    <value>Zuletzt verwendet</value>
+  </data>
+  <data name="RemoveToolTip" xml:space="preserve">
+    <value>Vom Projekt enfernen</value>
+  </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Nach Referenz suchen...</value>
+  </data>
+  <data name="SubCaption" xml:space="preserve">
+    <value>Wähle Typbibliotheken und VB-Projekte zum Hinzufügen oder Entfernen.</value>
+  </data>
+  <data name="TypeLibs" xml:space="preserve">
+    <value>Typbibliotheken</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.es.resx b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.es.resx
new file mode 100644
index 0000000000..9b2ec5ab14
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.es.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="References" xml:space="preserve">
+    <value>Referencias</value>
+  </data>
+  <data name="AddFailedCaption" xml:space="preserve">
+    <value>No se pudo agregar la referencia</value>
+  </data>
+  <data name="AddToolTip" xml:space="preserve">
+    <value>Agregar al proyecto</value>
+  </data>
+  <data name="BrowseButtonText" xml:space="preserve">
+    <value>Navegando...</value>
+  </data>
+  <data name="BrowseCaption" xml:space="preserve">
+    <value>Buscar referencias</value>
+  </data>
+  <data name="BrowseFilterAccess" xml:space="preserve">
+    <value>Bases de datos de Microsoft Access ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterActiveX" xml:space="preserve">
+    <value>Controles ActiveX (* .ocx)|*.ocx</value>
+  </data>
+  <data name="BrowseFilterAllFiles" xml:space="preserve">
+    <value>Todos los archivos (*.*)|*.*</value>
+  </data>
+  <data name="BrowseFilterExcel" xml:space="preserve">
+    <value>Archivos de Microsoft Excel ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterExecutable" xml:space="preserve">
+    <value>Archivos ejecutables (*.exe;*.dll)|*.exe;*.dll</value>
+  </data>
+  <data name="BrowseFilterOutlook" xml:space="preserve">
+    <value>Archivos de Outlook VBA ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPowerPoint" xml:space="preserve">
+    <value>Archivos de Complementos de PowerPoint ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPublisher" xml:space="preserve">
+    <value>Archivos de Publisher ({0}|{0}</value>
+  </data>
+  <data name="BrowseFilterTypes" xml:space="preserve">
+    <value>Bibliotecas de tipos (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
+  </data>
+  <data name="BrowseFilterVisio" xml:space="preserve">
+    <value>Todos los archivos de Visio ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterWord" xml:space="preserve">
+    <value>Documentos de Word ({0})|{0}</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Agregar/Eliminar referencias...</value>
+  </data>
+  <data name="CaptionTemplate" xml:space="preserve">
+    <value>Agregar/Eliminar referencias - {0}</value>
+  </data>
+  <data name="DefaultLocale" xml:space="preserve">
+    <value>Estándar</value>
+  </data>
+  <data name="Locale" xml:space="preserve">
+    <value>Local:</value>
+  </data>
+  <data name="MoveDownToolTip" xml:space="preserve">
+    <value>Mover hacia abajo</value>
+  </data>
+  <data name="MoveUpToolTip" xml:space="preserve">
+    <value>Mover hacia arriba</value>
+  </data>
+  <data name="Pinned" xml:space="preserve">
+    <value>Fijado</value>
+  </data>
+  <data name="PinToolTip" xml:space="preserve">
+    <value>Fijar Referencia</value>
+  </data>
+  <data name="Projects" xml:space="preserve">
+    <value>Proyectos</value>
+  </data>
+  <data name="Recent" xml:space="preserve">
+    <value>Reciente</value>
+  </data>
+  <data name="RemoveToolTip" xml:space="preserve">
+    <value>Eliminar del proyecto</value>
+  </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Buscar referencia ...</value>
+  </data>
+  <data name="SubCaption" xml:space="preserve">
+    <value>Seleccione bibliotecas de tipos y proyectos VB para agregar o eliminar.</value>
+  </data>
+  <data name="TypeLibs" xml:space="preserve">
+    <value>Bibliotecas de tipos</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Versión:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.fr.resx b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.fr.resx
new file mode 100644
index 0000000000..2a8067a2c4
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.fr.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="References" xml:space="preserve">
+    <value>Références</value>
+  </data>
+  <data name="AddFailedCaption" xml:space="preserve">
+    <value>La référence n'a pu être ajoutée</value>
+  </data>
+  <data name="AddToolTip" xml:space="preserve">
+    <value>Ajouter au projet</value>
+  </data>
+  <data name="BrowseButtonText" xml:space="preserve">
+    <value>Parcourir...</value>
+  </data>
+  <data name="BrowseCaption" xml:space="preserve">
+    <value>Parcourir...</value>
+  </data>
+  <data name="BrowseFilterAccess" xml:space="preserve">
+    <value>Base de données Microsoft Access ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterActiveX" xml:space="preserve">
+    <value>Contrôles ActiveX (*.ocx)|*.ocx</value>
+  </data>
+  <data name="BrowseFilterAllFiles" xml:space="preserve">
+    <value>Tous (*.*)|*.*</value>
+  </data>
+  <data name="BrowseFilterExcel" xml:space="preserve">
+    <value>Fichiers Microsoft Excel ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterExecutable" xml:space="preserve">
+    <value>Exécutables (*.exe,*.dll)|*.exe;*.dll</value>
+  </data>
+  <data name="BrowseFilterOutlook" xml:space="preserve">
+    <value>Fichiers VBA Outlook ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPowerPoint" xml:space="preserve">
+    <value>Fichiers complément PowerPoint ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPublisher" xml:space="preserve">
+    <value>Fichiers Publisher ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterTypes" xml:space="preserve">
+    <value>Bibliothêques (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
+  </data>
+  <data name="BrowseFilterVisio" xml:space="preserve">
+    <value>Tous les fichiers Visio ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterWord" xml:space="preserve">
+    <value>Documents Word ({0})|{0}</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Ajouter/Supprimer Références...</value>
+  </data>
+  <data name="CaptionTemplate" xml:space="preserve">
+    <value>Ajouter/Supprimer Références - {0}</value>
+  </data>
+  <data name="DefaultLocale" xml:space="preserve">
+    <value>Standard</value>
+  </data>
+  <data name="Locale" xml:space="preserve">
+    <value>Langue:</value>
+  </data>
+  <data name="MoveDownToolTip" xml:space="preserve">
+    <value>Déplacer vers le haut</value>
+  </data>
+  <data name="MoveUpToolTip" xml:space="preserve">
+    <value>Déplacer vers le bas</value>
+  </data>
+  <data name="Pinned" xml:space="preserve">
+    <value>Épingles</value>
+  </data>
+  <data name="PinToolTip" xml:space="preserve">
+    <value>Épingler la référence</value>
+  </data>
+  <data name="Projects" xml:space="preserve">
+    <value>Projets</value>
+  </data>
+  <data name="Recent" xml:space="preserve">
+    <value>Récents</value>
+  </data>
+  <data name="RemoveToolTip" xml:space="preserve">
+    <value>Supprimer du projet</value>
+  </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Rechercher une référence...</value>
+  </data>
+  <data name="SubCaption" xml:space="preserve">
+    <value>Sélectionner les librairies et projets à ajouter ou supprimer aux références du projet.</value>
+  </data>
+  <data name="TypeLibs" xml:space="preserve">
+    <value>Bibliothèques</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.resx b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.resx
new file mode 100644
index 0000000000..33cc5e3d34
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.resx
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="References" xml:space="preserve">
+    <value>References</value>
+  </data>
+  <data name="AddFailedCaption" xml:space="preserve">
+    <value>Could not add reference</value>
+  </data>
+  <data name="AddToolTip" xml:space="preserve">
+    <value>Add to project</value>
+  </data>
+  <data name="BrowseButtonText" xml:space="preserve">
+    <value>Browse...</value>
+  </data>
+  <data name="BrowseCaption" xml:space="preserve">
+    <value>Browse for reference</value>
+  </data>
+  <data name="BrowseFilterAccess" xml:space="preserve">
+    <value>Microsoft Access Databases({0})|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="BrowseFilterActiveX" xml:space="preserve">
+    <value>ActiveX Controls (*.ocx)|*.ocx</value>
+  </data>
+  <data name="BrowseFilterAllFiles" xml:space="preserve">
+    <value>All files (*.*)|*.*</value>
+  </data>
+  <data name="BrowseFilterExcel" xml:space="preserve">
+    <value>Microsoft Excel Files ({0})|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="BrowseFilterExecutable" xml:space="preserve">
+    <value>Executable Files (*.exe;*.dll)|*.exe;*.dll</value>
+  </data>
+  <data name="BrowseFilterOutlook" xml:space="preserve">
+    <value>Outlook VBA Files ({0})|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="BrowseFilterPowerPoint" xml:space="preserve">
+    <value>PowerPoint Addin Files({0})|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="BrowseFilterPublisher" xml:space="preserve">
+    <value>Publisher Files ({0}|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="BrowseFilterTypes" xml:space="preserve">
+    <value>Type Libraries (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
+  </data>
+  <data name="BrowseFilterVisio" xml:space="preserve">
+    <value>All Visio Files ({0})|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="BrowseFilterWord" xml:space="preserve">
+    <value>Word Documents ({0})|{0}</value>
+    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Add/Remove References...</value>
+  </data>
+  <data name="CaptionTemplate" xml:space="preserve">
+    <value>Add/Remove References - {0}</value>
+    <comment>{0} = Project name</comment>
+  </data>
+  <data name="DefaultLocale" xml:space="preserve">
+    <value>Standard</value>
+    <comment>Displayed as LCID description when locale is not specified.</comment>
+  </data>
+  <data name="Locale" xml:space="preserve">
+    <value>Locale:</value>
+  </data>
+  <data name="MoveDownToolTip" xml:space="preserve">
+    <value>Move down</value>
+  </data>
+  <data name="MoveUpToolTip" xml:space="preserve">
+    <value>Move up</value>
+  </data>
+  <data name="Pinned" xml:space="preserve">
+    <value>Pinned</value>
+  </data>
+  <data name="PinToolTip" xml:space="preserve">
+    <value>Pin reference</value>
+  </data>
+  <data name="Projects" xml:space="preserve">
+    <value>Projects</value>
+  </data>
+  <data name="Recent" xml:space="preserve">
+    <value>Recent</value>
+  </data>
+  <data name="RemoveToolTip" xml:space="preserve">
+    <value>Remove from project</value>
+  </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Search for reference...</value>
+  </data>
+  <data name="SubCaption" xml:space="preserve">
+    <value>Select type libraries and VB projects to add or remove.</value>
+  </data>
+  <data name="TypeLibs" xml:space="preserve">
+    <value>Type Libraries</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs
index c6e7212c3e..6e6ae1d296 100644
--- a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs
@@ -45,21 +45,21 @@ public class AddRemoveReferencesViewModel : ViewModelBase
 
         private static readonly Dictionary<string, string> HostFilters = new Dictionary<string, string>
         {
-            { "EXCEL.EXE", string.Format(RubberduckUI.References_BrowseFilterExcel, string.Join(";", HostFileFilters["EXCEL.EXE"].Select(_ => $"*.{_}"))) },
-            { "WINWORD.EXE", string.Format(RubberduckUI.References_BrowseFilterWord, string.Join(";", HostFileFilters["WINWORD.EXE"].Select(_ => $"*.{_}"))) }, 
-            { "MSACCESS.EXE", string.Format(RubberduckUI.References_BrowseFilterAccess, string.Join(";", HostFileFilters["MSACCESS.EXE"].Select(_ => $"*.{_}"))) },
-            { "POWERPNT.EXE", string.Format(RubberduckUI.References_BrowseFilterPowerPoint, string.Join(";", HostFileFilters["POWERPNT.EXE"].Select(_ => $"*.{_}"))) },
-            { "OUTLOOK.EXE", string.Format(RubberduckUI.References_BrowseFilterOutlook, string.Join(";", HostFileFilters["OUTLOOK.EXE"].Select(_ => $"*.{_}"))) },
-            { "MSPUB.EXE", string.Format(RubberduckUI.References_BrowseFilterOutlook, string.Join(";", HostFileFilters["MSPUB.EXE"].Select(_ => $"*.{_}"))) },
-            { "VISIO.EXE", string.Format(RubberduckUI.References_BrowseFilterVisio, string.Join(";", HostFileFilters["VISIO.EXE"].Select(_ => $"*.{_}"))) },
+            { "EXCEL.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterExcel, string.Join(";", HostFileFilters["EXCEL.EXE"].Select(_ => $"*.{_}"))) },
+            { "WINWORD.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterWord, string.Join(";", HostFileFilters["WINWORD.EXE"].Select(_ => $"*.{_}"))) }, 
+            { "MSACCESS.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterAccess, string.Join(";", HostFileFilters["MSACCESS.EXE"].Select(_ => $"*.{_}"))) },
+            { "POWERPNT.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterPowerPoint, string.Join(";", HostFileFilters["POWERPNT.EXE"].Select(_ => $"*.{_}"))) },
+            { "OUTLOOK.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterOutlook, string.Join(";", HostFileFilters["OUTLOOK.EXE"].Select(_ => $"*.{_}"))) },
+            { "MSPUB.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterOutlook, string.Join(";", HostFileFilters["MSPUB.EXE"].Select(_ => $"*.{_}"))) },
+            { "VISIO.EXE", string.Format(AddRemoveReferencesUI.BrowseFilterVisio, string.Join(";", HostFileFilters["VISIO.EXE"].Select(_ => $"*.{_}"))) },
         };
 
         private static readonly List<string> FileFilters = new List<string>
         {
-            RubberduckUI.References_BrowseFilterExecutable,
-            RubberduckUI.References_BrowseFilterTypes,
-            RubberduckUI.References_BrowseFilterActiveX,
-            RubberduckUI.References_BrowseFilterAllFiles,
+            AddRemoveReferencesUI.BrowseFilterExecutable,
+            AddRemoveReferencesUI.BrowseFilterTypes,
+            AddRemoveReferencesUI.BrowseFilterActiveX,
+            AddRemoveReferencesUI.BrowseFilterAllFiles,
         };
 
         public static bool HostHasProjects { get; }
@@ -127,14 +127,14 @@ public string ProjectCaption
             {
                 if (string.IsNullOrEmpty(Model?.Project?.IdentifierName))
                 {
-                    return RubberduckUI.References_Caption;
+                    return AddRemoveReferencesUI.Caption;
                 }
 
                 var project = _projectsProvider.Project(Model.Project.ProjectId);
 
                 if (project == null)
                 {
-                    return RubberduckUI.References_Caption;
+                    return AddRemoveReferencesUI.Caption;
                 }
 
                 return project.ProjectDisplayName;
@@ -277,7 +277,7 @@ private void ExecuteBrowseCommand(object parameter)
             using (var dialog = _browser.CreateOpenFileDialog())
             {
                 dialog.Filter = string.Join("|", FileFilters);
-                dialog.Title = RubberduckUI.References_BrowseCaption;
+                dialog.Title = AddRemoveReferencesUI.BrowseCaption;
                 var result = dialog.ShowDialog();
                 if (result != DialogResult.OK || string.IsNullOrEmpty(dialog.FileName))
                 {
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 117b328f32..4d952741e2 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3046,285 +3046,6 @@ public static string RefactoringFailure_TargetNull {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to References.
-        /// </summary>
-        public static string References {
-            get {
-                return ResourceManager.GetString("References", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not add reference.
-        /// </summary>
-        public static string References_AddFailedCaption {
-            get {
-                return ResourceManager.GetString("References_AddFailedCaption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Add to project.
-        /// </summary>
-        public static string References_AddToolTip {
-            get {
-                return ResourceManager.GetString("References_AddToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Browse....
-        /// </summary>
-        public static string References_BrowseButtonText {
-            get {
-                return ResourceManager.GetString("References_BrowseButtonText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Browse for reference.
-        /// </summary>
-        public static string References_BrowseCaption {
-            get {
-                return ResourceManager.GetString("References_BrowseCaption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Microsoft Access Databases({0})|{0}.
-        /// </summary>
-        public static string References_BrowseFilterAccess {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterAccess", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ActiveX Controls (*.ocx)|*.ocx.
-        /// </summary>
-        public static string References_BrowseFilterActiveX {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterActiveX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to All files (*.*)|*.*.
-        /// </summary>
-        public static string References_BrowseFilterAllFiles {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterAllFiles", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Microsoft Excel Files ({0})|{0}.
-        /// </summary>
-        public static string References_BrowseFilterExcel {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterExcel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Executable Files (*.exe;*.dll)|*.exe;*.dll.
-        /// </summary>
-        public static string References_BrowseFilterExecutable {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterExecutable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Outlook VBA Files ({0})|{0}.
-        /// </summary>
-        public static string References_BrowseFilterOutlook {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterOutlook", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to PowerPoint Addin Files({0})|{0}.
-        /// </summary>
-        public static string References_BrowseFilterPowerPoint {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterPowerPoint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Publisher Files ({0}|{0}.
-        /// </summary>
-        public static string References_BrowseFilterPublisher {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterPublisher", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type Libraries (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll.
-        /// </summary>
-        public static string References_BrowseFilterTypes {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterTypes", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to All Visio Files ({0})|{0}.
-        /// </summary>
-        public static string References_BrowseFilterVisio {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterVisio", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Word Documents ({0})|{0}.
-        /// </summary>
-        public static string References_BrowseFilterWord {
-            get {
-                return ResourceManager.GetString("References_BrowseFilterWord", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Add/Remove References....
-        /// </summary>
-        public static string References_Caption {
-            get {
-                return ResourceManager.GetString("References_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Add/Remove References - {0}.
-        /// </summary>
-        public static string References_CaptionTemplate {
-            get {
-                return ResourceManager.GetString("References_CaptionTemplate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Standard.
-        /// </summary>
-        public static string References_DefaultLocale {
-            get {
-                return ResourceManager.GetString("References_DefaultLocale", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Locale:.
-        /// </summary>
-        public static string References_Locale {
-            get {
-                return ResourceManager.GetString("References_Locale", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Move down.
-        /// </summary>
-        public static string References_MoveDownToolTip {
-            get {
-                return ResourceManager.GetString("References_MoveDownToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Move up.
-        /// </summary>
-        public static string References_MoveUpToolTip {
-            get {
-                return ResourceManager.GetString("References_MoveUpToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Pinned.
-        /// </summary>
-        public static string References_Pinned {
-            get {
-                return ResourceManager.GetString("References_Pinned", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Pin reference.
-        /// </summary>
-        public static string References_PinToolTip {
-            get {
-                return ResourceManager.GetString("References_PinToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Projects.
-        /// </summary>
-        public static string References_Projects {
-            get {
-                return ResourceManager.GetString("References_Projects", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Recent.
-        /// </summary>
-        public static string References_Recent {
-            get {
-                return ResourceManager.GetString("References_Recent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove from project.
-        /// </summary>
-        public static string References_RemoveToolTip {
-            get {
-                return ResourceManager.GetString("References_RemoveToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Search for reference....
-        /// </summary>
-        public static string References_SearchPlaceholder {
-            get {
-                return ResourceManager.GetString("References_SearchPlaceholder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Select type libraries and VB projects to add or remove..
-        /// </summary>
-        public static string References_SubCaption {
-            get {
-                return ResourceManager.GetString("References_SubCaption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type Libraries.
-        /// </summary>
-        public static string References_TypeLibs {
-            get {
-                return ResourceManager.GetString("References_TypeLibs", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Version:.
-        /// </summary>
-        public static string References_Version {
-            get {
-                return ResourceManager.GetString("References_Version", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Attempt to fix broken references.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index e44d78352f..a1a91d1ac9 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -965,60 +965,9 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Odstranit</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Reference</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Použít</value>
   </data>
-  <data name="References_AddFailedCaption" xml:space="preserve">
-    <value>Nepovedlo se přidat reference</value>
-  </data>
-  <data name="References_BrowseCaption" xml:space="preserve">
-    <value>Procházet pro reference</value>
-  </data>
-  <data name="References_BrowseFilterActiveX" xml:space="preserve">
-    <value>ActiveX Controls (*.ocx)|*.ocx</value>
-  </data>
-  <data name="References_BrowseFilterAllFiles" xml:space="preserve">
-    <value>Všechny soubory (*.*)|*.*</value>
-  </data>
-  <data name="References_BrowseFilterExcel" xml:space="preserve">
-    <value>Microsoft Excel Soubory ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterExecutable" xml:space="preserve">
-    <value>Spustitelné Soubory (*.exe;*.dll)|*.exe;*.dll</value>
-  </data>
-  <data name="References_BrowseFilterTypes" xml:space="preserve">
-    <value>Knihovny (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
-  </data>
-  <data name="References_Caption" xml:space="preserve">
-    <value>Přidat/Odebrat Reference...</value>
-  </data>
-  <data name="References_Locale" xml:space="preserve">
-    <value>Lokalizace:</value>
-  </data>
-  <data name="References_Pinned" xml:space="preserve">
-    <value>Připíchnuté</value>
-  </data>
-  <data name="References_Projects" xml:space="preserve">
-    <value>Projekty</value>
-  </data>
-  <data name="References_Recent" xml:space="preserve">
-    <value>Nedávné</value>
-  </data>
-  <data name="References_SearchPlaceholder" xml:space="preserve">
-    <value>Hledat referenci...</value>
-  </data>
-  <data name="References_SubCaption" xml:space="preserve">
-    <value>Vybrat knihovny a VB projekty pro přidání nebo odebrání.</value>
-  </data>
-  <data name="References_TypeLibs" xml:space="preserve">
-    <value>Knihovny</value>
-  </data>
-  <data name="References_Version" xml:space="preserve">
-    <value>Verze:</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
@@ -1028,15 +977,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>TODO Průzkumník</value>
   </data>
-  <data name="References_BrowseFilterAccess" xml:space="preserve">
-    <value>Microsoft Access Databáze ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterPowerPoint" xml:space="preserve">
-    <value>PowerPoint Addin Soubory ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterWord" xml:space="preserve">
-    <value>Word Dokumenty ({0})|{0}</value>
-  </data>
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Pokusit se opravit rozbité reference</value>
   </data>
@@ -1052,36 +992,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="ReferenceSettings_TrackHostReferences" xml:space="preserve">
     <value>Sledovat reference, které nebyly přidány Rubberduckem</value>
   </data>
-  <data name="References_BrowseFilterOutlook" xml:space="preserve">
-    <value>Outlook VBA Soubory ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterPublisher" xml:space="preserve">
-    <value>Publisher Soubory ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterVisio" xml:space="preserve">
-    <value>Všechny Visio Soubory ({0})|{0}</value>
-  </data>
-  <data name="References_DefaultLocale" xml:space="preserve">
-    <value>Standardní</value>
-  </data>
-  <data name="References_CaptionTemplate" xml:space="preserve">
-    <value>Přidat/Odebrat Reference = {0}</value>
-  </data>
-  <data name="References_AddToolTip" xml:space="preserve">
-    <value>Přidat do projektu</value>
-  </data>
-  <data name="References_MoveDownToolTip" xml:space="preserve">
-    <value>Posunout dolů</value>
-  </data>
-  <data name="References_MoveUpToolTip" xml:space="preserve">
-    <value>Posunout nahorů</value>
-  </data>
-  <data name="References_PinToolTip" xml:space="preserve">
-    <value>Přišpendlit referenci</value>
-  </data>
-  <data name="References_RemoveToolTip" xml:space="preserve">
-    <value>Odebrat z projektu</value>
-  </data>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
@@ -1116,9 +1026,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
     <value>'{0}' není definováno ani v komponentě komponenty, ve které je použito, ani ve standardním modulu.</value>
   </data>
-  <data name="References_BrowseButtonText" xml:space="preserve">
-    <value>Procházet...</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e410d05a5a..fe4e7c8788 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -970,18 +970,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Entfernen</value>
   </data>
-  <data name="References_BrowseFilterAllFiles" xml:space="preserve">
-    <value>Alle Dateien(*.*)|*.*</value>
-  </data>
-  <data name="References_BrowseFilterExcel" xml:space="preserve">
-    <value>Microsoft-Excel-Dateien ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterPowerPoint" xml:space="preserve">
-    <value>PowerPoint-Addin-Dateien({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterAccess" xml:space="preserve">
-    <value>Microsoft-Access-Datenbanken({0})|{0}</value>
-  </data>
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>TODO Explorer</value>
   </data>
@@ -994,99 +982,21 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Versuche fehlerhafte Referenzen zu reparieren</value>
   </data>
-  <data name="References_Version" xml:space="preserve">
-    <value>Version:</value>
-  </data>
-  <data name="References_BrowseFilterActiveX" xml:space="preserve">
-    <value>ActiveX-Kontrollelemente (*.ocx)|*.ocx</value>
-  </data>
-  <data name="References_AddToolTip" xml:space="preserve">
-    <value>Zu Projekt hinzufügen</value>
-  </data>
-  <data name="References_CaptionTemplate" xml:space="preserve">
-    <value>Referenzen hinzufügen/entfernen - {0}</value>
-  </data>
-  <data name="References_Caption" xml:space="preserve">
-    <value>Referenzen hinzufügen/entfernen...</value>
-  </data>
-  <data name="References_BrowseFilterVisio" xml:space="preserve">
-    <value>Alle Visio-Dateien ({0})|{0}</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Ausführen</value>
   </data>
   <data name="ReferenceSettings_FolderDialogHeader" xml:space="preserve">
     <value>Projektverzeichnis öffnen</value>
   </data>
-  <data name="References_BrowseCaption" xml:space="preserve">
-    <value>Verzeichnis der Referenz öffnen</value>
-  </data>
-  <data name="References_AddFailedCaption" xml:space="preserve">
-    <value>Hinzufügen der Referenz fehlgeschlagen</value>
-  </data>
-  <data name="References_BrowseFilterExecutable" xml:space="preserve">
-    <value>Ausführbare Dateien (*.exe;*.dll)|*.exe;*.dll</value>
-  </data>
-  <data name="References_Locale" xml:space="preserve">
-    <value>Sprache:</value>
-  </data>
-  <data name="References_BrowseFilterOutlook" xml:space="preserve">
-    <value>Outlook-VBA-Dateien ({0})|{0}</value>
-  </data>
-  <data name="References_PinToolTip" xml:space="preserve">
-    <value>Referenz anheften</value>
-  </data>
-  <data name="References_Pinned" xml:space="preserve">
-    <value>Angeheftet</value>
-  </data>
   <data name="ReferenceSettings_FoldersHeader" xml:space="preserve">
     <value>Projektverzeichnisse</value>
   </data>
-  <data name="References_Projects" xml:space="preserve">
-    <value>Projekte</value>
-  </data>
-  <data name="References_BrowseFilterWord" xml:space="preserve">
-    <value>Word-Dokumente ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterTypes" xml:space="preserve">
-    <value>Typbibliotheken (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
-  </data>
-  <data name="References_TypeLibs" xml:space="preserve">
-    <value>Typbibliotheken</value>
-  </data>
   <data name="ReferenceSettings_TrackHostReferences" xml:space="preserve">
     <value>Verfolge nicht von Rubberduck hinzugefügte Referenzen</value>
   </data>
-  <data name="References_DefaultLocale" xml:space="preserve">
-    <value>Standard</value>
-  </data>
-  <data name="References_SubCaption" xml:space="preserve">
-    <value>Wähle Typbibliotheken und VB-Projekte zum Hinzufügen oder Entfernen.</value>
-  </data>
-  <data name="References_SearchPlaceholder" xml:space="preserve">
-    <value>Nach Referenz suchen...</value>
-  </data>
-  <data name="References" xml:space="preserve">
-    <value>Referenzen</value>
-  </data>
-  <data name="References_BrowseFilterPublisher" xml:space="preserve">
-    <value>Publisher-Dateien ({0}|{0}</value>
-  </data>
   <data name="ReferenceSettings_RecentTracked" xml:space="preserve">
     <value>Zuletzt verfolgte Referenzen:</value>
   </data>
-  <data name="References_Recent" xml:space="preserve">
-    <value>Zuletzt verwendet</value>
-  </data>
-  <data name="References_RemoveToolTip" xml:space="preserve">
-    <value>Vom Projekt enfernen</value>
-  </data>
-  <data name="References_MoveDownToolTip" xml:space="preserve">
-    <value>Aufwärts bewegen</value>
-  </data>
-  <data name="References_MoveUpToolTip" xml:space="preserve">
-    <value>Abwärts bewegen</value>
-  </data>
   <data name="MemberAttributeRecoveryRewriteFailedMessage" xml:space="preserve">
     <value>Das Wiederherstellen der Elementattribute ist fehlgeschlagen.</value>
   </data>
@@ -1165,9 +1075,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
-  <data name="References_BrowseButtonText" xml:space="preserve">
-    <value>Durchsuchen...</value>
-  </data>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Speichern &amp; Schließen</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 226f673273..88cdab59aa 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -989,61 +989,9 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Eliminar</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Referencias</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Aplicar</value>
   </data>
-  <data name="References_AddFailedCaption" xml:space="preserve">
-    <value>No se pudo agregar la referencia</value>
-  </data>
-  <data name="References_BrowseCaption" xml:space="preserve">
-    <value>Buscar referencias</value>
-  </data>
-  <data name="References_BrowseFilterActiveX" xml:space="preserve">
-    <value>Controles ActiveX (* .ocx)|*.ocx</value>
-  </data>
-  <data name="References_BrowseFilterAllFiles" xml:space="preserve">
-    <value>Todos los archivos (*.*)|*.*</value>
-  </data>
-  <data name="References_BrowseFilterExcel" xml:space="preserve">
-    <value>Archivos de Microsoft Excel ({0})|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
-  <data name="References_BrowseFilterExecutable" xml:space="preserve">
-    <value>Archivos ejecutables (*.exe;*.dll)|*.exe;*.dll</value>
-  </data>
-  <data name="References_BrowseFilterTypes" xml:space="preserve">
-    <value>Bibliotecas de tipos (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
-  </data>
-  <data name="References_Caption" xml:space="preserve">
-    <value>Agregar/Eliminar referencias...</value>
-  </data>
-  <data name="References_Locale" xml:space="preserve">
-    <value>Local:</value>
-  </data>
-  <data name="References_Pinned" xml:space="preserve">
-    <value>Fijado</value>
-  </data>
-  <data name="References_Projects" xml:space="preserve">
-    <value>Proyectos</value>
-  </data>
-  <data name="References_Recent" xml:space="preserve">
-    <value>Reciente</value>
-  </data>
-  <data name="References_SearchPlaceholder" xml:space="preserve">
-    <value>Buscar referencia ...</value>
-  </data>
-  <data name="References_SubCaption" xml:space="preserve">
-    <value>Seleccione bibliotecas de tipos y proyectos VB para agregar o eliminar.</value>
-  </data>
-  <data name="References_TypeLibs" xml:space="preserve">
-    <value>Bibliotecas de tipos</value>
-  </data>
-  <data name="References_Version" xml:space="preserve">
-    <value>Versión:</value>
-  </data>
   <data name="TodoMarkerBug" xml:space="preserve">
     <value>BUG</value>
   </data>
@@ -1062,18 +1010,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>Explorador TODO</value>
   </data>
-  <data name="References_BrowseFilterAccess" xml:space="preserve">
-    <value>Bases de datos de Microsoft Access ({0})|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
-  <data name="References_BrowseFilterPowerPoint" xml:space="preserve">
-    <value>Archivos de Complementos de PowerPoint ({0})|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
-  <data name="References_BrowseFilterWord" xml:space="preserve">
-    <value>Documentos de Word ({0})|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Intentar arreglar las referencias rotas</value>
   </data>
@@ -1089,41 +1025,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="ReferenceSettings_TrackHostReferences" xml:space="preserve">
     <value>Referencias de pistas no agregadas por Rubberduck</value>
   </data>
-  <data name="References_BrowseFilterOutlook" xml:space="preserve">
-    <value>Archivos de Outlook VBA ({0})|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
-  <data name="References_BrowseFilterPublisher" xml:space="preserve">
-    <value>Archivos de Publisher ({0}|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
-  <data name="References_BrowseFilterVisio" xml:space="preserve">
-    <value>Todos los archivos de Visio ({0})|{0}</value>
-    <comment>{0} = lista de extensiones delimitadas por punto y coma en el formato de * .ext</comment>
-  </data>
-  <data name="References_DefaultLocale" xml:space="preserve">
-    <value>Estándar</value>
-    <comment>Se muestra como una descripción de LCID cuando no se especifica la configuración regional.</comment>
-  </data>
-  <data name="References_CaptionTemplate" xml:space="preserve">
-    <value>Agregar/Eliminar referencias - {0}</value>
-    <comment>{0} = nombre del proyecto</comment>
-  </data>
-  <data name="References_AddToolTip" xml:space="preserve">
-    <value>Agregar al proyecto</value>
-  </data>
-  <data name="References_MoveDownToolTip" xml:space="preserve">
-    <value>Mover hacia abajo</value>
-  </data>
-  <data name="References_MoveUpToolTip" xml:space="preserve">
-    <value>Mover hacia arriba</value>
-  </data>
-  <data name="References_PinToolTip" xml:space="preserve">
-    <value>Fijar Referencia</value>
-  </data>
-  <data name="References_RemoveToolTip" xml:space="preserve">
-    <value>Eliminar del proyecto</value>
-  </data>
   <data name="MemberAttributeRecoveryRewriteFailedMessage" xml:space="preserve">
     <value>Falló al recuperar los atributos de los miembros.</value>
   </data>
@@ -1166,9 +1067,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
-  <data name="References_BrowseButtonText" xml:space="preserve">
-    <value>Navegando...</value>
-  </data>
   <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
     <value>{0} Considere utilizar otro nombre.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c8a1d95221..d001c302fa 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -975,108 +975,18 @@ les projets dans le VBE.</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Tchèque</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Références</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Appliquer</value>
   </data>
-  <data name="References_AddFailedCaption" xml:space="preserve">
-    <value>La référence n'a pu être ajoutée</value>
-  </data>
-  <data name="References_BrowseCaption" xml:space="preserve">
-    <value>Parcourir...</value>
-  </data>
-  <data name="References_BrowseFilterActiveX" xml:space="preserve">
-    <value>Contrôles ActiveX (*.ocx)|*.ocx</value>
-  </data>
-  <data name="References_BrowseFilterAllFiles" xml:space="preserve">
-    <value>Tous (*.*)|*.*</value>
-  </data>
-  <data name="References_BrowseFilterExcel" xml:space="preserve">
-    <value>Fichiers Microsoft Excel ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterExecutable" xml:space="preserve">
-    <value>Exécutables (*.exe,*.dll)|*.exe;*.dll</value>
-  </data>
-  <data name="References_BrowseFilterTypes" xml:space="preserve">
-    <value>Bibliothêques (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
-  </data>
-  <data name="References_Caption" xml:space="preserve">
-    <value>Ajouter/Supprimer Références...</value>
-  </data>
   <data name="AllReferences_NoneFoundReference" xml:space="preserve">
     <value>Aucune utilisation de '{0}' n'a été trouvée dans le projet.</value>
   </data>
   <data name="AllReferences_PerformanceWarning" xml:space="preserve">
     <value>La recherche des utilisations de la référence '{0}' renvoie {1} résultats. Les afficher pourrait dégrader la performance. Continuer?</value>
   </data>
-  <data name="References_Locale" xml:space="preserve">
-    <value>Langue:</value>
-  </data>
   <data name="PerformanceWarningCaption" xml:space="preserve">
     <value>Avertissement - Performance</value>
   </data>
-  <data name="References_AddToolTip" xml:space="preserve">
-    <value>Ajouter au projet</value>
-  </data>
-  <data name="References_BrowseFilterAccess" xml:space="preserve">
-    <value>Base de données Microsoft Access ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterOutlook" xml:space="preserve">
-    <value>Fichiers VBA Outlook ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterPowerPoint" xml:space="preserve">
-    <value>Fichiers complément PowerPoint ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterPublisher" xml:space="preserve">
-    <value>Fichiers Publisher ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterVisio" xml:space="preserve">
-    <value>Tous les fichiers Visio ({0})|{0}</value>
-  </data>
-  <data name="References_BrowseFilterWord" xml:space="preserve">
-    <value>Documents Word ({0})|{0}</value>
-  </data>
-  <data name="References_CaptionTemplate" xml:space="preserve">
-    <value>Ajouter/Supprimer Références - {0}</value>
-  </data>
-  <data name="References_DefaultLocale" xml:space="preserve">
-    <value>Standard</value>
-  </data>
-  <data name="References_MoveDownToolTip" xml:space="preserve">
-    <value>Déplacer vers le haut</value>
-  </data>
-  <data name="References_MoveUpToolTip" xml:space="preserve">
-    <value>Déplacer vers le bas</value>
-  </data>
-  <data name="References_Pinned" xml:space="preserve">
-    <value>Épingles</value>
-  </data>
-  <data name="References_PinToolTip" xml:space="preserve">
-    <value>Épingler la référence</value>
-  </data>
-  <data name="References_Projects" xml:space="preserve">
-    <value>Projets</value>
-  </data>
-  <data name="References_Recent" xml:space="preserve">
-    <value>Récents</value>
-  </data>
-  <data name="References_RemoveToolTip" xml:space="preserve">
-    <value>Supprimer du projet</value>
-  </data>
-  <data name="References_SearchPlaceholder" xml:space="preserve">
-    <value>Rechercher une référence...</value>
-  </data>
-  <data name="References_SubCaption" xml:space="preserve">
-    <value>Sélectionner les librairies et projets à ajouter ou supprimer aux références du projet.</value>
-  </data>
-  <data name="References_TypeLibs" xml:space="preserve">
-    <value>Bibliothèques</value>
-  </data>
-  <data name="References_Version" xml:space="preserve">
-    <value>Version:</value>
-  </data>
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Tenter de réparer la référence</value>
   </data>
@@ -1128,9 +1038,6 @@ les projets dans le VBE.</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtrer</value>
   </data>
-  <data name="References_BrowseButtonText" xml:space="preserve">
-    <value>Parcourir...</value>
-  </data>
   <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
     <value>'{0}' est accessible globalement, et est utilisé.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 249c092b7e..8b53416ec4 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1036,9 +1036,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="EmptyLineHandling_Remove" xml:space="preserve">
     <value>Remove</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>References</value>
-  </data>
   <data name="padlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -1075,55 +1072,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="tick_circle_pinned" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\tick-circle-pinned.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="References_AddFailedCaption" xml:space="preserve">
-    <value>Could not add reference</value>
-  </data>
-  <data name="References_BrowseCaption" xml:space="preserve">
-    <value>Browse for reference</value>
-  </data>
-  <data name="References_BrowseFilterActiveX" xml:space="preserve">
-    <value>ActiveX Controls (*.ocx)|*.ocx</value>
-  </data>
-  <data name="References_BrowseFilterAllFiles" xml:space="preserve">
-    <value>All files (*.*)|*.*</value>
-  </data>
-  <data name="References_BrowseFilterExcel" xml:space="preserve">
-    <value>Microsoft Excel Files ({0})|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterExecutable" xml:space="preserve">
-    <value>Executable Files (*.exe;*.dll)|*.exe;*.dll</value>
-  </data>
-  <data name="References_BrowseFilterTypes" xml:space="preserve">
-    <value>Type Libraries (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
-  </data>
-  <data name="References_Caption" xml:space="preserve">
-    <value>Add/Remove References...</value>
-  </data>
-  <data name="References_Locale" xml:space="preserve">
-    <value>Locale:</value>
-  </data>
-  <data name="References_Pinned" xml:space="preserve">
-    <value>Pinned</value>
-  </data>
-  <data name="References_Projects" xml:space="preserve">
-    <value>Projects</value>
-  </data>
-  <data name="References_Recent" xml:space="preserve">
-    <value>Recent</value>
-  </data>
-  <data name="References_SearchPlaceholder" xml:space="preserve">
-    <value>Search for reference...</value>
-  </data>
-  <data name="References_SubCaption" xml:space="preserve">
-    <value>Select type libraries and VB projects to add or remove.</value>
-  </data>
-  <data name="References_TypeLibs" xml:space="preserve">
-    <value>Type Libraries</value>
-  </data>
-  <data name="References_Version" xml:space="preserve">
-    <value>Version:</value>
-  </data>
   <data name="TodoMarkerBug" xml:space="preserve">
     <value>BUG</value>
   </data>
@@ -1142,18 +1090,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="TodoSettings_Caption" xml:space="preserve">
     <value>TODO Explorer</value>
   </data>
-  <data name="References_BrowseFilterAccess" xml:space="preserve">
-    <value>Microsoft Access Databases({0})|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterPowerPoint" xml:space="preserve">
-    <value>PowerPoint Addin Files({0})|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterWord" xml:space="preserve">
-    <value>Word Documents ({0})|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Attempt to fix broken references</value>
   </data>
@@ -1169,32 +1105,12 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="ReferenceSettings_TrackHostReferences" xml:space="preserve">
     <value>Track references not added by Rubberduck</value>
   </data>
-  <data name="References_BrowseFilterOutlook" xml:space="preserve">
-    <value>Outlook VBA Files ({0})|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterPublisher" xml:space="preserve">
-    <value>Publisher Files ({0}|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterVisio" xml:space="preserve">
-    <value>All Visio Files ({0})|{0}</value>
-    <comment>{0} = semi-colon delimited extension list in the format of *.ext</comment>
-  </data>
-  <data name="References_DefaultLocale" xml:space="preserve">
-    <value>Standard</value>
-    <comment>Displayed as LCID description when locale is not specified.</comment>
-  </data>
   <data name="cross_script" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\cross-script.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="magnifier_medium" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\magnifier-medium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="References_CaptionTemplate" xml:space="preserve">
-    <value>Add/Remove References - {0}</value>
-    <comment>{0} = Project name</comment>
-  </data>
   <data name="edit_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\edit-size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -1213,21 +1129,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="arrow_270_dimmed" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\arrow-270-dimmed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="References_AddToolTip" xml:space="preserve">
-    <value>Add to project</value>
-  </data>
-  <data name="References_MoveDownToolTip" xml:space="preserve">
-    <value>Move down</value>
-  </data>
-  <data name="References_MoveUpToolTip" xml:space="preserve">
-    <value>Move up</value>
-  </data>
-  <data name="References_PinToolTip" xml:space="preserve">
-    <value>Pin reference</value>
-  </data>
-  <data name="References_RemoveToolTip" xml:space="preserve">
-    <value>Remove from project</value>
-  </data>
   <data name="MemberAttributeRecoveryRewriteFailedMessage" xml:space="preserve">
     <value>Failed to recover member attributes.</value>
   </data>
@@ -1284,9 +1185,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
-  <data name="References_BrowseButtonText" xml:space="preserve">
-    <value>Browse...</value>
-  </data>
   <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
     <value>Refactoring failed.</value>
   </data>
diff --git a/RubberduckTests/AddRemoveReferences/ReferenceReconcilerTests.cs b/RubberduckTests/AddRemoveReferences/ReferenceReconcilerTests.cs
index 0bb6ede375..3757494dfe 100644
--- a/RubberduckTests/AddRemoveReferences/ReferenceReconcilerTests.cs
+++ b/RubberduckTests/AddRemoveReferences/ReferenceReconcilerTests.cs
@@ -4,6 +4,7 @@
 using Moq;
 using NUnit.Framework;
 using Rubberduck.AddRemoveReferences;
+using Rubberduck.UI.AddRemoveReferences;
 using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
@@ -251,7 +252,7 @@ public void TryAddReferenceString_DisplaysMessageOnThrow()
 
             reconciler.TryAddReference(project.Object, file);
 
-            messageBox.Verify(m => m.NotifyWarn(exception, RubberduckUI.References_AddFailedCaption));
+            messageBox.Verify(m => m.NotifyWarn(exception, AddRemoveReferencesUI.AddFailedCaption));
         }
 
         [Test]
@@ -310,7 +311,7 @@ public void TryAddReferenceReferenceModel_DisplaysMessageOnThrow()
 
             reconciler.TryAddReference(project.Object, input);
 
-            messageBox.Verify(m => m.NotifyWarn(exception, RubberduckUI.References_AddFailedCaption));
+            messageBox.Verify(m => m.NotifyWarn(exception, AddRemoveReferencesUI.AddFailedCaption));
         }
 
         [Test]

From 1775b34b241fde102f7411afc2bccb407d8510cf Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Fri, 30 Oct 2020 02:03:04 -0700
Subject: [PATCH 41/64] Resolve stash artifacts

---
 Rubberduck.Resources/RubberduckUI.fr.resx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index cddf98846e..50fd0609f6 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1590,7 +1590,6 @@ Mise à jour annulée.</value>
 Si une interface privée est nécessaire, veuillez modifier le mode d'instanciation ("instancing") du module de classe pour 'Private'.
 Une classe privée peut toujours implémenter une interface publique.</value>
   </data>
-<<<<<<< Updated upstream
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Permettre glisser-déposer dans l'Explorateur de Code</value>
   </data>
@@ -1604,8 +1603,6 @@ Une classe privée peut toujours implémenter une interface publique.</value>
 
 Échec de l'importation.</value>
   </data>
-=======
->>>>>>> Stashed changes
   <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
     <value>Dossier:</value>
   </data>

From 8b65f699282f5c78baa7adfe0c4981665fee058c Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Fri, 30 Oct 2020 02:09:27 -0700
Subject: [PATCH 42/64] Correct missed migration update

---
 .../Refactorings/MoveFolder/MoveMultipleFoldersPresenter.cs   | 4 ++--
 .../MoveToFolder/MoveMultipleToFolderPresenter.cs             | 4 ++--
 .../ReorderParameters/ReorderParametersPresenter.cs           | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersPresenter.cs b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersPresenter.cs
index 726f4b3af6..7c0e0eb49d 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersPresenter.cs
@@ -1,11 +1,11 @@
 using Rubberduck.Refactorings.MoveFolder;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.MoveFolder
 {
     internal class MoveMultipleFoldersPresenter : RefactoringPresenterBase<MoveMultipleFoldersModel>, IMoveMultipleFoldersPresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.MoveToFolderDialog_Caption, 164, 684);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.MoveToFolderDialog_Caption, 164, 684);
 
         public MoveMultipleFoldersPresenter(MoveMultipleFoldersModel model, IRefactoringDialogFactory dialogFactory) :
             base(DialogData, model, dialogFactory)
diff --git a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderPresenter.cs b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderPresenter.cs
index aaf69ab1cc..5550f5bb3e 100644
--- a/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderPresenter.cs
@@ -1,11 +1,11 @@
 using Rubberduck.Refactorings.MoveToFolder;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.MoveToFolder
 {
     internal class MoveMultipleToFolderPresenter : RefactoringPresenterBase<MoveMultipleToFolderModel>, IMoveMultipleToFolderPresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.MoveToFolderDialog_Caption, 164, 684);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.MoveToFolderDialog_Caption, 164, 684);
 
         public MoveMultipleToFolderPresenter(MoveMultipleToFolderModel model, IRefactoringDialogFactory dialogFactory) :
             base(DialogData, model, dialogFactory)
diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
index 342d78f9c6..c7d159060e 100644
--- a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -1,5 +1,6 @@
 using Rubberduck.Resources;
 using Rubberduck.Interaction;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.ReorderParameters;
 
@@ -43,7 +44,7 @@ public override ReorderParametersModel Show()
 
         private bool UserConfirmsInterfaceTarget(ReorderParametersModel model)
         {
-            var message = string.Format(RubberduckUI.Refactoring_TargetIsInterfaceMemberImplementation,
+            var message = string.Format(RefactoringsUI.Refactoring_TargetIsInterfaceMemberImplementation,
                 model.OriginalTarget.IdentifierName, Model.TargetDeclaration.ComponentName, model.TargetDeclaration.IdentifierName);
             return UserConfirmsNewTarget(message);
         }

From 5928123a87c70f0d70d31282539a7f36e5caac9c Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Fri, 30 Oct 2020 02:16:46 -0700
Subject: [PATCH 43/64] Correct missed update

---
 Rubberduck.Core/UI/Settings/IndenterSettingsViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/IndenterSettingsViewModel.cs
index 88c29c8aa2..b51e67f81d 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettingsViewModel.cs
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsViewModel.cs
@@ -402,7 +402,7 @@ public string PreviewSampleCode
             {
                 var indenter = new Indenter(null, GetCurrentSettings);
 
-                var lines = RubberduckUI.IndenterSettings_PreviewCode.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+                var lines = IndenterSettingsUI.PreviewCode.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
                 lines = indenter.Indent(lines).ToArray();
                 return string.Join(Environment.NewLine, lines);
             }

From 92799d805d6a47d3acdcb249839e807b27f213ec Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Fri, 30 Oct 2020 02:17:00 -0700
Subject: [PATCH 44/64] Update resx usage

Fully qualifying the string is required. Trying to use a using
directive ends up not working.
---
 Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs
index ac09a160bf..c796fcb5c3 100644
--- a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs
@@ -15,7 +15,6 @@
 using Rubberduck.UI.Settings;
 using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Resources.ToDoExplorer;
 using Rubberduck.Interaction.Navigation;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.SettingsProvider;
@@ -254,8 +253,8 @@ public void ExecuteCopyResultsCommand(object obj)
                 .Select(formattedItem => formattedItem.ToArray()).ToArray();
 
             var resource = _items.Count == 1
-                ? ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Singular
-                : ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Plural;
+                ? Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Singular
+                : Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Plural;
 
             var title = string.Format(resource, DateTime.Now.ToString(CultureInfo.InvariantCulture), _items.Count);
 

From f8ce9ca8c78a068c59ac17fd1dc20837392b28a6 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Sun, 1 Nov 2020 10:11:30 -0800
Subject: [PATCH 45/64] Restore ability to compile

---
 Rubberduck.Core/Rubberduck.Core.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
index dd3c1136f0..d2b6b5e6a7 100644
--- a/Rubberduck.Core/Rubberduck.Core.csproj
+++ b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -102,9 +102,9 @@
     <Compile Update="**\*.Designer.cs">
       <DependentUpon>$([System.String]::Copy('%(Filename)').Replace('.Designer', '')).cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Update="UI\**\*.resx">
+    <!--<EmbeddedResource Update="UI\**\*.resx">
       <DependentUpon>%(Filename).cs</DependentUpon>
-    </EmbeddedResource>
+    </EmbeddedResource>-->
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">

From 542a9a65320c2b549d7e01a9394ea8fb5643cacd Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 11:44:46 -0800
Subject: [PATCH 46/64] Migrate RemoveParamsDialog_ resources

Opportunistinc  xaml resource consolidation as well.
---
 .../RemoveParameterFailedNotifier.cs          |  2 +-
 .../RemoveParametersPresenter.cs              |  6 +--
 .../RemoveParametersView.xaml                 | 43 +++++++++++--------
 .../RefactoringsUI.Designer.cs                | 36 ++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 12 ++++++
 .../RefactoringsUI.de.resx                    | 12 ++++++
 .../RefactoringsUI.es.resx                    | 12 ++++++
 .../RefactoringsUI.fr.resx                    | 12 ++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 12 ++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 36 ----------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 12 ------
 Rubberduck.Resources/RubberduckUI.de.resx     | 12 ------
 Rubberduck.Resources/RubberduckUI.es.resx     | 12 ------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 12 ------
 Rubberduck.Resources/RubberduckUI.resx        | 12 ------
 15 files changed, 125 insertions(+), 118 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs
index 62bdeb8394..60da91b81e 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RemoveParameterFailedNotifier.cs
@@ -11,7 +11,7 @@ public RemoveParameterFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.RemoveParamsDialog_Caption;
+        protected override string Caption => RefactoringsUI.RemoveParamsDialog_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
index 6918c712d6..a806791564 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -8,7 +8,7 @@ namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
     public class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel>, IRemoveParametersPresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RemoveParamsDialog_Caption, 395, 494);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.RemoveParamsDialog_Caption, 395, 494);
         private readonly IMessageBox _messageBox;
 
         public RemoveParametersPresenter(RemoveParametersModel model,
@@ -35,7 +35,7 @@ public override RemoveParametersModel Show()
             {
                 case 0:
                     var message = string.Format(RubberduckUI.RemovePresenter_NoParametersError, Model.TargetDeclaration.IdentifierName);
-                    _messageBox.NotifyWarn(message, RubberduckUI.RemoveParamsDialog_TitleText);
+                    _messageBox.NotifyWarn(message, RefactoringsUI.RemoveParamsDialog_TitleText);
                     return null;
                 case 1:
                     Model.RemoveParameters = Model.Parameters;
@@ -54,7 +54,7 @@ private bool UserConfirmsInterfaceTarget(RemoveParametersModel model)
 
         private bool UserConfirmsNewTarget(string message)
         {
-            return _messageBox.ConfirmYesNo(message, RubberduckUI.RemoveParamsDialog_TitleText);
+            return _messageBox.ConfirmYesNo(message, RefactoringsUI.RemoveParamsDialog_TitleText);
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml
index 76520ab29f..b327f0ec95 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml
@@ -32,8 +32,8 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=RemoveParamsDialog_TitleText}" FontWeight="Bold" />
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=RemoveParamsDialog_InstructionsLabelText}"
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RemoveParamsDialog_TitleText}" FontWeight="Bold" />
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RemoveParamsDialog_InstructionsLabelText}"
                        Margin="5,0" />
         </StackPanel>
         <Grid Grid.Row="1" Grid.IsSharedSizeScope="True">
@@ -65,29 +65,35 @@
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="Button">
+                        <Setter Property="Height" Value="20" />
+                        <Setter Property="Margin" Value="5,5,5,0" />
+                        <Setter Property="Padding" Value="5,0" />
+                    </Style>
+                    <Style TargetType="Control">
+                        <Setter Property="HorizontalContentAlignment" Value="Left" />
+                    </Style>
+                    <Style TargetType="Image">
+                        <Setter Property="Height" Value="10" />
+                        <Setter Property="Margin" Value="0,0,5,0" />
+                    </Style>
+                </Grid.Resources>
                 <Button Grid.Row="0"
-                        Height="20"
-                        Margin="5,5,5,0"
-                        Padding="5,0"
-                        HorizontalContentAlignment="Left"
                         IsEnabled="{Binding ElementName=ParameterGrid, Path=SelectedItem.IsRemoved, Converter={StaticResource InvertedBool}}"
                         Command="{Binding RemoveParameterCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Height="10" Source="{StaticResource RemoveParameterImage}" Margin="0,0,5,0" />
+                        <Image Source="{StaticResource RemoveParameterImage}" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" />
                     </StackPanel>
                 </Button>
                 <Button Grid.Row="1"
-                        Height="20"
-                        Margin="5,5,5,0"
-                        Padding="5,0"
-                        HorizontalContentAlignment="Left"
                         IsEnabled="{Binding ElementName=ParameterGrid, Path=SelectedItem.IsRemoved}"
                         Command="{Binding RestoreParameterCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Height="10" Source="{StaticResource RestoreParameterImage}" Margin="0,0,5,0" />
+                        <Image Source="{StaticResource RestoreParameterImage}" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Restore}" />
                     </StackPanel>
                 </Button>
@@ -120,17 +126,18 @@
                     <ColumnDefinition SharedSizeGroup="SettingsButtons" />
                     <ColumnDefinition SharedSizeGroup="SettingsButtons" />
                 </Grid.ColumnDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="Button">
+                        <Setter Property="Height" Value="20" />
+                        <Setter Property="Margin" Value="5,0" />
+                        <Setter Property="Padding" Value="10,0" />
+                    </Style>
+                </Grid.Resources>
                 <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=OK}"
                         Grid.Column="0"
-                        Height="20"
-                        Margin="5,0"
-                        Padding="10,0"
                         Command="{Binding OkButtonCommand}" />
                 <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CancelButtonText}"
                         Grid.Column="1"
-                        Height="20"
-                        Margin="5,0"
-                        Padding="10,0"
                         Command="{Binding CancelButtonCommand}">
                 </Button>
             </Grid>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 9194cf80d0..df297dc487 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -1054,5 +1054,41 @@ public static string RefactoringFailure_TargetNull {
                 return ResourceManager.GetString("RefactoringFailure_TargetNull", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Remove Parameters.
+        /// </summary>
+        public static string RemoveParamsDialog_Caption {
+            get {
+                return ResourceManager.GetString("RemoveParamsDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select a parameter and double-click it or use buttons to remove or restore it..
+        /// </summary>
+        public static string RemoveParamsDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("RemoveParamsDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot remove last parameter from setter or letter..
+        /// </summary>
+        public static string RemoveParamsDialog_RemoveIllegalSetterLetterParameter {
+            get {
+                return ResourceManager.GetString("RemoveParamsDialog_RemoveIllegalSetterLetterParameter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove parameters.
+        /// </summary>
+        public static string RemoveParamsDialog_TitleText {
+            get {
+                return ResourceManager.GetString("RemoveParamsDialog_TitleText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 785966138d..5b264e2368 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -446,4 +446,16 @@ Chcete pokračovat?</value>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
     <value>Cílová deklarace je 'Null'.</value>
   </data>
+  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
+    <value>Nelze odstranit poslední parametr ze setteru nebo letteru.</value>
+  </data>
+  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Odstranit Parametry</value>
+  </data>
+  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Vyberte parametr a dvojím poklepáním na něj, nebo použitím tlačítek, ho odstraňte nebo obnovte.</value>
+  </data>
+  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
+    <value>Odstranit parametry</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 5dd48eee39..c7b300ea81 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -452,4 +452,16 @@ Wollen Sie fortfahren?</value>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
     <value>Das Ziel des Refactorings ist null.</value>
   </data>
+  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
+    <value>Kann den letzten Parameter eines Setters oder Letters nicht entfernen.</value>
+  </data>
+  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Parameter entfernen</value>
+  </data>
+  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Wählen Sie einen Parameter und benutzen Sie die Schaltflächen oder doppelklicken Sie um ihn zu bewegen oder zu löschen.</value>
+  </data>
+  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
+    <value>Parameter entfernen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 8055bb7112..c08234e537 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -446,4 +446,16 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
     <value>Declaración destino es nula.</value>
   </data>
+  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
+    <value>No se puede eliminar el último parámetro del Setter o Letter.</value>
+  </data>
+  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Eliminar Parámetros</value>
+  </data>
+  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Seleccione un parámetro y haga doble clic en él o use los botones para eliminarlo o restaurarlo.</value>
+  </data>
+  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
+    <value>Eliminar parametros</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 61cc7753b6..ffc323b69e 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -428,4 +428,16 @@ Procéder?</value>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
     <value>La déclaration ciblée est 'null', ...poof?</value>
   </data>
+  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
+    <value>Les accesseurs Property Let et Property Set requièrent au moins un paramètre.</value>
+  </data>
+  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Supprimer les paramètres</value>
+  </data>
+  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Sélectionner un paramètre et utiliser les boutons ou un double-clic pour le supprimer.</value>
+  </data>
+  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
+    <value>Supprimer les paramètres</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index a4122cce6b..3d98a1cc62 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -464,4 +464,16 @@ Do you want to proceed?</value>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
     <value>Target declaration is null.</value>
   </data>
+  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
+    <value>Cannot remove last parameter from setter or letter.</value>
+  </data>
+  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Remove Parameters</value>
+  </data>
+  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Select a parameter and double-click it or use buttons to remove or restore it.</value>
+  </data>
+  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
+    <value>Remove parameters</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 2e3d6bb997..eacb04b3b3 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3299,42 +3299,6 @@ public static string Remove {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Remove Parameters.
-        /// </summary>
-        public static string RemoveParamsDialog_Caption {
-            get {
-                return ResourceManager.GetString("RemoveParamsDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Select a parameter and double-click it or use buttons to remove or restore it..
-        /// </summary>
-        public static string RemoveParamsDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("RemoveParamsDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot remove last parameter from setter or letter..
-        /// </summary>
-        public static string RemoveParamsDialog_RemoveIllegalSetterLetterParameter {
-            get {
-                return ResourceManager.GetString("RemoveParamsDialog_RemoveIllegalSetterLetterParameter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove parameters.
-        /// </summary>
-        public static string RemoveParamsDialog_TitleText {
-            get {
-                return ResourceManager.GetString("RemoveParamsDialog_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to No parameters in method &apos;{0}&apos;..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 6e6459a7ac..7854ebbda2 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -180,9 +180,6 @@
   <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
     <value>Přesunout výše</value>
   </data>
-  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
-    <value>Odstranit parametry</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Třída nebo člen '{0}' ještě není implementován.</value>
   </data>
@@ -312,9 +309,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Všechny reference: '{0}'</value>
   </data>
-  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
-    <value>Nelze odstranit poslední parametr ze setteru nebo letteru.</value>
-  </data>
   <data name="LoadConfigError" xml:space="preserve">
     <value>Chyba při načítání konfigurace Rubberducku</value>
   </data>
@@ -345,9 +339,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Nastavení modulu by měla být specifikována jako první</value>
   </data>
-  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Odstranit Parametry</value>
-  </data>
   <data name="Restore" xml:space="preserve">
     <value>Obnovit</value>
   </data>
@@ -486,9 +477,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Volitelné parametry musejí být specifikovány na konci seznamu parametrů.</value>
   </data>
-  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Vyberte parametr a dvojím poklepáním na něj, nebo použitím tlačítek, ho odstraňte nebo obnovte.</value>
-  </data>
   <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
     <value>Rubberduck Inspekce Kódu - {0}
 Nalezeno {1} problémů.</value>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 938360bd1f..2c68c93839 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -231,12 +231,6 @@
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Alle Referenzen: '{0}'</value>
   </data>
-  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
-    <value>Parameter entfernen</value>
-  </data>
-  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
-    <value>Kann den letzten Parameter eines Setters oder Letters nicht entfernen.</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Klasse oder Element '{0}' ist nicht implementiert.</value>
   </data>
@@ -336,12 +330,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Language_FR" xml:space="preserve">
     <value>Französisch</value>
   </data>
-  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Parameter entfernen</value>
-  </data>
-  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Wählen Sie einen Parameter und benutzen Sie die Schaltflächen oder doppelklicken Sie um ihn zu bewegen oder zu löschen.</value>
-  </data>
   <data name="Restore" xml:space="preserve">
     <value>Wiederherstellen</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index ef6373a5e7..b61a629727 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -231,12 +231,6 @@
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Todas las referencias: '{0}'</value>
   </data>
-  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
-    <value>Eliminar parametros</value>
-  </data>
-  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
-    <value>No se puede eliminar el último parámetro del Setter o Letter.</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>La clase o miembro '{0}' no está implementado.</value>
   </data>
@@ -347,12 +341,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Language_FR" xml:space="preserve">
     <value>Francés</value>
   </data>
-  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Eliminar Parámetros</value>
-  </data>
-  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Seleccione un parámetro y haga doble clic en él o use los botones para eliminarlo o restaurarlo.</value>
-  </data>
   <data name="Restore" xml:space="preserve">
     <value>Restaurar</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 818a9210ff..951aa472ce 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -234,12 +234,6 @@
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Références: '{0}'</value>
   </data>
-  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
-    <value>Supprimer les paramètres</value>
-  </data>
-  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
-    <value>Les accesseurs Property Let et Property Set requièrent au moins un paramètre.</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Aucune implémentation trouvée pour '{0}'.</value>
   </data>
@@ -382,12 +376,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Remove" xml:space="preserve">
     <value>Supprimer</value>
   </data>
-  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Supprimer les paramètres</value>
-  </data>
-  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Sélectionner un paramètre et utiliser les boutons ou un double-clic pour le supprimer.</value>
-  </data>
   <data name="Rename" xml:space="preserve">
     <value>Renommer</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index e54fbee772..1a48206e98 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -234,12 +234,6 @@
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>All references: '{0}'</value>
   </data>
-  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
-    <value>Remove parameters</value>
-  </data>
-  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
-    <value>Cannot remove last parameter from setter or letter.</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Class or member '{0}' is not implemented.</value>
   </data>
@@ -350,12 +344,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Language_FR" xml:space="preserve">
     <value>French</value>
   </data>
-  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Remove Parameters</value>
-  </data>
-  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Select a parameter and double-click it or use buttons to remove or restore it.</value>
-  </data>
   <data name="Restore" xml:space="preserve">
     <value>Restore</value>
   </data>

From 9e259ca9f7254ec99429aa157c496f38163da14f Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 12:07:35 -0800
Subject: [PATCH 47/64] Migrate RenameDialog_ resources

---
 .../Refactoring/RenameDeclarationQuickFix.cs  |   3 +-
 .../Notifiers/RenameFailedNotifier.cs         |   3 +-
 .../Notifiers/RenameFolderFailedNotifier.cs   |   3 +-
 .../UI/Refactorings/Rename/RenamePresenter.cs |   5 +-
 .../UI/Refactorings/Rename/RenameView.xaml    |   2 +-
 .../UI/Refactorings/Rename/RenameViewModel.cs |   9 +-
 .../RenameFolder/RenameFolderPresenter.cs     |   4 +-
 .../RenameFolder/RenameFolderView.xaml        |   6 +-
 .../RenameFolder/RenameFolderViewModel.cs     |   8 +-
 .../RefactoringsUI.Designer.cs                | 137 ++++++++++++++++++
 .../RefactoringsUI.cs.resx                    |  47 ++++++
 .../RefactoringsUI.de.resx                    |  47 ++++++
 .../RefactoringsUI.es.resx                    |  47 ++++++
 .../RefactoringsUI.fr.resx                    |  47 ++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  51 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 137 ------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  47 ------
 Rubberduck.Resources/RubberduckUI.de.resx     |  48 ------
 Rubberduck.Resources/RubberduckUI.es.resx     |  50 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  48 ------
 Rubberduck.Resources/RubberduckUI.resx        |  51 -------
 21 files changed, 400 insertions(+), 400 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs b/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs
index 5e8121cc39..2e72ca4c9f 100644
--- a/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs
+++ b/Rubberduck.CodeAnalysis/QuickFixes/Concrete/Refactoring/RenameDeclarationQuickFix.cs
@@ -2,6 +2,7 @@
 using Rubberduck.CodeAnalysis.Inspections;
 using Rubberduck.CodeAnalysis.Inspections.Concrete;
 using Rubberduck.CodeAnalysis.QuickFixes.Abstract;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.Resources;
 
@@ -64,7 +65,7 @@ protected override void Refactor(IInspectionResult result)
 
         public override string Description(IInspectionResult result)
         {
-            return string.Format(RubberduckUI.Rename_DeclarationType,
+            return string.Format(RefactoringsUI.Rename_DeclarationType,
                 RubberduckUI.ResourceManager.GetString("DeclarationType_" + result.Target.DeclarationType,
                     CultureInfo.CurrentUICulture));
         }
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs
index 177eb70c93..61d3246a13 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs
@@ -1,4 +1,5 @@
 using Rubberduck.Interaction;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.Rename;
 
@@ -10,7 +11,7 @@ public RenameFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         {}
 
-        protected override string Caption => Resources.RubberduckUI.RenameDialog_Caption;
+        protected override string Caption => RefactoringsUI.RenameDialog_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFolderFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFolderFailedNotifier.cs
index 96f321ff61..7751e612a8 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFolderFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFolderFailedNotifier.cs
@@ -1,4 +1,5 @@
 using Rubberduck.Interaction;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
 {
@@ -8,6 +9,6 @@ public RenameFolderFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         {}
 
-        protected override string Caption => Resources.RubberduckUI.RenameDialog_Caption;
+        protected override string Caption => RefactoringsUI.RenameDialog_Caption;
     }
 }
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs b/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
index ff640c44f8..b6010df8a7 100644
--- a/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
@@ -2,6 +2,7 @@
 using NLog;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.Resources;
@@ -10,7 +11,7 @@ namespace Rubberduck.UI.Refactorings.Rename
 {
     internal class RenamePresenter : RefactoringPresenterBase<RenameModel>, IRenamePresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RenameDialog_Caption, 164, 684);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.RenameDialog_Caption, 164, 684);
 
         private readonly IMessageBox _messageBox;
 
@@ -80,7 +81,7 @@ private bool UserConfirmsNewTarget(RenameModel model)
 
         private bool UserConfirmsRenameOfResolvedTarget(string message)
         {
-            return _messageBox?.ConfirmYesNo(message, RubberduckUI.RenameDialog_TitleText) ?? false;
+            return _messageBox?.ConfirmYesNo(message, RefactoringsUI.RenameDialog_TitleText) ?? false;
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml b/Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml
index b8e530ee9c..bad703155d 100644
--- a/Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=RenameDialog_TitleText}" FontWeight="Bold" />
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RenameDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
         <Grid Grid.Row="1" Margin="5,10,10,5">
diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs b/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs
index 364aa20924..cd96c86771 100644
--- a/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/Rename/RenameViewModel.cs
@@ -7,6 +7,7 @@
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.Resources;
 using Rubberduck.Refactorings.Common;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.Rename
 {
@@ -37,7 +38,7 @@ public string Instructions
                 }
 
                 var declarationType = RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, CultureInfo.CurrentUICulture);
-                return string.Format(RubberduckUI.RenameDialog_InstructionsLabelText, declarationType, Target.IdentifierName);
+                return string.Format(RefactoringsUI.RenameDialog_InstructionsLabelText, declarationType, Target.IdentifierName);
             }
         }
 
@@ -66,7 +67,7 @@ private void ValidateName()
             if (!originalName.Equals(NewName)
                 && originalName.Equals(NewName, StringComparison.InvariantCultureIgnoreCase))
             {
-                errors.Add(RubberduckUI.RenameDialog_OnlyCasingDifferent);
+                errors.Add(RefactoringsUI.RenameDialog_OnlyCasingDifferent);
             }
 
             if (errors.Any())
@@ -107,8 +108,8 @@ protected override void DialogOk()
 
         private bool UserConfirmsToProceedWithConflictingName(string newName, Declaration target, Declaration conflictingDeclaration)
         {
-            var message = string.Format(RubberduckUI.RenameDialog_ConflictingNames, newName, target.IdentifierName, conflictingDeclaration.QualifiedName.ToString());
-            return _messageBox?.ConfirmYesNo(message, RubberduckUI.RenameDialog_Caption) ?? false;
+            var message = string.Format(RefactoringsUI.RenameDialog_ConflictingNames, newName, target.IdentifierName, conflictingDeclaration.QualifiedName.ToString());
+            return _messageBox?.ConfirmYesNo(message, RefactoringsUI.RenameDialog_Caption) ?? false;
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderPresenter.cs b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderPresenter.cs
index 3705263a81..354e0ae66b 100644
--- a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderPresenter.cs
@@ -1,11 +1,11 @@
 using Rubberduck.Refactorings.RenameFolder;
-using Rubberduck.Resources;
+using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.RenameFolder
 {
     public class RenameFolderPresenter : RefactoringPresenterBase<RenameFolderModel>, IRenameFolderPresenter
     {
-        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RenameDialog_Caption, 164, 684);
+        private static readonly DialogData DialogData = DialogData.Create(RefactoringsUI.RenameDialog_Caption, 164, 684);
 
         public RenameFolderPresenter(RenameFolderModel model, IRefactoringDialogFactory dialogFactory) :
             base(DialogData, model, dialogFactory)
diff --git a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderView.xaml b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderView.xaml
index 503365bc24..a8f75d095c 100644
--- a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderView.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=RenameDialog_TitleText_Folder}" FontWeight="Bold" />
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RenameDialog_TitleText_Folder}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
         <Grid Grid.Row="1" Margin="5,10,10,5">
@@ -28,7 +28,7 @@
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=RenameDialog_FolderLabel}"
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RenameDialog_FolderLabel}"
                        VerticalAlignment="Center"
                        Margin="0,0,5,0" />
             <TextBox Name="RenameFolderTextBox"
@@ -43,7 +43,7 @@
         <StackPanel Grid.Row="2"
                     Margin="5,10,10,5"
                     Orientation="Horizontal">
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=RenameDialog_FullNewFolderLabel}"
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RenameDialog_FullNewFolderLabel}"
                        VerticalAlignment="Top"
                        Margin="0,0,5,0" />
             <TextBlock Text="{Binding FullNewFolderName}"
diff --git a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs
index ac56fde36e..e302df8679 100644
--- a/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderViewModel.cs
@@ -34,8 +34,8 @@ public string Instructions
                 var folderToRename = Model.OriginalFolder;
 
                 return string.Format(
-                    RubberduckUI.RenameDialog_InstructionsLabelText,
-                    RubberduckUI.RenameDialog_Folder,
+                    RefactoringsUI.RenameDialog_InstructionsLabelText,
+                    RefactoringsUI.RenameDialog_Folder,
                     folderToRename);
             }
         }
@@ -122,11 +122,11 @@ private bool FolderAlreadyExists(string fullFolderName)
         private bool UserConfirmsToProceedWithFolderMerge(string fullTargetFolder, string partToRename, string newFolderPart)
         {
             var message = string.Format(
-                RubberduckUI.RenameDialog_FolderAlreadyExists,
+                RefactoringsUI.RenameDialog_FolderAlreadyExists,
                 fullTargetFolder,
                 partToRename,
                 newFolderPart);
-            return _messageBox?.ConfirmYesNo(message, RubberduckUI.RenameDialog_Caption) ?? false;
+            return _messageBox?.ConfirmYesNo(message, RefactoringsUI.RenameDialog_Caption) ?? false;
         }
     }
 }
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index df297dc487..7b5d49b804 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -1090,5 +1090,142 @@ public static string RemoveParamsDialog_TitleText {
                 return ResourceManager.GetString("RemoveParamsDialog_TitleText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rename {0}.
+        /// </summary>
+        public static string Rename_DeclarationType {
+            get {
+                return ResourceManager.GetString("Rename_DeclarationType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please ensure that exactly 1 control is selected before renaming..
+        /// </summary>
+        public static string RenameDialog_AmbiguousSelection {
+            get {
+                return ResourceManager.GetString("RenameDialog_AmbiguousSelection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} {1} cannot be changed..
+        /// </summary>
+        public static string RenameDialog_BuiltInNameError {
+            get {
+                return ResourceManager.GetString("RenameDialog_BuiltInNameError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Rename.
+        /// </summary>
+        public static string RenameDialog_Caption {
+            get {
+                return ResourceManager.GetString("RenameDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; conflicts with the name of the existing declaration &apos;{1}&apos;. Renaming &apos;{2}&apos; to &apos;{0}&apos; may result in uncompilable  code or a change in logic.
+        ///Do you want to proceed with this rename?.
+        /// </summary>
+        public static string RenameDialog_ConflictingNames {
+            get {
+                return ResourceManager.GetString("RenameDialog_ConflictingNames", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Could not rename {0}..
+        /// </summary>
+        public static string RenameDialog_DefaultRenameError {
+            get {
+                return ResourceManager.GetString("RenameDialog_DefaultRenameError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to folder.
+        /// </summary>
+        public static string RenameDialog_Folder {
+            get {
+                return ResourceManager.GetString("RenameDialog_Folder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The folder &apos;{0}&apos; already exists. Renaming &apos;{1}&apos; to &apos;{2}&apos; will lead to a merge with the existing folder.
+        ///Do you want to proceed?.
+        /// </summary>
+        public static string RenameDialog_FolderAlreadyExists {
+            get {
+                return ResourceManager.GetString("RenameDialog_FolderAlreadyExists", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folder:.
+        /// </summary>
+        public static string RenameDialog_FolderLabel {
+            get {
+                return ResourceManager.GetString("RenameDialog_FolderLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Full new folder:.
+        /// </summary>
+        public static string RenameDialog_FullNewFolderLabel {
+            get {
+                return ResourceManager.GetString("RenameDialog_FullNewFolderLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please specify new name for {0} &apos;{1}&apos;..
+        /// </summary>
+        public static string RenameDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("RenameDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Could not rename Interface Member {0}..
+        /// </summary>
+        public static string RenameDialog_InterfaceRenameError {
+            get {
+                return ResourceManager.GetString("RenameDialog_InterfaceRenameError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to It is not possible to change only the case of an identifier in VBA (language is case-insensitive)..
+        /// </summary>
+        public static string RenameDialog_OnlyCasingDifferent {
+            get {
+                return ResourceManager.GetString("RenameDialog_OnlyCasingDifferent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rename identifier.
+        /// </summary>
+        public static string RenameDialog_TitleText {
+            get {
+                return ResourceManager.GetString("RenameDialog_TitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rename folder.
+        /// </summary>
+        public static string RenameDialog_TitleText_Folder {
+            get {
+                return ResourceManager.GetString("RenameDialog_TitleText_Folder", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 5b264e2368..185d0a7762 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -458,4 +458,51 @@ Chcete pokračovat?</value>
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Odstranit parametry</value>
   </data>
+  <data name="Rename_DeclarationType" xml:space="preserve">
+    <value>Přejmenovat {0}</value>
+  </data>
+  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
+    <value>Přesvědčte se, že máte před přejemnováním vybrán pouze 1 control.</value>
+  </data>
+  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
+    <value>{0} {1} není možno změnit.</value>
+  </data>
+  <data name="RenameDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Přejmenovat</value>
+  </data>
+  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
+    <value>Přejmenování na '{0}' je ve střetu s existující deklarací '{1}. Přejmenování '{2}' na '{0}' může vyústit v nekompatibilní kód nebo změnu v jeho logice.
+Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
+  </data>
+  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
+    <value>Nebylo možno přejmenovat {0}.</value>
+  </data>
+  <data name="RenameDialog_Folder" xml:space="preserve">
+    <value>složka</value>
+  </data>
+  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
+    <value>Složka '{0}' již existuje. Přejmenování '{1}' na '{2}' vyústí ve sloučení s existující složkou.
+Chcete pokračovat?</value>
+  </data>
+  <data name="RenameDialog_FolderLabel" xml:space="preserve">
+    <value>Složka:</value>
+  </data>
+  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
+    <value>Plná nová složka:</value>
+  </data>
+  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Prosím specifikujte nový název pro {0} '{1}'.</value>
+  </data>
+  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
+    <value>Nebylo možno přejmenovat Člena Rozhraní {0}.</value>
+  </data>
+  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
+    <value>Ve VBA není možné změnit pouze počáteční písmeno identifikátoru (jazyk ignoruje velká/malá písmena).</value>
+  </data>
+  <data name="RenameDialog_TitleText" xml:space="preserve">
+    <value>Přejmenovat identifikátor</value>
+  </data>
+  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
+    <value>Přejmenovat složku</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index c7b300ea81..0e394e4922 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -464,4 +464,51 @@ Wollen Sie fortfahren?</value>
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Parameter entfernen</value>
   </data>
+  <data name="Rename_DeclarationType" xml:space="preserve">
+    <value>{0} Umbenennen</value>
+  </data>
+  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
+    <value>Bitte stellen Sie zur Umbenennung sicher, dass genau ein Control-Objekt ausgewählt ist.</value>
+  </data>
+  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
+    <value>{0} {1} kann nicht geändert werden.</value>
+  </data>
+  <data name="RenameDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Umbenennen</value>
+  </data>
+  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
+    <value>Der neue Name '{0}' kollidiert mit dem Namen des existierenden Elements '{1}'. '{2}' in '{0}' umzubenennen kann zu nicht kompilierbarem Code oder einer Änderung der Logik führen.
+Wollen Sie trotzdem fortfahren?</value>
+  </data>
+  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
+    <value>Konnte {0} nicht umbenennen.</value>
+  </data>
+  <data name="RenameDialog_Folder" xml:space="preserve">
+    <value>Ordner</value>
+  </data>
+  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
+    <value>Der Ordner '{0}' existiert bereits. '{1}' in '{2}. umzubenennen wird die Ordner verschmelzen.
+Wollen Sie fortfahren?</value>
+  </data>
+  <data name="RenameDialog_FolderLabel" xml:space="preserve">
+    <value>Ordner:</value>
+  </data>
+  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
+    <value>Kompletter Ordnername:</value>
+  </data>
+  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Bitte geben Sie einen neuen Namen für {0} '{1}' an.</value>
+  </data>
+  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
+    <value>Konnte Interfacemitglied {0} nicht umbenennen.</value>
+  </data>
+  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
+    <value>Es ist in VBA nicht möglich nur die Groß- und Kleinschreibung eines Namens zu ändern.</value>
+  </data>
+  <data name="RenameDialog_TitleText" xml:space="preserve">
+    <value>Identifikator umbenennen</value>
+  </data>
+  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
+    <value>Ordner umbenennen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index c08234e537..f84ee7f7ca 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -458,4 +458,51 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Eliminar parametros</value>
   </data>
+  <data name="Rename_DeclarationType" xml:space="preserve">
+    <value>Renombrar {0}</value>
+  </data>
+  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
+    <value>Asegúrese de que se haya seleccionado exactamente 1 control antes de cambiar el nombre.</value>
+  </data>
+  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
+    <value>{0} {1} no se puede cambiar.</value>
+  </data>
+  <data name="RenameDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Renombrar</value>
+  </data>
+  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
+    <value>'{0}' entra en conflicto con el nombre de la declaración existente '{1}'. Renombrar de '{2}' a '{0}' puede resultar en un código no compilable o un cambio en la lógica.
+¿Desea continuar con este renombre?</value>
+  </data>
+  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
+    <value>No se pudo renombrar {0}.</value>
+  </data>
+  <data name="RenameDialog_Folder" xml:space="preserve">
+    <value>carpeta</value>
+  </data>
+  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
+    <value>La carpeta '{0}' ya existe. Cambiar el nombre de '{1}' a '{2}' implica una combinación de carpetas.
+¿Desea continuar?</value>
+  </data>
+  <data name="RenameDialog_FolderLabel" xml:space="preserve">
+    <value>Carpeta:</value>
+  </data>
+  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
+    <value>Nueva carpeta completa:</value>
+  </data>
+  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Por favor especificar un nuevo nombre para {0} '{1}'.</value>
+  </data>
+  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
+    <value>No se pudo renombrar el miembro de la interfaz {0}.</value>
+  </data>
+  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
+    <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
+  </data>
+  <data name="RenameDialog_TitleText" xml:space="preserve">
+    <value>Renombrar identificador</value>
+  </data>
+  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
+    <value>Renombrar carpeta</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index ffc323b69e..da6f44cfc4 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -440,4 +440,51 @@ Procéder?</value>
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Supprimer les paramètres</value>
   </data>
+  <data name="Rename_DeclarationType" xml:space="preserve">
+    <value>Renommer {0}</value>
+  </data>
+  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
+    <value>Veuillez sélectionner 1 seul contrôle à renommer.</value>
+  </data>
+  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
+    <value>{0}{1} ne peut être renommé.</value>
+  </data>
+  <data name="RenameDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Renommer</value>
+  </data>
+  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
+    <value>Le nom '{0}' entre en collision avec '{1}', ayant la même portée. Renommer '{2}' à '{0}' peut résulter en code non-compilable ou sournoisement modifier la logique du code appelant.
+Continuer?</value>
+  </data>
+  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
+    <value>Impossible de renommer {0}.</value>
+  </data>
+  <data name="RenameDialog_Folder" xml:space="preserve">
+    <value>dossier</value>
+  </data>
+  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
+    <value>Le dossier '{0}' existe déjà. Renommer '{1}' à '{2}' fusionnera les deux dossiers.
+Procéder?</value>
+  </data>
+  <data name="RenameDialog_FolderLabel" xml:space="preserve">
+    <value>Dossier:</value>
+  </data>
+  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
+    <value>Nouveau dossier (chemin complet):</value>
+  </data>
+  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez spécifier un nouveau nom pour {0} '{1}'.</value>
+  </data>
+  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
+    <value>Impossible de renommer le membre '{0}' de l'interface.</value>
+  </data>
+  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
+    <value>Impossible de modifier la casse d'un identifiant VBA (le language est insensible à la casse).</value>
+  </data>
+  <data name="RenameDialog_TitleText" xml:space="preserve">
+    <value>Renommer l'identifiant</value>
+  </data>
+  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
+    <value>Renommer le dossier</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 3d98a1cc62..3d09f23964 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -476,4 +476,55 @@ Do you want to proceed?</value>
   <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
     <value>Remove parameters</value>
   </data>
+  <data name="Rename_DeclarationType" xml:space="preserve">
+    <value>Rename {0}</value>
+  </data>
+  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
+    <value>Please ensure that exactly 1 control is selected before renaming.</value>
+  </data>
+  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
+    <value>{0} {1} cannot be changed.</value>
+    <comment>0: DeclarationType; 1: IdentifierName</comment>
+  </data>
+  <data name="RenameDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Rename</value>
+  </data>
+  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
+    <value>'{0}' conflicts with the name of the existing declaration '{1}'. Renaming '{2}' to '{0}' may result in uncompilable  code or a change in logic.
+Do you want to proceed with this rename?</value>
+    <comment>{0}: NewName {1}: conflicting declaration {2}: CurrentName</comment>
+  </data>
+  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
+    <value>Could not rename {0}.</value>
+  </data>
+  <data name="RenameDialog_Folder" xml:space="preserve">
+    <value>folder</value>
+  </data>
+  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
+    <value>The folder '{0}' already exists. Renaming '{1}' to '{2}' will lead to a merge with the existing folder.
+Do you want to proceed?</value>
+    <comment>{0} new full folder name; {1} folder part to rename; {2} new folder part name</comment>
+  </data>
+  <data name="RenameDialog_FolderLabel" xml:space="preserve">
+    <value>Folder:</value>
+  </data>
+  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
+    <value>Full new folder:</value>
+  </data>
+  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Please specify new name for {0} '{1}'.</value>
+    <comment>0: DeclarationType; 1: IdentifierName</comment>
+  </data>
+  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
+    <value>Could not rename Interface Member {0}.</value>
+  </data>
+  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
+    <value>It is not possible to change only the case of an identifier in VBA (language is case-insensitive).</value>
+  </data>
+  <data name="RenameDialog_TitleText" xml:space="preserve">
+    <value>Rename identifier</value>
+  </data>
+  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
+    <value>Rename folder</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index eacb04b3b3..c057c4ae6a 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3317,143 +3317,6 @@ public static string Rename {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rename {0}.
-        /// </summary>
-        public static string Rename_DeclarationType {
-            get {
-                return ResourceManager.GetString("Rename_DeclarationType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please ensure that exactly 1 control is selected before renaming..
-        /// </summary>
-        public static string RenameDialog_AmbiguousSelection {
-            get {
-                return ResourceManager.GetString("RenameDialog_AmbiguousSelection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} {1} cannot be changed..
-        /// </summary>
-        public static string RenameDialog_BuiltInNameError {
-            get {
-                return ResourceManager.GetString("RenameDialog_BuiltInNameError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Rename.
-        /// </summary>
-        public static string RenameDialog_Caption {
-            get {
-                return ResourceManager.GetString("RenameDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; conflicts with the name of the existing declaration &apos;{1}&apos;. Renaming &apos;{2}&apos; to &apos;{0}&apos; may result in uncompilable  code or a change in logic.
-        ///Do you want to proceed with this rename?.
-        /// </summary>
-        public static string RenameDialog_ConflictingNames {
-            get {
-                return ResourceManager.GetString("RenameDialog_ConflictingNames", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not rename {0}..
-        /// </summary>
-        public static string RenameDialog_DefaultRenameError {
-            get {
-                return ResourceManager.GetString("RenameDialog_DefaultRenameError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to folder.
-        /// </summary>
-        public static string RenameDialog_Folder {
-            get {
-                return ResourceManager.GetString("RenameDialog_Folder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The folder &apos;{0}&apos; already exists. Renaming &apos;{1}&apos; to &apos;{2}&apos; will lead to a merge with the existing folder.
-        ///Do you want to proceed?.
-        /// </summary>
-        public static string RenameDialog_FolderAlreadyExists {
-            get {
-                return ResourceManager.GetString("RenameDialog_FolderAlreadyExists", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Folder:.
-        /// </summary>
-        public static string RenameDialog_FolderLabel {
-            get {
-                return ResourceManager.GetString("RenameDialog_FolderLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Full new folder:.
-        /// </summary>
-        public static string RenameDialog_FullNewFolderLabel {
-            get {
-                return ResourceManager.GetString("RenameDialog_FullNewFolderLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please specify new name for {0} &apos;{1}&apos;..
-        /// </summary>
-        public static string RenameDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("RenameDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not rename Interface Member {0}..
-        /// </summary>
-        public static string RenameDialog_InterfaceRenameError {
-            get {
-                return ResourceManager.GetString("RenameDialog_InterfaceRenameError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to It is not possible to change only the case of an identifier in VBA (language is case-insensitive)..
-        /// </summary>
-        public static string RenameDialog_OnlyCasingDifferent {
-            get {
-                return ResourceManager.GetString("RenameDialog_OnlyCasingDifferent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rename identifier.
-        /// </summary>
-        public static string RenameDialog_TitleText {
-            get {
-                return ResourceManager.GetString("RenameDialog_TitleText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rename folder.
-        /// </summary>
-        public static string RenameDialog_TitleText_Folder {
-            get {
-                return ResourceManager.GetString("RenameDialog_TitleText_Folder", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Target &apos;{0}&apos; is a standard event handler, which cannot be renamed..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 7854ebbda2..196d687fd9 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -159,15 +159,6 @@
   <data name="OK" xml:space="preserve">
     <value>Ok</value>
   </data>
-  <data name="RenameDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Přejmenovat</value>
-  </data>
-  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Prosím specifikujte nový název pro {0} '{1}'.</value>
-  </data>
-  <data name="RenameDialog_TitleText" xml:space="preserve">
-    <value>Přejmenovat identifikátor</value>
-  </data>
   <data name="CodeInspections_Inspecting" xml:space="preserve">
     <value>Kontroluji...</value>
   </data>
@@ -405,9 +396,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="New" xml:space="preserve">
     <value>Nový</value>
   </data>
-  <data name="Rename_DeclarationType" xml:space="preserve">
-    <value>Přejmenovat {0}</value>
-  </data>
   <data name="DeclarationType_UserDefinedType" xml:space="preserve">
     <value>uživatelsky-definovaný typ</value>
   </data>
@@ -481,13 +469,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
     <value>Rubberduck Inspekce Kódu - {0}
 Nalezeno {1} problémů.</value>
   </data>
-  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>Přejmenování na '{0}' je ve střetu s existující deklarací '{1}. Přejmenování '{2}' na '{0}' může vyústit v nekompatibilní kód nebo změnu v jeho logice.
-Jste si jisti, že chcete pokračovat s tímto přejmenováním?</value>
-  </data>
-  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
-    <value>Přesvědčte se, že máte před přejemnováním vybrán pouze 1 control.</value>
-  </data>
   <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
     <value>{0} ({1} problémů)</value>
   </data>
@@ -844,15 +825,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="Preview" xml:space="preserve">
     <value>Náhled</value>
   </data>
-  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>Nebylo možno přejmenovat {0}.</value>
-  </data>
-  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
-    <value>Nebylo možno přejmenovat Člena Rozhraní {0}.</value>
-  </data>
-  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
-    <value>{0} {1} není možno změnit.</value>
-  </data>
   <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
     <value>Závažnosti Inspekce</value>
   </data>
@@ -1361,23 +1333,4 @@ Import přerušen.</value>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Povolit drag and drop v Code Exploreru</value>
   </data>
-  <data name="RenameDialog_Folder" xml:space="preserve">
-    <value>složka</value>
-  </data>
-  <data name="RenameDialog_FolderLabel" xml:space="preserve">
-    <value>Složka:</value>
-  </data>
-  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
-    <value>Plná nová složka:</value>
-  </data>
-  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
-    <value>Ve VBA není možné změnit pouze počáteční písmeno identifikátoru (jazyk ignoruje velká/malá písmena).</value>
-  </data>
-  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
-    <value>Přejmenovat složku</value>
-  </data>
-  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
-    <value>Složka '{0}' již existuje. Přejmenování '{1}' na '{2}' vyústí ve sloučení s existující složkou.
-Chcete pokračovat?</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 2c68c93839..e7c9e056f1 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -174,16 +174,6 @@
   <data name="OK" xml:space="preserve">
     <value>OK</value>
   </data>
-  <data name="RenameDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Umbenennen</value>
-  </data>
-  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Bitte geben Sie einen neuen Namen für {0} '{1}' an.</value>
-    <comment>0: Deklarationstyp; 1: Identifikationsname</comment>
-  </data>
-  <data name="RenameDialog_TitleText" xml:space="preserve">
-    <value>Identifikator umbenennen</value>
-  </data>
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>Sprungmarke</value>
   </data>
@@ -418,13 +408,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="New" xml:space="preserve">
     <value>Neu</value>
   </data>
-  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>Der neue Name '{0}' kollidiert mit dem Namen des existierenden Elements '{1}'. '{2}' in '{0}' umzubenennen kann zu nicht kompilierbarem Code oder einer Änderung der Logik führen.
-Wollen Sie trotzdem fortfahren?</value>
-  </data>
-  <data name="Rename_DeclarationType" xml:space="preserve">
-    <value>{0} Umbenennen</value>
-  </data>
   <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
     <value>{0} Problem</value>
   </data>
@@ -882,21 +865,12 @@ Um den Change Log anzuschauen und Rubberduck manuell zu aktualisieren, klicken S
 
 Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Diese können unter Rubberduck &gt; Einstellungen deaktiviert werden.</value>
   </data>
-  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
-    <value>Bitte stellen Sie zur Umbenennung sicher, dass genau ein Control-Objekt ausgewählt ist.</value>
-  </data>
   <data name="ContextMultipleControlsSelection" xml:space="preserve">
     <value>Mehrere Schaltflächen</value>
   </data>
   <data name="ConfirmRemoveAssignmentWithUnusedDeclaration" xml:space="preserve">
     <value>Variable '{0}' ist zugewiesen. Zuweisung(en) entfernen?</value>
   </data>
-  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
-    <value>Konnte Interfacemitglied {0} nicht umbenennen.</value>
-  </data>
-  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>Konnte {0} nicht umbenennen.</value>
-  </data>
   <data name="Preview" xml:space="preserve">
     <value>Vorschau</value>
   </data>
@@ -906,9 +880,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
     <value>VB Dateien</value>
   </data>
-  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
-    <value>{0} {1} kann nicht geändert werden.</value>
-  </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>Methode '{0}' ist ein EventHandler für die Schaltfläche '{1}'. Nur die Schaltfläche kann umbenannt werden. Stattdessen '{1}' umbennen?</value>
   </data>
@@ -1393,25 +1364,6 @@ Import abgebrochen.</value>
   <data name="ComponentType_UserControl" xml:space="preserve">
     <value>Benutzerkontrollelement</value>
   </data>
-  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
-    <value>Es ist in VBA nicht möglich nur die Groß- und Kleinschreibung eines Namens zu ändern.</value>
-  </data>
-  <data name="RenameDialog_Folder" xml:space="preserve">
-    <value>Ordner</value>
-  </data>
-  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
-    <value>Der Ordner '{0}' existiert bereits. '{1}' in '{2}. umzubenennen wird die Ordner verschmelzen.
-Wollen Sie fortfahren?</value>
-  </data>
-  <data name="RenameDialog_FolderLabel" xml:space="preserve">
-    <value>Ordner:</value>
-  </data>
-  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
-    <value>Kompletter Ordnername:</value>
-  </data>
-  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
-    <value>Ordner umbenennen</value>
-  </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Drag and Drop im Code Explorer aktivieren</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index b61a629727..bb1f3f9fe9 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -174,16 +174,6 @@
   <data name="OK" xml:space="preserve">
     <value>Ok</value>
   </data>
-  <data name="RenameDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Renombrar</value>
-  </data>
-  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Por favor especificar un nuevo nombre para {0} '{1}'.</value>
-    <comment>0: Tipo de declaración; 1: Nombre del identificador</comment>
-  </data>
-  <data name="RenameDialog_TitleText" xml:space="preserve">
-    <value>Renombrar identificador</value>
-  </data>
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>etiqueta de línea</value>
   </data>
@@ -434,17 +424,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="New" xml:space="preserve">
     <value>Nuevo</value>
   </data>
-  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>'{0}' entra en conflicto con el nombre de la declaración existente '{1}'. Renombrar de '{2}' a '{0}' puede resultar en un código no compilable o un cambio en la lógica.
-¿Desea continuar con este renombre?</value>
-    <comment>0: Nuevo nombre 1: Nombre actual</comment>
-  </data>
-  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
-    <value>Asegúrese de que se haya seleccionado exactamente 1 control antes de cambiar el nombre.</value>
-  </data>
-  <data name="Rename_DeclarationType" xml:space="preserve">
-    <value>Renombrar {0}</value>
-  </data>
   <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
     <value>{0} ({1} problemas)</value>
     <comment>{0} = estado; {1} = número</comment>
@@ -940,16 +919,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="Preview" xml:space="preserve">
     <value>Vista previa</value>
   </data>
-  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>No se pudo renombrar {0}.</value>
-  </data>
-  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
-    <value>No se pudo renombrar el miembro de la interfaz {0}.</value>
-  </data>
-  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
-    <value>{0} {1} no se puede cambiar.</value>
-    <comment>0: Tipo de declaración; 1: Nombre del identificador</comment>
-  </data>
   <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
     <value>Severidad de la inspección</value>
   </data>
@@ -1304,9 +1273,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
 
 Importación cancelada.</value>
   </data>
-  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
-    <value>Renombrar carpeta</value>
-  </data>
   <data name="RegexAssistant_SpelledOut_CarriageReturn" xml:space="preserve">
     <value>retorno-carro</value>
   </data>
@@ -1431,22 +1397,6 @@ Importación cancelada.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>Formulario VB</value>
   </data>
-  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
-    <value>No es posible cambiar sólo mayúsculas/minúsculas de un identificador en VBA.</value>
-  </data>
-  <data name="RenameDialog_Folder" xml:space="preserve">
-    <value>carpeta</value>
-  </data>
-  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
-    <value>La carpeta '{0}' ya existe. Cambiar el nombre de '{1}' a '{2}' implica una combinación de carpetas.
-¿Desea continuar?</value>
-  </data>
-  <data name="RenameDialog_FolderLabel" xml:space="preserve">
-    <value>Carpeta:</value>
-  </data>
-  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
-    <value>Nueva carpeta completa:</value>
-  </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Habilitar arrastrar y soltar en Explorador de Código</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 951aa472ce..a64c6edc79 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -174,16 +174,6 @@
   <data name="OK" xml:space="preserve">
     <value>Ok</value>
   </data>
-  <data name="RenameDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Renommer</value>
-  </data>
-  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez spécifier un nouveau nom pour {0} '{1}'.</value>
-    <comment>0: DeclarationType; 1: IdentifierName</comment>
-  </data>
-  <data name="RenameDialog_TitleText" xml:space="preserve">
-    <value>Renommer l'identifiant</value>
-  </data>
   <data name="DeclarationType_Project" xml:space="preserve">
     <value>le projet</value>
   </data>
@@ -438,13 +428,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="New" xml:space="preserve">
     <value>Nouveau</value>
   </data>
-  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>Le nom '{0}' entre en collision avec '{1}', ayant la même portée. Renommer '{2}' à '{0}' peut résulter en code non-compilable ou sournoisement modifier la logique du code appelant.
-Continuer?</value>
-  </data>
-  <data name="Rename_DeclarationType" xml:space="preserve">
-    <value>Renommer {0}</value>
-  </data>
   <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
     <value>{0} ({1} problèmes)</value>
     <comment>{0}=status; {1}=number</comment>
@@ -883,9 +866,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
     <value>Échantillon de code indenté</value>
   </data>
-  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
-    <value>Veuillez sélectionner 1 seul contrôle à renommer.</value>
-  </data>
   <data name="ContextMultipleControlsSelection" xml:space="preserve">
     <value>contrôles multiples</value>
   </data>
@@ -904,9 +884,6 @@ Vous pouvez désactiver cette fonctionnalité dans le menu Rubberduck &gt; Param
   <data name="WindowSettings_StartupVisibilityHeader" xml:space="preserve">
     <value>Visibilité au démarrage</value>
   </data>
-  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
-    <value>Impossible de renommer le membre '{0}' de l'interface.</value>
-  </data>
   <data name="EmptyUIRefreshMessage" xml:space="preserve">
     <value>pour analyser et traiter
 les projets dans le VBE.</value>
@@ -914,9 +891,6 @@ les projets dans le VBE.</value>
   <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
     <value>Fichiers VB</value>
   </data>
-  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
-    <value>{0}{1} ne peut être renommé.</value>
-  </data>
   <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
     <value>La méthode {0} répond aux événements du contrôle '{1}'. Renommer '{1}'?</value>
   </data>
@@ -941,9 +915,6 @@ les projets dans le VBE.</value>
   <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
     <value>Fonctionnalités expérimentales:</value>
   </data>
-  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>Impossible de renommer {0}.</value>
-  </data>
   <data name="Preview" xml:space="preserve">
     <value>Aperçu</value>
   </data>
@@ -1360,23 +1331,4 @@ Mise à jour annulée.</value>
 
 Échec de l'importation.</value>
   </data>
-  <data name="RenameDialog_Folder" xml:space="preserve">
-    <value>dossier</value>
-  </data>
-  <data name="RenameDialog_FolderLabel" xml:space="preserve">
-    <value>Dossier:</value>
-  </data>
-  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
-    <value>Nouveau dossier (chemin complet):</value>
-  </data>
-  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
-    <value>Le dossier '{0}' existe déjà. Renommer '{1}' à '{2}' fusionnera les deux dossiers.
-Procéder?</value>
-  </data>
-  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
-    <value>Impossible de modifier la casse d'un identifiant VBA (le language est insensible à la casse).</value>
-  </data>
-  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
-    <value>Renommer le dossier</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 1a48206e98..ede6ae7c1d 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -177,16 +177,6 @@
   <data name="SaveAndClose" xml:space="preserve">
     <value>Save &amp; Close</value>
   </data>
-  <data name="RenameDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Rename</value>
-  </data>
-  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Please specify new name for {0} '{1}'.</value>
-    <comment>0: DeclarationType; 1: IdentifierName</comment>
-  </data>
-  <data name="RenameDialog_TitleText" xml:space="preserve">
-    <value>Rename identifier</value>
-  </data>
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>line label</value>
   </data>
@@ -437,17 +427,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="New" xml:space="preserve">
     <value>New</value>
   </data>
-  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>'{0}' conflicts with the name of the existing declaration '{1}'. Renaming '{2}' to '{0}' may result in uncompilable  code or a change in logic.
-Do you want to proceed with this rename?</value>
-    <comment>{0}: NewName {1}: conflicting declaration {2}: CurrentName</comment>
-  </data>
-  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
-    <value>Please ensure that exactly 1 control is selected before renaming.</value>
-  </data>
-  <data name="Rename_DeclarationType" xml:space="preserve">
-    <value>Rename {0}</value>
-  </data>
   <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
     <value>{0} ({1} issues)</value>
     <comment>{0}=status; {1}=number</comment>
@@ -944,16 +923,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="Preview" xml:space="preserve">
     <value>Preview</value>
   </data>
-  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>Could not rename {0}.</value>
-  </data>
-  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
-    <value>Could not rename Interface Member {0}.</value>
-  </data>
-  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
-    <value>{0} {1} cannot be changed.</value>
-    <comment>0: DeclarationType; 1: IdentifierName</comment>
-  </data>
   <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
     <value>Inspection Severities</value>
   </data>
@@ -1551,26 +1520,6 @@ Import aborted.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>VB Form</value>
   </data>
-  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
-    <value>It is not possible to change only the case of an identifier in VBA (language is case-insensitive).</value>
-  </data>
-  <data name="RenameDialog_Folder" xml:space="preserve">
-    <value>folder</value>
-  </data>
-  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
-    <value>The folder '{0}' already exists. Renaming '{1}' to '{2}' will lead to a merge with the existing folder.
-Do you want to proceed?</value>
-    <comment>{0} new full folder name; {1} folder part to rename; {2} new folder part name</comment>
-  </data>
-  <data name="RenameDialog_FolderLabel" xml:space="preserve">
-    <value>Folder:</value>
-  </data>
-  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
-    <value>Full new folder:</value>
-  </data>
-  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
-    <value>Rename folder</value>
-  </data>
   <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
     <value>Enable drag and drop in Code Explorer</value>
   </data>

From aad348c43fbfb2fb18bc68cd32613f06fb5a40c9 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 12:23:26 -0800
Subject: [PATCH 48/64] Migrate RenameFailure_ & RenamePresenter_ resources

---
 .../Notifiers/RenameFailedNotifier.cs         |  6 +--
 .../UI/Refactorings/Rename/RenamePresenter.cs |  7 ++-
 .../RefactoringsUI.Designer.cs                | 54 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 18 +++++++
 .../RefactoringsUI.de.resx                    | 18 +++++++
 .../RefactoringsUI.es.resx                    | 18 +++++++
 .../RefactoringsUI.fr.resx                    | 18 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 24 +++++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 54 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 18 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 19 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 21 --------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 19 -------
 Rubberduck.Resources/RubberduckUI.resx        | 24 ---------
 14 files changed, 156 insertions(+), 162 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs
index 61d3246a13..619a49fe5e 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/RenameFailedNotifier.cs
@@ -19,12 +19,12 @@ protected override string Message(RefactoringException exception)
             {
                 case CodeModuleNotFoundException codeModuleNotFound:
                     Logger.Warn(codeModuleNotFound);
-                    return string.Format(Resources.RubberduckUI.RenameFailure_TargetModuleWithoutCodeModule, codeModuleNotFound.TargetDeclaration.QualifiedModuleName);
+                    return string.Format(RefactoringsUI.RenameFailure_TargetModuleWithoutCodeModule, codeModuleNotFound.TargetDeclaration.QualifiedModuleName);
                 case TargetControlNotFoundException controlNotFound:
                     Logger.Warn(controlNotFound);
-                    return string.Format(Resources.RubberduckUI.RenameFailure_TargetControlNotFound, controlNotFound.TargetDeclaration.QualifiedName);
+                    return string.Format(RefactoringsUI.RenameFailure_TargetControlNotFound, controlNotFound.TargetDeclaration.QualifiedName);
                 case TargetDeclarationIsStandardEventHandlerException standardHandler:
-                    return string.Format(Resources.RubberduckUI.RenameFailure_StandardEventHandler, standardHandler.TargetDeclaration.QualifiedName);
+                    return string.Format(RefactoringsUI.RenameFailure_StandardEventHandler, standardHandler.TargetDeclaration.QualifiedName);
                 default:
                     return base.Message(exception);
             }
diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs b/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
index b6010df8a7..97c7b34769 100644
--- a/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Rename;
-using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Refactorings.Rename
 {
@@ -58,19 +57,19 @@ private bool UserConfirmsNewTarget(RenameModel model)
 
             if (model.IsControlEventHandlerRename)
             {
-                var message = string.Format(RubberduckUI.RenamePresenter_TargetIsControlEventHandler, initialTarget.IdentifierName, newTarget.IdentifierName);
+                var message = string.Format(RefactoringsUI.RenamePresenter_TargetIsControlEventHandler, initialTarget.IdentifierName, newTarget.IdentifierName);
                 return UserConfirmsRenameOfResolvedTarget(message);
             }
 
             if (model.IsUserEventHandlerRename)
             {
-                var message = string.Format(RubberduckUI.RenamePresenter_TargetIsEventHandlerImplementation, initialTarget.IdentifierName, newTarget.ComponentName, newTarget.IdentifierName);
+                var message = string.Format(RefactoringsUI.RenamePresenter_TargetIsEventHandlerImplementation, initialTarget.IdentifierName, newTarget.ComponentName, newTarget.IdentifierName);
                 return UserConfirmsRenameOfResolvedTarget(message);
             }
 
             if (model.IsInterfaceMemberRename)
             {
-                var message = string.Format(RubberduckUI.RenamePresenter_TargetIsInterfaceMemberImplementation, initialTarget.IdentifierName, newTarget.ComponentName, newTarget.IdentifierName);
+                var message = string.Format(RefactoringsUI.RenamePresenter_TargetIsInterfaceMemberImplementation, initialTarget.IdentifierName, newTarget.ComponentName, newTarget.IdentifierName);
                 return UserConfirmsRenameOfResolvedTarget(message);
             }
 
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 7b5d49b804..b16f2f52aa 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -1227,5 +1227,59 @@ public static string RenameDialog_TitleText_Folder {
                 return ResourceManager.GetString("RenameDialog_TitleText_Folder", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Target &apos;{0}&apos; is a standard event handler, which cannot be renamed..
+        /// </summary>
+        public static string RenameFailure_StandardEventHandler {
+            get {
+                return ResourceManager.GetString("RenameFailure_StandardEventHandler", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Target control &apos;{0}&apos; not found..
+        /// </summary>
+        public static string RenameFailure_TargetControlNotFound {
+            get {
+                return ResourceManager.GetString("RenameFailure_TargetControlNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No code module found for the target module &apos;{0}&apos;..
+        /// </summary>
+        public static string RenameFailure_TargetModuleWithoutCodeModule {
+            get {
+                return ResourceManager.GetString("RenameFailure_TargetModuleWithoutCodeModule", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Method &apos;{0}&apos; is an EventHandler for control &apos;{1}&apos;.  Only the control can be renamed.  Rename &apos;{1}&apos; instead?.
+        /// </summary>
+        public static string RenamePresenter_TargetIsControlEventHandler {
+            get {
+                return ResourceManager.GetString("RenamePresenter_TargetIsControlEventHandler", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Method &apos;{0}&apos; is an implementation of event &apos;{1}.{2}&apos;.  Rename event &apos;{2}&apos; instead?.
+        /// </summary>
+        public static string RenamePresenter_TargetIsEventHandlerImplementation {
+            get {
+                return ResourceManager.GetString("RenamePresenter_TargetIsEventHandlerImplementation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Method &apos;{0}&apos; implements &apos;{1}.{2}&apos;. Rename the interface member?.
+        /// </summary>
+        public static string RenamePresenter_TargetIsInterfaceMemberImplementation {
+            get {
+                return ResourceManager.GetString("RenamePresenter_TargetIsInterfaceMemberImplementation", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 185d0a7762..c759247a75 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -505,4 +505,22 @@ Chcete pokračovat?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Přejmenovat složku</value>
   </data>
+  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
+    <value>Cíl '{0}' je standardní ovladač událostí, který nemůže být přejmenován.</value>
+  </data>
+  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
+    <value>Cílový control '{0}' nebyl nalezen.</value>
+  </data>
+  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
+    <value>Pro cílový modul '{0}' nebyl nalezen žádný kódový modul.</value>
+  </data>
+  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
+    <value>Metoda '{0}' je EventHandler pro ovládací prvek '{1}'. Přejmenovat lze pouze ovládací prvek. Místo toho přejmenovat '{1}'?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
+    <value>Metoda '{0}' je implementací události '{1}.{2}'. Místo toho přejmenovat událost '{2}'?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Metoda '{0}' implementuje '{1}.{2}'. Přejmenovat člena rozhraní?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 0e394e4922..6c7fba8215 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -511,4 +511,22 @@ Wollen Sie fortfahren?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Ordner umbenennen</value>
   </data>
+  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
+    <value>Das Ziel '{0}' ist ein Standardeventhandler, welcher nicht umbenannt werden kann.</value>
+  </data>
+  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
+    <value>Es wurde das Zielkontrollelement '{0}' nicht gefunden.</value>
+  </data>
+  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
+    <value>Es wurde kein Codemodul für das Zielmodul '{0}' gefunden.</value>
+  </data>
+  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
+    <value>Methode '{0}' ist ein EventHandler für die Schaltfläche '{1}'. Nur die Schaltfläche kann umbenannt werden. Stattdessen '{1}' umbennen?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
+    <value>Die Methode '{0}' ist eine Implementierung des Ereignisses '{1}.{2}'. Stattdessen Ereignis '{2}' umbenennen?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Methode '{0}' implementiert '{1}.{2}'. Wollen Sie den Interfacemember umbenennen?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index f84ee7f7ca..382d8c653f 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -505,4 +505,22 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renombrar carpeta</value>
   </data>
+  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
+    <value>El destino '{0}' es un manejador de eventos estándar, el cual no puede ser renombrado.</value>
+  </data>
+  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
+    <value>No se encontró el control destino '{0}'.</value>
+  </data>
+  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
+    <value>No se encontró modulo para el módulo destino '{0}'.</value>
+  </data>
+  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
+    <value>El método '{0}' es un EventHandler para el control '{1}'. Solo el control puede ser renombrado. ¿Renombrar '{1}' en su lugar?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
+    <value>El método '{0}' es una implementación del evento '{1}. {2}'. ¿Renombrar el evento '{2}' en su lugar?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>El método '{0}' implementa '{1}. {2}'. ¿Renombrar el miembro de la interfaz?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index da6f44cfc4..7ed13c9dec 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -487,4 +487,22 @@ Procéder?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renommer le dossier</value>
   </data>
+  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
+    <value>La cible '{0}' est une procédure gestionnaire d'événements, impossible de renommer cette pocédure sans briser quelque chose!</value>
+  </data>
+  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
+    <value>Le contrôle ciblé '{0}' est introuvable.</value>
+  </data>
+  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
+    <value>Le module ciblé '{0}' n'est plus trouvable!</value>
+  </data>
+  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
+    <value>La méthode {0} répond aux événements du contrôle '{1}'. Renommer '{1}'?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
+    <value>La méthode '{0}' répond à l'événement '{1}.{2}'. Renommer l'événement '{2}'?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier l'interface? (cette modification serait propagée à toutes les implémentations)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 3d09f23964..5513f203b6 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -527,4 +527,28 @@ Do you want to proceed?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Rename folder</value>
   </data>
+  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
+    <value>Target '{0}' is a standard event handler, which cannot be renamed.</value>
+    <comment>{0}: name of target</comment>
+  </data>
+  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
+    <value>Target control '{0}' not found.</value>
+    <comment>{0}: name of control</comment>
+  </data>
+  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
+    <value>No code module found for the target module '{0}'.</value>
+    <comment>{0}: name of module</comment>
+  </data>
+  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
+    <value>Method '{0}' is an EventHandler for control '{1}'.  Only the control can be renamed.  Rename '{1}' instead?</value>
+    <comment>0: Selected target Identifier; 1: Control Name</comment>
+  </data>
+  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
+    <value>Method '{0}' is an implementation of event '{1}.{2}'.  Rename event '{2}' instead?</value>
+    <comment>0: Selected target Identifier; 1: Event Parent; 2: Event name</comment>
+  </data>
+  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Method '{0}' implements '{1}.{2}'. Rename the interface member?</value>
+    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index c057c4ae6a..af6e454d2f 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3317,60 +3317,6 @@ public static string Rename {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Target &apos;{0}&apos; is a standard event handler, which cannot be renamed..
-        /// </summary>
-        public static string RenameFailure_StandardEventHandler {
-            get {
-                return ResourceManager.GetString("RenameFailure_StandardEventHandler", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Target control &apos;{0}&apos; not found..
-        /// </summary>
-        public static string RenameFailure_TargetControlNotFound {
-            get {
-                return ResourceManager.GetString("RenameFailure_TargetControlNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No code module found for the target module &apos;{0}&apos;..
-        /// </summary>
-        public static string RenameFailure_TargetModuleWithoutCodeModule {
-            get {
-                return ResourceManager.GetString("RenameFailure_TargetModuleWithoutCodeModule", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Method &apos;{0}&apos; is an EventHandler for control &apos;{1}&apos;.  Only the control can be renamed.  Rename &apos;{1}&apos; instead?.
-        /// </summary>
-        public static string RenamePresenter_TargetIsControlEventHandler {
-            get {
-                return ResourceManager.GetString("RenamePresenter_TargetIsControlEventHandler", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Method &apos;{0}&apos; is an implementation of event &apos;{1}.{2}&apos;.  Rename event &apos;{2}&apos; instead?.
-        /// </summary>
-        public static string RenamePresenter_TargetIsEventHandlerImplementation {
-            get {
-                return ResourceManager.GetString("RenamePresenter_TargetIsEventHandlerImplementation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Method &apos;{0}&apos; implements &apos;{1}.{2}&apos;. Rename the interface member?.
-        /// </summary>
-        public static string RenamePresenter_TargetIsInterfaceMemberImplementation {
-            get {
-                return ResourceManager.GetString("RenamePresenter_TargetIsInterfaceMemberImplementation", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Rubberduck - Reorder Parameters.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 196d687fd9..f2018f053b 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -387,9 +387,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Navigation" xml:space="preserve">
     <value>Navigace</value>
   </data>
-  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Metoda '{0}' implementuje '{1}.{2}'. Přejmenovat člena rozhraní?</value>
-  </data>
   <data name="OK_AllCaps" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -828,12 +825,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
     <value>Závažnosti Inspekce</value>
   </data>
-  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
-    <value>Metoda '{0}' je EventHandler pro ovládací prvek '{1}'. Přejmenovat lze pouze ovládací prvek. Místo toho přejmenovat '{1}'?</value>
-  </data>
-  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
-    <value>Metoda '{0}' je implementací události '{1}.{2}'. Místo toho přejmenovat událost '{2}'?</value>
-  </data>
   <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
     <value>Toto nastavení povolte jen pokud více, to děláte. Povolením a/nebo užíváním věcí z této sekce může skončit nečekanými obtížemi, poruchami kódu a nenávratnou ztrátou dat.</value>
   </data>
@@ -1186,15 +1177,6 @@ End Enum</value>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filtr</value>
   </data>
-  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
-    <value>Cílový control '{0}' nebyl nalezen.</value>
-  </data>
-  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>Pro cílový modul '{0}' nebyl nalezen žádný kódový modul.</value>
-  </data>
-  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>Cíl '{0}' je standardní ovladač událostí, který nemůže být přejmenován.</value>
-  </data>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Uložit a Zavřít</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e7c9e056f1..8de92b215a 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -398,10 +398,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Navigation" xml:space="preserve">
     <value>Navigation</value>
   </data>
-  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Methode '{0}' implementiert '{1}.{2}'. Wollen Sie den Interfacemember umbenennen?</value>
-    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
-  </data>
   <data name="OK_AllCaps" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -880,9 +876,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
     <value>VB Dateien</value>
   </data>
-  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
-    <value>Methode '{0}' ist ein EventHandler für die Schaltfläche '{1}'. Nur die Schaltfläche kann umbenannt werden. Stattdessen '{1}' umbennen?</value>
-  </data>
   <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
     <value>Alle Dateien</value>
   </data>
@@ -895,9 +888,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
     <value>Auf eigene Verantwortung und Gefahr aktivieren. Aktivierung und / oder Verwendung von Funktionalitäten in dieser Sektion kann zu unvorhergesehenen Fehlern und unwiederbringlichem Datenverlust führen.</value>
   </data>
-  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
-    <value>Die Methode '{0}' ist eine Implementierung des Ereignisses '{1}.{2}'. Stattdessen Ereignis '{2}' umbenennen?</value>
-  </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Einen Ordner als Ziel für den Quellcode von {0} wählen:</value>
   </data>
@@ -1205,15 +1195,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
-  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>Es wurde kein Codemodul für das Zielmodul '{0}' gefunden.</value>
-  </data>
-  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
-    <value>Es wurde das Zielkontrollelement '{0}' nicht gefunden.</value>
-  </data>
-  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>Das Ziel '{0}' ist ein Standardeventhandler, welcher nicht umbenannt werden kann.</value>
-  </data>
   <data name="GroupingGrid_Filter" xml:space="preserve">
     <value>Filter</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index bb1f3f9fe9..aeeb6e4722 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -414,10 +414,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
 {1} problemas encontrados.</value>
     <comment>{0} = marca de tiempo; {1} = número</comment>
   </data>
-  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>El método '{0}' implementa '{1}. {2}'. ¿Renombrar el miembro de la interfaz?</value>
-    <comment>0: objetivo seleccionado; 1: nombre de la interfaz; 2: nombre del miembro de la interfaz</comment>
-  </data>
   <data name="OK_AllCaps" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -922,14 +918,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
     <value>Severidad de la inspección</value>
   </data>
-  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
-    <value>El método '{0}' es un EventHandler para el control '{1}'. Solo el control puede ser renombrado. ¿Renombrar '{1}' en su lugar?</value>
-    <comment>0: identificador de objetivo seleccionado; 1: Nombre de control</comment>
-  </data>
-  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
-    <value>El método '{0}' es una implementación del evento '{1}. {2}'. ¿Renombrar el evento '{2}' en su lugar?</value>
-    <comment>0: identificador de objetivo seleccionado; 1: Evento Padre; 2: nombre del evento</comment>
-  </data>
   <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
     <value>Solo habilítar si sabe lo que está haciendo. La habilitación y/o el uso de las funciones de esta sección pueden hacer que las cosas se rompan de forma inesperada e irrevocable.</value>
   </data>
@@ -1259,15 +1247,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="SaveAndClose" xml:space="preserve">
     <value>Guardar y Cerrar</value>
   </data>
-  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>No se encontró modulo para el módulo destino '{0}'.</value>
-  </data>
-  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
-    <value>No se encontró el control destino '{0}'.</value>
-  </data>
-  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>El destino '{0}' es un manejador de eventos estándar, el cual no puede ser renombrado.</value>
-  </data>
   <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
     <value>Para el archivo '{0}', faltan los archivos binarios '{1}' y el componente destino '{2}' no existía.
 
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index a64c6edc79..3188c31c32 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -418,10 +418,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Next" xml:space="preserve">
     <value>Suivant</value>
   </data>
-  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier l'interface? (cette modification serait propagée à toutes les implémentations)</value>
-    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
-  </data>
   <data name="OK_AllCaps" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -891,9 +887,6 @@ les projets dans le VBE.</value>
   <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
     <value>Fichiers VB</value>
   </data>
-  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
-    <value>La méthode {0} répond aux événements du contrôle '{1}'. Renommer '{1}'?</value>
-  </data>
   <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
     <value>Tous les fichiers</value>
   </data>
@@ -906,9 +899,6 @@ les projets dans le VBE.</value>
   <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
     <value>Ces fonctionnalités sont présentement en phase de tests et/ou diagnostics. Activer ces fonctionnalités peut produire des erreurs inattendues qui peuvent résulter en pertes de données.</value>
   </data>
-  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
-    <value>La méthode '{0}' répond à l'événement '{1}.{2}'. Renommer l'événement '{2}'?</value>
-  </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Veuillez sélectionner un dossier où exporter les fichier source de {0}:</value>
   </data>
@@ -1240,12 +1230,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="VersionCheck_BuildType_Release" xml:space="preserve">
     <value>officielle</value>
   </data>
-  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>Le module ciblé '{0}' n'est plus trouvable!</value>
-  </data>
-  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>La cible '{0}' est une procédure gestionnaire d'événements, impossible de renommer cette pocédure sans briser quelque chose!</value>
-  </data>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>Indiquer les espaces dans la description</value>
   </data>
@@ -1282,9 +1266,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>L'identifiant '{0}' chatouillera l'inspection suggérant d'utiliser un nom conférant signification et importance.</value>
   </data>
-  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
-    <value>Le contrôle ciblé '{0}' est introuvable.</value>
-  </data>
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
     <value>Rubberduck - Résultats des tests : {0}</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index ede6ae7c1d..b528321258 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -417,10 +417,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
 {1} issues found.</value>
     <comment>{0}=timestamp; {1}=number</comment>
   </data>
-  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Method '{0}' implements '{1}.{2}'. Rename the interface member?</value>
-    <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
-  </data>
   <data name="OK_AllCaps" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -926,14 +922,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
     <value>Inspection Severities</value>
   </data>
-  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
-    <value>Method '{0}' is an EventHandler for control '{1}'.  Only the control can be renamed.  Rename '{1}' instead?</value>
-    <comment>0: Selected target Identifier; 1: Control Name</comment>
-  </data>
-  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
-    <value>Method '{0}' is an implementation of event '{1}.{2}'.  Rename event '{2}' instead?</value>
-    <comment>0: Selected target Identifier; 1: Event Parent; 2: Event name</comment>
-  </data>
   <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
     <value>Only enable these if you know what you're doing. Enabling and/or using features from this section may result in things breaking unexpectedly and irrevocable data loss.</value>
   </data>
@@ -1363,18 +1351,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="References_BrowseButtonText" xml:space="preserve">
     <value>Browse...</value>
   </data>
-  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>No code module found for the target module '{0}'.</value>
-    <comment>{0}: name of module</comment>
-  </data>
-  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
-    <value>Target control '{0}' not found.</value>
-    <comment>{0}: name of control</comment>
-  </data>
-  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>Target '{0}' is a standard event handler, which cannot be renamed.</value>
-    <comment>{0}: name of target</comment>
-  </data>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>Spell out whitespace in the description</value>
   </data>

From 135eb413b554d32862035f9d37752af01a3eb7fb Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 12:43:02 -0800
Subject: [PATCH 49/64] Migrate RemovePresenter_ resource

---
 .../RemoveParameters/RemoveParametersPresenter.cs        | 2 +-
 Rubberduck.Refactorings/RefactoringsUI.Designer.cs       | 9 +++++++++
 Rubberduck.Refactorings/RefactoringsUI.cs.resx           | 3 +++
 Rubberduck.Refactorings/RefactoringsUI.de.resx           | 3 +++
 Rubberduck.Refactorings/RefactoringsUI.es.resx           | 3 +++
 Rubberduck.Refactorings/RefactoringsUI.fr.resx           | 3 +++
 Rubberduck.Refactorings/RefactoringsUI.resx              | 4 ++++
 Rubberduck.Resources/RubberduckUI.Designer.cs            | 9 ---------
 Rubberduck.Resources/RubberduckUI.cs.resx                | 3 ---
 Rubberduck.Resources/RubberduckUI.de.resx                | 4 ----
 Rubberduck.Resources/RubberduckUI.es.resx                | 4 ----
 Rubberduck.Resources/RubberduckUI.fr.resx                | 4 ----
 Rubberduck.Resources/RubberduckUI.resx                   | 4 ----
 13 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
index a806791564..e062e38e07 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -34,7 +34,7 @@ public override RemoveParametersModel Show()
             switch (Model.Parameters.Count)
             {
                 case 0:
-                    var message = string.Format(RubberduckUI.RemovePresenter_NoParametersError, Model.TargetDeclaration.IdentifierName);
+                    var message = string.Format(RefactoringsUI.RemovePresenter_NoParametersError, Model.TargetDeclaration.IdentifierName);
                     _messageBox.NotifyWarn(message, RefactoringsUI.RemoveParamsDialog_TitleText);
                     return null;
                 case 1:
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index b16f2f52aa..55a08a9600 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -1091,6 +1091,15 @@ public static string RemoveParamsDialog_TitleText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to No parameters in method &apos;{0}&apos;..
+        /// </summary>
+        public static string RemovePresenter_NoParametersError {
+            get {
+                return ResourceManager.GetString("RemovePresenter_NoParametersError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rename {0}.
         /// </summary>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index c759247a75..d735583d54 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -523,4 +523,7 @@ Chcete pokračovat?</value>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
     <value>Metoda '{0}' implementuje '{1}.{2}'. Přejmenovat člena rozhraní?</value>
   </data>
+  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
+    <value>V metodě '{0}' nejsou žádné parametry.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 6c7fba8215..affa80ab93 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -529,4 +529,7 @@ Wollen Sie fortfahren?</value>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
     <value>Methode '{0}' implementiert '{1}.{2}'. Wollen Sie den Interfacemember umbenennen?</value>
   </data>
+  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
+    <value>Keine Parameter in Methode '{0}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index 382d8c653f..ff8c5bf99a 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -523,4 +523,7 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
     <value>El método '{0}' implementa '{1}. {2}'. ¿Renombrar el miembro de la interfaz?</value>
   </data>
+  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
+    <value>No hay parámetros en el método '{0}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 7ed13c9dec..8e8b895039 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -505,4 +505,7 @@ Procéder?</value>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
     <value>La méthode '{0}' implémente '{1}.{2}'. Modifier l'interface? (cette modification serait propagée à toutes les implémentations)</value>
   </data>
+  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
+    <value>La méthode '{0}' n'a pas de paramètres.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 5513f203b6..a7a89d9155 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -551,4 +551,8 @@ Do you want to proceed?</value>
     <value>Method '{0}' implements '{1}.{2}'. Rename the interface member?</value>
     <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
   </data>
+  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
+    <value>No parameters in method '{0}'.</value>
+    <comment>0: Selected target</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index af6e454d2f..d6e0cbd901 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3299,15 +3299,6 @@ public static string Remove {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to No parameters in method &apos;{0}&apos;..
-        /// </summary>
-        public static string RemovePresenter_NoParametersError {
-            get {
-                return ResourceManager.GetString("RemovePresenter_NoParametersError", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Rename.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index f2018f053b..2be6e46093 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -294,9 +294,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
     <value>Parametr ParamArray musí být specifikován naposled.</value>
   </data>
-  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
-    <value>V metodě '{0}' nejsou žádné parametry.</value>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Všechny reference: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 8de92b215a..17217822e4 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -214,10 +214,6 @@
   <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
     <value>ParamArray-Parameter muss als letztes spezifiziert werden.</value>
   </data>
-  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
-    <value>Keine Parameter in Methode '{0}'.</value>
-    <comment>0: Gewähltes Ziel</comment>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Alle Referenzen: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index aeeb6e4722..e3fd0f06d8 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -214,10 +214,6 @@
   <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
     <value>El parámetro ParamArray debe especificarse al final.</value>
   </data>
-  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
-    <value>No hay parámetros en el método '{0}'.</value>
-    <comment>0: objetivo seleccionado</comment>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Todas las referencias: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 3188c31c32..63291d8c66 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -217,10 +217,6 @@
   <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
     <value>Un paramètre ParamArray doit être spécifié en dernier.</value>
   </data>
-  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
-    <value>La méthode '{0}' n'a pas de paramètres.</value>
-    <comment>0: Selected target</comment>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Références: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index b528321258..0b7b70bb41 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -217,10 +217,6 @@
   <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
     <value>ParamArray parameter must be specified last.</value>
   </data>
-  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
-    <value>No parameters in method '{0}'.</value>
-    <comment>0: Selected target</comment>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>All references: '{0}'</value>
   </data>

From a6b20984a8368790981f7ac6461f32b749648d06 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 17:13:10 -0800
Subject: [PATCH 50/64] Migrate ReorderParamsDialog_ resources

---
 .../ReorderParametersFailedNotifier.cs        |  2 +-
 .../ReorderParametersPresenter.cs             |  6 +--
 .../ReorderParametersView.xaml                |  8 ++--
 .../RefactoringsUI.Designer.cs                | 45 +++++++++++++++++++
 .../RefactoringsUI.cs.resx                    | 15 +++++++
 .../RefactoringsUI.de.resx                    | 15 +++++++
 .../RefactoringsUI.es.resx                    | 15 +++++++
 .../RefactoringsUI.fr.resx                    | 15 +++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   | 15 +++++++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 45 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.resx        | 15 -------
 15 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs
index 3b0c2bfe2b..5193c9275f 100644
--- a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs
+++ b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/ReorderParametersFailedNotifier.cs
@@ -11,7 +11,7 @@ public ReorderParametersFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => Resources.RubberduckUI.ReorderParamsDialog_Caption;
+        protected override string Caption => RefactoringsUI.ReorderParamsDialog_Caption;
 
         protected override string Message(RefactoringException exception)
         {
diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
index c7d159060e..865fe1fa08 100644
--- a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -9,7 +9,7 @@ namespace Rubberduck.UI.Refactorings.ReorderParameters
     public class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel>, IReorderParametersPresenter
     {
         private static readonly DialogData DialogData =
-            DialogData.Create(RubberduckUI.ReorderParamsDialog_Caption, 395, 494);
+            DialogData.Create(RefactoringsUI.ReorderParamsDialog_Caption, 395, 494);
         private readonly IMessageBox _messageBox;
 
         public ReorderParametersPresenter(ReorderParametersModel model,
@@ -35,7 +35,7 @@ public override ReorderParametersModel Show()
             if (Model.Parameters.Count < 2)
             {
                 var message = string.Format(RubberduckUI.ReorderPresenter_LessThanTwoParametersError, Model.TargetDeclaration.IdentifierName);
-                _messageBox.NotifyWarn(message, RubberduckUI.ReorderParamsDialog_TitleText);
+                _messageBox.NotifyWarn(message, RefactoringsUI.ReorderParamsDialog_TitleText);
                 return null;
             }
 
@@ -51,7 +51,7 @@ private bool UserConfirmsInterfaceTarget(ReorderParametersModel model)
 
         private bool UserConfirmsNewTarget(string message)
         {
-            return _messageBox.ConfirmYesNo(message, RubberduckUI.ReorderParamsDialog_TitleText);
+            return _messageBox.ConfirmYesNo(message, RefactoringsUI.ReorderParamsDialog_TitleText);
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml
index d1f6240145..8f41aad5cf 100644
--- a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml
@@ -27,8 +27,8 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Background="{StaticResource BackgroundLightBrush}">
-            <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_TitleText}" FontWeight="Bold" />
-            <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_InstructionsLabelText}"
+            <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ReorderParamsDialog_TitleText}" FontWeight="Bold" />
+            <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ReorderParamsDialog_InstructionsLabelText}"
                        Margin="5,0" />
         </StackPanel>
         <Grid Grid.Row="1" Grid.IsSharedSizeScope="True">
@@ -74,7 +74,7 @@
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
                         <Image Source="{StaticResource MoveUpImage}" />
-                        <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_MoveUpButtonText}" />
+                        <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ReorderParamsDialog_MoveUpButtonText}" />
                     </StackPanel>
                 </Button>
                 <Button Grid.Row="1"
@@ -98,7 +98,7 @@
                     </Button.Style>
                     <StackPanel Orientation="Horizontal">
                         <Image Source="{StaticResource MoveDownImage}" />
-                        <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_MoveDownButtonText}" />
+                        <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ReorderParamsDialog_MoveDownButtonText}" />
                     </StackPanel>
                 </Button>
             </Grid>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 55a08a9600..9e2fb21d9a 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -1290,5 +1290,50 @@ public static string RenamePresenter_TargetIsInterfaceMemberImplementation {
                 return ResourceManager.GetString("RenamePresenter_TargetIsInterfaceMemberImplementation", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck - Reorder Parameters.
+        /// </summary>
+        public static string ReorderParamsDialog_Caption {
+            get {
+                return ResourceManager.GetString("ReorderParamsDialog_Caption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select a parameter and drag it or use buttons to move it up or down..
+        /// </summary>
+        public static string ReorderParamsDialog_InstructionsLabelText {
+            get {
+                return ResourceManager.GetString("ReorderParamsDialog_InstructionsLabelText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move down.
+        /// </summary>
+        public static string ReorderParamsDialog_MoveDownButtonText {
+            get {
+                return ResourceManager.GetString("ReorderParamsDialog_MoveDownButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move up.
+        /// </summary>
+        public static string ReorderParamsDialog_MoveUpButtonText {
+            get {
+                return ResourceManager.GetString("ReorderParamsDialog_MoveUpButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reorder parameters.
+        /// </summary>
+        public static string ReorderParamsDialog_TitleText {
+            get {
+                return ResourceManager.GetString("ReorderParamsDialog_TitleText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index d735583d54..dc97a75bcd 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -526,4 +526,19 @@ Chcete pokračovat?</value>
   <data name="RemovePresenter_NoParametersError" xml:space="preserve">
     <value>V metodě '{0}' nejsou žádné parametry.</value>
   </data>
+  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
+    <value>Přesunout výše</value>
+  </data>
+  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Přeuspořádat parametry</value>
+  </data>
+  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Zvol parametr a za použití táhnutí myši nebo pomocí tlačítek ho přesuň výše nebo níže.</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
+    <value>Přesunout níže</value>
+  </data>
+  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
+    <value>Přeuspořádat parametry</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index affa80ab93..69f0e4abe9 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -532,4 +532,19 @@ Wollen Sie fortfahren?</value>
   <data name="RemovePresenter_NoParametersError" xml:space="preserve">
     <value>Keine Parameter in Methode '{0}'.</value>
   </data>
+  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
+    <value>Nach oben</value>
+  </data>
+  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Parameter umordnen</value>
+  </data>
+  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Wählen sie einen Parameter und bewegen Sie ihn mit der Maus oder den Schaltflächen nach oben oder unten.</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
+    <value>Nach unten</value>
+  </data>
+  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
+    <value>Parameter umordnen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index ff8c5bf99a..f296237e2c 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -526,4 +526,19 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="RemovePresenter_NoParametersError" xml:space="preserve">
     <value>No hay parámetros en el método '{0}'.</value>
   </data>
+  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
+    <value>Mover hacia arriba</value>
+  </data>
+  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Reordenar Parámetros</value>
+  </data>
+  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Seleccione un parámetro y arrástrelo o use los botones para moverlo hacia arriba o hacia abajo.</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
+    <value>Mover hacia abajo</value>
+  </data>
+  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
+    <value>Reordenar parametros</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 8e8b895039..e0ae9ea3df 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -508,4 +508,19 @@ Procéder?</value>
   <data name="RemovePresenter_NoParametersError" xml:space="preserve">
     <value>La méthode '{0}' n'a pas de paramètres.</value>
   </data>
+  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
+    <value>Déplacer vers le haut</value>
+  </data>
+  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Modifier l'ordre des paramètres</value>
+  </data>
+  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Veuillez sélectionner un paramètre et glisser-déposer, ou utilisez les boutons pour modifier l'ordre.</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
+    <value>Déplacer vers le bas</value>
+  </data>
+  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
+    <value>Modifier l'ordre des paramètres</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index a7a89d9155..55dd1f555b 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -555,4 +555,19 @@ Do you want to proceed?</value>
     <value>No parameters in method '{0}'.</value>
     <comment>0: Selected target</comment>
   </data>
+  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
+    <value>Move up</value>
+  </data>
+  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Reorder Parameters</value>
+  </data>
+  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Select a parameter and drag it or use buttons to move it up or down.</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
+    <value>Move down</value>
+  </data>
+  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
+    <value>Reorder parameters</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index d6e0cbd901..1d6acafe42 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3308,51 +3308,6 @@ public static string Rename {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck - Reorder Parameters.
-        /// </summary>
-        public static string ReorderParamsDialog_Caption {
-            get {
-                return ResourceManager.GetString("ReorderParamsDialog_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Select a parameter and drag it or use buttons to move it up or down..
-        /// </summary>
-        public static string ReorderParamsDialog_InstructionsLabelText {
-            get {
-                return ResourceManager.GetString("ReorderParamsDialog_InstructionsLabelText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Move down.
-        /// </summary>
-        public static string ReorderParamsDialog_MoveDownButtonText {
-            get {
-                return ResourceManager.GetString("ReorderParamsDialog_MoveDownButtonText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Move up.
-        /// </summary>
-        public static string ReorderParamsDialog_MoveUpButtonText {
-            get {
-                return ResourceManager.GetString("ReorderParamsDialog_MoveUpButtonText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Reorder parameters.
-        /// </summary>
-        public static string ReorderParamsDialog_TitleText {
-            get {
-                return ResourceManager.GetString("ReorderParamsDialog_TitleText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Less than two parameters in method &apos;{0}&apos;..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 2be6e46093..8200db8206 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -165,12 +165,6 @@
   <data name="Parsing" xml:space="preserve">
     <value>(parsuji...)</value>
   </data>
-  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
-    <value>Přesunout níže</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
-    <value>Přesunout výše</value>
-  </data>
   <data name="AllImplementations_NoneFound" xml:space="preserve">
     <value>Třída nebo člen '{0}' ještě není implementován.</value>
   </data>
@@ -276,15 +270,9 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>označení řádku</value>
   </data>
-  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Přeuspořádat parametry</value>
-  </data>
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>VBDesigner-Objekt</value>
   </data>
-  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
-    <value>Přeuspořádat parametry</value>
-  </data>
   <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
     <value>V metodě '{0}' je méně než 2 parametry.</value>
   </data>
@@ -942,9 +930,6 @@ End Enum</value>
   <data name="DeclarationType_PropertySet" xml:space="preserve">
     <value>Set accessor vlastnosti</value>
   </data>
-  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Zvol parametr a za použití táhnutí myši nebo pomocí tlačítek ho přesuň výše nebo níže.</value>
-  </data>
   <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
     <value>Rubberduck Inspekce Kódu - {0}
 {1} problém nalezen.</value>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 17217822e4..a810717fa0 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -183,21 +183,6 @@
   <data name="Parsing" xml:space="preserve">
     <value>(Parse...)</value>
   </data>
-  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Parameter umordnen</value>
-  </data>
-  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Wählen sie einen Parameter und bewegen Sie ihn mit der Maus oder den Schaltflächen nach oben oder unten.</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
-    <value>Nach unten</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
-    <value>Nach oben</value>
-  </data>
-  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
-    <value>Parameter umordnen</value>
-  </data>
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>VBDesigner-Objekt</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index e3fd0f06d8..ba9b64a046 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -183,21 +183,6 @@
   <data name="Parsing" xml:space="preserve">
     <value>(analizando ...)</value>
   </data>
-  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Reordenar Parámetros</value>
-  </data>
-  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Seleccione un parámetro y arrástrelo o use los botones para moverlo hacia arriba o hacia abajo.</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
-    <value>Mover hacia abajo</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
-    <value>Mover hacia arriba</value>
-  </data>
-  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
-    <value>Reordenar parametros</value>
-  </data>
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>control</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 63291d8c66..9f14d71da4 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -186,21 +186,6 @@
   <data name="Parsing" xml:space="preserve">
     <value>(analyse...)</value>
   </data>
-  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Modifier l'ordre des paramètres</value>
-  </data>
-  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Veuillez sélectionner un paramètre et glisser-déposer, ou utilisez les boutons pour modifier l'ordre.</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
-    <value>Déplacer vers le bas</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
-    <value>Déplacer vers le haut</value>
-  </data>
-  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
-    <value>Modifier l'ordre des paramètres</value>
-  </data>
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>le contrôle</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 0b7b70bb41..39d74092ca 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -186,21 +186,6 @@
   <data name="Parsing" xml:space="preserve">
     <value>(parsing...)</value>
   </data>
-  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Reorder Parameters</value>
-  </data>
-  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Select a parameter and drag it or use buttons to move it up or down.</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
-    <value>Move down</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
-    <value>Move up</value>
-  </data>
-  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
-    <value>Reorder parameters</value>
-  </data>
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>control</value>
   </data>

From 3d6160cb8a59e0236c694d0e2e6f314241b21cfd Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 19:44:24 -0800
Subject: [PATCH 51/64] Migrate ReorderPresenter_ resource

The other resources were deleted because searching for them yielded
no results outside of the *.resx files
---
 .../ReorderParametersPresenter.cs             |  2 +-
 .../RefactoringsUI.Designer.cs                |  9 +++++++
 .../RefactoringsUI.cs.resx                    |  3 +++
 .../RefactoringsUI.de.resx                    |  3 +++
 .../RefactoringsUI.es.resx                    |  3 +++
 .../RefactoringsUI.fr.resx                    |  3 +++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  4 +++
 Rubberduck.Resources/RubberduckUI.Designer.cs | 27 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 10 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 10 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 10 -------
 Rubberduck.Resources/RubberduckUI.resx        | 10 -------
 13 files changed, 26 insertions(+), 77 deletions(-)

diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
index 865fe1fa08..3c887c6aec 100644
--- a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -34,7 +34,7 @@ public override ReorderParametersModel Show()
 
             if (Model.Parameters.Count < 2)
             {
-                var message = string.Format(RubberduckUI.ReorderPresenter_LessThanTwoParametersError, Model.TargetDeclaration.IdentifierName);
+                var message = string.Format(RefactoringsUI.ReorderPresenter_LessThanTwoParametersError, Model.TargetDeclaration.IdentifierName);
                 _messageBox.NotifyWarn(message, RefactoringsUI.ReorderParamsDialog_TitleText);
                 return null;
             }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 9e2fb21d9a..dcb6270315 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -1335,5 +1335,14 @@ public static string ReorderParamsDialog_TitleText {
                 return ResourceManager.GetString("ReorderParamsDialog_TitleText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Less than two parameters in method &apos;{0}&apos;..
+        /// </summary>
+        public static string ReorderPresenter_LessThanTwoParametersError {
+            get {
+                return ResourceManager.GetString("ReorderPresenter_LessThanTwoParametersError", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index dc97a75bcd..4a73534ad8 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -541,4 +541,7 @@ Chcete pokračovat?</value>
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Přeuspořádat parametry</value>
   </data>
+  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
+    <value>V metodě '{0}' je méně než 2 parametry.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 69f0e4abe9..c8d0291c7e 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -547,4 +547,7 @@ Wollen Sie fortfahren?</value>
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Parameter umordnen</value>
   </data>
+  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
+    <value>Weniger als zwei Parameter für die Methode '{0}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index f296237e2c..c51cf4bc8c 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -541,4 +541,7 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Reordenar parametros</value>
   </data>
+  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
+    <value>Menos de dos parámetros en el método '{0}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index e0ae9ea3df..aed18c5cc4 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -523,4 +523,7 @@ Procéder?</value>
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Modifier l'ordre des paramètres</value>
   </data>
+  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
+    <value>La méthode '{0}' compte moins de deux paramètres.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 55dd1f555b..9936a15fbe 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -570,4 +570,8 @@ Do you want to proceed?</value>
   <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
     <value>Reorder parameters</value>
   </data>
+  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
+    <value>Less than two parameters in method '{0}'.</value>
+    <comment>0: Selected target</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 1d6acafe42..f6662e0bfd 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -3308,33 +3308,6 @@ public static string Rename {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Less than two parameters in method &apos;{0}&apos;..
-        /// </summary>
-        public static string ReorderPresenter_LessThanTwoParametersError {
-            get {
-                return ResourceManager.GetString("ReorderPresenter_LessThanTwoParametersError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Optional parameters must be specified at the end of the parameter list..
-        /// </summary>
-        public static string ReorderPresenter_OptionalParametersMustBeLastError {
-            get {
-                return ResourceManager.GetString("ReorderPresenter_OptionalParametersMustBeLastError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ParamArray parameter must be specified last..
-        /// </summary>
-        public static string ReorderPresenter_ParamArrayError {
-            get {
-                return ResourceManager.GetString("ReorderPresenter_ParamArrayError", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to {0}. Click to refresh..
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 8200db8206..2f03cf8047 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -273,15 +273,9 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>VBDesigner-Objekt</value>
   </data>
-  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
-    <value>V metodě '{0}' je méně než 2 parametry.</value>
-  </data>
   <data name="AllReferences_NoneFound" xml:space="preserve">
     <value>V ukazateli '{0}' nebyly nalezeny žádné reference.</value>
   </data>
-  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
-    <value>Parametr ParamArray musí být specifikován naposled.</value>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Všechny reference: '{0}'</value>
   </data>
@@ -444,9 +438,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Add" xml:space="preserve">
     <value>Přidat</value>
   </data>
-  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
-    <value>Volitelné parametry musejí být specifikovány na konci seznamu parametrů.</value>
-  </data>
   <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
     <value>Rubberduck Inspekce Kódu - {0}
 Nalezeno {1} problémů.</value>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index a810717fa0..19bb1864bb 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -186,19 +186,9 @@
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>VBDesigner-Objekt</value>
   </data>
-  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
-    <value>Optionale Parameter müssen am Ende der Parameterliste deklariert werden.</value>
-  </data>
-  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
-    <value>Weniger als zwei Parameter für die Methode '{0}'.</value>
-    <comment>0: Gewähltes Ziel</comment>
-  </data>
   <data name="AllReferences_NoneFound" xml:space="preserve">
     <value>Keine Referenzen für '{0}' gefunden.</value>
   </data>
-  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
-    <value>ParamArray-Parameter muss als letztes spezifiziert werden.</value>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Alle Referenzen: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index ba9b64a046..2211706fd5 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -186,19 +186,9 @@
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>control</value>
   </data>
-  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
-    <value>Los parámetros opcionales deben especificarse al final de la lista de parámetros.</value>
-  </data>
-  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
-    <value>Menos de dos parámetros en el método '{0}'.</value>
-    <comment>0: objetivo seleccionado</comment>
-  </data>
   <data name="AllReferences_NoneFound" xml:space="preserve">
     <value>No se encontraron referencias para el identificador '{0}'.</value>
   </data>
-  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
-    <value>El parámetro ParamArray debe especificarse al final.</value>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Todas las referencias: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 9f14d71da4..aa4c790c9f 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -189,19 +189,9 @@
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>le contrôle</value>
   </data>
-  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
-    <value>Les paramètres optionels doivent être spéficiés à la fin de la liste.</value>
-  </data>
-  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
-    <value>La méthode '{0}' compte moins de deux paramètres.</value>
-    <comment>0: Selected target</comment>
-  </data>
   <data name="AllReferences_NoneFound" xml:space="preserve">
     <value>Aucune référence trouvée pour l'identifiant '{0}'.</value>
   </data>
-  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
-    <value>Un paramètre ParamArray doit être spécifié en dernier.</value>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>Références: '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 39d74092ca..332a7a8688 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -189,19 +189,9 @@
   <data name="DeclarationType_Control" xml:space="preserve">
     <value>control</value>
   </data>
-  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
-    <value>Optional parameters must be specified at the end of the parameter list.</value>
-  </data>
-  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
-    <value>Less than two parameters in method '{0}'.</value>
-    <comment>0: Selected target</comment>
-  </data>
   <data name="AllReferences_NoneFound" xml:space="preserve">
     <value>No references were found for identifier '{0}'.</value>
   </data>
-  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
-    <value>ParamArray parameter must be specified last.</value>
-  </data>
   <data name="AllReferences_Caption" xml:space="preserve">
     <value>All references: '{0}'</value>
   </data>

From 5ce1933544d30c09ce2f235ebab78f6a2ad88182 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 21:17:34 -0800
Subject: [PATCH 52/64] Migrate TestOutcome_ resources

---
 .../UI/UnitTesting/TestExplorerControl.xaml   | 10 ++---
 .../Properties/ParsingSettings.Designer.cs    |  2 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 45 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 12 -----
 Rubberduck.Resources/RubberduckUI.de.resx     | 12 -----
 Rubberduck.Resources/RubberduckUI.es.resx     | 12 -----
 Rubberduck.Resources/RubberduckUI.fr.resx     | 12 -----
 Rubberduck.Resources/RubberduckUI.resx        | 15 -------
 .../UnitTesting/TestExplorer.Designer.cs      | 11 ++++-
 .../UnitTesting/TestExplorer.cs.resx          |  9 ++--
 .../UnitTesting/TestExplorer.de.resx          |  9 ++--
 .../UnitTesting/TestExplorer.es.resx          |  3 ++
 .../UnitTesting/TestExplorer.fr.resx          |  9 ++--
 .../UnitTesting/TestExplorer.resx             |  3 ++
 14 files changed, 40 insertions(+), 124 deletions(-)

diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
index 27a910a09c..f64f3d528b 100644
--- a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
@@ -213,27 +213,27 @@
 
                 <Label Content="{Resx Key=TestExplorer_Outcome, ResxName=Rubberduck.Resources.UnitTesting.TestExplorer}" />
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_Unknown}"
+                              ToolTip="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_Unknown}"
                               IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Unknown}}" >
                     <Image Source="{StaticResource OutcomeUnknown}" />
                 </ToggleButton>
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_Fail}"
+                              ToolTip="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_Fail}"
                               IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Fail}}" >
                     <Image Source="{StaticResource OutcomeFail}" />
                 </ToggleButton>
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_Inconclusive}"
+                              ToolTip="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_Inconclusive}"
                               IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Inconclusive}}" >
                     <Image Source="{StaticResource OutcomeInconclusive}" />
                 </ToggleButton>
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_Succeeded}"
+                              ToolTip="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_Succeeded}"
                               IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Succeeded}}" >
                     <Image Source="{StaticResource OutcomeSucceeded}" />
                 </ToggleButton>
                 <ToggleButton Style="{StaticResource ToolBarToggleStyle}"
-                              ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_Ignored}"
+                              ToolTip="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_Ignored}"
                               IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Ignored}}">
                     <Image Source="{StaticResource OutcomeIgnored}" />
                 </ToggleButton>
diff --git a/Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs b/Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs
index 41bcc95a71..e208582873 100644
--- a/Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs
+++ b/Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs
@@ -12,7 +12,7 @@ namespace Rubberduck.Parsing.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
     internal sealed partial class ParsingSettings : global::System.Configuration.ApplicationSettingsBase {
         
         private static ParsingSettings defaultInstance = ((ParsingSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new ParsingSettings())));
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ae232e690d..cd90c79f10 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -4912,51 +4912,6 @@ public static string TestExplorer_AppendHeader {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Fail.
-        /// </summary>
-        public static string TestOutcome_Fail {
-            get {
-                return ResourceManager.GetString("TestOutcome_Fail", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ignored.
-        /// </summary>
-        public static string TestOutcome_Ignored {
-            get {
-                return ResourceManager.GetString("TestOutcome_Ignored", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Inconclusive.
-        /// </summary>
-        public static string TestOutcome_Inconclusive {
-            get {
-                return ResourceManager.GetString("TestOutcome_Inconclusive", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Succeeded.
-        /// </summary>
-        public static string TestOutcome_Succeeded {
-            get {
-                return ResourceManager.GetString("TestOutcome_Succeeded", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unknown.
-        /// </summary>
-        public static string TestOutcome_Unknown {
-            get {
-                return ResourceManager.GetString("TestOutcome_Unknown", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a605648f57..230d4c0b2b 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1395,18 +1395,6 @@ End Enum</value>
   <data name="RegexAssistant_SpelledOut_UnidentifiedWhitespace" xml:space="preserve">
     <value>neidentifikovaná-mezera</value>
   </data>
-  <data name="TestOutcome_Fail" xml:space="preserve">
-    <value>Selhání</value>
-  </data>
-  <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Úspěch</value>
-  </data>
-  <data name="TestOutcome_Unknown" xml:space="preserve">
-    <value>Neznámý</value>
-  </data>
-  <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Bezvýsledný</value>
-  </data>
   <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
     <value>'{0}' nezačíná písmenem.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e25afdb15e..9dd12f955f 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1427,18 +1427,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="RegexAssistant_SpelledOut_Tab" xml:space="preserve">
     <value>Tab</value>
   </data>
-  <data name="TestOutcome_Fail" xml:space="preserve">
-    <value>Fehlgeschlagen</value>
-  </data>
-  <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Erfolgreich</value>
-  </data>
-  <data name="TestOutcome_Unknown" xml:space="preserve">
-    <value>Unbekannt</value>
-  </data>
-  <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Uneindeutig</value>
-  </data>
   <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
     <value>'{0}' beginnt nicht mit einem Buchstaben.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 40f3148a42..ce33dea7a3 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1510,18 +1510,6 @@ Importación cancelada.</value>
   <data name="RegexAssistant_SpelledOut_UnidentifiedWhitespace" xml:space="preserve">
     <value>espacio-sin-identificar</value>
   </data>
-  <data name="TestOutcome_Fail" xml:space="preserve">
-    <value>Fallo</value>
-  </data>
-  <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Indefinido</value>
-  </data>
-  <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Exitoso</value>
-  </data>
-  <data name="TestOutcome_Unknown" xml:space="preserve">
-    <value>Desconocido</value>
-  </data>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>La descripción contiene espacios en blanco</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c3c4f58fdc..ce4937d50e 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1453,18 +1453,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="RegexAssistant_SpelledOut_UnidentifiedWhitespace" xml:space="preserve">
     <value>espace-non-identifié</value>
   </data>
-  <data name="TestOutcome_Fail" xml:space="preserve">
-    <value>Échec</value>
-  </data>
-  <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Inconcluant</value>
-  </data>
-  <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Succès</value>
-  </data>
-  <data name="TestOutcome_Unknown" xml:space="preserve">
-    <value>Inconnu</value>
-  </data>
   <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
     <value>'{0}' doit débuter par une lettre.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9445c6b439..d2e602439f 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1609,18 +1609,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="RegexAssistant_SpelledOut_UnidentifiedWhitespace" xml:space="preserve">
     <value>unidentified-whitespace</value>
   </data>
-  <data name="TestOutcome_Fail" xml:space="preserve">
-    <value>Fail</value>
-  </data>
-  <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Inconclusive</value>
-  </data>
-  <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Succeeded</value>
-  </data>
-  <data name="TestOutcome_Unknown" xml:space="preserve">
-    <value>Unknown</value>
-  </data>
   <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
     <value>'{0}' does not start with a letter.</value>
     <comment>{0} = code element name</comment>
@@ -1956,7 +1944,4 @@ Do you want to proceed?</value>
   <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
     <value>Add/Adjust attribute</value>
   </data>
-  <data name="TestOutcome_Ignored" xml:space="preserve">
-    <value>Ignored</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs b/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
index 2fb2719c58..c3ccd9212f 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.UnitTesting {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class TestExplorer {
@@ -456,6 +456,15 @@ public static string TestOutcome_DurationSecond {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Fail.
+        /// </summary>
+        public static string TestOutcome_Fail {
+            get {
+                return ResourceManager.GetString("TestOutcome_Fail", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Failed.
         /// </summary>
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.cs.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.cs.resx
index 462ae772e4..8de5aa650c 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.cs.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.cs.resx
@@ -189,9 +189,6 @@
   <data name="TestExplorerDockablePresenter_MultipleTestsSameNameError" xml:space="preserve">
     <value>Dva nebo více projektů obsahující testovací metody, mají stejné jména nebo stejně pojmenované testy. Pokud chcete pokračovat, jedno z nich prosím přejmenujte.</value>
   </data>
-  <data name="TestOutcome_Failed" xml:space="preserve">
-    <value>Selhalo</value>
-  </data>
   <data name="TestOutcome_Ignored" xml:space="preserve">
     <value>Ignorováno</value>
   </data>
@@ -348,4 +345,10 @@
   <data name="TestExplorer_ContextMenuUnignoreSelectedTests" xml:space="preserve">
     <value>Zrušit ignorování označených testů</value>
   </data>
+  <data name="TestOutcome_Failed" xml:space="preserve">
+    <value>Selhalo</value>
+  </data>
+  <data name="TestOutcome_Fail" xml:space="preserve">
+    <value>Selhání</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.de.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.de.resx
index 3662a8d452..e0b63a2383 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.de.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.de.resx
@@ -180,9 +180,6 @@
   <data name="TestExplorer_QualifiedModuleName" xml:space="preserve">
     <value>Modul</value>
   </data>
-  <data name="TestOutcome_Failed" xml:space="preserve">
-    <value>Fehlerhaft</value>
-  </data>
   <data name="TestOutcome_Inconclusive" xml:space="preserve">
     <value>Ergebnislos</value>
   </data>
@@ -336,4 +333,10 @@
   <data name="TestExplorer_ContextMenuUnignoreGroup" xml:space="preserve">
     <value>Ignorieren aller Tests in der Gruppe aufheben</value>
   </data>
+  <data name="TestOutcome_Failed" xml:space="preserve">
+    <value>Fehlerhaft</value>
+  </data>
+  <data name="TestOutcome_Fail" xml:space="preserve">
+    <value>Fehlgeschlagen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.es.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.es.resx
index eddadcadc3..b4e76aecc8 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.es.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.es.resx
@@ -336,4 +336,7 @@
   <data name="TestExplorer_TestToggle_Unignore" xml:space="preserve">
     <value>Incluir la prueba</value>
   </data>
+  <data name="TestOutcome_Fail" xml:space="preserve">
+    <value>Fallo</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.fr.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.fr.resx
index b2b2d2e275..897bae2783 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.fr.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.fr.resx
@@ -207,9 +207,6 @@
   <data name="UnitTest_NewMethod_RaisedTestError" xml:space="preserve">
     <value>Le test a produit une erreur</value>
   </data>
-  <data name="TestOutcome_Failed" xml:space="preserve">
-    <value>Échec</value>
-  </data>
   <data name="UnitTest_NewMethod_ChangeErrorNo" xml:space="preserve">
     <value>Changer le numéro d'erreur</value>
   </data>
@@ -291,4 +288,10 @@
   <data name="TestOutcome_DurationMinute" xml:space="preserve">
     <value>min</value>
   </data>
+  <data name="TestOutcome_Failed" xml:space="preserve">
+    <value>Échec</value>
+  </data>
+  <data name="TestOutcome_Fail" xml:space="preserve">
+    <value>Échec</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.resx
index d10301a83a..d0be4147ba 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.resx
@@ -363,4 +363,7 @@
   <data name="TestExplorer_ContextMenuIgnoreSelectedTests" xml:space="preserve">
     <value>Ignore selected tests</value>
   </data>
+  <data name="TestOutcome_Fail" xml:space="preserve">
+    <value>Fail</value>
+  </data>
 </root>
\ No newline at end of file

From 26f8a12be71facdfe566f87ad72841e74388e95a Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 21:19:20 -0800
Subject: [PATCH 53/64] Delete unused resource

---
 Rubberduck.Resources/RubberduckUI.Designer.cs | 9 ---------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 3 ---
 Rubberduck.Resources/RubberduckUI.de.resx     | 3 ---
 Rubberduck.Resources/RubberduckUI.es.resx     | 3 ---
 Rubberduck.Resources/RubberduckUI.fr.resx     | 3 ---
 Rubberduck.Resources/RubberduckUI.resx        | 3 ---
 6 files changed, 24 deletions(-)

diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index cd90c79f10..b3982440f3 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -4903,15 +4903,6 @@ public static System.Drawing.Bitmap SyncArrows {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck Test Results - {0}.
-        /// </summary>
-        public static string TestExplorer_AppendHeader {
-            get {
-                return ResourceManager.GetString("TestExplorer_AppendHeader", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 230d4c0b2b..223b4ee9ac 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1434,9 +1434,6 @@ End Enum</value>
   <data name="RegexAssistant_EncloseWhitespaceFlag" xml:space="preserve">
     <value>V popisu uveďte mezeru</value>
   </data>
-  <data name="TestExplorer_AppendHeader" xml:space="preserve">
-    <value>Rubberduck: Výsledky Testů - {0}</value>
-  </data>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>Nelze přerušit Parser k provedení operace refaktoringu.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 9dd12f955f..b4708bc13a 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1511,9 +1511,6 @@ Import abgebrochen.</value>
 
 Import abgebrochen.</value>
   </data>
-  <data name="TestExplorer_AppendHeader" xml:space="preserve">
-    <value>Rubberduck: Testergebnisse - {0}</value>
-  </data>
   <data name="ComponentType_ActiveXDesigner" xml:space="preserve">
     <value>ActiveX-Designer</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index ce33dea7a3..15e793cae3 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1531,9 +1531,6 @@ Importación cancelada.</value>
   <data name="MeaninglessNameCriteriaMatchFormat" xml:space="preserve">
     <value>El identificador '{0}' disparará un resultado de inspección 'Usar nombres significativos'.</value>
   </data>
-  <data name="TestExplorer_AppendHeader" xml:space="preserve">
-    <value>Rubberduck Resultados de pruebas - {0}</value>
-  </data>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>No se puede suspender el analizador para ejecutar la operación de refactorización.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index ce4937d50e..c8b76b8985 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -1477,9 +1477,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
     <value>Le contrôle ciblé '{0}' est introuvable.</value>
   </data>
-  <data name="TestExplorer_AppendHeader" xml:space="preserve">
-    <value>Rubberduck - Résultats des tests : {0}</value>
-  </data>
   <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
     <value>Impossible de suspendre l'analyse en cours pour effectuer le refactoring.</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index d2e602439f..d0eb37a4b1 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1636,9 +1636,6 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>{0} Consider choosing a different name.</value>
     <comment>{0} = Meaningless name message</comment>
   </data>
-  <data name="TestExplorer_AppendHeader" xml:space="preserve">
-    <value>Rubberduck Test Results - {0}</value>
-  </data>
   <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
     <value>{0} {1} {2} {3} {4} {5}</value>
     <comment>{0}=Project; {1}=Folder; {2}=Component; {3}=DeclarationType; {4}=Scope; {5}=Name</comment>

From 6d74eddd2d1400f07583f7f190b0c7602d832c77 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 21:30:21 -0800
Subject: [PATCH 54/64] Use ToDoExplorerUI resources

---
 .../Formatters/ToDoItemFormatter.cs           |  4 +-
 .../UI/Settings/WindowSettings.xaml           |  2 +-
 Rubberduck.Resources/RubberduckUI.Designer.cs | 65 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 23 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 23 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 25 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 23 -------
 Rubberduck.Resources/RubberduckUI.resx        | 25 -------
 8 files changed, 3 insertions(+), 187 deletions(-)

diff --git a/Rubberduck.Core/Formatters/ToDoItemFormatter.cs b/Rubberduck.Core/Formatters/ToDoItemFormatter.cs
index 567016fab2..943b627554 100644
--- a/Rubberduck.Core/Formatters/ToDoItemFormatter.cs
+++ b/Rubberduck.Core/Formatters/ToDoItemFormatter.cs
@@ -1,6 +1,6 @@
 using Rubberduck.ToDoItems;
 using Rubberduck.Common;
-using Rubberduck.Resources;
+using Rubberduck.Resources.ToDoExplorer;
 
 namespace Rubberduck.Formatters
 {
@@ -22,7 +22,7 @@ public object[] ToArray()
         public string ToClipboardString()
         {
             var module = _toDoItem.Selection.QualifiedName;
-            return string.Format(RubberduckUI.ToDoExplorerToDoItemFormat,
+            return string.Format(ToDoExplorerUI.ToDoExplorerToDoItemFormat,
                 _toDoItem.Type,
                 _toDoItem.Description,
                 module.ProjectName,
diff --git a/Rubberduck.Core/UI/Settings/WindowSettings.xaml b/Rubberduck.Core/UI/Settings/WindowSettings.xaml
index 409f487650..70e40e8e87 100644
--- a/Rubberduck.Core/UI/Settings/WindowSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/WindowSettings.xaml
@@ -52,7 +52,7 @@
                       IsChecked="{Binding TestExplorerVisibleOnStartup, Mode=TwoWay}"
                       Margin="5,0,0,5"
                       HorizontalAlignment="Left" />
-            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TodoExplorer_Caption}"
+            <CheckBox Content="{Resx ResxName=Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI, Key=TodoExplorer_Caption}"
                       IsChecked="{Binding TodoExplorerVisibleOnStartup, Mode=TwoWay}"
                       Margin="5,0,0,5"
                       HorizontalAlignment="Left" />
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index ae232e690d..912d8d1c89 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -4977,71 +4977,6 @@ public static System.Drawing.Bitmap tick_circle_pinned {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Todo Explorer.
-        /// </summary>
-        public static string TodoExplorer_Caption {
-            get {
-                return ResourceManager.GetString("TodoExplorer_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy to clipboard.
-        /// </summary>
-        public static string ToDoExplorer_CopyToolTip {
-            get {
-                return ResourceManager.GetString("ToDoExplorer_CopyToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Description.
-        /// </summary>
-        public static string TodoExplorer_Description {
-            get {
-                return ResourceManager.GetString("TodoExplorer_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Line Number.
-        /// </summary>
-        public static string TodoExplorer_LineNumber {
-            get {
-                return ResourceManager.GetString("TodoExplorer_LineNumber", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck TODO Items - {0}
-        ///{1} items found..
-        /// </summary>
-        public static string ToDoExplorer_NumberOfIssuesFound_Plural {
-            get {
-                return ResourceManager.GetString("ToDoExplorer_NumberOfIssuesFound_Plural", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Rubberduck TODO Items - {0}
-        ///{1} items found..
-        /// </summary>
-        public static string ToDoExplorer_NumberOfIssuesFound_Singular {
-            get {
-                return ResourceManager.GetString("ToDoExplorer_NumberOfIssuesFound_Singular", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0}: {1} - {2}.{3} line {4}..
-        /// </summary>
-        public static string ToDoExplorerToDoItemFormat {
-            get {
-                return ResourceManager.GetString("ToDoExplorerToDoItemFormat", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to BUG.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a605648f57..f0603e1132 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -297,12 +297,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="ProjectName" xml:space="preserve">
     <value>Jméno projektu</value>
   </data>
-  <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Číslo řádku</value>
-  </data>
-  <data name="TodoExplorer_Description" xml:space="preserve">
-    <value>Popisek</value>
-  </data>
   <data name="DeclarationType_LineLabel" xml:space="preserve">
     <value>označení řádku</value>
   </data>
@@ -366,9 +360,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Passed" xml:space="preserve">
     <value>V pořádku</value>
   </data>
-  <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>Todo Explorer</value>
-  </data>
   <data name="EasterEgg_Continuator" xml:space="preserve">
     <value>Získali jste odznak "Continuator"!</value>
   </data>
@@ -1000,20 +991,6 @@ Toto dialogové okno se zobrazuje, protože je povolena kontrola nových verzí.
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck prozatím nic nevidí.</value>
   </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck TODO položky - {0}
-{1} položek nalezeno.</value>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck TODO položky - {0}
-{1} položka nalezena.</value>
-  </data>
-  <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3} řádek {4}.</value>
-  </data>
-  <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
-    <value>Zkopírovat do schránky</value>
-  </data>
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Metrika Kódu</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index e25afdb15e..f1f9a2dcc9 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -346,9 +346,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Type" xml:space="preserve">
     <value>Typ</value>
   </data>
-  <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>ToDo Liste</value>
-  </data>
   <data name="Warning" xml:space="preserve">
     <value>Warnung</value>
   </data>
@@ -415,12 +412,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
     <value>Code-Untersuchung ausführen</value>
   </data>
-  <data name="TodoExplorer_Description" xml:space="preserve">
-    <value>Beschreibung</value>
-  </data>
-  <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Zeilennummer</value>
-  </data>
   <data name="ProjectName" xml:space="preserve">
     <value>Projektname</value>
   </data>
@@ -1045,20 +1036,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
     <value>Experimentelle Funktionalität:</value>
   </data>
-  <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
-    <value>In die Zwischenablage kopieren</value>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck TODO Markierungen - {0}
-{1} Markierungen gefunden.</value>
-  </data>
-  <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3} Zeile {4}.</value>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck TODO Markierungen - {0}
-{1} Markierungen gefunden.</value>
-  </data>
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Codemetrikergebnisse</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 40f3148a42..bd8734d66b 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -354,9 +354,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Type" xml:space="preserve">
     <value>Tipo</value>
   </data>
-  <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>TODO Explorer</value>
-  </data>
   <data name="Warning" xml:space="preserve">
     <value>Advertencia</value>
   </data>
@@ -426,12 +423,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
     <value>Ejecutar inspecciones de código</value>
   </data>
-  <data name="TodoExplorer_Description" xml:space="preserve">
-    <value>Descripción</value>
-  </data>
-  <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Número de línea</value>
-  </data>
   <data name="ProjectName" xml:space="preserve">
     <value>Nombre del proyecto</value>
   </data>
@@ -1107,22 +1098,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck no ve nada todavía.</value>
   </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Ítems de TODO de Rubberduck - {0}
-{1} ítems encontrados.</value>
-    <comment>{0} = marca de tiempo; {1} = número</comment>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Ítem de TODO de Rubberduck - {0}
-{1} ítem encontrado.</value>
-    <comment>{0} = marca de tiempo; {1} = número</comment>
-  </data>
-  <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
-    <value>{0}: {1} - {2}. {3} línea {4}.</value>
-  </data>
-  <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
-    <value>Copiar al portapapeles</value>
-  </data>
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Métricas de Código</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index c3c4f58fdc..b31b30e961 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -352,9 +352,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
-  <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>Explorateur de marqueurs "TODO"</value>
-  </data>
   <data name="Warning" xml:space="preserve">
     <value>Avertissement</value>
   </data>
@@ -430,12 +427,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Run" xml:space="preserve">
     <value>Exécuter</value>
   </data>
-  <data name="TodoExplorer_Description" xml:space="preserve">
-    <value>Description</value>
-  </data>
-  <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Ligne</value>
-  </data>
   <data name="TodoSettings_TokenLabel" xml:space="preserve">
     <value>Texte:</value>
   </data>
@@ -1059,20 +1050,6 @@ les projets dans le VBE.</value>
   <data name="Preview" xml:space="preserve">
     <value>Aperçu</value>
   </data>
-  <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
-    <value>Copier dans le presse-papier</value>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck - {0}
-{1} marqueurs TODO trouvés.</value>
-  </data>
-  <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3} ligne {4}.</value>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck marqueurs TODO - {0}
-{1} marqueurs trouvés.</value>
-  </data>
   <data name="CodeMetrics_Nesting" xml:space="preserve">
     <value>Imbrication</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 9445c6b439..47608ef139 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -357,9 +357,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
-  <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>Todo Explorer</value>
-  </data>
   <data name="Warning" xml:space="preserve">
     <value>Warning</value>
   </data>
@@ -429,12 +426,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
     <value>Run code inspections</value>
   </data>
-  <data name="TodoExplorer_Description" xml:space="preserve">
-    <value>Description</value>
-  </data>
-  <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Line Number</value>
-  </data>
   <data name="ProjectName" xml:space="preserve">
     <value>Project Name</value>
   </data>
@@ -1117,22 +1108,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck doesn't see anything yet.</value>
   </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck TODO Items - {0}
-{1} items found.</value>
-    <comment>{0}=timestamp; {1}=number</comment>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck TODO Items - {0}
-{1} items found.</value>
-    <comment>{0}=timestamp; {1}=number</comment>
-  </data>
-  <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3} line {4}.</value>
-  </data>
-  <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
-    <value>Copy to clipboard</value>
-  </data>
   <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
     <value>Code Metrics</value>
   </data>

From 3ca3c7b3261021319a3aa4bfb7b767bc35060ef6 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 21:31:56 -0800
Subject: [PATCH 55/64] Delete unused resources

Searched for each resource and none were found.
---
 Rubberduck.Resources/RubberduckUI.Designer.cs | 27 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.de.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.es.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     |  9 -------
 Rubberduck.Resources/RubberduckUI.resx        |  9 -------
 6 files changed, 72 deletions(-)

diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 912d8d1c89..a09bbd51fa 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -4977,33 +4977,6 @@ public static System.Drawing.Bitmap tick_circle_pinned {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to BUG.
-        /// </summary>
-        public static string TodoMarkerBug {
-            get {
-                return ResourceManager.GetString("TodoMarkerBug", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to NOTE.
-        /// </summary>
-        public static string TodoMarkerNote {
-            get {
-                return ResourceManager.GetString("TodoMarkerNote", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to TODO.
-        /// </summary>
-        public static string TodoMarkerTodo {
-            get {
-                return ResourceManager.GetString("TodoMarkerTodo", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to TODO Explorer.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index f0603e1132..7b0180f359 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -228,15 +228,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="Rubberduck_AboutBuild" xml:space="preserve">
     <value>Verze {0}</value>
   </data>
-  <data name="TodoMarkerBug" xml:space="preserve">
-    <value>BUG</value>
-  </data>
-  <data name="TodoMarkerNote" xml:space="preserve">
-    <value>NOTE</value>
-  </data>
-  <data name="TodoMarkerTodo" xml:space="preserve">
-    <value>TODO</value>
-  </data>
   <data name="AllImplementations_Caption" xml:space="preserve">
     <value>Implementace '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index f1f9a2dcc9..c5478f56f5 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1125,15 +1125,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="Add" xml:space="preserve">
     <value>Hinzufügen</value>
   </data>
-  <data name="TodoMarkerBug" xml:space="preserve">
-    <value>BUG</value>
-  </data>
-  <data name="TodoMarkerNote" xml:space="preserve">
-    <value>NOTE</value>
-  </data>
-  <data name="TodoMarkerTodo" xml:space="preserve">
-    <value>TODO</value>
-  </data>
   <data name="IndentCurrentProject" xml:space="preserve">
     <value>Aktuelles Projekt</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index bd8734d66b..91594a5125 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -1254,15 +1254,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="References_Version" xml:space="preserve">
     <value>Versión:</value>
   </data>
-  <data name="TodoMarkerBug" xml:space="preserve">
-    <value>BUG</value>
-  </data>
-  <data name="TodoMarkerNote" xml:space="preserve">
-    <value>NOTA</value>
-  </data>
-  <data name="TodoMarkerTodo" xml:space="preserve">
-    <value>TODO</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Texto:</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index b31b30e961..93b2801053 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -307,15 +307,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Rubberduck_AboutBuild" xml:space="preserve">
     <value>Version {0}</value>
   </data>
-  <data name="TodoMarkerBug" xml:space="preserve">
-    <value>BUG </value>
-  </data>
-  <data name="TodoMarkerNote" xml:space="preserve">
-    <value>NOTE </value>
-  </data>
-  <data name="TodoMarkerTodo" xml:space="preserve">
-    <value>TODO </value>
-  </data>
   <data name="AllImplementations_Caption" xml:space="preserve">
     <value>Implémentations de '{0}'</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 47608ef139..58a6e755c1 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -1334,15 +1334,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="References_Version" xml:space="preserve">
     <value>Version:</value>
   </data>
-  <data name="TodoMarkerBug" xml:space="preserve">
-    <value>BUG</value>
-  </data>
-  <data name="TodoMarkerNote" xml:space="preserve">
-    <value>NOTE</value>
-  </data>
-  <data name="TodoMarkerTodo" xml:space="preserve">
-    <value>TODO</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>

From eb1639f6075930cc50629d5f39e60bf3168bd618 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 21:40:29 -0800
Subject: [PATCH 56/64] Remove unused TodoSettings_ resources

---
 Rubberduck.Resources/RubberduckUI.Designer.cs | 45 -------------------
 Rubberduck.Resources/RubberduckUI.cs.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.de.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.es.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.fr.resx     | 15 -------
 Rubberduck.Resources/RubberduckUI.resx        | 15 -------
 .../Settings/ToDoExplorerPage.Designer.cs     | 29 +-----------
 .../Settings/ToDoExplorerPage.cs.resx         |  9 ----
 .../Settings/ToDoExplorerPage.de.resx         |  9 ----
 .../Settings/ToDoExplorerPage.es.resx         |  9 ----
 .../Settings/ToDoExplorerPage.fr.resx         |  9 ----
 .../Settings/ToDoExplorerPage.resx            |  9 ----
 .../ToDoExplorer/ToDoExplorerUI.Designer.cs   | 29 +-----------
 .../ToDoExplorer/ToDoExplorerUI.cs.resx       |  9 ----
 .../ToDoExplorer/ToDoExplorerUI.de.resx       |  9 ----
 .../ToDoExplorer/ToDoExplorerUI.es.resx       |  9 ----
 .../ToDoExplorer/ToDoExplorerUI.fr.resx       |  9 ----
 .../ToDoExplorer/ToDoExplorerUI.resx          |  9 ----
 18 files changed, 2 insertions(+), 266 deletions(-)

diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index a09bbd51fa..68525b9808 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -4977,51 +4977,6 @@ public static System.Drawing.Bitmap tick_circle_pinned {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to TODO Explorer.
-        /// </summary>
-        public static string TodoSettings_Caption {
-            get {
-                return ResourceManager.GetString("TodoSettings_Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Text.
-        /// </summary>
-        public static string TodoSettings_Text {
-            get {
-                return ResourceManager.GetString("TodoSettings_Text", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Text:.
-        /// </summary>
-        public static string TodoSettings_TextLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TextLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Token Text:.
-        /// </summary>
-        public static string TodoSettings_TokenLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TokenLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Token List:.
-        /// </summary>
-        public static string TodoSettings_TokenListLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TokenListLabel", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Type.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 7b0180f359..c254b56175 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -435,12 +435,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
     <value>uživatelsky-definovaný člen</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Text tokenu:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Seznam tokenu:</value>
-  </data>
   <data name="ExtractInterface_TitleLabel" xml:space="preserve">
     <value>Extrahovat Rozhraní</value>
   </data>
@@ -1188,15 +1182,6 @@ End Enum</value>
   <data name="References_Version" xml:space="preserve">
     <value>Verze:</value>
   </data>
-  <data name="TodoSettings_TextLabel" xml:space="preserve">
-    <value>Text:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>TODO Průzkumník</value>
-  </data>
   <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
     <value>Korekce pro displaye s vysokým rozlišením a škálováním</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index c5478f56f5..2d8748994a 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -436,12 +436,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="Remove" xml:space="preserve">
     <value>Entfernen</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Markierungstext:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Markierungen:</value>
-  </data>
   <data name="Navigation" xml:space="preserve">
     <value>Navigation</value>
   </data>
@@ -1188,15 +1182,6 @@ ACHTUNG: Ein Neustart ist nötig, damit die Änderungen wirksam werden.</value>
   <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
     <value>Korrektur für hochauflösende Displayskalierung</value>
   </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>TODO Explorer</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
-  <data name="TodoSettings_TextLabel" xml:space="preserve">
-    <value>Text:</value>
-  </data>
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Versuche fehlerhafte Referenzen zu reparieren</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 91594a5125..0b53f9811d 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -447,12 +447,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="Remove" xml:space="preserve">
     <value>Eliminar</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Etiqueta:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Lista de Etiquetas:</value>
-  </data>
   <data name="Navigation" xml:space="preserve">
     <value>Navegación</value>
   </data>
@@ -1254,15 +1248,6 @@ NOTA: Es necesario reiniciar para que la configuración tenga efecto.</value>
   <data name="References_Version" xml:space="preserve">
     <value>Versión:</value>
   </data>
-  <data name="TodoSettings_TextLabel" xml:space="preserve">
-    <value>Texto:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Texto</value>
-  </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>Explorador TODO</value>
-  </data>
   <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
     <value>Corrección para escalas de pantalla de alta resolución</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 93b2801053..914fcdc48b 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -418,12 +418,6 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="Run" xml:space="preserve">
     <value>Exécuter</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Texte:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Liste:</value>
-  </data>
   <data name="CodeInspections_NextToolTip" xml:space="preserve">
     <value>Naviguer au prochain problème</value>
   </data>
@@ -1298,15 +1292,6 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
   <data name="ReferenceSettings_TrackHostReferences" xml:space="preserve">
     <value>Inclure les références qui n'ont pas été ajoutées par Rubberduck</value>
   </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>Explorateur de tâches</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Texte</value>
-  </data>
-  <data name="TodoSettings_TextLabel" xml:space="preserve">
-    <value>Texte:</value>
-  </data>
   <data name="Language_ES" xml:space="preserve">
     <value>Español</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 58a6e755c1..6abde474ea 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -450,12 +450,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="Remove" xml:space="preserve">
     <value>Remove</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Token Text:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Token List:</value>
-  </data>
   <data name="Navigation" xml:space="preserve">
     <value>Navigation</value>
   </data>
@@ -1334,15 +1328,6 @@ NOTE: Restart is required for the setting to take effect.</value>
   <data name="References_Version" xml:space="preserve">
     <value>Version:</value>
   </data>
-  <data name="TodoSettings_TextLabel" xml:space="preserve">
-    <value>Text:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>TODO Explorer</value>
-  </data>
   <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
     <value>Correction for high-resolution display scalings</value>
   </data>
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs b/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs
index 400c7a592f..e644b2892e 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.Settings {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class ToDoExplorerPage {
@@ -60,15 +60,6 @@ internal ToDoExplorerPage() {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to TODO Explorer.
-        /// </summary>
-        public static string TodoSettings_Caption {
-            get {
-                return ResourceManager.GetString("TodoSettings_Caption", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Text:.
         /// </summary>
@@ -77,23 +68,5 @@ public static string TodoSettings_TextLabel {
                 return ResourceManager.GetString("TodoSettings_TextLabel", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Token Text:.
-        /// </summary>
-        public static string TodoSettings_TokenLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TokenLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Token List:.
-        /// </summary>
-        public static string TodoSettings_TokenListLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TokenListLabel", resourceCulture);
-            }
-        }
     }
 }
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx
index a7e1afb9d1..7c6a470a71 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx
@@ -117,15 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>TODO Explorer</value>
-  </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Text tokenu:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Seznam tokenu:</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx
index 4e42a6e86a..7c6a470a71 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx
@@ -117,15 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Markierungstext:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Markierungen:</value>
-  </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>To-Do Explorer</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx
index 3e17f9aac8..6cdad8cd07 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx
@@ -117,15 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Texto de Etiqueta:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Lista de Etiquetas:</value>
-  </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>TODO Explorer</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Texto:</value>
   </data>
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx
index 2f39eab5ff..d350b1281d 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx
@@ -117,15 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>Marqueurs "TODO"</value>
-  </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Texte:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Liste:</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Texte:</value>
   </data>
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.resx
index 1904515173..7c6a470a71 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.resx
@@ -117,15 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Token Text:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Token List:</value>
-  </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>TODO Explorer</value>
-  </data>
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.Designer.cs b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.Designer.cs
index dde1e89a5e..60d1991799 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.Designer.cs
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.ToDoExplorer {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class ToDoExplorerUI {
@@ -124,32 +124,5 @@ public static string ToDoExplorerToDoItemFormat {
                 return ResourceManager.GetString("ToDoExplorerToDoItemFormat", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Text.
-        /// </summary>
-        public static string TodoSettings_Text {
-            get {
-                return ResourceManager.GetString("TodoSettings_Text", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Token Text:.
-        /// </summary>
-        public static string TodoSettings_TokenLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TokenLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Token List:.
-        /// </summary>
-        public static string TodoSettings_TokenListLabel {
-            get {
-                return ResourceManager.GetString("TodoSettings_TokenListLabel", resourceCulture);
-            }
-        }
     }
 }
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.cs.resx b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.cs.resx
index 1ba6b0472a..3cf5fdd2ca 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.cs.resx
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.cs.resx
@@ -126,12 +126,6 @@
   <data name="TodoExplorer_Caption" xml:space="preserve">
     <value>TODO Explorer</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Text tokenu:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Seznam tokenu:</value>
-  </data>
   <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
     <value>{0}: {1} - {2}.{3} řádek {4}.</value>
   </data>
@@ -148,7 +142,4 @@
 {1} položek nalezeno.</value>
     <comment>{0}=timestamp; {1}=number</comment>
   </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.de.resx b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.de.resx
index 3bb59b1165..ea22976fdd 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.de.resx
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.de.resx
@@ -126,15 +126,6 @@
   <data name="TodoExplorer_LineNumber" xml:space="preserve">
     <value>Zeilennummer</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Markierungstext:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Markierungen:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>In die Zwischenablage kopieren</value>
   </data>
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.es.resx b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.es.resx
index 5873bc6261..f3ea4e9ffe 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.es.resx
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.es.resx
@@ -126,15 +126,6 @@
   <data name="TodoExplorer_LineNumber" xml:space="preserve">
     <value>Número de línea</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Texto de Etiqueta:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Lista de Etiquetas:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Texto</value>
-  </data>
   <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
     <value>Ítems de TODO de Rubberduck - {0}
 {1} ítems encontrados.</value>
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.fr.resx b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.fr.resx
index 92048ca87c..60680521ba 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.fr.resx
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.fr.resx
@@ -126,15 +126,6 @@
   <data name="TodoExplorer_LineNumber" xml:space="preserve">
     <value>Ligne</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Texte:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Liste:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Texte</value>
-  </data>
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>Copier dans le presse-papier</value>
   </data>
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.resx b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.resx
index 48fc9ac68f..d709bad6a0 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.resx
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.resx
@@ -126,15 +126,6 @@
   <data name="TodoExplorer_LineNumber" xml:space="preserve">
     <value>Line Number</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Token Text:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Token List:</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
   <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
     <value>Rubberduck TODO Items - {0}
 {1} items found.</value>

From 176a4f8428bfb2a71e987b6a3bee6171359c5226 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Mon, 2 Nov 2020 22:51:31 -0800
Subject: [PATCH 57/64] Correct missed migration

---
 Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs
index 71f397b321..9c84f0273f 100644
--- a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs
+++ b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-using Rubberduck.Resources;
+using Rubberduck.Resources.ToDoExplorer;
 
 namespace Rubberduck.UI.ToDoItems
 {
@@ -10,7 +10,7 @@ public sealed partial class ToDoExplorerWindow : UserControl, IDockableUserContr
     {
         private const string ClassId = "8B071EDA-2C9C-4009-9A22-A1958BF98B28"; // todo get from Resources.Registration?
         string IDockableUserControl.ClassId => ClassId;
-        string IDockableUserControl.Caption => RubberduckUI.TodoExplorer_Caption;
+        string IDockableUserControl.Caption => ToDoExplorerUI.TodoExplorer_Caption;
 
         private ToDoExplorerWindow()
         {

From 53af86ef89f023cd2ac7704151352da849e24a0a Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Sat, 24 Apr 2021 21:24:08 -0700
Subject: [PATCH 58/64] Opportunistic edits

Expression body member
Autoproperty
Remove redundant default initialization
Remove unnecessary using directive
---
 .../UI/CodeExplorer/Commands/ImportCommand.cs    |  1 -
 .../UI/Inspections/InspectionResultsViewModel.cs |  2 +-
 .../UI/Inspections/InspectionResultsWindow.cs    | 16 ++++++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
index 35c8c6b7e4..3ba681a8c0 100644
--- a/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
+++ b/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
@@ -9,7 +9,6 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.VBA.DeclarationCaching;
-using Rubberduck.Resources;
 using Rubberduck.Resources.CodeExplorer;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.ComManagement;
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs
index 84870fe8c7..dc29eb3c5d 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs
@@ -407,7 +407,7 @@ public bool IsBusy
         /// A boolean indicating that a local refresh was triggered.
         /// When this is set to true, InspectionResults are refreshed, even when inspecting after successful parsing is disabled.
         /// </summary>
-        private bool _forceRefreshResults = false;
+        private bool _forceRefreshResults;
 
         private bool _unparsed = true;
         public bool Unparsed
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
index 6d1cb35479..5ed829461f 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
@@ -6,9 +6,9 @@ namespace Rubberduck.UI.Inspections
     public sealed partial class InspectionResultsWindow : UserControl, IDockableUserControl
     {
         private const string ClassId = "D3B2A683-9856-4246-BDC8-6B0795DC875B";
-        string IDockableUserControl.ClassId { get { return ClassId; } }
-        string IDockableUserControl.Caption { get { return RubberduckUI.CodeInspections; } }
-        
+        string IDockableUserControl.ClassId => ClassId;
+        string IDockableUserControl.Caption => RubberduckUI.CodeInspections;
+
         private InspectionResultsWindow()
         {
             InitializeComponent();
@@ -16,14 +16,10 @@ private InspectionResultsWindow()
 
         public InspectionResultsWindow(InspectionResultsViewModel viewModel) : this()
         {
-            _viewModel = viewModel;
-            wpfInspectionResultsControl.DataContext = _viewModel;
+            ViewModel = viewModel;
+            wpfInspectionResultsControl.DataContext = ViewModel;
         }
 
-        private readonly InspectionResultsViewModel _viewModel;
-        public InspectionResultsViewModel ViewModel
-        {
-            get { return _viewModel; }
-        }
+        public InspectionResultsViewModel ViewModel { get; }
     }
 }

From 52e19967e3a5ca304a87952b8678d373167108a3 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Sun, 25 Apr 2021 00:03:56 -0700
Subject: [PATCH 59/64] Opportunistic edits

Use expression body
Remove unused local variable
Use null propagation
Remove redundant explicit array creation in argument
Remove unused using directive
Convert variables to constants
Use auto-property
Remove unused resource
---
 .../UI/Inspections/InspectionResultsWindow.cs | 16 +++++---------
 .../AnnotateDeclarationView.xaml              |  3 ---
 .../AssignedByValParameterQuickFixDialog.cs   |  2 +-
 .../UI/Refactorings/ExtractMethodDialog.cs    | 22 ++++++-------------
 .../RemoveParametersPresenter.cs              |  1 -
 .../Common/VBAIdentifierValidator.cs          |  4 ++--
 ...lateFieldInsertNewCodeRefactoringAction.cs |  2 +-
 7 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
index 6d1cb35479..5ed829461f 100644
--- a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
@@ -6,9 +6,9 @@ namespace Rubberduck.UI.Inspections
     public sealed partial class InspectionResultsWindow : UserControl, IDockableUserControl
     {
         private const string ClassId = "D3B2A683-9856-4246-BDC8-6B0795DC875B";
-        string IDockableUserControl.ClassId { get { return ClassId; } }
-        string IDockableUserControl.Caption { get { return RubberduckUI.CodeInspections; } }
-        
+        string IDockableUserControl.ClassId => ClassId;
+        string IDockableUserControl.Caption => RubberduckUI.CodeInspections;
+
         private InspectionResultsWindow()
         {
             InitializeComponent();
@@ -16,14 +16,10 @@ private InspectionResultsWindow()
 
         public InspectionResultsWindow(InspectionResultsViewModel viewModel) : this()
         {
-            _viewModel = viewModel;
-            wpfInspectionResultsControl.DataContext = _viewModel;
+            ViewModel = viewModel;
+            wpfInspectionResultsControl.DataContext = ViewModel;
         }
 
-        private readonly InspectionResultsViewModel _viewModel;
-        public InspectionResultsViewModel ViewModel
-        {
-            get { return _viewModel; }
-        }
+        public InspectionResultsViewModel ViewModel { get; }
     }
 }
diff --git a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml
index 5a0cac817c..18b7f4910a 100644
--- a/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml
+++ b/Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml
@@ -47,9 +47,6 @@
             <converters:SpecificValueToVisibilityConverter SpecialValue="{x:Static annotations:AnnotationArgumentType.Boolean}" CollapseSpecialValue="False" x:Key="BooleanArgumentVisibilityConverter"/>
             <converters:SpecificValueToVisibilityConverter SpecialValue="{x:Static annotations:AnnotationArgumentType.Inspection}" CollapseSpecialValue="False" x:Key="InspectionArgumentVisibilityConverter"/>
             <DataTemplate DataType="{x:Type local:IAnnotationArgumentViewModel}" x:Key="ArgumentValueTemplate">
-                <DataTemplate.Resources>
-                    <CollectionViewSource Source="{Binding InspectionNames}" x:Key="InspectionNamesView" />
-                </DataTemplate.Resources>
                 <StackPanel VerticalAlignment="Center">
                     <TextBox Text="{Binding ArgumentValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
                              Style="{StaticResource TextBoxErrorStyle}"
diff --git a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
index 6fdf3d2fc0..e2bccc6b38 100644
--- a/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs
@@ -39,7 +39,7 @@ private void NewNameBox_TextChanged(object sender, EventArgs e)
 
         public string NewName
         {
-            get { return NewNameBox.Text; }
+            get => NewNameBox.Text;
             set
             {
                 NewNameBox.Text = value;
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs b/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
index 8dd6c3bed7..86f407d886 100644
--- a/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
@@ -99,7 +99,7 @@ public void OnRefreshPreview()
 
         public bool SetReturnValue
         {
-            get { return _setReturnValue; }
+            get => _setReturnValue;
             set
             {
                 _setReturnValue = value;
@@ -112,7 +112,7 @@ public bool SetReturnValue
         private Accessibility _accessibility;
         public Accessibility Accessibility
         {
-            get { return _accessibility; }
+            get => _accessibility;
             set
             {
                 _accessibility = value; 
@@ -134,18 +134,14 @@ private void MethodNameBox_TextChanged(object sender, EventArgs e)
         private void OnViewEvent(EventHandler target, EventArgs args = null)
         {
             var handler = target;
-            if (handler == null)
-            {
-                return;
-            }
 
-            handler(this, args ?? EventArgs.Empty);
+            handler?.Invoke(this, args ?? EventArgs.Empty);
         }
 
         private string _preview;
         public string Preview
         {
-            get { return _preview; }
+            get => _preview;
             set
             {
                 _preview = value;
@@ -168,12 +164,8 @@ public IEnumerable<ExtractedParameter> Parameters
         private BindingList<ExtractedParameter> _returnValues; 
         public IEnumerable<ExtractedParameter> ReturnValues
         {
-            get { return _returnValues; }
-            set
-            {
-                _returnValues = new BindingList<ExtractedParameter>(value.ToList());
-                var items = _returnValues.ToArray();
-            }
+            get => _returnValues;
+            set => _returnValues = new BindingList<ExtractedParameter>(value.ToList());
         }
 
         private readonly ExtractedParameter _returnValue;
@@ -186,7 +178,7 @@ public IEnumerable<ExtractedParameter> ReturnValues
 
         public string MethodName
         {
-            get { return MethodNameBox.Text; }
+            get => MethodNameBox.Text;
             set
             {
                 MethodNameBox.Text = value;
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
index e062e38e07..2a1ebf143d 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -1,7 +1,6 @@
 using Rubberduck.Interaction;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
-using Rubberduck.Resources;
 using Rubberduck.Refactorings.RemoveParameters;
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
diff --git a/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs b/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs
index 7e258bb375..c63117ea3b 100644
--- a/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs
+++ b/Rubberduck.Refactorings/Common/VBAIdentifierValidator.cs
@@ -26,8 +26,8 @@ public static bool IsMeaningfulIdentifier(string name)
         public static bool TryMatchMeaninglessIdentifierCriteria(string name, out string criteriaMatchMessage)
         {
             criteriaMatchMessage = string.Empty;
-            string Vowels = "aeiouyàâäéèêëïîöôùûü";
-            int MinimumNameLength = 3;
+            const string Vowels = "aeiouyàâäéèêëïîöôùûü";
+            const int MinimumNameLength = 3;
 
             bool HasVowel()
                 => name.Any(character => Vowels.Any(vowel =>
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs
index fcd18c73e7..a4d711704d 100644
--- a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs
+++ b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs
@@ -94,7 +94,7 @@ private void InsertBlocks(EncapsulateFieldInsertNewCodeModel model, IRewriteSess
                 return;
             }
 
-            var allNewContent = string.Join(NewLines.DOUBLE_SPACE, new string[] { newDeclarationSectionBlock });
+            var allNewContent = string.Join(NewLines.DOUBLE_SPACE, newDeclarationSectionBlock);
 
             var previewMarker = model.NewContentAggregator.RetrieveBlock(RefactoringsUI.EncapsulateField_PreviewMarker);
             if (!string.IsNullOrEmpty(previewMarker))

From 452b8ffcd6937a707cc06cfca736445d71422ba9 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 12 May 2021 01:26:04 -0700
Subject: [PATCH 60/64] Bulk migration of resource strings

Values in a format Foo_Bar were migrated to another resource file.
---
 .../CodeAnalysisUI.it.resx                    |  266 ++++
 .../AddRemoveReferencesUI.it.resx             |  213 ++++
 .../Inspections/InspectionResultsUI.it.resx   |  132 ++
 .../UI/Settings/GeneralSettingsUI.it.resx     |  224 ++++
 .../UI/Settings/IndenterSettings.xaml         |    4 +-
 .../UI/Settings/IndenterSettingsUI.cs.resx    |    3 +
 .../UI/Settings/IndenterSettingsUI.de.resx    |    3 +
 .../UI/Settings/IndenterSettingsUI.fr.resx    |    3 +
 .../UI/Settings/IndenterSettingsUI.it.resx    |  236 ++++
 .../UI/Settings/IndenterSettingsUI.resx       |    3 +
 .../RefactoringsUI.Designer.cs                |    9 -
 .../RefactoringsUI.cs.resx                    |   18 +-
 .../RefactoringsUI.de.resx                    |    3 -
 .../RefactoringsUI.es.resx                    |    3 -
 .../RefactoringsUI.fr.resx                    |    3 -
 .../RefactoringsUI.it.resx                    |  559 +++++++++
 Rubberduck.Refactorings/RefactoringsUI.resx   |    3 -
 .../CodeExplorer/CodeExplorerUI.it.resx       |   34 +
 Rubberduck.Resources/RubberduckUI.Designer.cs |   54 +-
 Rubberduck.Resources/RubberduckUI.cs.resx     |   30 -
 Rubberduck.Resources/RubberduckUI.de.resx     |   15 -
 Rubberduck.Resources/RubberduckUI.es.resx     |    9 -
 Rubberduck.Resources/RubberduckUI.fr.resx     |   12 -
 Rubberduck.Resources/RubberduckUI.it.resx     | 1066 -----------------
 Rubberduck.Resources/RubberduckUI.resx        |   15 -
 .../ToDoExplorer/ToDoExplorerUI.it.resx       |   11 +-
 .../UnitTesting/TestExplorer.it.resx          |    7 +-
 27 files changed, 1708 insertions(+), 1230 deletions(-)
 create mode 100644 Rubberduck.CodeAnalysis/CodeAnalysisUI.it.resx
 create mode 100644 Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.it.resx
 create mode 100644 Rubberduck.Core/UI/Inspections/InspectionResultsUI.it.resx
 create mode 100644 Rubberduck.Core/UI/Settings/GeneralSettingsUI.it.resx
 create mode 100644 Rubberduck.Core/UI/Settings/IndenterSettingsUI.it.resx
 create mode 100644 Rubberduck.Refactorings/RefactoringsUI.it.resx

diff --git a/Rubberduck.CodeAnalysis/CodeAnalysisUI.it.resx b/Rubberduck.CodeAnalysis/CodeAnalysisUI.it.resx
new file mode 100644
index 0000000000..44148d372f
--- /dev/null
+++ b/Rubberduck.CodeAnalysis/CodeAnalysisUI.it.resx
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CodeMetrics_Complexity" xml:space="preserve">
+    <value>Complessità Ciclomatica</value>
+  </data>
+  <data name="CodeMetrics_Lines" xml:space="preserve">
+    <value>Righe</value>
+  </data>
+  <data name="CodeMetrics_Nesting" xml:space="preserve">
+    <value>Annidamenti Massimi</value>
+  </data>
+  <data name="CodeInspectionResults_Type" xml:space="preserve">
+    <value>Tipo</value>
+  </data>
+  <data name="CodeInspectionResults_Location" xml:space="preserve">
+    <value>Posizione</value>
+  </data>
+  <data name="CodeInspectionResults_Issue" xml:space="preserve">
+    <value>Problema</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Impostazione Compila su Richiesta</value>
+  </data>
+  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
+    <value>L'impostazione "Compila su richiesta" di VBE è attualmente abilitata. Questo non è raccomandato perché può nascondere errori di compilazione e causare problemi con l'analisi. Vuoi analizzare comunque?</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
+    <value>Impossibile compilare per l'analisi.</value>
+  </data>
+  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
+    <value>Il/i seguente/i progetto/i non può/possono essere compilato/i, con probabile errore dell'analisi. Continuare comunque? {0}</value>
+  </data>
+  <data name="GroupingGrid_Filter" xml:space="preserve">
+    <value>Filtra</value>
+  </data>
+  <data name="EmptyLineHandling_Remove" xml:space="preserve">
+    <value>Rimuovi</value>
+  </data>
+  <data name="EmptyLineHandling_Indent" xml:space="preserve">
+    <value>Indenta</value>
+  </data>
+  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
+    <value>Ignora</value>
+  </data>
+  <data name="EasterEgg_Continuator" xml:space="preserve">
+    <value>Hai guadagnato il badge di "Continuatore"!</value>
+  </data>
+  <data name="DeclarationType_Variable" xml:space="preserve">
+    <value>variabile</value>
+  </data>
+  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
+    <value>membro di tipo definito dall'utente</value>
+  </data>
+  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
+    <value>tipo definito dall'utente</value>
+  </data>
+  <data name="DeclarationType_PropertySet" xml:space="preserve">
+    <value>property set accessor</value>
+  </data>
+  <data name="DeclarationType_PropertyLet" xml:space="preserve">
+    <value>property let accessor</value>
+  </data>
+  <data name="DeclarationType_PropertyGet" xml:space="preserve">
+    <value>property get accessor</value>
+  </data>
+  <data name="DeclarationType_Project" xml:space="preserve">
+    <value>progetto</value>
+  </data>
+  <data name="DeclarationType_Procedure" xml:space="preserve">
+    <value>procedura</value>
+  </data>
+  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
+    <value>modulo</value>
+  </data>
+  <data name="DeclarationType_Parameter" xml:space="preserve">
+    <value>parametro</value>
+  </data>
+  <data name="DeclarationType_LineLabel" xml:space="preserve">
+    <value>riga di etichetta</value>
+  </data>
+  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
+    <value>libreria di procedura</value>
+  </data>
+  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
+    <value>libreria di funzione</value>
+  </data>
+  <data name="DeclarationType_Function" xml:space="preserve">
+    <value>funzione</value>
+  </data>
+  <data name="DeclarationType_Event" xml:space="preserve">
+    <value>evento</value>
+  </data>
+  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
+    <value>membro di enum</value>
+  </data>
+  <data name="DeclarationType_Enumeration" xml:space="preserve">
+    <value>enum</value>
+  </data>
+  <data name="DeclarationType_Control" xml:space="preserve">
+    <value>controllo</value>
+  </data>
+  <data name="DeclarationType_Constant" xml:space="preserve">
+    <value>costante</value>
+  </data>
+  <data name="DeclarationType_ClassModule" xml:space="preserve">
+    <value>classe</value>
+  </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>espressione a runtime</value>
+  </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Statistiche</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
+    <value>Rubberduck Ispezioni del Codice - {0}
+{1} problema trovato.</value>
+  </data>
+  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
+    <value>Rubberduck Ispezioni del Codice - {0}
+{1} problemi trovati.</value>
+  </data>
+  <data name="CodeInspections_Inspecting" xml:space="preserve">
+    <value>Ispezione...</value>
+  </data>
+  <data name="CodeInspections" xml:space="preserve">
+    <value>Ispezioni del Codice</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterBySeverity" xml:space="preserve">
+    <value>Gravità:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_FilterByDescription" xml:space="preserve">
+    <value>Descrizione:</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_InspectionSeveritySettingsLabel" xml:space="preserve">
+    <value>Gravità dell'ispezione</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
+    <value>Esegui le ispezioni automaticamente ad analisi superata</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_Misc" xml:space="preserve">
+    <value>Varie</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersLabel" xml:space="preserve">
+    <value>Identificatori Consentiti</value>
+  </data>
+  <data name="CodeInspectionSettingsPage_WhitelistedIdentifiersDescription" xml:space="preserve">
+    <value>Questi identificatori saranno ignorati dall'ispezione 'Usa nomi significativi'.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.it.resx b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.it.resx
new file mode 100644
index 0000000000..5d63958833
--- /dev/null
+++ b/Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesUI.it.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AddFailedCaption" xml:space="preserve">
+    <value>Impossibile aggiungere riferimenti</value>
+  </data>
+  <data name="AddToolTip" xml:space="preserve">
+    <value>Aggiugni al progetto</value>
+  </data>
+  <data name="BrowseButtonText" xml:space="preserve">
+    <value>Sfoglia...</value>
+  </data>
+  <data name="BrowseCaption" xml:space="preserve">
+    <value>Sfoglia riferimenti</value>
+  </data>
+  <data name="BrowseFilterAccess" xml:space="preserve">
+    <value>Database di Microsoft Access({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterActiveX" xml:space="preserve">
+    <value>Controlli ActiveX (*.ocx)|*.ocx</value>
+  </data>
+  <data name="BrowseFilterAllFiles" xml:space="preserve">
+    <value>Tutti i file (*.*)|*.*</value>
+  </data>
+  <data name="BrowseFilterExcel" xml:space="preserve">
+    <value>File di Microsoft Excel ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterExecutable" xml:space="preserve">
+    <value>File eseguibili (*.exe;*.dll)|*.exe;*.dll</value>
+  </data>
+  <data name="BrowseFilterOutlook" xml:space="preserve">
+    <value>File VBA di Outlook ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPowerPoint" xml:space="preserve">
+    <value>File Addin di PowerPoint({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterPublisher" xml:space="preserve">
+    <value>File di Publisher ({0}|{0}</value>
+  </data>
+  <data name="BrowseFilterTypes" xml:space="preserve">
+    <value>Tipi Libreria (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
+  </data>
+  <data name="BrowseFilterVisio" xml:space="preserve">
+    <value>Tutti i file di Visio ({0})|{0}</value>
+  </data>
+  <data name="BrowseFilterWord" xml:space="preserve">
+    <value>Documenti di Word ({0})|{0}</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Aggiungi/Rimuovi Riferimento...</value>
+  </data>
+  <data name="CaptionTemplate" xml:space="preserve">
+    <value>Aggiungi/Rimuovi Riferimenti - {0}</value>
+  </data>
+  <data name="DefaultLocale" xml:space="preserve">
+    <value>Standard</value>
+  </data>
+  <data name="Locale" xml:space="preserve">
+    <value>Lingua:</value>
+  </data>
+  <data name="MoveDownToolTip" xml:space="preserve">
+    <value>Sposta sotto</value>
+  </data>
+  <data name="MoveUpToolTip" xml:space="preserve">
+    <value>Sposta sopra</value>
+  </data>
+  <data name="Pinned" xml:space="preserve">
+    <value>Bloccati</value>
+  </data>
+  <data name="PinToolTip" xml:space="preserve">
+    <value>Blocca riferimento</value>
+  </data>
+  <data name="Projects" xml:space="preserve">
+    <value>Progetti</value>
+  </data>
+  <data name="Recent" xml:space="preserve">
+    <value>Recenti</value>
+  </data>
+  <data name="RemoveToolTip" xml:space="preserve">
+    <value>Rimuovi dal progetto</value>
+  </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Cerca riferimenti...</value>
+  </data>
+  <data name="SubCaption" xml:space="preserve">
+    <value>Selezionare i tipi libreria e progetti VB da aggiungere o rimuovere.</value>
+  </data>
+  <data name="TypeLibs" xml:space="preserve">
+    <value>Tipi Libreria</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Versione:</value>
+  </data>
+  <data name="References" xml:space="preserve">
+    <value>Riferimenti</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsUI.it.resx b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.it.resx
new file mode 100644
index 0000000000..4950e4c5ac
--- /dev/null
+++ b/Rubberduck.Core/UI/Inspections/InspectionResultsUI.it.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FilterByError" xml:space="preserve">
+    <value>Errore</value>
+  </data>
+  <data name="FilterByHint" xml:space="preserve">
+    <value>Indizio</value>
+  </data>
+  <data name="FilterBySuggestion" xml:space="preserve">
+    <value>Suggerimento</value>
+  </data>
+  <data name="FilterByWarning" xml:space="preserve">
+    <value>Avvertimento</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.it.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.it.resx
new file mode 100644
index 0000000000..1f9746a354
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.it.resx
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CheckVersion" xml:space="preserve">
+    <value>Verifica se è disponibile una versione più recente all'avvio.</value>
+  </data>
+  <data name="CompileBeforeParse" xml:space="preserve">
+    <value>Compilare il codice prima dell'analisi</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
+    <value>L'impostazione "Compila su richiesta" di VBE è attualmente abilitata. E' fortemente raccomandato disabilitare l'impostazione dalla finestra Opzioni di VBE nella scheda Generale per usare la funzionalità Compila Prima di Analizzare. Disabilitare ora?
+
+NOTA: è necessario un riavvio perché l'impostazione abbia effetto.</value>
+  </data>
+  <data name="CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
+    <value>Compila su richiesta attualmente abilitata</value>
+  </data>
+  <data name="DebugLogLevel" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+  <data name="EnableDragAndDrop" xml:space="preserve">
+    <value>Abilità drag and drop in Explorer del Codice</value>
+  </data>
+  <data name="ErrorLogLevel" xml:space="preserve">
+    <value>Errore</value>
+  </data>
+  <data name="ExperimentalFeatures" xml:space="preserve">
+    <value>Funzionalità Sperimentali (è necessario un riavvio perché abbia effetto):</value>
+  </data>
+  <data name="ExperimentalFeaturesWarning" xml:space="preserve">
+    <value>Abilitare solo se si sa cosa si sta facendo. Abilitare e/o usare funzionalità da questa sezione può causare chiusure improvvise e perdita di dati irreparabile.</value>
+  </data>
+  <data name="FatalLogLevel" xml:space="preserve">
+    <value>Fatale</value>
+  </data>
+  <data name="FolderDelimiterLabel" xml:space="preserve">
+    <value>Delimitatore di Cartella:</value>
+  </data>
+  <data name="HotkeyAlt" xml:space="preserve">
+    <value>Alt</value>
+  </data>
+  <data name="HotkeyCtrl" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+  <data name="HotkeyDescription" xml:space="preserve">
+    <value>Descrizione</value>
+  </data>
+  <data name="HotkeyEnabled" xml:space="preserve">
+    <value>Abilitato</value>
+  </data>
+  <data name="HotkeyKey1" xml:space="preserve">
+    <value>Tasto1</value>
+  </data>
+  <data name="HotkeyKey2" xml:space="preserve">
+    <value>Tasto2</value>
+  </data>
+  <data name="HotkeyRestrictionLabel" xml:space="preserve">
+    <value>Le combinazioni dovrebbero includere Alt e/o Ctrl.</value>
+  </data>
+  <data name="HotkeyRestrictionToolTip" xml:space="preserve">
+    <value>Questa configurazione di combinazioni può causare effetti collaterali indesiderati.</value>
+  </data>
+  <data name="HotkeyShift" xml:space="preserve">
+    <value>Maiuscolo</value>
+  </data>
+  <data name="HotkeysLabel" xml:space="preserve">
+    <value>Combinazioni:</value>
+  </data>
+  <data name="IncludePreRelease" xml:space="preserve">
+    <value>Avvertimi se una build pre-release più recente è disponibile.</value>
+  </data>
+  <data name="InfoLogLevel" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="LanguageLabel" xml:space="preserve">
+    <value>Lingua di visualizzazione:</value>
+  </data>
+  <data name="MinimumLogLevelLabel" xml:space="preserve">
+    <value>Livello Minimo di Registrazione:</value>
+  </data>
+  <data name="ModifierWarning" xml:space="preserve">
+    <value>Avvertimento di Modificatore</value>
+  </data>
+  <data name="OffLogLevel" xml:space="preserve">
+    <value>Nessuna registrazione</value>
+  </data>
+  <data name="PeriodDelimiter" xml:space="preserve">
+    <value>Punto (.)</value>
+  </data>
+  <data name="SetDpiUnaware" xml:space="preserve">
+    <value>Correzione per il ridimensionamento nei display ad alta risoluzione</value>
+  </data>
+  <data name="ShowLogFolder" xml:space="preserve">
+    <value>Mostra la cartella dei log</value>
+  </data>
+  <data name="ShowSplash" xml:space="preserve">
+    <value>Mostra la schermata di presentazione all'avvio</value>
+  </data>
+  <data name="SlashDelimiter" xml:space="preserve">
+    <value>Barra (/)</value>
+  </data>
+  <data name="TraceLogLevel" xml:space="preserve">
+    <value>Traccia</value>
+  </data>
+  <data name="WarnLogLevel" xml:space="preserve">
+    <value>Avvertimento</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettings.xaml b/Rubberduck.Core/UI/Settings/IndenterSettings.xaml
index b90866443e..2871af1370 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/IndenterSettings.xaml
@@ -311,8 +311,8 @@
                                       IsChecked="{Binding GroupRelatedProperties,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <AccessText TextWrapping="WrapWithOverflow">
                                     <AccessText.Text>
-                                        <Resx ResxName="Rubberduck.Resources.RubberduckUI"
-                                              Key="IndenterSettings_GroupRelatedProperties" />
+                                        <Resx ResxName="Rubberduck.UI.Settings.IndenterSettingsUI"
+                                              Key="GroupRelatedProperties" />
                                     </AccessText.Text>
                                 </AccessText>
                             </CheckBox>
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx
index 1e97c9ba49..79df5f589e 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.cs.resx
@@ -196,4 +196,7 @@ End Enum</value>
   <data name="VerticalSpacingLabel" xml:space="preserve">
     <value>Vertikální vzdálenosti</value>
   </data>
+  <data name="GroupRelatedProperties" xml:space="preserve">
+    <value>Odeberte vertikální mezeru mezi souvisejícími property členy</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx
index f0cfc5695a..320dd9603f 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.de.resx
@@ -230,4 +230,7 @@ End Sub</value>
   <data name="VerticalSpacingLabel" xml:space="preserve">
     <value>Vertikalen Abstand</value>
   </data>
+  <data name="GroupRelatedProperties" xml:space="preserve">
+    <value>Entferne vertikalen Zwischenraum zwischen verwandten Eigenschaften</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx
index a6ec6c056d..bcc917ab44 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.fr.resx
@@ -230,4 +230,7 @@ End Sub</value>
   <data name="VerticalSpacingLabel" xml:space="preserve">
     <value>Espacement vertical</value>
   </data>
+  <data name="GroupRelatedProperties" xml:space="preserve">
+    <value>Supprime l'espacement vertical entre les membres d'une même propriété</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.it.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.it.resx
new file mode 100644
index 0000000000..c622b150d5
--- /dev/null
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.it.resx
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AlignCommentsWithCode" xml:space="preserve">
+    <value>Allinea i commenti con il codice</value>
+  </data>
+  <data name="AlignContinuations" xml:space="preserve">
+    <value>Allinea le continuazioni</value>
+  </data>
+  <data name="AlignDims" xml:space="preserve">
+    <value>Allinea i dimensionamenti (Dim)</value>
+  </data>
+  <data name="AlignmentOptionsLabel" xml:space="preserve">
+    <value>Opzioni di allineamento</value>
+  </data>
+  <data name="CodeSampleHeader" xml:space="preserve">
+    <value>Esempio di Codice indentato</value>
+  </data>
+  <data name="EmptyLineHeading" xml:space="preserve">
+    <value>Trattamento delle righe vuote:</value>
+  </data>
+  <data name="EnableOptionsLabel" xml:space="preserve">
+    <value>Opzioni di Abilitazione</value>
+  </data>
+  <data name="EnableUndo" xml:space="preserve">
+    <value>Abilita annullamenti</value>
+  </data>
+  <data name="EndOfLineCommentStyle" xml:space="preserve">
+    <value>Stile dei commenti di fine riga:</value>
+  </data>
+  <data name="ForceCompilerDirectivesToColumn1" xml:space="preserve">
+    <value>Forza le direttive di compilazione nella colonna 1</value>
+  </data>
+  <data name="ForceDebugDirectivesToColumn1" xml:space="preserve">
+    <value>Forza le direttive di debug nella colonna 1</value>
+  </data>
+  <data name="IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
+    <value>Ignorare le righe vuote per individuare il primo commento e i blocchi di dichiarazione</value>
+  </data>
+  <data name="IgnoreOperators" xml:space="preserve">
+    <value>Ignorare gli operatori</value>
+  </data>
+  <data name="IndentCase" xml:space="preserve">
+    <value>Indenta Case</value>
+  </data>
+  <data name="IndentCompilerDirectives" xml:space="preserve">
+    <value>Indenta le direttive di compilazione</value>
+  </data>
+  <data name="IndentEntireProcedureBody" xml:space="preserve">
+    <value>Indenta l'intero corpo della procedura</value>
+  </data>
+  <data name="IndentEnumTypeAsProcedure" xml:space="preserve">
+    <value>Indenta i commenti nei blocchi Enum e Type come nelle procedure</value>
+  </data>
+  <data name="IndentFirstCommentBlock" xml:space="preserve">
+    <value>Indenta il primo blocco dei commenti</value>
+  </data>
+  <data name="IndentFirstDeclarationBlock" xml:space="preserve">
+    <value>Indenta il primo blocco di dichiarazione</value>
+  </data>
+  <data name="IndentOptionsLabel" xml:space="preserve">
+    <value>Opzioni di indentazione</value>
+  </data>
+  <data name="IndentSpaces" xml:space="preserve">
+    <value>Spazi di indentazione:</value>
+  </data>
+  <data name="PreviewCode" xml:space="preserve">
+    <value>Public Enum EsempioEnum
+' Commento di Enum
+Foo
+Bar ' commento del Membro.
+End Enum
+
+' Esempio di Procedura
+Sub EsempioProc()
+
+' SMART INDENTER
+' Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
+' © 2016 by Rubberduck VBA.
+
+Dim count As Integer
+Static name As String
+
+If YouLikeRubberduck Then
+' Mettici una Stella su GitHub http://github.com/rubberduck-vba/Rubberduck
+' Seguici su Twitter @rubberduckvba
+' Visita http://rubberduckvba.com per novità ed aggiornamenti
+
+Select Case X
+Case "A"
+' Se hai qualche commento o suggerimento, _
+o trovi codice VBA valido con indentazione non corretta,
+
+#If VBA6 Then
+MsgBox "Contatta contact@rubberduck-vba.com"
+#End If
+
+Case "Stringhe e parametri continuati possono essere" _
+&amp; "allineati in verticale per una più facile lettura, ignorando eventualmente" _
+&amp; "qualsiasi operatore (&amp;+, ecc) all'inizio della riga."
+
+Debug.Print "X&lt;&gt;1"
+End Select      'Case X
+End If      'Più Strumenti? Suggerimenti http://github.com/rubberduck-vba/Rubberduck/Issues/New
+
+End Sub</value>
+  </data>
+  <data name="SpecialOptionsLabel" xml:space="preserve">
+    <value>Opzioni Speciali</value>
+  </data>
+  <data name="VerticalSpacing" xml:space="preserve">
+    <value>Preserva la spaziatura verticale</value>
+  </data>
+  <data name="VerticalSpacingLabel" xml:space="preserve">
+    <value>Spaziatura Verticale</value>
+  </data>
+  <data name="GroupRelatedProperties" xml:space="preserve">
+    <value>Rimuovi gli spazi verticali tra membri proprietà collegati</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx
index 61e6a67adc..19d8d6a177 100644
--- a/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx
+++ b/Rubberduck.Core/UI/Settings/IndenterSettingsUI.resx
@@ -210,4 +210,7 @@ End Sub</value>
   <data name="VerticalSpacingLabel" xml:space="preserve">
     <value>Vertical Spacing</value>
   </data>
+  <data name="GroupRelatedProperties" xml:space="preserve">
+    <value>Remove vertical space between related property members</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index a8e86f9b5c..1dbdc319ad 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -204,15 +204,6 @@ public static string AnnotationArgument_ValidationError_NotABoolean {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Annotation arguments of type &apos;Number&apos; have to be a valid number in integer of floating point format..
-        /// </summary>
-        public static string AnnotationArgument_ValidationError_NotANumber {
-            get {
-                return ResourceManager.GetString("AnnotationArgument_ValidationError_NotANumber", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Annotation arguments must not contain control characters..
         /// </summary>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index ef5ab99d7d..8349a0ea05 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -165,9 +165,6 @@
   <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
     <value>Argumenty anotace typu 'Boolean' musejí být buď 'True' nebo 'False'.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Argumenty anotace typu 'Number' musejí být validní číslo ve formátu integer nebo float.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Argumenty anotace nesmějí obsahovat 'control' charaktery.</value>
   </data>
@@ -547,4 +544,19 @@ Chcete pokračovat?</value>
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Volitelné parametry musejí být specifikovány na konci seznamu parametrů.</value>
   </data>
+  <data name="ExtractInterface_OptionReplaceMembersWithInterfaceMembers" xml:space="preserve">
+    <value>Nahradit Členy za Členy Rozhraní</value>
+  </data>
+  <data name="ExtractInterface_OptionForwardToObjectMembers" xml:space="preserve">
+    <value>Přeposlat volání členů rozhraní na členy objektů</value>
+  </data>
+  <data name="ExtractInterface_OptionForwardToInterfaceMembers" xml:space="preserve">
+    <value>Přeposlat volání členů objektů na členy rozhraní</value>
+  </data>
+  <data name="ExtractInterface_OptionAddEmptyImplementation" xml:space="preserve">
+    <value>Přidat Prázdnou Implementaci</value>
+  </data>
+  <data name="ExtractInterface_ImplementationOptionsGroupBox" xml:space="preserve">
+    <value>Možnosti Implementace:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index d3b244a2fb..252cc5ae75 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -165,9 +165,6 @@
   <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
     <value>Annotationsargumente vom Typ 'Wahrheitswert' müssen entweder 'True' oder 'False' sein.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Annotationsargumente vom Typ 'Zahl' müssen eine ganze Zahl oder eine Gleitkommazahl sein.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Annotationsargumente dürfen keine Kontrollzeichen enthalten.</value>
   </data>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index c51cf4bc8c..d0168a51ee 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -165,9 +165,6 @@
   <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
     <value>Los argumentos de anotaciones del tipo 'Booleano' deben ser 'True' o 'False'.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Los argumentos de anotaciones del tipo 'Número' deben ser un numero válido entero o en formato de punto flotante.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Los argumentos de anotaciones no pueden contener caracteres de control.</value>
   </data>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index f632dccb8e..6154e67763 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -165,9 +165,6 @@
   <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
     <value>La valeur des arguments de type 'Boolean' doit être 'True' ou 'False'.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>La valeur des arguments de type 'Number' doit être un nombre entier ou décimal valide.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>La valeur des arguments ne doit pas contenir de caractères de contrôle.</value>
   </data>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.it.resx b/Rubberduck.Refactorings/RefactoringsUI.it.resx
new file mode 100644
index 0000000000..4a4d63b6ee
--- /dev/null
+++ b/Rubberduck.Refactorings/RefactoringsUI.it.resx
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>Numero</value>
+  </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>Nome dell'Ispezione</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Boolean</value>
+  </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Attributo</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione di tipo 'Nome Attributo' non possono contenere whitespace.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione non possono essere più lunghi di {0} caratteri.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione non devono contenere caratteri di controllo.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione di tipo 'Boolean' devono essere 'Vero' o 'Falso'.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione possono contenere solo una riga.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione di tipo 'Inspection Name' devono essere il nome di un'ispezione esistente.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione non posso essere vuoti.</value>
+  </data>
+  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
+    <value>Gli argomenti dell'annotazione di tipo 'Nomi attributo' devono iniziare con 'VB_'.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
+    <value>Aggiungi</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
+    <value>Dichiarazione di Annotazione</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
+    <value>Rimuovi</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
+    <value>Selezionare un'annotazione (e valori) da aggiungere alla dichiarazione.</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
+    <value>Dichiarazione di Annotazione:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Dichiarazione di Annotazione</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
+    <value>Valore</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
+    <value>Tipo</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
+    <value>Argomenti dell'Annotazione:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
+    <value>Annotazione da Aggiungere:</value>
+  </data>
+  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
+    <value>Aggiungi/Adatta attributo</value>
+  </data>
+  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
+    <value>{0} Considerare di scegliere un nome diverso.</value>
+  </data>
+  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
+    <value>'{0}' è già accessibile in questo scope.</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
+    <value>Specificare il Nome della Variabile Locale Copia</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare un nome da usare per la copia locale di ByVal {0} '{1}'.</value>
+  </data>
+  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
+    <value>Parametro assegnato con ByVal Soluzione veloce - Creare una Copia Locale</value>
+  </data>
+  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
+    <value>I parametri opzionali devono essere specificati alla fine della lista dei parametri.</value>
+  </data>
+  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
+    <value>Meno di due parametri nel metodo '{0}'.</value>
+  </data>
+  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
+    <value>Riordina i parametri</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
+    <value>Sposta sopra</value>
+  </data>
+  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
+    <value>Sposta sotto</value>
+  </data>
+  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Selezionare un parametro e trascinarlo o usare i pulsanti per spostarlo sopra o sotto.</value>
+  </data>
+  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Riordina Parametri</value>
+  </data>
+  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Il metodo '{0}' implementa '{1}.{2}'. Rinominare il membro dell'interfaccia?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
+    <value>Il metodo '{0}' è un'implementazione dell'evento '{1}.{2}'. Rinominare l'evento '{2}'?</value>
+  </data>
+  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
+    <value>Il metodo '{0}' un è EventHandler per il controllo '{1}'. Solo il controllo può essere rinominato. Rinominare '{1}'?</value>
+  </data>
+  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
+    <value>Nessun modulo di codice trovato per il modulo di destinazione '{0}'.</value>
+  </data>
+  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
+    <value>Controllo di destinazione '{0}' non trovato.</value>
+  </data>
+  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
+    <value>La destinazione '{0}' è un gestore d'evento standard, che non può essere rinominato.</value>
+  </data>
+  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
+    <value>Rinomina cartella</value>
+  </data>
+  <data name="RenameDialog_TitleText" xml:space="preserve">
+    <value>Rinomina l'identificatore</value>
+  </data>
+  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
+    <value>Non è possibile modificare solo maiuscole e minuscole di un identificatore in VBA (il linguaggio non distingue maiuscole e minuscole).</value>
+  </data>
+  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
+    <value>Impossibile rinominare il membro di interfaccia {0}.</value>
+  </data>
+  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare il nuovo nome per {0} '{1}'.</value>
+  </data>
+  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
+    <value>Nuova cartella completa:</value>
+  </data>
+  <data name="RenameDialog_FolderLabel" xml:space="preserve">
+    <value>Cartella:</value>
+  </data>
+  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
+    <value>La cartella '{0}' esiste già. Rinominare '{1}' in '{2}' la unirà con la cartella esistente.
+Continuare?</value>
+  </data>
+  <data name="RenameDialog_Folder" xml:space="preserve">
+    <value>cartella</value>
+  </data>
+  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
+    <value>Impossibile rinominare {0}.</value>
+  </data>
+  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
+    <value>'{0}' è in conflitto con il nome della dichiarazione esistente '{1}'. Rinominare '{2}' in '{0}' può rendere il codice non compilabile o modificarne la logica.
+Procedere con la ridenominazione?</value>
+  </data>
+  <data name="RenameDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Rinomina</value>
+  </data>
+  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
+    <value>{0} {1} non può essere modificato.</value>
+  </data>
+  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
+    <value>Assicurarsi che esattamente 1 controllo sia selezionato prima di rinominare.</value>
+  </data>
+  <data name="Rename_DeclarationType" xml:space="preserve">
+    <value>Rinomina {0}</value>
+  </data>
+  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
+    <value>Nessun parametro nel metodo '{0}'.</value>
+  </data>
+  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
+    <value>Rimuovi i parametri</value>
+  </data>
+  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
+    <value>Impossibile rimuovere l'ultimo parametro dal setter o letter.</value>
+  </data>
+  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Seleziona un parametro e fai doppio click su di esso o usa i pulsanti per rimuoverlo o ripristinarlo.</value>
+  </data>
+  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Rimozione Parametri</value>
+  </data>
+  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
+    <value>La dichiarazione di destinazione è nulla.</value>
+  </data>
+  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
+    <value>Impossibile sospendere l'analizzatore dal compiere l'operazione di refactoring.</value>
+  </data>
+  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
+    <value>La destinazione non è di tipo definito dall'utente.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
+    <value>Non è stata specificata la destinazione.</value>
+  </data>
+  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
+    <value>Nessuna destinazione valida selezionata.</value>
+  </data>
+  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
+    <value>Non c'è nessuna seleziona attiva.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
+    <value>Il tipo dichiarazione di destinazione '{0}' è '{1}' invece di '{2}' atteso.</value>
+  </data>
+  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
+    <value>Il tipo dichiarazione di destinazione '{0}' è '{1}' invece di '{2}' atteso.</value>
+  </data>
+  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
+    <value>Refactoring non riuscito.</value>
+  </data>
+  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
+    <value>Il refactoring può solo annotare componenti, membri e variabili, ma la destinazione ha è di tipo '{0}'.</value>
+  </data>
+  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
+    <value>Il componente '{0}' sarebbe oggetto di refactoring, ma il suo stato nella memoria di Rubberduck è superato. Aggiorna Rubberduck e riprova.</value>
+  </data>
+  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
+    <value>Il metodo '{0}' implementa '{1}.{2}'. Modificare la firma dell'interfaccia? (Si propagherà a tutte le implementazioni.)</value>
+  </data>
+  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
+    <value>Sposta nella cartella</value>
+  </data>
+  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare una nuova cartella per {0} '{1}' nella cartella '{2}'.</value>
+  </data>
+  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
+    <value>Cartella:</value>
+  </data>
+  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
+    <value>Rubberduck - Spostare più vicino all'uso</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
+    <value>Selezione non valida.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
+    <value>Il metodo che usa '{0}' ha già la dichiarazione '{1}' con lo stesso nome nell'area di validità.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
+    <value>'{0}' non è usato.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
+    <value>'{0}' non è definito nello stesso progetto in cui è usato.</value>
+  </data>
+  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Sposta nella cartella</value>
+  </data>
+  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare la nuova cartella superiore per la cartella '{0}'.</value>
+  </data>
+  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare la nuova cartella per i componenti.</value>
+  </data>
+  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
+    <value>Sposta cartelle</value>
+  </data>
+  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare la nuova cartella superiore per le cartelle.</value>
+  </data>
+  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
+    <value>Rubberduck - Sposta Cartelle</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
+    <value>La cartella di destinazione '{0}' contiene già sottocartelle '{1}'. Spostando le cartelle queste saranno unite con le cartelle esistenti con il nome corrispondente.
+Procedere?</value>
+  </data>
+  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
+    <value>La cartella di destinazione '{0}' contiene già una sottocartella '{1}'. Spostare la cartella questa sarà unirà con la cartella esistente.
+Procedere?</value>
+  </data>
+  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
+    <value>Più cartelle con lo stesso nome stanno per essere spostate. Questo le unirà.
+Continuare?</value>
+  </data>
+  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
+    <value>I nomi delle singole sottocartelle non possono essere vuoti.</value>
+  </data>
+  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
+    <value>Il nome di una cartella non può essere vuoto.</value>
+  </data>
+  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
+    <value>I nomi delle cartelle non possono contenere caratteri di controllo come ad esempio nuove righe.</value>
+  </data>
+  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
+    <value>Specificare la nuova cartella superiore per la sottocartella '{0}' di '{1}'.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
+    <value>'{0}' ha riferimenti in più metodi.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
+    <value>'{0}' è built-in.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
+    <value>'{0}' è un membro pubblico di una classe, maschera o documento.</value>
+  </data>
+  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
+    <value>'{0}' non è definito né nel componente in cui è usato né in un modulo standard.</value>
+  </data>
+  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
+    <value>'{0}' è una parola riservata.</value>
+  </data>
+  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
+    <value>Gli identificatori VBA non possono essere nulli o a lunghezza zero.</value>
+  </data>
+  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
+    <value>'{0}' contiene uno o più caratteri speciali diversi dal trattino basso.</value>
+  </data>
+  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
+    <value>'{0}' eccede la lunghezza massima consentita per una stringa.</value>
+  </data>
+  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
+    <value>'{0}' non inizia con una lettera.</value>
+  </data>
+  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
+    <value>La destinazione '{0}' non è contenuta in un metodo.</value>
+  </data>
+  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
+    <value>Il metodo '{0}' implementa '{1}.{2}'. Modificare la firma dell'interfaccia? (Si propagherà a tutte le implementazioni.)</value>
+  </data>
+  <data name="IntroduceParameter_Caption" xml:space="preserve">
+    <value>Rubberduck - Introduci Parametro</value>
+  </data>
+  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
+    <value>La destinazione '{0}' è già un campo.</value>
+  </data>
+  <data name="IntroduceField_Caption" xml:space="preserve">
+    <value>Rubberduck - Introduci Campo</value>
+  </data>
+  <data name="ImplementInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Implementare un'Interfaccia</value>
+  </data>
+  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
+    <value>Nessuna implementazione selezionata.</value>
+  </data>
+  <data name="ExtractMethod_TitleText" xml:space="preserve">
+    <value>Estrai metodo</value>
+  </data>
+  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
+    <value>Set</value>
+  </data>
+  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
+    <value>Risultato:</value>
+  </data>
+  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
+    <value>Anteprima:</value>
+  </data>
+  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
+    <value>Parametri:</value>
+  </data>
+  <data name="ExtractMethod_OutputNone" xml:space="preserve">
+    <value>(nessuno)</value>
+  </data>
+  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
+    <value>La selezione corrente non è valida.</value>
+  </data>
+  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
+    <value>Specificare il nome del metodo, tipo da restituire e/o i parametri (se applicabili), ed altre opzioni.</value>
+  </data>
+  <data name="ExtractMethod_Caption" xml:space="preserve">
+    <value>Rubberduck - Estrai Metodo</value>
+  </data>
+  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
+    <value>Accessibilità:</value>
+  </data>
+  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
+    <value>Estrai Interfaccia</value>
+  </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>La classe implementante è 'Public' così come l'interfaccia mandante.
+Se serve un'interfaccia privata, modificare la classe istanziante in 'Private'.
+Una classe privata riesce ad implementare un'interfaccia pubblica.</value>
+  </data>
+  <data name="ExtractInterface_OptionReplaceMembersWithInterfaceMembers" xml:space="preserve">
+    <value>Sostituisci i Membri con i Membri dell'Interfaccia</value>
+  </data>
+  <data name="ExtractInterface_OptionForwardToObjectMembers" xml:space="preserve">
+    <value>Inoltra le Chiamate dei Membri dell'Interfaccia ai Membri dell'Oggetto</value>
+  </data>
+  <data name="ExtractInterface_OptionForwardToInterfaceMembers" xml:space="preserve">
+    <value>Inoltra le Chiamate dei Membri dell'Oggetto ai Membri dell'Interfaccia</value>
+  </data>
+  <data name="ExtractInterface_OptionAddEmptyImplementation" xml:space="preserve">
+    <value>Aggiunti un'Implementazione Vuota</value>
+  </data>
+  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
+    <value>Membri</value>
+  </data>
+  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
+    <value>Specificare il nome dell'interfaccia e i membri.</value>
+  </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Istanziamento</value>
+  </data>
+  <data name="ExtractInterface_ImplementationOptionsGroupBox" xml:space="preserve">
+    <value>Opzioni di implementazione:</value>
+  </data>
+  <data name="ExtractInterface_Caption" xml:space="preserve">
+    <value>Rubberduck - Estrai Interfaccia</value>
+  </data>
+  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
+    <value>Racchiudi i Campi in Tipi Private</value>
+  </data>
+  <data name="EncapsulateField_TitleText" xml:space="preserve">
+    <value>Incapsula Campo</value>
+  </data>
+  <data name="EncapsulateField_SetterType" xml:space="preserve">
+    <value>Tipo di assegnazione:</value>
+  </data>
+  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
+    <value>Sola Lettura</value>
+  </data>
+  <data name="EncapsulateField_PropertyName" xml:space="preserve">
+    <value>Nome della proprietà:</value>
+  </data>
+  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
+    <value>Crea una proprietà per ogni membro di un Tipo Definito dall'Utente (UDT)</value>
+  </data>
+  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
+    <value>'&lt;===== Modifiche alla proprietà e alla dichiarazione sopra questa riga =====&gt;</value>
+  </data>
+  <data name="EncapsulateField_Preview" xml:space="preserve">
+    <value>Anteprima:</value>
+  </data>
+  <data name="EncapsulateField_ParameterName" xml:space="preserve">
+    <value>Nome del parametro:</value>
+  </data>
+  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
+    <value>Conflitto di nomi</value>
+  </data>
+  <data name="EncapsulateField_InstructionText" xml:space="preserve">
+    <value>Selezionare uno o più campi da incapsulare. Accettare i valori predefiniti o modificare i nomi delle proprietà.</value>
+  </data>
+  <data name="EncapsulateField_Caption" xml:space="preserve">
+    <value>Rubberduck - Incapsula Campo</value>
+  </data>
+  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
+    <value>Impossibile incapsulare '{0}'. Istruzione/i ReDim({0}) presente/i in altri moduli.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index c014ae410d..62972b64ca 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -165,9 +165,6 @@
   <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
     <value>Annotation arguments of type 'Boolean' have to either be 'True' or 'False'.</value>
   </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Annotation arguments of type 'Number' have to be a valid number in integer of floating point format.</value>
-  </data>
   <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
     <value>Annotation arguments must not contain control characters.</value>
   </data>
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx
index 575b7e35c9..9f602c98cd 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx
@@ -334,4 +334,38 @@ Continuare?</value>
   <data name="CodeExplorer_NavigateText" xml:space="preserve">
     <value>Naviga</value>
   </data>
+  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
+    <value>Per il file '{0}', i(l)  file(s) binari(o) necessari(o) '{1}' è/sono mancanti/e e il componente di destinazione '{2}' non esiste ancora.
+
+Importazione annullata.</value>
+  </data>
+  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
+    <value>Per il file '{0}', i(l)  file(s) binari(o) necessari(o) '{1}' è/sono mancanti/e.
+
+Importazione annullata.</value>
+  </data>
+  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
+    <value>Non ci sono documenti modulo con nome '{0}'; il file '{1}' non può essere importato.
+
+Importazione annullata.</value>
+  </data>
+  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
+    <value>Più file contengono il codice per il componente '{0}'.
+
+Importazione annullata.</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
+    <value>Tutti i file</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
+    <value>VB File</value>
+  </data>
+  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
+    <value>Importa File Sorgente</value>
+  </data>
+  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
+    <value>L'estensione del file '{0}' non è supportata.
+
+Importazione annullata.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index e41e665273..6163a66e58 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -288,33 +288,6 @@ public static string CodeExplorer_IExportable_DeclarationFormat {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Inspection Severities.
-        /// </summary>
-        public static string CodeInspectionSettings_InspectionSeveritySettingsLabel {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_InspectionSeveritySettingsLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to These identifiers will be ignored by the &apos;Use meaningful names&apos; inspection..
-        /// </summary>
-        public static string CodeInspectionSettings_WhitelistedIdentifiersDescription {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_WhitelistedIdentifiersDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Allowed Identifiers.
-        /// </summary>
-        public static string CodeInspectionSettings_WhitelistedIdentifiersLabel {
-            get {
-                return ResourceManager.GetString("CodeInspectionSettings_WhitelistedIdentifiersLabel", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Code _Inspections.
         /// </summary>
@@ -879,15 +852,6 @@ public static string IndentCurrentProject {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Remove vertical space between related property members.
-        /// </summary>
-        public static string IndenterSettings_GroupRelatedProperties {
-            get {
-                return ResourceManager.GetString("IndenterSettings_GroupRelatedProperties", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Inspect.
         /// </summary>
@@ -969,6 +933,15 @@ public static string Language_FR {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Italian.
+        /// </summary>
+        public static string Language_IT {
+            get {
+                return ResourceManager.GetString("Language_IT", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1535,15 +1508,6 @@ public static System.Drawing.Bitmap question_white {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to References.
-        /// </summary>
-        public static string References {
-            get {
-                return ResourceManager.GetString("References", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Attempt to fix broken references.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 2ce332777a..a116e60b28 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -429,12 +429,6 @@ Upozornění: Všechna uživatelská nastavení budou ztracena. Váš starý sou
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Řeším reference...</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Dovolené Identifikátory</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Tyto identifikátory budou ignorovány inspekcí 'Použij smysluplné názvy'.</value>
-  </data>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Refaktorovat / Zapouzdřit Pole</value>
   </data>
@@ -504,9 +498,6 @@ Přejete si toto nastavení importovat do Rubberducku?</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Čeština</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Reference</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Použít</value>
   </data>
@@ -644,27 +635,6 @@ Import přerušen.</value>
   <data name="DeclarationType_Document" xml:space="preserve">
     <value>dokument</value>
   </data>
-  <data name="TestOutcome_Ignored" xml:space="preserve">
-    <value>Ignorováno</value>
-  </data>
-  <data name="IndenterSettings_GroupRelatedProperties" xml:space="preserve">
-    <value>Odeberte vertikální mezeru mezi souvisejícími property členy</value>
-  </data>
-  <data name="ExtractInterface_OptionReplaceMembersWithInterfaceMembers" xml:space="preserve">
-    <value>Nahradit Členy za Členy Rozhraní</value>
-  </data>
-  <data name="ExtractInterface_ImplementationOptionsGroupBox" xml:space="preserve">
-    <value>Možnosti Implementace:</value>
-  </data>
-  <data name="ExtractInterface_OptionForwardToInterfaceMembers" xml:space="preserve">
-    <value>Přeposlat volání členů objektů na členy rozhraní</value>
-  </data>
-  <data name="ExtractInterface_OptionForwardToObjectMembers" xml:space="preserve">
-    <value>Přeposlat volání členů rozhraní na členy objektů</value>
-  </data>
-  <data name="ExtractInterface_OptionAddEmptyImplementation" xml:space="preserve">
-    <value>Přidat Prázdnou Implementaci</value>
-  </data>
   <data name="CodeInspectionsWindowSettings_AccessKey" xml:space="preserve">
     <value>_Inspekce kódu</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 8c0020c0b4..2e6ab5dad0 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -393,15 +393,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="RubberduckFatalError" xml:space="preserve">
     <value>In Rubberduck ist ein Fehler aufgetreten. Bitte speichern Sie Ihre Arbeit und starten Sie das Hostprogramm neu. Laden Sie dann Ihre Logdatei zu unserer GitHub-Seite hoch.</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Explizit erlaubte Namen</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Diese Namen werden von der Inspektion "Nutze aussagekräftige Namen" ignoriert.</value>
-  </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Inspektionsschwere</value>
-  </data>
   <data name="RubberduckReloadFailure_Title" xml:space="preserve">
     <value>Rubberduck wird nicht neu geladen</value>
   </data>
@@ -522,9 +513,6 @@ Dieses Fenster wird angezeigt, da Aktualisierungsprüfungen aktiviert sind. Dies
   <data name="ReferenceSettings_TrackHostReferences" xml:space="preserve">
     <value>Verfolge nicht von Rubberduck hinzugefügte Referenzen</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Referenzen</value>
-  </data>
   <data name="ReferenceSettings_RecentTracked" xml:space="preserve">
     <value>Zuletzt verfolgte Referenzen:</value>
   </data>
@@ -644,9 +632,6 @@ Import abgebrochen.</value>
   <data name="DeclarationType_Document" xml:space="preserve">
     <value>Dokument</value>
   </data>
-  <data name="IndenterSettings_GroupRelatedProperties" xml:space="preserve">
-    <value>Entferne vertikalen Zwischenraum zwischen verwandten Eigenschaften</value>
-  </data>
   <data name="CodeInspectionsWindowSettings_AccessKey" xml:space="preserve">
     <value>Code _Untersuchung</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 43b4b42deb..997e72972d 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -433,12 +433,6 @@ Advertencia: Se perderán todos los ajustes personalizados. Su archivo anterior
   <data name="RubberduckFatalError" xml:space="preserve">
     <value>Rubberduck encontró un error. Por favor guarde su trabajo y reinicie el programa host; si el registro está habilitado, puede cargar su archivo de registro ubicado en '%AppData%Roaming\Rubberduck\Logs\RubberduckLog.txt' en un problema de GitHub en 'https://github.com/rubberduck-vba/Rubberduck/issues/new ' y reportar el error.</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Identificadores en lista blanca</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Estos identificadores serán ignorados por la inspección 'Usar nombres significativos'.</value>
-  </data>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Refactorizar / Encapsular Campo</value>
   </data>
@@ -515,9 +509,6 @@ Este diálogo se muestra porque el chequeo de versiones está Activo. Puede desa
   <data name="Language_CS" xml:space="preserve">
     <value>Checo</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Referencias</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Aplicar</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index ecd52f781c..b29b7edf72 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -393,18 +393,12 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
   <data name="RubberduckReloadFailure_Title" xml:space="preserve">
     <value>Rubberduck ne redémarre pas</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Identifiants permis</value>
-  </data>
   <data name="RubberduckReloadFailure_Message" xml:space="preserve">
     <value>Les fenêtres ancrables n'ont probablement pas été correctement détruites, et/ou n'ont pas pu être recréées. l'environnement peut ne pas être dans un état stable. Rubberduck démerrera normalement à la prochaine initialisation du VBE.</value>
   </data>
   <data name="ParserState_ResolvingReferences" xml:space="preserve">
     <value>Résolution des références...</value>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Niveau de sévérité</value>
-  </data>
   <data name="ParserState_ResolvingDeclarations" xml:space="preserve">
     <value>Résolution des déclarations...</value>
   </data>
@@ -505,9 +499,6 @@ les projets dans le VBE.</value>
   <data name="Language_CS" xml:space="preserve">
     <value>Tchèque</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>Références</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Appliquer</value>
   </data>
@@ -631,9 +622,6 @@ Mise à jour annulée.</value>
   <data name="DeclarationType_Document" xml:space="preserve">
     <value>le document</value>
   </data>
-  <data name="IndenterSettings_GroupRelatedProperties" xml:space="preserve">
-    <value>Supprime l'espacement vertical entre les membres d'une même propriété</value>
-  </data>
   <data name="GroupingStyle_ByOutcome" xml:space="preserve">
     <value>Par résultat</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.it.resx b/Rubberduck.Resources/RubberduckUI.it.resx
index b2c9268b6e..f41fb87659 100644
--- a/Rubberduck.Resources/RubberduckUI.it.resx
+++ b/Rubberduck.Resources/RubberduckUI.it.resx
@@ -140,103 +140,9 @@
     <value>La ricerca degli usi del riferimento '{0}' ha restituito {1} risultati. Visualizzarli può influire negativamente sulle prestazioni. Continuare?</value>
     <comment>{0} = nome del riferimento, {1} = numero di usi</comment>
   </data>
-  <data name="AnnotateDeclarationDialog_AddArgumentButtonLabel" xml:space="preserve">
-    <value>Aggiungi</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
-    <value>Aggiungi/Adatta attributo</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_AnnotationLabel" xml:space="preserve">
-    <value>Annotazione da Aggiungere:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentsLabel" xml:space="preserve">
-    <value>Argomenti dell'Annotazione:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentTypeHeader" xml:space="preserve">
-    <value>Tipo</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_ArgumentValueHeader" xml:space="preserve">
-    <value>Valore</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Dichiarazione di Annotazione</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_DeclarationLabel" xml:space="preserve">
-    <value>Dichiarazione di Annotazione:</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_Instructions" xml:space="preserve">
-    <value>Selezionare un'annotazione (e valori) da aggiungere alla dichiarazione.</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_RemoveArgumentButtonLabel" xml:space="preserve">
-    <value>Rimuovi</value>
-  </data>
-  <data name="AnnotateDeclarationDialog_TitleText" xml:space="preserve">
-    <value>Dichiarazione di Annotazione</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_AttributeNameStart" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione di tipo 'Nomi attributo' devono iniziare con 'VB_'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_EmptyArgument" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione non posso essere vuoti.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_InspectionName" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione di tipo 'Inspection Name' devono essere il nome di un'ispezione esistente.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_Newline" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione possono contenere solo una riga.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotABoolean" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione di tipo 'Boolean' devono essere 'Vero' o 'Falso'.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione di tipo 'Numero' devono essere un numero valido in formato intero o a virgola mobile.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_SpecialCharacters" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione non devono contenere caratteri di controllo.</value>
-  </data>
-  <data name="AnnotationArgument_ValidationError_TooLong" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione non possono essere più lunghi di {0} caratteri.</value>
-    <comment>al massimo {0} caratteri ammessi</comment>
-  </data>
-  <data name="AnnotationArgument_ValidationError_WhitespaceInAttribute" xml:space="preserve">
-    <value>Gli argomenti dell'annotazione di tipo 'Nome Attributo' non possono contenere whitespace.</value>
-  </data>
-  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
-    <value>Attributo</value>
-  </data>
-  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
-    <value>Boolean</value>
-  </data>
-  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
-    <value>Nome dell'Ispezione</value>
-  </data>
-  <data name="AnnotationArgumentType_Number" xml:space="preserve">
-    <value>Numero</value>
-  </data>
-  <data name="AnnotationArgumentType_Text" xml:space="preserve">
-    <value>Testo</value>
-  </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Applica</value>
   </data>
-  <data name="AssignedByValDialog_MeaninglessNameFormat" xml:space="preserve">
-    <value>{0} Considerare di scegliere un nome diverso.</value>
-    <comment>{0} = nome del messaggio non significativo</comment>
-  </data>
-  <data name="AssignedByValDialog_NewNameAlreadyUsedFormat" xml:space="preserve">
-    <value>'{0}' è già accessibile in questo scope.</value>
-    <comment>{0} = nome della variabile proposto.</comment>
-  </data>
-  <data name="AssignedByValParamQFixDialog_Caption" xml:space="preserve">
-    <value>Parametro assegnato con ByVal Soluzione veloce - Creare una Copia Locale</value>
-  </data>
-  <data name="AssignedByValParamQFixDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare un nome da usare per la copia locale di ByVal {0} '{1}'.</value>
-    <comment>0: TipoDichiarazione; 1: NomeIdentificatore</comment>
-  </data>
-  <data name="AssignedByValParamQFixDialog_TitleText" xml:space="preserve">
-    <value>Specificare il Nome della Variabile Locale Copia</value>
-  </data>
   <data name="CancelButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
@@ -253,27 +159,12 @@
   <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
     <value>Da tipo ispezione</value>
   </data>
-  <data name="CodeInspectionResults_Issue" xml:space="preserve">
-    <value>Problema</value>
-  </data>
-  <data name="CodeInspectionResults_Location" xml:space="preserve">
-    <value>Posizione</value>
-  </data>
-  <data name="CodeInspectionResults_Type" xml:space="preserve">
-    <value>Tipo</value>
-  </data>
-  <data name="CodeInspections" xml:space="preserve">
-    <value>Ispezioni del Codice</value>
-  </data>
   <data name="CodeInspections_CopyToolTip" xml:space="preserve">
     <value>Copia i risultati dell'ispezione negli appunti</value>
   </data>
   <data name="CodeInspections_GoToolTip" xml:space="preserve">
     <value>Vai al problema selezionato</value>
   </data>
-  <data name="CodeInspections_Inspecting" xml:space="preserve">
-    <value>Ispezione...</value>
-  </data>
   <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
     <value>{0} ({1} problemi)</value>
     <comment>{0}=stato; {1}=numero</comment>
@@ -292,16 +183,6 @@
     <value>{0} problema</value>
     <comment>{0}=numero</comment>
   </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck Ispezioni del Codice - {0}
-{1} problemi trovati.</value>
-    <comment>{0}=timestamp; {1}=numero</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck Ispezioni del Codice - {0}
-{1} problema trovato.</value>
-    <comment>{0}=timestamp; {1}=numero</comment>
-  </data>
   <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
     <value>Vai al precedente problema</value>
   </data>
@@ -314,45 +195,6 @@
   <data name="CodeInspections_Run" xml:space="preserve">
     <value>Esegui le ispezioni del codice</value>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Gravità dell'ispezione</value>
-  </data>
-  <data name="CodeInspectionSettings_Misc" xml:space="preserve">
-    <value>Varie</value>
-  </data>
-  <data name="CodeInspectionSettings_Misc_RunInspectionsOnSuccessfulParse" xml:space="preserve">
-    <value>Esegui le ispezioni automaticamente ad analisi superata</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>Questi identificatori saranno ignorati dall'ispezione 'Usa nomi significativi'.</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Identificatori Consentiti</value>
-  </data>
-  <data name="CodeMetrics_Complexity" xml:space="preserve">
-    <value>Complessità Ciclomatica</value>
-  </data>
-  <data name="CodeMetrics_Lines" xml:space="preserve">
-    <value>Righe</value>
-  </data>
-  <data name="CodeMetrics_Nesting" xml:space="preserve">
-    <value>Annidamenti Massimi</value>
-  </data>
-  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
-    <value>Statistiche</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile" xml:space="preserve">
-    <value>Il/i seguente/i progetto/i non può/possono essere compilato/i, con probabile errore dell'analisi. Continuare comunque? {0}</value>
-  </data>
-  <data name="Command_Reparse_CannotCompile_Caption" xml:space="preserve">
-    <value>Impossibile compilare per l'analisi.</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled" xml:space="preserve">
-    <value>L'impostazione "Compila su richiesta" di VBE è attualmente abilitata. Questo non è raccomandato perché può nascondere errori di compilazione e causare problemi con l'analisi. Vuoi analizzare comunque?</value>
-  </data>
-  <data name="Command_Reparse_CompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Impostazione Compila su Richiesta</value>
-  </data>
   <data name="CommandDescription_CodeExplorerCommand" xml:space="preserve">
     <value>Explorer del Codice</value>
   </data>
@@ -457,84 +299,9 @@
     <value>riferimenti</value>
     <comment>Usato per visualizzare il numero dei riferimenti nella selezione contestuale della barra dei comandi</comment>
   </data>
-  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
-    <value>espressione a runtime</value>
-  </data>
-  <data name="DeclarationType_ClassModule" xml:space="preserve">
-    <value>classe</value>
-  </data>
-  <data name="DeclarationType_Constant" xml:space="preserve">
-    <value>costante</value>
-  </data>
-  <data name="DeclarationType_Control" xml:space="preserve">
-    <value>controllo</value>
-  </data>
-  <data name="DeclarationType_Enumeration" xml:space="preserve">
-    <value>enum</value>
-  </data>
-  <data name="DeclarationType_EnumerationMember" xml:space="preserve">
-    <value>membro di enum</value>
-  </data>
-  <data name="DeclarationType_Event" xml:space="preserve">
-    <value>evento</value>
-  </data>
-  <data name="DeclarationType_Function" xml:space="preserve">
-    <value>funzione</value>
-  </data>
-  <data name="DeclarationType_LibraryFunction" xml:space="preserve">
-    <value>libreria di funzione</value>
-  </data>
-  <data name="DeclarationType_LibraryProcedure" xml:space="preserve">
-    <value>libreria di procedura</value>
-  </data>
-  <data name="DeclarationType_LineLabel" xml:space="preserve">
-    <value>riga di etichetta</value>
-  </data>
-  <data name="DeclarationType_Parameter" xml:space="preserve">
-    <value>parametro</value>
-  </data>
-  <data name="DeclarationType_ProceduralModule" xml:space="preserve">
-    <value>modulo</value>
-  </data>
-  <data name="DeclarationType_Procedure" xml:space="preserve">
-    <value>procedura</value>
-  </data>
-  <data name="DeclarationType_Project" xml:space="preserve">
-    <value>progetto</value>
-  </data>
-  <data name="DeclarationType_PropertyGet" xml:space="preserve">
-    <value>property get accessor</value>
-  </data>
-  <data name="DeclarationType_PropertyLet" xml:space="preserve">
-    <value>property let accessor</value>
-  </data>
-  <data name="DeclarationType_PropertySet" xml:space="preserve">
-    <value>property set accessor</value>
-  </data>
-  <data name="DeclarationType_UserDefinedType" xml:space="preserve">
-    <value>tipo definito dall'utente</value>
-  </data>
-  <data name="DeclarationType_UserDefinedTypeMember" xml:space="preserve">
-    <value>membro di tipo definito dall'utente</value>
-  </data>
-  <data name="DeclarationType_Variable" xml:space="preserve">
-    <value>variabile</value>
-  </data>
   <data name="DeselectAll_Button" xml:space="preserve">
     <value>Deseleziona Tutto</value>
   </data>
-  <data name="EasterEgg_Continuator" xml:space="preserve">
-    <value>Hai guadagnato il badge di "Continuatore"!</value>
-  </data>
-  <data name="EmptyLineHandling_Ignore" xml:space="preserve">
-    <value>Ignora</value>
-  </data>
-  <data name="EmptyLineHandling_Indent" xml:space="preserve">
-    <value>Indenta</value>
-  </data>
-  <data name="EmptyLineHandling_Remove" xml:space="preserve">
-    <value>Rimuovi</value>
-  </data>
   <data name="EmptyUIRefreshMessage" xml:space="preserve">
     <value>per analizzare e processare il progetto nel VBE.</value>
     <comment>Segue il testo per 'Aggiorna'</comment>
@@ -542,46 +309,6 @@
   <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
     <value>Rubberduck non ha ancora visto nulla.</value>
   </data>
-  <data name="EncapsulateField_ArrayHasExternalRedimFormat" xml:space="preserve">
-    <value>Impossibile incapsulare '{0}'. Istruzione/i ReDim({0}) presente/i in altri moduli.</value>
-    <comment>{0} = campo NomeIndicatore selezionato</comment>
-  </data>
-  <data name="EncapsulateField_Caption" xml:space="preserve">
-    <value>Rubberduck - Incapsula Campo</value>
-  </data>
-  <data name="EncapsulateField_InstructionText" xml:space="preserve">
-    <value>Selezionare uno o più campi da incapsulare. Accettare i valori predefiniti o modificare i nomi delle proprietà.</value>
-  </data>
-  <data name="EncapsulateField_NameConflictDetected" xml:space="preserve">
-    <value>Conflitto di nomi</value>
-  </data>
-  <data name="EncapsulateField_ParameterName" xml:space="preserve">
-    <value>Nome del parametro:</value>
-  </data>
-  <data name="EncapsulateField_Preview" xml:space="preserve">
-    <value>Anteprima:</value>
-  </data>
-  <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
-    <value>'&lt;===== Modifiche alla proprietà e alla dichiarazione sopra questa riga =====&gt;</value>
-  </data>
-  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
-    <value>Crea una proprietà per ogni membro di un Tipo Definito dall'Utente (UDT)</value>
-  </data>
-  <data name="EncapsulateField_PropertyName" xml:space="preserve">
-    <value>Nome della proprietà:</value>
-  </data>
-  <data name="EncapsulateField_ReadOnlyCheckBoxContent" xml:space="preserve">
-    <value>Sola Lettura</value>
-  </data>
-  <data name="EncapsulateField_SetterType" xml:space="preserve">
-    <value>Tipo di assegnazione:</value>
-  </data>
-  <data name="EncapsulateField_TitleText" xml:space="preserve">
-    <value>Incapsula Campo</value>
-  </data>
-  <data name="EncapsulateField_WrapFieldsInPrivateType" xml:space="preserve">
-    <value>Racchiudi i Campi in Tipi Private</value>
-  </data>
   <data name="EndOfLineCommentStyle_Absolute" xml:space="preserve">
     <value>Assoluto</value>
   </data>
@@ -598,71 +325,6 @@
     <value>Selezionare la cartella in cui esportare il sorgente di {0}:</value>
     <comment>{0} VBProject.Name</comment>
   </data>
-  <data name="ExtractInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Estrai Interfaccia</value>
-  </data>
-  <data name="ExtractInterface_ImplementationOptionsGroupBox" xml:space="preserve">
-    <value>Opzioni di implementazione:</value>
-  </data>
-  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
-    <value>Istanziamento</value>
-  </data>
-  <data name="ExtractInterface_InstructionLabel" xml:space="preserve">
-    <value>Specificare il nome dell'interfaccia e i membri.</value>
-  </data>
-  <data name="ExtractInterface_MembersGroupBox" xml:space="preserve">
-    <value>Membri</value>
-  </data>
-  <data name="ExtractInterface_OptionAddEmptyImplementation" xml:space="preserve">
-    <value>Aggiunti un'Implementazione Vuota</value>
-  </data>
-  <data name="ExtractInterface_OptionForwardToInterfaceMembers" xml:space="preserve">
-    <value>Inoltra le Chiamate dei Membri dell'Oggetto ai Membri dell'Interfaccia</value>
-  </data>
-  <data name="ExtractInterface_OptionForwardToObjectMembers" xml:space="preserve">
-    <value>Inoltra le Chiamate dei Membri dell'Interfaccia ai Membri dell'Oggetto</value>
-  </data>
-  <data name="ExtractInterface_OptionReplaceMembersWithInterfaceMembers" xml:space="preserve">
-    <value>Sostituisci i Membri con i Membri dell'Interfaccia</value>
-  </data>
-  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
-    <value>La classe implementante è 'Public' così come l'interfaccia mandante.
-Se serve un'interfaccia privata, modificare la classe istanziante in 'Private'.
-Una classe privata riesce ad implementare un'interfaccia pubblica.</value>
-  </data>
-  <data name="ExtractInterface_TitleLabel" xml:space="preserve">
-    <value>Estrai Interfaccia</value>
-  </data>
-  <data name="ExtractMethod_AccessibilityLabel" xml:space="preserve">
-    <value>Accessibilità:</value>
-  </data>
-  <data name="ExtractMethod_Caption" xml:space="preserve">
-    <value>Rubberduck - Estrai Metodo</value>
-  </data>
-  <data name="ExtractMethod_InstructionsText" xml:space="preserve">
-    <value>Specificare il nome del metodo, tipo da restituire e/o i parametri (se applicabili), ed altre opzioni.</value>
-  </data>
-  <data name="ExtractMethod_InvalidSelectionMessage" xml:space="preserve">
-    <value>La selezione corrente non è valida.</value>
-  </data>
-  <data name="ExtractMethod_OutputNone" xml:space="preserve">
-    <value>(nessuno)</value>
-  </data>
-  <data name="ExtractMethod_ParametersLabel" xml:space="preserve">
-    <value>Parametri:</value>
-  </data>
-  <data name="ExtractMethod_PreviewLabel" xml:space="preserve">
-    <value>Anteprima:</value>
-  </data>
-  <data name="ExtractMethod_ReturnLabel" xml:space="preserve">
-    <value>Risultato:</value>
-  </data>
-  <data name="ExtractMethod_SetBoxLabel" xml:space="preserve">
-    <value>Set</value>
-  </data>
-  <data name="ExtractMethod_TitleText" xml:space="preserve">
-    <value>Estrai metodo</value>
-  </data>
   <data name="Find" xml:space="preserve">
     <value>Trova</value>
   </data>
@@ -672,119 +334,9 @@ Una classe privata riesce ad implementare un'interfaccia pubblica.</value>
   <data name="Fix" xml:space="preserve">
     <value>Ripara</value>
   </data>
-  <data name="GeneralSettings_CheckVersion" xml:space="preserve">
-    <value>Verifica se è disponibile una versione più recente all'avvio.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
-    <value>Compilare il codice prima dell'analisi</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled" xml:space="preserve">
-    <value>L'impostazione "Compila su richiesta" di VBE è attualmente abilitata. E' fortemente raccomandato disabilitare l'impostazione dalla finestra Opzioni di VBE nella scheda Generale per usare la funzionalità Compila Prima di Analizzare. Disabilitare ora?
-
-NOTA: è necessario un riavvio perché l'impostazione abbia effetto.</value>
-  </data>
-  <data name="GeneralSettings_CompileBeforeParse_WarnCompileOnDemandEnabled_Caption" xml:space="preserve">
-    <value>Compila su richiesta attualmente abilitata</value>
-  </data>
-  <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Debug</value>
-  </data>
-  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
-    <value>Abilità drag and drop in Explorer del Codice</value>
-  </data>
-  <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
-    <value>Errore</value>
-  </data>
-  <data name="GeneralSettings_ExperimentalFeatures" xml:space="preserve">
-    <value>Funzionalità Sperimentali (è necessario un riavvio perché abbia effetto):</value>
-  </data>
-  <data name="GeneralSettings_ExperimentalFeaturesWarning" xml:space="preserve">
-    <value>Abilitare solo se si sa cosa si sta facendo. Abilitare e/o usare funzionalità da questa sezione può causare chiusure improvvise e perdita di dati irreparabile.</value>
-  </data>
-  <data name="GeneralSettings_FatalLogLevel" xml:space="preserve">
-    <value>Fatale</value>
-  </data>
-  <data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
-    <value>Delimitatore di Cartella:</value>
-  </data>
-  <data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
-    <value>Alt</value>
-  </data>
-  <data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
-    <value>Ctrl</value>
-  </data>
-  <data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
-    <value>Descrizione</value>
-  </data>
-  <data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
-    <value>Abilitato</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
-    <value>Tasto1</value>
-  </data>
-  <data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
-    <value>Tasto2</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionLabel" xml:space="preserve">
-    <value>Le combinazioni dovrebbero includere Alt e/o Ctrl.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyRestrictionToolTip" xml:space="preserve">
-    <value>Questa configurazione di combinazioni può causare effetti collaterali indesiderati.</value>
-  </data>
-  <data name="GeneralSettings_HotkeyShift" xml:space="preserve">
-    <value>Maiuscolo</value>
-  </data>
-  <data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
-    <value>Combinazioni:</value>
-  </data>
-  <data name="GeneralSettings_IncludePreRelease" xml:space="preserve">
-    <value>Avvertimi se una build pre-release più recente è disponibile.</value>
-  </data>
-  <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Info</value>
-  </data>
-  <data name="GeneralSettings_LanguageLabel" xml:space="preserve">
-    <value>Lingua di visualizzazione:</value>
-  </data>
-  <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Livello Minimo di Registrazione:</value>
-  </data>
-  <data name="GeneralSettings_ModifierWarning" xml:space="preserve">
-    <value>Avvertimento di Modificatore</value>
-  </data>
-  <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
-    <value>Nessuna registrazione</value>
-  </data>
-  <data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
-    <value>Punto (.)</value>
-  </data>
-  <data name="GeneralSettings_SetDpiUnaware" xml:space="preserve">
-    <value>Correzione per il ridimensionamento nei display ad alta risoluzione</value>
-  </data>
-  <data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
-    <value>Mostra la cartella dei log</value>
-  </data>
-  <data name="GeneralSettings_ShowSplash" xml:space="preserve">
-    <value>Mostra la schermata di presentazione all'avvio</value>
-  </data>
-  <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Barra (/)</value>
-  </data>
-  <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Traccia</value>
-  </data>
-  <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
-    <value>Avvertimento</value>
-  </data>
   <data name="Go" xml:space="preserve">
     <value>Vai</value>
   </data>
-  <data name="GroupingGrid_Filter" xml:space="preserve">
-    <value>Filtra</value>
-  </data>
-  <data name="GroupingGrid_FilterBy" xml:space="preserve">
-    <value>Filtra Per</value>
-  </data>
   <data name="GroupingGrid_GroupingStyle" xml:space="preserve">
     <value>Raggruppamento</value>
   </data>
@@ -812,171 +364,9 @@ NOTA: è necessario un riavvio perché l'impostazione abbia effetto.</value>
   <data name="Home" xml:space="preserve">
     <value>Home</value>
   </data>
-  <data name="ImplementInterface_Caption" xml:space="preserve">
-    <value>Rubberduck - Implementare un'Interfaccia</value>
-  </data>
-  <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
-    <value>La selezione corrente non è valida.</value>
-  </data>
-  <data name="ImplementInterfaceFailed_NoImplementsStatementSelected" xml:space="preserve">
-    <value>Nessuna implementazione selezionata.</value>
-  </data>
-  <data name="ImportCommand_BinaryAndComponentDoNotExist" xml:space="preserve">
-    <value>Per il file '{0}', i(l)  file(s) binari(o) necessari(o) '{1}' è/sono mancanti/e e il componente di destinazione '{2}' non esiste ancora.
-
-Importazione annullata.</value>
-  </data>
-  <data name="ImportCommand_BinaryDoesNotExist" xml:space="preserve">
-    <value>Per il file '{0}', i(l)  file(s) binari(o) necessari(o) '{1}' è/sono mancanti/e.
-
-Importazione annullata.</value>
-  </data>
-  <data name="ImportCommand_DocumentDoesNotExist" xml:space="preserve">
-    <value>Non ci sono documenti modulo con nome '{0}'; il file '{1}' non può essere importato.
-
-Importazione annullata.</value>
-    <comment>(0) nome del modulo, (1) nomefile</comment>
-  </data>
-  <data name="ImportCommand_DuplicateModule" xml:space="preserve">
-    <value>Più file contengono il codice per il componente '{0}'.
-
-Importazione annullata.</value>
-    <comment>{0} nome del modulo</comment>
-  </data>
-  <data name="ImportCommand_OpenDialog_Filter_AllFiles" xml:space="preserve">
-    <value>Tutti i file</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Filter_VBFiles" xml:space="preserve">
-    <value>VB File</value>
-  </data>
-  <data name="ImportCommand_OpenDialog_Title" xml:space="preserve">
-    <value>Importa File Sorgente</value>
-  </data>
-  <data name="ImportCommand_UnsupportedFileExtensions" xml:space="preserve">
-    <value>L'estensione del file '{0}' non è supportata.
-
-Importazione annullata.</value>
-    <comment>{0} nomefile di file non supportato</comment>
-  </data>
   <data name="IndentCurrentProject" xml:space="preserve">
     <value>Progetto corrente</value>
   </data>
-  <data name="IndenterSettings_AlignCommentsWithCode" xml:space="preserve">
-    <value>Allinea i commenti con il codice</value>
-  </data>
-  <data name="IndenterSettings_AlignContinuations" xml:space="preserve">
-    <value>Allinea le continuazioni</value>
-  </data>
-  <data name="IndenterSettings_AlignDims" xml:space="preserve">
-    <value>Allinea i dimensionamenti (Dim)</value>
-  </data>
-  <data name="IndenterSettings_AlignmentOptionsLabel" xml:space="preserve">
-    <value>Opzioni di allineamento</value>
-  </data>
-  <data name="IndenterSettings_CodeSampleHeader" xml:space="preserve">
-    <value>Esempio di Codice indentato</value>
-  </data>
-  <data name="IndenterSettings_EmptyLineHeading" xml:space="preserve">
-    <value>Trattamento delle righe vuote:</value>
-  </data>
-  <data name="IndenterSettings_EnableOptionsLabel" xml:space="preserve">
-    <value>Opzioni di Abilitazione</value>
-  </data>
-  <data name="IndenterSettings_EnableUndo" xml:space="preserve">
-    <value>Abilita annullamenti</value>
-  </data>
-  <data name="IndenterSettings_EndOfLineCommentStyle" xml:space="preserve">
-    <value>Stile dei commenti di fine riga:</value>
-  </data>
-  <data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
-    <value>Forza le direttive di compilazione nella colonna 1</value>
-  </data>
-  <data name="IndenterSettings_ForceDebugDirectivesToColumn1" xml:space="preserve">
-    <value>Forza le direttive di debug nella colonna 1</value>
-  </data>
-  <data name="IndenterSettings_GroupRelatedProperties" xml:space="preserve">
-    <value>Rimuovi gli spazi verticali tra membri proprietà collegati</value>
-  </data>
-  <data name="IndenterSettings_IgnoreEmptyLinesInFirstBlocks" xml:space="preserve">
-    <value>Ignorare le righe vuote per individuare il primo commento e i blocchi di dichiarazione</value>
-  </data>
-  <data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
-    <value>Ignorare gli operatori</value>
-  </data>
-  <data name="IndenterSettings_IndentCase" xml:space="preserve">
-    <value>Indenta Case</value>
-  </data>
-  <data name="IndenterSettings_IndentCompilerDirectives" xml:space="preserve">
-    <value>Indenta le direttive di compilazione</value>
-  </data>
-  <data name="IndenterSettings_IndentEntireProcedureBody" xml:space="preserve">
-    <value>Indenta l'intero corpo della procedura</value>
-  </data>
-  <data name="IndenterSettings_IndentEnumTypeAsProcedure" xml:space="preserve">
-    <value>Indenta i commenti nei blocchi Enum e Type come nelle procedure</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstCommentBlock" xml:space="preserve">
-    <value>Indenta il primo blocco dei commenti</value>
-  </data>
-  <data name="IndenterSettings_IndentFirstDeclarationBlock" xml:space="preserve">
-    <value>Indenta il primo blocco di dichiarazione</value>
-  </data>
-  <data name="IndenterSettings_IndentOptionsLabel" xml:space="preserve">
-    <value>Opzioni di indentazione</value>
-  </data>
-  <data name="IndenterSettings_IndentSpaces" xml:space="preserve">
-    <value>Spazi di indentazione:</value>
-  </data>
-  <data name="IndenterSettings_PreviewCode" xml:space="preserve">
-    <value>Public Enum EsempioEnum
-' Commento di Enum
-Foo
-Bar ' commento del Membro.
-End Enum
-
-' Esempio di Procedura
-Sub EsempioProc()
-
-' SMART INDENTER
-' Original VB6 code graciously offered to Rubberduck by Stephen Bullen &amp; Rob Bovey
-' © 2016 by Rubberduck VBA.
-
-Dim count As Integer
-Static name As String
-
-If YouLikeRubberduck Then
-' Mettici una Stella su GitHub http://github.com/rubberduck-vba/Rubberduck
-' Seguici su Twitter @rubberduckvba
-' Visita http://rubberduckvba.com per novità ed aggiornamenti
-
-Select Case X
-Case "A"
-' Se hai qualche commento o suggerimento, _
-o trovi codice VBA valido con indentazione non corretta,
-
-#If VBA6 Then
-MsgBox "Contatta contact@rubberduck-vba.com"
-#End If
-
-Case "Stringhe e parametri continuati possono essere" _
-&amp; "allineati in verticale per una più facile lettura, ignorando eventualmente" _
-&amp; "qualsiasi operatore (&amp;+, ecc) all'inizio della riga."
-
-Debug.Print "X&lt;&gt;1"
-End Select      'Case X
-End If      'Più Strumenti? Suggerimenti http://github.com/rubberduck-vba/Rubberduck/Issues/New
-
-End Sub</value>
-  </data>
-  <data name="IndenterSettings_SpecialOptionsLabel" xml:space="preserve">
-    <value>Opzioni Speciali</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacing" xml:space="preserve">
-    <value>Preserva la spaziatura verticale</value>
-  </data>
-  <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
-    <value>Spaziatura Verticale</value>
-  </data>
   <data name="Inspect" xml:space="preserve">
     <value>Ispeziona</value>
   </data>
@@ -986,61 +376,6 @@ End Sub</value>
   <data name="InspectionResults_ExpandAll" xml:space="preserve">
     <value>Espandi tutto</value>
   </data>
-  <data name="InspectionResults_FilterByError" xml:space="preserve">
-    <value>Errore</value>
-  </data>
-  <data name="InspectionResults_FilterByHint" xml:space="preserve">
-    <value>Indizio</value>
-  </data>
-  <data name="InspectionResults_FilterBySuggestion" xml:space="preserve">
-    <value>Suggerimento</value>
-  </data>
-  <data name="InspectionResults_FilterByWarning" xml:space="preserve">
-    <value>Avvertimento</value>
-  </data>
-  <data name="InspectionSettings_FilterByDescription" xml:space="preserve">
-    <value>Descrizione:</value>
-  </data>
-  <data name="InspectionSettings_FilterBySeverity" xml:space="preserve">
-    <value>Gravità:</value>
-  </data>
-  <data name="IntroduceField_Caption" xml:space="preserve">
-    <value>Rubberduck - Introduci Campo</value>
-  </data>
-  <data name="IntroduceFieldFailed_TargetIsAlreadyAField" xml:space="preserve">
-    <value>La destinazione '{0}' è già un campo.</value>
-    <comment>{0}: nome della destinazione</comment>
-  </data>
-  <data name="IntroduceParameter_Caption" xml:space="preserve">
-    <value>Rubberduck - Introduci Parametro</value>
-  </data>
-  <data name="IntroduceParameter_PromptIfTargetIsInterface" xml:space="preserve">
-    <value>Il metodo '{0}' implementa '{1}.{2}'. Modificare la firma dell'interfaccia? (Si propagherà a tutte le implementazioni.)</value>
-    <comment>0: destinazione selezionata; 1: Nome dell'interfaccia; 2: Nome del membro dell'interfaccia</comment>
-  </data>
-  <data name="IntroduceParameterFailed_TargetNotContainedInMethod" xml:space="preserve">
-    <value>La destinazione '{0}' non è contenuta in un metodo.</value>
-    <comment>{0}: nome della destinazione</comment>
-  </data>
-  <data name="InvalidNameCriteria_DoesNotStartWithLetterFormat" xml:space="preserve">
-    <value>'{0}' non inizia con una lettera.</value>
-    <comment>{0} = nome dell'elemento di codice</comment>
-  </data>
-  <data name="InvalidNameCriteria_ExceedsMaximumLengthFormat" xml:space="preserve">
-    <value>'{0}' eccede la lunghezza massima consentita per una stringa.</value>
-    <comment>{0} = nome dell'elemento di codice</comment>
-  </data>
-  <data name="InvalidNameCriteria_InvalidCharactersFormat" xml:space="preserve">
-    <value>'{0}' contiene uno o più caratteri speciali diversi dal trattino basso.</value>
-    <comment>{0} = nome dell'elemento di codice</comment>
-  </data>
-  <data name="InvalidNameCriteria_IsNullOrEmpty" xml:space="preserve">
-    <value>Gli identificatori VBA non possono essere nulli o a lunghezza zero.</value>
-  </data>
-  <data name="InvalidNameCriteria_IsReservedKeywordFormat" xml:space="preserve">
-    <value>'{0}' è una parola riservata.</value>
-    <comment>{0} = nome dell'elemento di codice</comment>
-  </data>
   <data name="Issue" xml:space="preserve">
     <value>Problema</value>
   </data>
@@ -1091,96 +426,6 @@ End Sub</value>
   <data name="ModuleOptionsNotSpecifiedFirst" xml:space="preserve">
     <value>Le opzioni del Modulo dovrebbero essere specificate prima</value>
   </data>
-  <data name="MoveCloserToUsage_Caption" xml:space="preserve">
-    <value>Rubberduck - Spostare più vicino all'uso</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_InvalidSelection" xml:space="preserve">
-    <value>Selezione non valida.</value>
-  </data>
-  <data name="MoveCloserToUsageFailure_ReferencingMethodHasSameNameDeclarationInScope" xml:space="preserve">
-    <value>Il metodo che usa '{0}' ha già la dichiarazione '{1}' con lo stesso nome nell'area di validità.</value>
-    <comment>{0}: Nome della Variabile; {1}: nome della dichiarazione in conflitto</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetHasNoReferences" xml:space="preserve">
-    <value>'{0}' non è usato.</value>
-    <comment>{0}: Nome della Variabile</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInDifferentProject" xml:space="preserve">
-    <value>'{0}' non è definito nello stesso progetto in cui è usato.</value>
-    <comment>{0}: Nome della Variabile</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsInOtherNonStandardModule" xml:space="preserve">
-    <value>'{0}' non è definito né nel componente in cui è usato né in un modulo standard.</value>
-    <comment>{0}: Nome della Variabile</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNonPrivateInNonStandardModule" xml:space="preserve">
-    <value>'{0}' è un membro pubblico di una classe, maschera o documento.</value>
-    <comment>{0}: Nome della Variabile</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsNotUserDefined" xml:space="preserve">
-    <value>'{0}' è built-in.</value>
-    <comment>{0}: Nome della Variabile</comment>
-  </data>
-  <data name="MoveCloserToUsageFailure_TargetIsUsedInMultipleMethods" xml:space="preserve">
-    <value>'{0}' ha riferimenti in più metodi.</value>
-    <comment>{0}: Nome della Variabile</comment>
-  </data>
-  <data name="MoveFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare la nuova cartella superiore per la sottocartella '{0}' di '{1}'.</value>
-    <comment>{0} cartella; {1} cartella superiore</comment>
-  </data>
-  <data name="MoveFolders_ControlCharacter" xml:space="preserve">
-    <value>I nomi delle cartelle non possono contenere caratteri di controllo come ad esempio nuove righe.</value>
-  </data>
-  <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
-    <value>Il nome di una cartella non può essere vuoto.</value>
-  </data>
-  <data name="MoveFolders_EmptySubfolderName" xml:space="preserve">
-    <value>I nomi delle singole sottocartelle non possono essere vuoti.</value>
-  </data>
-  <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
-    <value>Più cartelle con lo stesso nome stanno per essere spostate. Questo le unirà.
-Continuare?</value>
-  </data>
-  <data name="MoveFolders_SameNameSubfolder" xml:space="preserve">
-    <value>La cartella di destinazione '{0}' contiene già una sottocartella '{1}'. Spostare la cartella questa sarà unirà con la cartella esistente.
-Procedere?</value>
-    <comment>{0} cartella di destinazione; {1} sottocartella</comment>
-  </data>
-  <data name="MoveFolders_SameNameSubfolders" xml:space="preserve">
-    <value>La cartella di destinazione '{0}' contiene già sottocartelle '{1}'. Spostando le cartelle queste saranno unite con le cartelle esistenti con il nome corrispondente.
-Procedere?</value>
-    <comment>{0} cartella di destinazione; {1} sottocartella</comment>
-  </data>
-  <data name="MoveFoldersDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Sposta Cartelle</value>
-  </data>
-  <data name="MoveFoldersDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare la nuova cartella superiore per le cartelle.</value>
-  </data>
-  <data name="MoveFoldersDialog_TitleText" xml:space="preserve">
-    <value>Sposta cartelle</value>
-  </data>
-  <data name="MoveMultipleToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare la nuova cartella per i componenti.</value>
-  </data>
-  <data name="MoveRootFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare la nuova cartella superiore per la cartella '{0}'.</value>
-    <comment>{0} cartella</comment>
-  </data>
-  <data name="MoveToFolderDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Sposta nella cartella</value>
-  </data>
-  <data name="MoveToFolderDialog_FolderLabelText" xml:space="preserve">
-    <value>Cartella:</value>
-  </data>
-  <data name="MoveToFolderDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare una nuova cartella per {0} '{1}' nella cartella '{2}'.</value>
-    <comment>{0} TipoDichiarazione; {1} NomeIdentificatore; {2} cartella attuale</comment>
-  </data>
-  <data name="MoveToFolderDialog_TitleText" xml:space="preserve">
-    <value>Sposta nella cartella</value>
-  </data>
   <data name="Name" xml:space="preserve">
     <value>Nome</value>
   </data>
@@ -1302,147 +547,6 @@ Procedere?</value>
 Ripristinare la configurazione di default?
 Attenzione: tutte le impostazioni personalizzate saranno perse. Il tuo vecchio file sarà salvato in '{3}'.</value>
   </data>
-  <data name="Refactoring_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Il metodo '{0}' implementa '{1}.{2}'. Modificare la firma dell'interfaccia? (Si propagherà a tutte le implementazioni.)</value>
-    <comment>0: Destinazione selezionata; 1: Nome dell'interfaccia; 2: Nome del membro dell'interfaccia</comment>
-  </data>
-  <data name="RefactoringFailure_AffectedModuleIsStale" xml:space="preserve">
-    <value>Il componente '{0}' sarebbe oggetto di refactoring, ma il suo stato nella memoria di Rubberduck è superato. Aggiorna Rubberduck e riprova.</value>
-    <comment>{0} modulo superato</comment>
-  </data>
-  <data name="RefactoringFailure_AnnotateDeclaration_InvalidType" xml:space="preserve">
-    <value>Il refactoring può solo annotare componenti, membri e variabili, ma la destinazione ha è di tipo '{0}'.</value>
-    <comment>{0} tipo dichiarazione</comment>
-  </data>
-  <data name="RefactoringFailure_BaseMessage" xml:space="preserve">
-    <value>Refactoring non riuscito.</value>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType" xml:space="preserve">
-    <value>Il tipo dichiarazione di destinazione '{0}' è '{1}' invece di '{2}' atteso.</value>
-    <comment>{0}: nome della destinazione; {1}: tipo dichiarazione reale; {2}: tipo dichiarazione atteso</comment>
-  </data>
-  <data name="RefactoringFailure_InvalidDeclarationType_multipleValid" xml:space="preserve">
-    <value>Il tipo dichiarazione di destinazione '{0}' è '{1}' invece di '{2}' atteso.</value>
-    <comment>{0}: nome della destinazione; {1}: tipo dichiarazione reale; {2}: tipi dichiarazione attesi</comment>
-  </data>
-  <data name="RefactoringFailure_NoActiveSelection" xml:space="preserve">
-    <value>Non c'è nessuna seleziona attiva.</value>
-  </data>
-  <data name="RefactoringFailure_NoTargetFolder" xml:space="preserve">
-    <value>Non è stata specificata la destinazione.</value>
-  </data>
-  <data name="RefactoringFailure_SuspendParserFailure" xml:space="preserve">
-    <value>Impossibile sospendere l'analizzatore dal compiere l'operazione di refactoring.</value>
-  </data>
-  <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
-    <value>La destinazione non è di tipo definito dall'utente.</value>
-    <comment>{0}: nome della destinazione</comment>
-  </data>
-  <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>La dichiarazione di destinazione è nulla.</value>
-  </data>
-  <data name="References" xml:space="preserve">
-    <value>Riferimenti</value>
-  </data>
-  <data name="References_AddFailedCaption" xml:space="preserve">
-    <value>Impossibile aggiungere riferimenti</value>
-  </data>
-  <data name="References_AddToolTip" xml:space="preserve">
-    <value>Aggiugni al progetto</value>
-  </data>
-  <data name="References_BrowseButtonText" xml:space="preserve">
-    <value>Sfoglia...</value>
-  </data>
-  <data name="References_BrowseCaption" xml:space="preserve">
-    <value>Sfoglia riferimenti</value>
-  </data>
-  <data name="References_BrowseFilterAccess" xml:space="preserve">
-    <value>Database di Microsoft Access({0})|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterActiveX" xml:space="preserve">
-    <value>Controlli ActiveX (*.ocx)|*.ocx</value>
-  </data>
-  <data name="References_BrowseFilterAllFiles" xml:space="preserve">
-    <value>Tutti i file (*.*)|*.*</value>
-  </data>
-  <data name="References_BrowseFilterExcel" xml:space="preserve">
-    <value>File di Microsoft Excel ({0})|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterExecutable" xml:space="preserve">
-    <value>File eseguibili (*.exe;*.dll)|*.exe;*.dll</value>
-  </data>
-  <data name="References_BrowseFilterOutlook" xml:space="preserve">
-    <value>File VBA di Outlook ({0})|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterPowerPoint" xml:space="preserve">
-    <value>File Addin di PowerPoint({0})|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterPublisher" xml:space="preserve">
-    <value>File di Publisher ({0}|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterTypes" xml:space="preserve">
-    <value>Tipi Libreria (*.olb;*.tlb;*.dll)|*.olb;*.tlb;*.dll</value>
-  </data>
-  <data name="References_BrowseFilterVisio" xml:space="preserve">
-    <value>Tutti i file di Visio ({0})|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_BrowseFilterWord" xml:space="preserve">
-    <value>Documenti di Word ({0})|{0}</value>
-    <comment>{0} = elenco di estensioni delimitato da puntoevirgola nel formato *.ext</comment>
-  </data>
-  <data name="References_Caption" xml:space="preserve">
-    <value>Aggiungi/Rimuovi Riferimento...</value>
-  </data>
-  <data name="References_CaptionTemplate" xml:space="preserve">
-    <value>Aggiungi/Rimuovi Riferimenti - {0}</value>
-    <comment>{0} = Nome del progetto</comment>
-  </data>
-  <data name="References_DefaultLocale" xml:space="preserve">
-    <value>Standard</value>
-    <comment>Visualizzato come descrizione LCID quando la lingua non è specificata.</comment>
-  </data>
-  <data name="References_Locale" xml:space="preserve">
-    <value>Lingua:</value>
-  </data>
-  <data name="References_MoveDownToolTip" xml:space="preserve">
-    <value>Sposta sotto</value>
-  </data>
-  <data name="References_MoveUpToolTip" xml:space="preserve">
-    <value>Sposta sopra</value>
-  </data>
-  <data name="References_Pinned" xml:space="preserve">
-    <value>Bloccati</value>
-  </data>
-  <data name="References_PinToolTip" xml:space="preserve">
-    <value>Blocca riferimento</value>
-  </data>
-  <data name="References_Projects" xml:space="preserve">
-    <value>Progetti</value>
-  </data>
-  <data name="References_Recent" xml:space="preserve">
-    <value>Recenti</value>
-  </data>
-  <data name="References_RemoveToolTip" xml:space="preserve">
-    <value>Rimuovi dal progetto</value>
-  </data>
-  <data name="References_SearchPlaceholder" xml:space="preserve">
-    <value>Cerca riferimenti...</value>
-  </data>
-  <data name="References_SubCaption" xml:space="preserve">
-    <value>Selezionare i tipi libreria e progetti VB da aggiungere o rimuovere.</value>
-  </data>
-  <data name="References_TypeLibs" xml:space="preserve">
-    <value>Tipi Libreria</value>
-  </data>
-  <data name="References_Version" xml:space="preserve">
-    <value>Versione:</value>
-  </data>
   <data name="ReferenceSettings_FixBroken" xml:space="preserve">
     <value>Tentativo di riparazione dei riferimenti danneggiati</value>
   </data>
@@ -1464,121 +568,9 @@ Attenzione: tutte le impostazioni personalizzate saranno perse. Il tuo vecchio f
   <data name="Remove" xml:space="preserve">
     <value>Rimuovi</value>
   </data>
-  <data name="RemoveParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Rimozione Parametri</value>
-  </data>
-  <data name="RemoveParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Seleziona un parametro e fai doppio click su di esso o usa i pulsanti per rimuoverlo o ripristinarlo.</value>
-  </data>
-  <data name="RemoveParamsDialog_RemoveIllegalSetterLetterParameter" xml:space="preserve">
-    <value>Impossibile rimuovere l'ultimo parametro dal setter o letter.</value>
-  </data>
-  <data name="RemoveParamsDialog_TitleText" xml:space="preserve">
-    <value>Rimuovi i parametri</value>
-  </data>
-  <data name="RemovePresenter_NoParametersError" xml:space="preserve">
-    <value>Nessun parametro nel metodo '{0}'.</value>
-    <comment>0: Destinazione selezionata</comment>
-  </data>
   <data name="Rename" xml:space="preserve">
     <value>Rinomina</value>
   </data>
-  <data name="Rename_DeclarationType" xml:space="preserve">
-    <value>Rinomina {0}</value>
-  </data>
-  <data name="RenameDialog_AmbiguousSelection" xml:space="preserve">
-    <value>Assicurarsi che esattamente 1 controllo sia selezionato prima di rinominare.</value>
-  </data>
-  <data name="RenameDialog_BuiltInNameError" xml:space="preserve">
-    <value>{0} {1} non può essere modificato.</value>
-    <comment>0: TipoDichiarazione; 1: NomeIdentificatore</comment>
-  </data>
-  <data name="RenameDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Rinomina</value>
-  </data>
-  <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>'{0}' è in conflitto con il nome della dichiarazione esistente '{1}'. Rinominare '{2}' in '{0}' può rendere il codice non compilabile o modificarne la logica.
-Procedere con la ridenominazione?</value>
-    <comment>{0}: NuovoNome {1}: dichiarazione in conflitto {2}: NomeAttuale</comment>
-  </data>
-  <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>Impossibile rinominare {0}.</value>
-  </data>
-  <data name="RenameDialog_Folder" xml:space="preserve">
-    <value>cartella</value>
-  </data>
-  <data name="RenameDialog_FolderAlreadyExists" xml:space="preserve">
-    <value>La cartella '{0}' esiste già. Rinominare '{1}' in '{2}' la unirà con la cartella esistente.
-Continuare?</value>
-    <comment>{0} nuovo nome completo della cartella; {1} parte della cartella da rinominare; {2} nuova parte del nome della cartella</comment>
-  </data>
-  <data name="RenameDialog_FolderLabel" xml:space="preserve">
-    <value>Cartella:</value>
-  </data>
-  <data name="RenameDialog_FullNewFolderLabel" xml:space="preserve">
-    <value>Nuova cartella completa:</value>
-  </data>
-  <data name="RenameDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Specificare il nuovo nome per {0} '{1}'.</value>
-  </data>
-  <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
-    <value>Impossibile rinominare il membro di interfaccia {0}.</value>
-  </data>
-  <data name="RenameDialog_OnlyCasingDifferent" xml:space="preserve">
-    <value>Non è possibile modificare solo maiuscole e minuscole di un identificatore in VBA (il linguaggio non distingue maiuscole e minuscole).</value>
-  </data>
-  <data name="RenameDialog_TitleText" xml:space="preserve">
-    <value>Rinomina l'identificatore</value>
-  </data>
-  <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
-    <value>Rinomina cartella</value>
-  </data>
-  <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>La destinazione '{0}' è un gestore d'evento standard, che non può essere rinominato.</value>
-    <comment>{0}: nome della destinazione</comment>
-  </data>
-  <data name="RenameFailure_TargetControlNotFound" xml:space="preserve">
-    <value>Controllo di destinazione '{0}' non trovato.</value>
-    <comment>{0}: nome del controllo</comment>
-  </data>
-  <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>Nessun modulo di codice trovato per il modulo di destinazione '{0}'.</value>
-    <comment>{0}: nome del modulo</comment>
-  </data>
-  <data name="RenamePresenter_TargetIsControlEventHandler" xml:space="preserve">
-    <value>Il metodo '{0}' un è EventHandler per il controllo '{1}'. Solo il controllo può essere rinominato. Rinominare '{1}'?</value>
-    <comment>0: Idenficatore di destinazione selezionato; 1: Nome del controllo</comment>
-  </data>
-  <data name="RenamePresenter_TargetIsEventHandlerImplementation" xml:space="preserve">
-    <value>Il metodo '{0}' è un'implementazione dell'evento '{1}.{2}'. Rinominare l'evento '{2}'?</value>
-    <comment>0: Idenficatore di destinazione selezionato; 1: Evento superiore; 2: Nome dell'evento</comment>
-  </data>
-  <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>Il metodo '{0}' implementa '{1}.{2}'. Rinominare il membro dell'interfaccia?</value>
-    <comment>0: Destinazione selezionata; 1: Nome dell'interfaccia; 2: Nome del membro dell'interfaccia</comment>
-  </data>
-  <data name="ReorderParamsDialog_Caption" xml:space="preserve">
-    <value>Rubberduck - Riordina Parametri</value>
-  </data>
-  <data name="ReorderParamsDialog_InstructionsLabelText" xml:space="preserve">
-    <value>Selezionare un parametro e trascinarlo o usare i pulsanti per spostarlo sopra o sotto.</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveDownButtonText" xml:space="preserve">
-    <value>Sposta sotto</value>
-  </data>
-  <data name="ReorderParamsDialog_MoveUpButtonText" xml:space="preserve">
-    <value>Sposta sopra</value>
-  </data>
-  <data name="ReorderParamsDialog_TitleText" xml:space="preserve">
-    <value>Riordina i parametri</value>
-  </data>
-  <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
-    <value>Meno di due parametri nel metodo '{0}'.</value>
-    <comment>0: Destinazione selezionata</comment>
-  </data>
-  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
-    <value>I parametri opzionali devono essere specificati alla fine della lista dei parametri.</value>
-  </data>
   <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
     <value>Il parametro ParamArray deve essere specificato per ultimo.</value>
   </data>
@@ -1678,46 +670,6 @@ Importarle in Rubberduck?</value>
   <data name="TestExplorer_AppendHeader" xml:space="preserve">
     <value>Rubberduck Risultati del test - {0}</value>
   </data>
-  <data name="TestOutcome_Fail" xml:space="preserve">
-    <value>Errore</value>
-  </data>
-  <data name="TestOutcome_Ignored" xml:space="preserve">
-    <value>Ignorato</value>
-  </data>
-  <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Non concludente</value>
-  </data>
-  <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Concluso con successo</value>
-  </data>
-  <data name="TestOutcome_Unknown" xml:space="preserve">
-    <value>Sconosciuto</value>
-  </data>
-  <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>Explorer dei Todo</value>
-  </data>
-  <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
-    <value>Copia negli appunti</value>
-  </data>
-  <data name="TodoExplorer_Description" xml:space="preserve">
-    <value>Descirzione</value>
-  </data>
-  <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Numero di riga</value>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
-    <value>Rubberduck Elementi TODO - {0}
-{1} elementi trovati.</value>
-    <comment>{0}=timestamp; {1}=numero</comment>
-  </data>
-  <data name="ToDoExplorer_NumberOfIssuesFound_Singular" xml:space="preserve">
-    <value>Rubberduck Elementi TODO - {0}
-{1} elementi trovati.</value>
-    <comment>{0}=timestamp; {1}=numero</comment>
-  </data>
-  <data name="ToDoExplorerToDoItemFormat" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3} riga {4}.</value>
-  </data>
   <data name="TodoMarkerBug" xml:space="preserve">
     <value>BUG</value>
   </data>
@@ -1727,21 +679,6 @@ Importarle in Rubberduck?</value>
   <data name="TodoMarkerTodo" xml:space="preserve">
     <value>TODO</value>
   </data>
-  <data name="TodoSettings_Caption" xml:space="preserve">
-    <value>Explorer dei TODO</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Testo</value>
-  </data>
-  <data name="TodoSettings_TextLabel" xml:space="preserve">
-    <value>Testo:</value>
-  </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Testo Token:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Lista Token:</value>
-  </data>
   <data name="Type" xml:space="preserve">
     <value>Tipo</value>
   </data>
@@ -1773,9 +710,6 @@ La finestra è stata visualizzata perché è abilitata la verifica di versione.
   <data name="WindowSettings_StartupVisibilityHeader" xml:space="preserve">
     <value>Visibilità della finestra all'avvio</value>
   </data>
-  <data name="RefactoringFailure_NoTargetDeclarationForSelection" xml:space="preserve">
-    <value>Nessuna destinazione valida selezionata.</value>
-  </data>
   <data name="DeclarationType_Document" xml:space="preserve">
     <value>documento</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index ec4d79f5ed..30aee16891 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -436,12 +436,6 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
   <data name="RubberduckFatalError" xml:space="preserve">
     <value>Rubberduck encountered an error. Please save your work and restart the host program; if logging is enabled, you can upload your log file located at '%AppData%Roaming\Rubberduck\Logs\RubberduckLog.txt' to a GitHub issue at 'https://github.com/rubberduck-vba/Rubberduck/issues/new' and report the bug.</value>
   </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersLabel" xml:space="preserve">
-    <value>Allowed Identifiers</value>
-  </data>
-  <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
-    <value>These identifiers will be ignored by the 'Use meaningful names' inspection.</value>
-  </data>
   <data name="CommandDescription_RefactorEncapsulateFieldCommand" xml:space="preserve">
     <value>Refactor / Encapsulate Field</value>
   </data>
@@ -484,9 +478,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="Preview" xml:space="preserve">
     <value>Preview</value>
   </data>
-  <data name="CodeInspectionSettings_InspectionSeveritySettingsLabel" xml:space="preserve">
-    <value>Inspection Severities</value>
-  </data>
   <data name="ExportAllCommand_SaveAsDialog_Title" xml:space="preserve">
     <value>Select a folder to export the source of {0} to:</value>
   </data>
@@ -548,9 +539,6 @@ This dialog is showing because version checks are enabled. You can turn off this
   <data name="Language_CS" xml:space="preserve">
     <value>Czech</value>
   </data>
-  <data name="References" xml:space="preserve">
-    <value>References</value>
-  </data>
   <data name="padlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\Fugue\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -731,9 +719,6 @@ Import aborted.</value>
   <data name="ComponentType_VBForm" xml:space="preserve">
     <value>VB Form</value>
   </data>
-  <data name="IndenterSettings_GroupRelatedProperties" xml:space="preserve">
-    <value>Remove vertical space between related property members</value>
-  </data>
   <data name="DeclarationType_Document" xml:space="preserve">
     <value>document</value>
   </data>
diff --git a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.it.resx b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.it.resx
index 58c03e124a..862dc4f648 100644
--- a/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.it.resx
+++ b/Rubberduck.Resources/ToDoExplorer/ToDoExplorerUI.it.resx
@@ -124,10 +124,7 @@
     <value>Descrizione</value>
   </data>
   <data name="TodoExplorer_LineNumber" xml:space="preserve">
-    <value>Numero riga</value>
-  </data>
-  <data name="TodoSettings_Text" xml:space="preserve">
-    <value>Testo</value>
+    <value>Numero di riga</value>
   </data>
   <data name="ToDoExplorer_NumberOfIssuesFound_Plural" xml:space="preserve">
     <value>Rubberduck Elementi TODO - {0}
@@ -145,10 +142,4 @@
   <data name="ToDoExplorer_CopyToolTip" xml:space="preserve">
     <value>Copia negli appunti</value>
   </data>
-  <data name="TodoSettings_TokenLabel" xml:space="preserve">
-    <value>Testo del Token:</value>
-  </data>
-  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
-    <value>Lista del Token:</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.it.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.it.resx
index 7dc4ae78dc..ca9dcea159 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.it.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.it.resx
@@ -264,7 +264,7 @@
     <comment>{0} è il numero di test nell'esecuzione del test, {1} è il totale dei test, {2} è la durata totale</comment>
   </data>
   <data name="TestOutcome_Inconclusive" xml:space="preserve">
-    <value>Inconcludente</value>
+    <value>Non concludente</value>
   </data>
   <data name="TestOutcome_SummaryCaption" xml:space="preserve">
     <value>Sommario:</value>
@@ -273,7 +273,7 @@
     <value>Sconosciuto</value>
   </data>
   <data name="TestOutcome_Succeeded" xml:space="preserve">
-    <value>Superato</value>
+    <value>Concluso con successo</value>
   </data>
   <data name="UnitTest_NewMethod_ChangeErrorNo" xml:space="preserve">
     <value>Modifica con il numero dell'errore atteso</value>
@@ -370,4 +370,7 @@
     <value>TestAssociazioneTardiva</value>
     <comment>Direttiva del precompilatore, come in "#Const LateBind = LateBindTests". Localizza come identificatore.</comment>
   </data>
+  <data name="TestOutcome_Fail" xml:space="preserve">
+    <value>Errore</value>
+  </data>
 </root>
\ No newline at end of file

From fd52de4fd6a73beac8c4b532bfd6ed2028882270 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 12 May 2021 01:57:16 -0700
Subject: [PATCH 61/64] Remove apparently duplicated strings

Reasonably confident the strings weren't used or naming was
incorrect. Also restored string to permit a valid build.
---
 .../RefactoringsUI.Designer.cs                |  9 +++++++
 .../RefactoringsUI.cs.resx                    |  3 +++
 .../RefactoringsUI.de.resx                    |  3 +++
 .../RefactoringsUI.es.resx                    |  3 +++
 .../RefactoringsUI.fr.resx                    |  3 +++
 Rubberduck.Refactorings/RefactoringsUI.resx   |  3 +++
 .../CodeExplorer/CodeExplorerUI.it.resx       |  2 +-
 Rubberduck.Resources/RubberduckUI.it.resx     | 24 -------------------
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
index 1dbdc319ad..a8e86f9b5c 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
+++ b/Rubberduck.Refactorings/RefactoringsUI.Designer.cs
@@ -204,6 +204,15 @@ public static string AnnotationArgument_ValidationError_NotABoolean {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Annotation arguments of type &apos;Number&apos; have to be a valid number in integer of floating point format..
+        /// </summary>
+        public static string AnnotationArgument_ValidationError_NotANumber {
+            get {
+                return ResourceManager.GetString("AnnotationArgument_ValidationError_NotANumber", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Annotation arguments must not contain control characters..
         /// </summary>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.cs.resx b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
index 8349a0ea05..e5c52452b8 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.cs.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.cs.resx
@@ -559,4 +559,7 @@ Chcete pokračovat?</value>
   <data name="ExtractInterface_ImplementationOptionsGroupBox" xml:space="preserve">
     <value>Možnosti Implementace:</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Argumenty anotace typu 'Number' musejí být validní číslo ve formátu integer nebo float.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index 252cc5ae75..dd34a09927 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -562,4 +562,7 @@ Wollen Sie fortfahren?</value>
   <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
     <value>Weniger als zwei Parameter für die Methode '{0}'.</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Annotationsargumente vom Typ 'Zahl' müssen eine ganze Zahl oder eine Gleitkommazahl sein.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index d0168a51ee..c2895539a3 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -541,4 +541,7 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
     <value>Menos de dos parámetros en el método '{0}'.</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Los argumentos de anotaciones del tipo 'Número' deben ser un numero válido entero o en formato de punto flotante.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 6154e67763..77eddcfc9c 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -538,4 +538,7 @@ Procéder?</value>
   <data name="ReorderPresenter_LessThanTwoParametersError" xml:space="preserve">
     <value>La méthode '{0}' compte moins de deux paramètres.</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>La valeur des arguments de type 'Number' doit être un nombre entier ou décimal valide.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.resx b/Rubberduck.Refactorings/RefactoringsUI.resx
index 62972b64ca..9ddd972bc8 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.resx
@@ -609,4 +609,7 @@ Do you want to proceed?</value>
   <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
     <value>Optional parameters must be specified at the end of the parameter list.</value>
   </data>
+  <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
+    <value>Annotation arguments of type 'Number' have to be a valid number in integer of floating point format.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx
index 9f602c98cd..a7f2705d88 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.it.resx
@@ -169,7 +169,7 @@
     <value>Raggruppa tutto</value>
   </data>
   <data name="CodeExplorer_CopyToolTip" xml:space="preserve">
-    <value>Copia negli appunti</value>
+    <value>Copia i risultati dell'ispezione negli appunti</value>
   </data>
   <data name="CodeExplorer_Delete" xml:space="preserve">
     <value>Cancella</value>
diff --git a/Rubberduck.Resources/RubberduckUI.it.resx b/Rubberduck.Resources/RubberduckUI.it.resx
index f41fb87659..02cebfb47e 100644
--- a/Rubberduck.Resources/RubberduckUI.it.resx
+++ b/Rubberduck.Resources/RubberduckUI.it.resx
@@ -153,36 +153,12 @@
     <value>{0} {1} {2} {3} {4} {5}</value>
     <comment>{0}=Progetto; {1}=Cartella; {2}=Componente; {3}=TipoDichiarazione; {4}=Scope; {5}=Nome</comment>
   </data>
-  <data name="CodeInspectionResults_GroupByModule" xml:space="preserve">
-    <value>Da modulo</value>
-  </data>
-  <data name="CodeInspectionResults_GroupByType" xml:space="preserve">
-    <value>Da tipo ispezione</value>
-  </data>
-  <data name="CodeInspections_CopyToolTip" xml:space="preserve">
-    <value>Copia i risultati dell'ispezione negli appunti</value>
-  </data>
   <data name="CodeInspections_GoToolTip" xml:space="preserve">
     <value>Vai al problema selezionato</value>
   </data>
-  <data name="CodeInspections_InspectingIssues_Plural" xml:space="preserve">
-    <value>{0} ({1} problemi)</value>
-    <comment>{0}=stato; {1}=numero</comment>
-  </data>
-  <data name="CodeInspections_InspectingIssues_Singular" xml:space="preserve">
-    <value>{0} ({1} problema)</value>
-  </data>
   <data name="CodeInspections_NextToolTip" xml:space="preserve">
     <value>Vai al prossimo problema</value>
   </data>
-  <data name="CodeInspections_NumberOfIssues_Plural" xml:space="preserve">
-    <value>{0} problemi</value>
-    <comment>{0}=numero</comment>
-  </data>
-  <data name="CodeInspections_NumberOfIssues_Singular" xml:space="preserve">
-    <value>{0} problema</value>
-    <comment>{0}=numero</comment>
-  </data>
   <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
     <value>Vai al precedente problema</value>
   </data>

From 9b504e6a16b5303a4b263aa0dbe36bdf2d463275 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 12 May 2021 11:08:00 -0700
Subject: [PATCH 62/64] Finer grained resource edits

Some resources that likely aren't used and can be removed were restored in
favor of eliminating those that *are* needed.
---
 .../CodeInspectionDefaults.Designer.cs        | 226 +++++++++--------
 .../CodeInspectionDefaults.settings           |   8 +-
 .../Rubberduck.CodeAnalysis.csproj            |   1 +
 Rubberduck.CodeAnalysis/app.config            | 232 ++++++++++++------
 .../RefactoringsUI.de.resx                    |   3 +
 .../RefactoringsUI.es.resx                    |   3 +
 .../RefactoringsUI.fr.resx                    |  18 ++
 .../Inspections/InspectionInfo.cs.resx        |   3 -
 .../Inspections/InspectionInfo.es.resx        |   3 -
 .../Inspections/InspectionInfo.fr.resx        |   3 -
 .../Inspections/InspectionNames.cs.resx       |   3 -
 .../Inspections/InspectionNames.es.resx       |   3 -
 .../Inspections/InspectionNames.fr.resx       |   3 -
 .../Inspections/InspectionResults.cs.resx     |   3 -
 .../Inspections/InspectionResults.es.resx     |   3 -
 .../Inspections/InspectionResults.fr.resx     |   3 -
 .../Rubberduck.Resources.csproj               |   3 +
 Rubberduck.Resources/RubberduckUI.Designer.cs | 117 +++++++++
 Rubberduck.Resources/RubberduckUI.cs.resx     |  36 +++
 Rubberduck.Resources/RubberduckUI.de.resx     |  36 +++
 Rubberduck.Resources/RubberduckUI.es.resx     |  40 +++
 Rubberduck.Resources/RubberduckUI.fr.resx     |  39 +++
 Rubberduck.Resources/RubberduckUI.resx        |  40 +++
 .../Settings/ToDoExplorerPage.Designer.cs     |  27 ++
 .../Settings/ToDoExplorerPage.cs.resx         |   9 +
 .../Settings/ToDoExplorerPage.de.resx         |   9 +
 .../Settings/ToDoExplorerPage.es.resx         |   9 +
 .../Settings/ToDoExplorerPage.fr.resx         |   9 +
 .../Settings/ToDoExplorerPage.resx            |   9 +
 29 files changed, 676 insertions(+), 225 deletions(-)

diff --git a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs
index c7d0c0aed7..1bf28617db 100644
--- a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs
+++ b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs
@@ -12,7 +12,7 @@ namespace Rubberduck.CodeAnalysis.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
     public sealed partial class CodeInspectionDefaults : global::System.Configuration.ApplicationSettingsBase {
         
         private static CodeInspectionDefaults defaultInstance = ((CodeInspectionDefaults)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new CodeInspectionDefaults())));
@@ -38,121 +38,117 @@ public static CodeInspectionDefaults Default {
             "CodeInspection Name=\"ImplicitByRefModifierInspection\" Severity=\"Hint\" Inspection" +
             "Type=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"FunctionReturnValueNotUse" +
             "dInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <Code" +
-            "Inspection Name=\"IllegalAnnotationInspection\" Severity=\"Error\" InspectionType=\"R" +
-            "ubberduckOpportunities\" />\r\n    <CodeInspection Name=\"RedundantByRefModifierInsp" +
-            "ection\" Severity=\"DoNotShow\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeIns" +
-            "pection Name=\"MissingAttributeInspection\" Severity=\"Warning\" InspectionType=\"Rub" +
-            "berduckOpportunities\" />\r\n    <CodeInspection Name=\"AttributeValueOutOfSyncInspe" +
-            "ction\" Severity=\"Warning\" InspectionType=\"RubberduckOpportunities\" />\r\n    <Code" +
-            "Inspection Name=\"MissingAnnotationArgumentInspection\" Severity=\"Error\" Inspectio" +
-            "nType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"MissingMemberAnnotationI" +
-            "nspection\" Severity=\"Error\" InspectionType=\"RubberduckOpportunities\" />\r\n    <Co" +
-            "deInspection Name=\"ModuleScopeDimKeywordInspection\" Severity=\"Suggestion\" Inspec" +
-            "tionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"MultilineParamete" +
-            "rInspection\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadability" +
-            "Issues\" />\r\n    <CodeInspection Name=\"MultipleDeclarationsInspection\" Severity=\"" +
-            "Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspe" +
-            "ction Name=\"ObsoleteCallStatementInspection\" Severity=\"Suggestion\" InspectionTyp" +
-            "e=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ObsoleteCommentSyntaxIns" +
-            "pection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <C" +
-            "odeInspection Name=\"ObsoleteLetStatementInspection\" Severity=\"Suggestion\" Inspec" +
-            "tionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"OptionBaseInspect" +
-            "ion\" Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n  " +
-            "  <CodeInspection Name=\"RedundantOptionInspection\" Severity=\"Hint\" InspectionTyp" +
-            "e=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"OptionExplicitInspection" +
-            "\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Na" +
-            "me=\"ProcedureCanBeWrittenAsFunctionInspection\" Severity=\"Suggestion\" InspectionT" +
-            "ype=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ApplicationWorksheetFu" +
-            "nctionInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n " +
-            "   <CodeInspection Name=\"AssignedByValParameterInspection\" Severity=\"Warning\" In" +
-            "spectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"EmptyModuleInspec" +
-            "tion\" Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n " +
-            "   <CodeInspection Name=\"LineLabelNotUsedInspection\" Severity=\"Warning\" Inspecti" +
-            "onType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"IntegerDataTypeInspecti" +
-            "on\" Severity=\"Hint\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection N" +
-            "ame=\"ShadowedDeclarationInspection\" Severity=\"DoNotShow\" InspectionType=\"CodeQua" +
-            "lityIssues\" />\r\n    <CodeInspection Name=\"ConstantNotUsedInspection\" Severity=\"W" +
-            "arning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"Default" +
-            "ProjectNameInspection\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndR" +
-            "eadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyCaseBlockInspection\" Severi" +
-            "ty=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeI" +
-            "nspection Name=\"EmptyDoWhileBlockInspection\" Severity=\"Suggestion\" InspectionTyp" +
-            "e=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyElseB" +
-            "lockInspection\" Severity=\"Warning\" InspectionType=\"MaintainabilityAndReadability" +
-            "Issues\" />\r\n    <CodeInspection Name=\"EmptyForEachBlockInspection\" Severity=\"War" +
-            "ning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspecti" +
-            "on Name=\"EmptyForLoopBlockInspection\" Severity=\"Warning\" InspectionType=\"Maintai" +
-            "nabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyIfBlockInspecti" +
-            "on\" Severity=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n" +
-            "    <CodeInspection Name=\"EmptyWhileWendBlockInspection\" Severity=\"Warning\" Insp" +
-            "ectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"E" +
-            "ncapsulatePublicFieldInspection\" Severity=\"Suggestion\" InspectionType=\"Maintaina" +
-            "bilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"HostSpecificExpression" +
-            "Inspection\" Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <C" +
-            "odeInspection Name=\"HungarianNotationInspection\" Severity=\"Suggestion\" Inspectio" +
-            "nType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"Implic" +
-            "itActiveSheetReferenceInspection\" Severity=\"Warning\" InspectionType=\"LanguageOpp" +
-            "ortunities\" />\r\n    <CodeInspection Name=\"ImplicitContainingSheetReferenceInspec" +
-            "tion\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <Code" +
-            "Inspection Name=\"ImplicitActiveWorkbookReferenceInspection\" Severity=\"Warning\" I" +
-            "nspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ImplicitCont" +
-            "ainingWorkbookReferenceInspection\" Severity=\"Suggestion\" InspectionType=\"Languag" +
-            "eOpportunities\" />\r\n    <CodeInspection Name=\"ImplicitDefaultMemberAssignmentIns" +
-            "pection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <C" +
-            "odeInspection Name=\"ImplicitPublicMemberInspection\" Severity=\"Hint\" InspectionTy" +
-            "pe=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ImplicitVariantReturnTy" +
-            "peInspection\" Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <Co" +
-            "deInspection Name=\"MemberNotOnInterfaceInspection\" Severity=\"Warning\" Inspection" +
-            "Type=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"MoveFieldCloserToUsageIns" +
-            "pection\" Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />" +
-            "\r\n    <CodeInspection Name=\"NonReturningFunctionInspection\" Severity=\"Error\" Ins" +
-            "pectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"ObjectVariableNotS" +
-            "etInspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeI" +
-            "nspection Name=\"ObsoleteGlobalInspection\" Severity=\"Suggestion\" InspectionType=\"" +
-            "LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ObsoleteTypeHintInspection\"" +
-            " Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspe" +
-            "ction Name=\"ParameterCanBeByValInspection\" Severity=\"Suggestion\" InspectionType=" +
-            "\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"ParameterNot" +
-            "UsedInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <C" +
-            "odeInspection Name=\"ProcedureNotUsedInspection\" Severity=\"Warning\" InspectionTyp" +
-            "e=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"SelfAssignedDeclarationInspe" +
-            "ction\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeIns" +
-            "pection Name=\"UnassignedVariableUsageInspection\" Severity=\"Error\" InspectionType" +
-            "=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UndeclaredVariableInspection\"" +
-            " Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Nam" +
-            "e=\"UntypedFunctionUsageInspection\" Severity=\"Hint\" InspectionType=\"LanguageOppor" +
-            "tunities\" />\r\n    <CodeInspection Name=\"UseMeaningfulNameInspection\" Severity=\"S" +
-            "uggestion\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeIns" +
-            "pection Name=\"VariableNotAssignedInspection\" Severity=\"Warning\" InspectionType=\"" +
-            "CodeQualityIssues\" />\r\n    <CodeInspection Name=\"VariableNotUsedInspection\" Seve" +
-            "rity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"" +
-            "VariableTypeNotDeclaredInspection\" Severity=\"Warning\" InspectionType=\"LanguageOp" +
-            "portunities\" />\r\n    <CodeInspection Name=\"WriteOnlyPropertyInspection\" Severity" +
-            "=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"D" +
-            "efTypeStatementInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportu" +
-            "nities\" />\r\n    <CodeInspection Name=\"StepIsNotSpecifiedInspection\" Severity=\"Do" +
-            "NotShow\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"St" +
-            "epOneIsRedundantInspection\" Severity=\"Hint\" InspectionType=\"LanguageOpportunitie" +
-            "s\" />\r\n    <CodeInspection Name=\"SheetAccessedUsingStringInspection\" Severity=\"S" +
-            "uggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"" +
-            "ObsoleteMemberUsageInspection\" Severity=\"Warning\" InspectionType=\"Maintainabilit" +
-            "yAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"ObsoleteCallingConventionIn" +
+            "Inspection Name=\"RedundantByRefModifierInspection\" Severity=\"DoNotShow\" Inspecti" +
+            "onType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"MissingAttributeInspect" +
+            "ion\" Severity=\"Warning\" InspectionType=\"RubberduckOpportunities\" />\r\n    <CodeIn" +
+            "spection Name=\"AttributeOutOfSyncInspection\" Severity=\"Warning\" InspectionType=\"" +
+            "RubberduckOpportunities\" />\r\n    <CodeInspection Name=\"MissingAnnotationArgument" +
+            "Inspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeIns" +
+            "pection Name=\"ModuleScopeDimKeywordInspection\" Severity=\"Suggestion\" InspectionT" +
+            "ype=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"MultilineParameterInsp" +
+            "ection\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadabilityIssue" +
+            "s\" />\r\n    <CodeInspection Name=\"MultipleDeclarationsInspection\" Severity=\"Warni" +
+            "ng\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection" +
+            " Name=\"ObsoleteCallStatementInspection\" Severity=\"Suggestion\" InspectionType=\"La" +
+            "nguageOpportunities\" />\r\n    <CodeInspection Name=\"ObsoleteCommentSyntaxInspecti" +
+            "on\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
+            "spection Name=\"ObsoleteLetStatementInspection\" Severity=\"Suggestion\" InspectionT" +
+            "ype=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"OptionBaseInspection\" " +
+            "Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <Co" +
+            "deInspection Name=\"RedundantOptionInspection\" Severity=\"Hint\" InspectionType=\"La" +
+            "nguageOpportunities\" />\r\n    <CodeInspection Name=\"OptionExplicitInspection\" Sev" +
+            "erity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"P" +
+            "rocedureCanBeWrittenAsFunctionInspection\" Severity=\"Suggestion\" InspectionType=\"" +
+            "LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ApplicationWorksheetFunctio" +
+            "nInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <C" +
+            "odeInspection Name=\"AssignedByValParameterInspection\" Severity=\"Warning\" Inspect" +
+            "ionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"EmptyModuleInspection\"" +
+            " Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <C" +
+            "odeInspection Name=\"LineLabelNotUsedInspection\" Severity=\"Warning\" InspectionTyp" +
+            "e=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"IntegerDataTypeInspection\" S" +
+            "everity=\"Hint\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"" +
+            "ShadowedDeclarationInspection\" Severity=\"DoNotShow\" InspectionType=\"CodeQualityI" +
+            "ssues\" />\r\n    <CodeInspection Name=\"ConstantNotUsedInspection\" Severity=\"Warnin" +
+            "g\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"DefaultProje" +
+            "ctNameInspection\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadab" +
+            "ilityIssues\" />\r\n    <CodeInspection Name=\"EmptyCaseBlockInspection\" Severity=\"W" +
+            "arning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspec" +
+            "tion Name=\"EmptyDoWhileBlockInspection\" Severity=\"Suggestion\" InspectionType=\"Ma" +
+            "intainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyElseBlockI" +
+            "nspection\" Severity=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssue" +
+            "s\" />\r\n    <CodeInspection Name=\"EmptyForEachBlockInspection\" Severity=\"Warning\"" +
+            " InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Na" +
+            "me=\"EmptyForLoopBlockInspection\" Severity=\"Warning\" InspectionType=\"Maintainabil" +
+            "ityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyIfBlockInspection\" S" +
+            "everity=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <" +
+            "CodeInspection Name=\"EmptyWhileWendBlockInspection\" Severity=\"Warning\" Inspectio" +
+            "nType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"Encaps" +
+            "ulatePublicFieldInspection\" Severity=\"Suggestion\" InspectionType=\"Maintainabilit" +
+            "yAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"HostSpecificExpressionInspe" +
+            "ction\" Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
+            "spection Name=\"HungarianNotationInspection\" Severity=\"Suggestion\" InspectionType" +
+            "=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"ImplicitAct" +
+            "iveSheetReferenceInspection\" Severity=\"Warning\" InspectionType=\"LanguageOpportun" +
+            "ities\" />\r\n    <CodeInspection Name=\"ImplicitActiveWorkbookReferenceInspection\" " +
+            "Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspectio" +
+            "n Name=\"ImplicitDefaultMemberAssignmentInspection\" Severity=\"Suggestion\" Inspect" +
+            "ionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ImplicitPublicMemb" +
+            "erInspection\" Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <Co" +
+            "deInspection Name=\"ImplicitVariantReturnTypeInspection\" Severity=\"Hint\" Inspecti" +
+            "onType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"MemberNotOnInterfac" +
+            "eInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <Code" +
+            "Inspection Name=\"MoveFieldCloserToUsageInspection\" Severity=\"Hint\" InspectionTyp" +
+            "e=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"NonReturni" +
+            "ngFunctionInspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n  " +
+            "  <CodeInspection Name=\"ObjectVariableNotSetInspection\" Severity=\"Error\" Inspect" +
+            "ionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"ObsoleteGlobalInspecti" +
+            "on\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
+            "spection Name=\"ObsoleteTypeHintInspection\" Severity=\"Suggestion\" InspectionType=" +
+            "\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ParameterCanBeByValInspect" +
+            "ion\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadabilityIssues\" " +
+            "/>\r\n    <CodeInspection Name=\"ParameterNotUsedInspection\" Severity=\"Warning\" Ins" +
+            "pectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"ProcedureNotUsedIn" +
             "spection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeIns" +
-            "pection Name=\"DuplicatedAnnotationInspection\" Severity=\"Error\" InspectionType=\"R" +
-            "ubberduckOpportunities\" />\r\n    <CodeInspection Name=\"ModuleWithoutFolderInspect" +
-            "ion\" Severity=\"Suggestion\" InspectionType=\"RubberduckOpportunities\" />\r\n    <Cod" +
-            "eInspection Name=\"OnLocalErrorInspection\" Severity=\"Suggestion\" InspectionType=\"" +
-            "LanguageOpportunities\" />\r\n    <CodeInspection Name=\"IsMissingOnInappropriateArg" +
-            "umentInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <" +
-            "CodeInspection Name=\"IsMissingWithNonArgumentParameterInspection\" Severity=\"Warn" +
-            "ing\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"Assignment" +
-            "NotUsedInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n" +
-            "    <CodeInspection Name=\"UnderscoreInPublicClassModuleMemberInspection\" Severit" +
-            "y=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"Exc" +
-            "elUdfNameIsValidCellReferenceInspection\" Severity=\"Warning\" InspectionType=\"Code" +
-            "QualityIssues\" />\r\n  </CodeInspections>\r\n  <WhitelistedIdentifiers />\r\n  <RunIns" +
-            "pectionsOnSuccessfulParse>true</RunInspectionsOnSuccessfulParse>\r\n</CodeInspecti" +
-            "onSettings>")]
+            "pection Name=\"SelfAssignedDeclarationInspection\" Severity=\"Suggestion\" Inspectio" +
+            "nType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UnassignedVariableUsageI" +
+            "nspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInsp" +
+            "ection Name=\"UndeclaredVariableInspection\" Severity=\"Error\" InspectionType=\"Code" +
+            "QualityIssues\" />\r\n    <CodeInspection Name=\"UntypedFunctionUsageInspection\" Sev" +
+            "erity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name" +
+            "=\"UseMeaningfulNameInspection\" Severity=\"Suggestion\" InspectionType=\"Maintainabi" +
+            "lityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"VariableNotAssignedInspe" +
+            "ction\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspec" +
+            "tion Name=\"VariableNotUsedInspection\" Severity=\"Warning\" InspectionType=\"CodeQua" +
+            "lityIssues\" />\r\n    <CodeInspection Name=\"VariableTypeNotDeclaredInspection\" Sev" +
+            "erity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection N" +
+            "ame=\"WriteOnlyPropertyInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQual" +
+            "ityIssues\" />\r\n    <CodeInspection Name=\"DefTypeStatementInspection\" Severity=\"S" +
+            "uggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"" +
+            "StepIsNotSpecifiedInspection\" Severity=\"DoNotShow\" InspectionType=\"LanguageOppor" +
+            "tunities\" />\r\n    <CodeInspection Name=\"StepOneIsRedundantInspection\" Severity=\"" +
+            "Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"Sheet" +
+            "AccessedUsingStringInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpp" +
+            "ortunities\" />\r\n    <CodeInspection Name=\"ObsoleteMemberUsageInspection\" Severit" +
+            "y=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeIn" +
+            "spection Name=\"ObsoleteCallingConventionInspection\" Severity=\"Warning\" Inspectio" +
+            "nType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"DuplicatedAnnotationInsp" +
+            "ection\" Severity=\"Error\" InspectionType=\"RubberduckOpportunities\" />\r\n    <CodeI" +
+            "nspection Name=\"ModuleWithoutFolderInspection\" Severity=\"Suggestion\" InspectionT" +
+            "ype=\"RubberduckOpportunities\" />\r\n    <CodeInspection Name=\"OnLocalErrorInspecti" +
+            "on\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
+            "spection Name=\"IsMissingOnInappropriateArgumentInspection\" Severity=\"Warning\" In" +
+            "spectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"IsMissingWithNonA" +
+            "rgumentParameterInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues" +
+            "\" />\r\n    <CodeInspection Name=\"AssignmentNotUsedInspection\" Severity=\"Suggestio" +
+            "n\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UnderscoreIn" +
+            "PublicClassModuleMemberInspection\" Severity=\"Warning\" InspectionType=\"CodeQualit" +
+            "yIssues\" />\r\n    <CodeInspection Name=\"ExcelUdfNameIsValidCellReferenceInspectio" +
+            "n\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection" +
+            " Name=\"EmptyMethodInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssu" +
+            "es\" />\r\n    <CodeInspection Name=\"ImplementedInterfaceMemberInspection\" Severity" +
+            "=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n  </CodeInspections>\r\n  <Wh" +
+            "itelistedIdentifiers />\r\n  <RunInspectionsOnSuccessfulParse>true</RunInspections" +
+            "OnSuccessfulParse>\r\n</CodeInspectionSettings>")]
         public global::Rubberduck.CodeAnalysis.Settings.CodeInspectionSettings CodeInspectionSettings {
             get {
                 return ((global::Rubberduck.CodeAnalysis.Settings.CodeInspectionSettings)(this["CodeInspectionSettings"]));
diff --git a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings
index d0b41da20e..449dbd6b86 100644
--- a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings
+++ b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings
@@ -13,12 +13,10 @@
     &lt;CodeInspection Name="EmptyStringLiteralInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitByRefModifierInspection" Severity="Hint" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="FunctionReturnValueNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
-    &lt;CodeInspection Name="IllegalAnnotationInspection" Severity="Error" InspectionType="RubberduckOpportunities" /&gt;
     &lt;CodeInspection Name="RedundantByRefModifierInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="MissingAttributeInspection" Severity="Warning" InspectionType="RubberduckOpportunities" /&gt;
-    &lt;CodeInspection Name="AttributeValueOutOfSyncInspection" Severity="Warning" InspectionType="RubberduckOpportunities" /&gt;
+    &lt;CodeInspection Name="AttributeOutOfSyncInspection" Severity="Warning" InspectionType="RubberduckOpportunities" /&gt;
     &lt;CodeInspection Name="MissingAnnotationArgumentInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
-    &lt;CodeInspection Name="MissingMemberAnnotationInspection" Severity="Error" InspectionType="RubberduckOpportunities" /&gt;
     &lt;CodeInspection Name="ModuleScopeDimKeywordInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="MultilineParameterInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
     &lt;CodeInspection Name="MultipleDeclarationsInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
@@ -48,9 +46,7 @@
     &lt;CodeInspection Name="HostSpecificExpressionInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="HungarianNotationInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
     &lt;CodeInspection Name="ImplicitActiveSheetReferenceInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="ImplicitContainingSheetReferenceInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitActiveWorkbookReferenceInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="ImplicitContainingWorkbookReferenceInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitDefaultMemberAssignmentInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitPublicMemberInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitVariantReturnTypeInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
@@ -86,6 +82,8 @@
     &lt;CodeInspection Name="AssignmentNotUsedInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="UnderscoreInPublicClassModuleMemberInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ExcelUdfNameIsValidCellReferenceInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
+    &lt;CodeInspection Name="EmptyMethodInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
+    &lt;CodeInspection Name="ImplementedInterfaceMemberInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" /&gt;
   &lt;/CodeInspections&gt;
   &lt;WhitelistedIdentifiers /&gt;
   &lt;RunInspectionsOnSuccessfulParse&gt;true&lt;/RunInspectionsOnSuccessfulParse&gt;
diff --git a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
index 1e74baec37..6211d227a1 100644
--- a/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
+++ b/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj
@@ -70,6 +70,7 @@
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>CodeInspectionDefaults.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/Rubberduck.CodeAnalysis/app.config b/Rubberduck.CodeAnalysis/app.config
index 688666fbff..64d43f5b25 100644
--- a/Rubberduck.CodeAnalysis/app.config
+++ b/Rubberduck.CodeAnalysis/app.config
@@ -21,85 +21,161 @@
           <CodeInspectionSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
             <CodeInspections>
-              <CodeInspection Name="BooleanAssignedInIfElseInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="ObsoleteErrorSyntaxInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="StopKeywordInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="UnhandledOnErrorResumeNextInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="EmptyStringLiteralInspection" Severity="Warning" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ImplicitByRefModifierInspection" Severity="Hint" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="FunctionReturnValueNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="IllegalAnnotationInspection" Severity="Error" InspectionType="RubberduckOpportunities" />
-              <CodeInspection Name="RedundantByRefModifierInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="MissingAttributeInspection" Severity="Warning" InspectionType="RubberduckOpportunities" />
-              <CodeInspection Name="AttributeOutOfSyncInspection" Severity="Warning" InspectionType="RubberduckOpportunities" />
-              <CodeInspection Name="MissingAnnotationArgumentInspection" Severity="Error" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ModuleScopeDimKeywordInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="MultilineParameterInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="MultipleDeclarationsInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="ObsoleteCallStatementInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ObsoleteCommentSyntaxInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ObsoleteLetStatementInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="BooleanAssignedInIfElseInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="ObsoleteErrorSyntaxInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="StopKeywordInspection" Severity="Suggestion"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="UnhandledOnErrorResumeNextInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="EmptyStringLiteralInspection" Severity="Warning"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ImplicitByRefModifierInspection" Severity="Hint"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="FunctionReturnValueNotUsedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="RedundantByRefModifierInspection" Severity="DoNotShow"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="MissingAttributeInspection" Severity="Warning"
+                InspectionType="RubberduckOpportunities" />
+              <CodeInspection Name="AttributeOutOfSyncInspection" Severity="Warning"
+                InspectionType="RubberduckOpportunities" />
+              <CodeInspection Name="MissingAnnotationArgumentInspection" Severity="Error"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ModuleScopeDimKeywordInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="MultilineParameterInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="MultipleDeclarationsInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="ObsoleteCallStatementInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ObsoleteCommentSyntaxInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ObsoleteLetStatementInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
               <CodeInspection Name="OptionBaseInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" />
-			  <CodeInspection Name="RedundantOptionInspection" Severity="Hint" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="OptionExplicitInspection" Severity="Error" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ProcedureCanBeWrittenAsFunctionInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ApplicationWorksheetFunctionInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="AssignedByValParameterInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="EmptyModuleInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="LineLabelNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="IntegerDataTypeInspection" Severity="Hint" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ShadowedDeclarationInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ConstantNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="DefaultProjectNameInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyCaseBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyDoWhileBlockInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyElseBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyForEachBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyForLoopBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyIfBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EmptyWhileWendBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="EncapsulatePublicFieldInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="HostSpecificExpressionInspection" Severity="Warning" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="HungarianNotationInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="ImplicitActiveSheetReferenceInspection" Severity="Warning" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ImplicitActiveWorkbookReferenceInspection" Severity="Warning" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ImplicitDefaultMemberAssignmentInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ImplicitPublicMemberInspection" Severity="Hint" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ImplicitVariantReturnTypeInspection" Severity="Hint" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="MemberNotOnInterfaceInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="MoveFieldCloserToUsageInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="NonReturningFunctionInspection" Severity="Error" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ObjectVariableNotSetInspection" Severity="Error" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ObsoleteGlobalInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ObsoleteTypeHintInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ParameterCanBeByValInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="ParameterNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ProcedureNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="SelfAssignedDeclarationInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="UnassignedVariableUsageInspection" Severity="Error" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="UndeclaredVariableInspection" Severity="Error" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="UntypedFunctionUsageInspection" Severity="Hint" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="UseMeaningfulNameInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="VariableNotAssignedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="VariableNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="VariableTypeNotDeclaredInspection" Severity="Warning" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="WriteOnlyPropertyInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="DefTypeStatementInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="StepIsNotSpecifiedInspection" Severity="DoNotShow" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="StepOneIsRedundantInspection" Severity="Hint" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="SheetAccessedUsingStringInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
-              <CodeInspection Name="ObsoleteCallingConventionInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="DuplicatedAnnotationInspection" Severity="Error" InspectionType="RubberduckOpportunities" />
-              <CodeInspection Name="ModuleWithoutFolderInspection" Severity="Suggestion" InspectionType="RubberduckOpportunities" />
-              <CodeInspection Name="OnLocalErrorInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="IsMissingOnInappropriateArgumentInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="IsMissingWithNonArgumentParameterInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="AssignmentNotUsedInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="UnderscoreInPublicClassModuleMemberInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ExcelUdfNameIsValidCellReferenceInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="EmptyMethodInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
-              <CodeInspection Name="ImplementedInterfaceMemberInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="RedundantOptionInspection" Severity="Hint"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="OptionExplicitInspection" Severity="Error"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ProcedureCanBeWrittenAsFunctionInspection"
+                Severity="Suggestion" InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ApplicationWorksheetFunctionInspection"
+                Severity="Suggestion" InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="AssignedByValParameterInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="EmptyModuleInspection" Severity="Hint"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="LineLabelNotUsedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="IntegerDataTypeInspection" Severity="Hint"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ShadowedDeclarationInspection" Severity="DoNotShow"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ConstantNotUsedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="DefaultProjectNameInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyCaseBlockInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyDoWhileBlockInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyElseBlockInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyForEachBlockInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyForLoopBlockInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyIfBlockInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EmptyWhileWendBlockInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="EncapsulatePublicFieldInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="HostSpecificExpressionInspection" Severity="Warning"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="HungarianNotationInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="ImplicitActiveSheetReferenceInspection"
+                Severity="Warning" InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ImplicitActiveWorkbookReferenceInspection"
+                Severity="Warning" InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ImplicitDefaultMemberAssignmentInspection"
+                Severity="Suggestion" InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ImplicitPublicMemberInspection" Severity="Hint"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ImplicitVariantReturnTypeInspection" Severity="Hint"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="MemberNotOnInterfaceInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="MoveFieldCloserToUsageInspection" Severity="Hint"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="NonReturningFunctionInspection" Severity="Error"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ObjectVariableNotSetInspection" Severity="Error"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ObsoleteGlobalInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ObsoleteTypeHintInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ParameterCanBeByValInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="ParameterNotUsedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ProcedureNotUsedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="SelfAssignedDeclarationInspection" Severity="Suggestion"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="UnassignedVariableUsageInspection" Severity="Error"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="UndeclaredVariableInspection" Severity="Error"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="UntypedFunctionUsageInspection" Severity="Hint"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="UseMeaningfulNameInspection" Severity="Suggestion"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="VariableNotAssignedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="VariableNotUsedInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="VariableTypeNotDeclaredInspection" Severity="Warning"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="WriteOnlyPropertyInspection" Severity="Suggestion"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="DefTypeStatementInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="StepIsNotSpecifiedInspection" Severity="DoNotShow"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="StepOneIsRedundantInspection" Severity="Hint"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="SheetAccessedUsingStringInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning"
+                InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="ObsoleteCallingConventionInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="DuplicatedAnnotationInspection" Severity="Error"
+                InspectionType="RubberduckOpportunities" />
+              <CodeInspection Name="ModuleWithoutFolderInspection" Severity="Suggestion"
+                InspectionType="RubberduckOpportunities" />
+              <CodeInspection Name="OnLocalErrorInspection" Severity="Suggestion"
+                InspectionType="LanguageOpportunities" />
+              <CodeInspection Name="IsMissingOnInappropriateArgumentInspection"
+                Severity="Warning" InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="IsMissingWithNonArgumentParameterInspection"
+                Severity="Warning" InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="AssignmentNotUsedInspection" Severity="Suggestion"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="UnderscoreInPublicClassModuleMemberInspection"
+                Severity="Warning" InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ExcelUdfNameIsValidCellReferenceInspection"
+                Severity="Warning" InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="EmptyMethodInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
+              <CodeInspection Name="ImplementedInterfaceMemberInspection" Severity="Suggestion"
+                InspectionType="CodeQualityIssues" />
             </CodeInspections>
             <WhitelistedIdentifiers />
             <RunInspectionsOnSuccessfulParse>true</RunInspectionsOnSuccessfulParse>
diff --git a/Rubberduck.Refactorings/RefactoringsUI.de.resx b/Rubberduck.Refactorings/RefactoringsUI.de.resx
index dd34a09927..b06fe9b550 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.de.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.de.resx
@@ -565,4 +565,7 @@ Wollen Sie fortfahren?</value>
   <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
     <value>Annotationsargumente vom Typ 'Zahl' müssen eine ganze Zahl oder eine Gleitkommazahl sein.</value>
   </data>
+  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
+    <value>Optionale Parameter müssen am Ende der Parameterliste deklariert werden.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.es.resx b/Rubberduck.Refactorings/RefactoringsUI.es.resx
index c2895539a3..9a7af4b784 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.es.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.es.resx
@@ -544,4 +544,7 @@ Una clase privada puede asimismo implementar una interfaz pública.</value>
   <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
     <value>Los argumentos de anotaciones del tipo 'Número' deben ser un numero válido entero o en formato de punto flotante.</value>
   </data>
+  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
+    <value>Los parámetros opcionales deben especificarse al final de la lista de parámetros.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Refactorings/RefactoringsUI.fr.resx b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
index 77eddcfc9c..4dbd47cca1 100644
--- a/Rubberduck.Refactorings/RefactoringsUI.fr.resx
+++ b/Rubberduck.Refactorings/RefactoringsUI.fr.resx
@@ -541,4 +541,22 @@ Procéder?</value>
   <data name="AnnotationArgument_ValidationError_NotANumber" xml:space="preserve">
     <value>La valeur des arguments de type 'Number' doit être un nombre entier ou décimal valide.</value>
   </data>
+  <data name="ReorderPresenter_OptionalParametersMustBeLastError" xml:space="preserve">
+    <value>Les paramètres optionels doivent être spéficiés à la fin de la liste.</value>
+  </data>
+  <data name="AnnotationArgumentType_Text" xml:space="preserve">
+    <value>Texte</value>
+  </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Attribut</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Valeur Booléenne</value>
+  </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>AnnotationArgumentType_Inspection</value>
+  </data>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>AnnotationArgumentType_Number</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Inspections/InspectionInfo.cs.resx b/Rubberduck.Resources/Inspections/InspectionInfo.cs.resx
index 0842f33872..a2355027ad 100644
--- a/Rubberduck.Resources/Inspections/InspectionInfo.cs.resx
+++ b/Rubberduck.Resources/Inspections/InspectionInfo.cs.resx
@@ -301,9 +301,6 @@ Jestliže může být parametr prázdný, ignorujte výsledek této inspekce; p
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>Anotace Rubberducku je specifikována pro modul nebo člen, ale příslušný atribut není přítomen. Atributy modulu a anotace je třeba synchronizovat.</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Anotace, která má být specifikována na úrovni modulu, nemůže být použita k anotaci členů; anotace, které mají být členy anotací, nemohou být použity na úrovni modulu; anotace modulu a členů mohou být specifikovány pouze jednou.</value>
-  </data>
   <data name="OptionBaseZeroInspection" xml:space="preserve">
     <value>Toto je výchozí nastavení, není třeba jej specifikovat.</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionInfo.es.resx b/Rubberduck.Resources/Inspections/InspectionInfo.es.resx
index 1283c74ce6..969345fe51 100644
--- a/Rubberduck.Resources/Inspections/InspectionInfo.es.resx
+++ b/Rubberduck.Resources/Inspections/InspectionInfo.es.resx
@@ -244,9 +244,6 @@ Si el parámetro puede ser nulo, ignore el resultado de esta inspección; pasar
   <data name="OptionBaseZeroInspection" xml:space="preserve">
     <value>Esta es la configuración predeterminada, no es necesario especificarla.</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Una anotación que debe especificarse a nivel de módulo no se puede utilizar para anotar miembros; las anotaciones destinadas a ser miembros de anotaciones no se pueden utilizar a nivel de módulo.</value>
-  </data>
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>Se especifica una anotación de Rubberduck para un módulo o miembro, pero el atributo correspondiente no está presente. Los atributos del módulo y las anotaciones deben estar sincronizados.</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx b/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx
index 0867838af4..7d9a49e503 100644
--- a/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx
@@ -244,9 +244,6 @@ Si le paramètre peut être nul, ignorer ce résultat; passer une valeur nulle 
   <data name="ShadowedDeclarationInspection" xml:space="preserve">
     <value>Deux déclarations ont le même nom dans le même espace-nom: une seule d'entre elles peut être utilisée.</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Une annotation devant être spécifiée au niveau du module ne peut être utilisée pour annoter de membres; les annotations devant être spécifiées au niveau des membres du module, ne peuvent être utilisées au niveau du module; toutes les annotations ne devrait être spécifiées qu'une seule fois par module/membre.</value>
-  </data>
   <data name="RedundantOptionInspection" xml:space="preserve">
     <value>Cette instruction correspondant aux paramètres par défaut et peut être supprimée sans effet.</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionNames.cs.resx b/Rubberduck.Resources/Inspections/InspectionNames.cs.resx
index 6169421da0..9fcca9c4bd 100644
--- a/Rubberduck.Resources/Inspections/InspectionNames.cs.resx
+++ b/Rubberduck.Resources/Inspections/InspectionNames.cs.resx
@@ -243,9 +243,6 @@
   <data name="OptionBaseZeroInspection" xml:space="preserve">
     <value>'Option Base 0' je nadbytečná</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Ilegální anotace</value>
-  </data>
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>Chybějící atribut</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionNames.es.resx b/Rubberduck.Resources/Inspections/InspectionNames.es.resx
index bbd6be0134..157c262665 100644
--- a/Rubberduck.Resources/Inspections/InspectionNames.es.resx
+++ b/Rubberduck.Resources/Inspections/InspectionNames.es.resx
@@ -243,9 +243,6 @@
   <data name="OptionBaseZeroInspection" xml:space="preserve">
     <value>'Option Base 0' es redundante</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Anotación ilegal</value>
-  </data>
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>Falta atributo</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionNames.fr.resx b/Rubberduck.Resources/Inspections/InspectionNames.fr.resx
index 2617702aea..fef2bfd388 100644
--- a/Rubberduck.Resources/Inspections/InspectionNames.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionNames.fr.resx
@@ -261,9 +261,6 @@
   <data name="ImplicitByRefModifierInspection" xml:space="preserve">
     <value>Paramètre ByRef implicite</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Annotation illégale</value>
-  </data>
   <data name="EmptyForEachBlockInspection" xml:space="preserve">
     <value>Boucle 'For Each...Next' vide</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionResults.cs.resx b/Rubberduck.Resources/Inspections/InspectionResults.cs.resx
index af3df8b2ad..3e1664afd6 100644
--- a/Rubberduck.Resources/Inspections/InspectionResults.cs.resx
+++ b/Rubberduck.Resources/Inspections/InspectionResults.cs.resx
@@ -243,9 +243,6 @@
   <data name="OptionBaseZeroInspection" xml:space="preserve">
     <value>Komponenta '{0}' používá 'Option Base 1'.</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>Anotace '{0}' je v tomto kontextu ilegální.</value>
-  </data>
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>Modul nebo člen '{0}' má '{1}' anotaci, ale žádný korespondující atribut.</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionResults.es.resx b/Rubberduck.Resources/Inspections/InspectionResults.es.resx
index 4895241532..2f7ae141bf 100644
--- a/Rubberduck.Resources/Inspections/InspectionResults.es.resx
+++ b/Rubberduck.Resources/Inspections/InspectionResults.es.resx
@@ -243,9 +243,6 @@
   <data name="OptionBaseZeroInspection" xml:space="preserve">
     <value>El componente '{0}' usa 'Option Base 0'.</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>La anotación '{0}' es ilegal en este contexto.</value>
-  </data>
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>El módulo o miembro '{0}' tiene una anotación '{1}', pero no tiene el atributo correspondiente.</value>
   </data>
diff --git a/Rubberduck.Resources/Inspections/InspectionResults.fr.resx b/Rubberduck.Resources/Inspections/InspectionResults.fr.resx
index 1bc35ed2b7..2f0fb12b9b 100644
--- a/Rubberduck.Resources/Inspections/InspectionResults.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionResults.fr.resx
@@ -285,9 +285,6 @@
   <data name="EmptyDoWhileBlockInspection" xml:space="preserve">
     <value>Une boucle 'Do...While' vide, qui ne contient aucune instruction exécutable, laisse songeur quant aux intentions de l'auteur. Évitez d'écrire du code qui n'a pas besoin d'être écrit.</value>
   </data>
-  <data name="IllegalAnnotationInspection" xml:space="preserve">
-    <value>L'annotation '{0}' est illégale dans ce contexte.</value>
-  </data>
   <data name="RedundantOptionInspection" xml:space="preserve">
     <value>'{0}' n'a aucun effet.</value>
   </data>
diff --git a/Rubberduck.Resources/Rubberduck.Resources.csproj b/Rubberduck.Resources/Rubberduck.Resources.csproj
index 390621edba..6d93cebcfb 100644
--- a/Rubberduck.Resources/Rubberduck.Resources.csproj
+++ b/Rubberduck.Resources/Rubberduck.Resources.csproj
@@ -57,6 +57,9 @@
     <Compile Update="Settings\SettingsUI.Designer.cs">
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Update="Settings\ToDoExplorerPage.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Update="Settings\UnitTestingPage.Designer.cs">
       <DesignTime>True</DesignTime>
     </Compile>
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
index 6163a66e58..72c2d23f4d 100644
--- a/Rubberduck.Resources/RubberduckUI.Designer.cs
+++ b/Rubberduck.Resources/RubberduckUI.Designer.cs
@@ -288,6 +288,60 @@ public static string CodeExplorer_IExportable_DeclarationFormat {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Navigate to selected issue.
+        /// </summary>
+        public static string CodeInspections_GoToolTip {
+            get {
+                return ResourceManager.GetString("CodeInspections_GoToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Navigate to next issue.
+        /// </summary>
+        public static string CodeInspections_NextToolTip {
+            get {
+                return ResourceManager.GetString("CodeInspections_NextToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Navigate to previous issue.
+        /// </summary>
+        public static string CodeInspections_PreviousToolTip {
+            get {
+                return ResourceManager.GetString("CodeInspections_PreviousToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Address the issue.
+        /// </summary>
+        public static string CodeInspections_QuickFixToolTip {
+            get {
+                return ResourceManager.GetString("CodeInspections_QuickFixToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Run code inspections.
+        /// </summary>
+        public static string CodeInspections_RefreshToolTip {
+            get {
+                return ResourceManager.GetString("CodeInspections_RefreshToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Run code inspections.
+        /// </summary>
+        public static string CodeInspections_Run {
+            get {
+                return ResourceManager.GetString("CodeInspections_Run", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Code _Inspections.
         /// </summary>
@@ -651,6 +705,24 @@ public static System.Drawing.Bitmap edit_size {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to to parse and process the projects in the VBE..
+        /// </summary>
+        public static string EmptyUIRefreshMessage {
+            get {
+                return ResourceManager.GetString("EmptyUIRefreshMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck doesn&apos;t see anything yet..
+        /// </summary>
+        public static string EmptyUIRefreshMessage_Title {
+            get {
+                return ResourceManager.GetString("EmptyUIRefreshMessage_Title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Absolute.
         /// </summary>
@@ -1580,6 +1652,15 @@ public static string Rename {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ParamArray parameter must be specified last..
+        /// </summary>
+        public static string ReorderPresenter_ParamArrayError {
+            get {
+                return ResourceManager.GetString("ReorderPresenter_ParamArrayError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0}. Click to refresh..
         /// </summary>
@@ -1863,6 +1944,15 @@ public static System.Drawing.Bitmap SyncArrows {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Rubberduck Test Results - {0}.
+        /// </summary>
+        public static string TestExplorer_AppendHeader {
+            get {
+                return ResourceManager.GetString("TestExplorer_AppendHeader", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1883,6 +1973,33 @@ public static System.Drawing.Bitmap tick_circle_pinned {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to BUG.
+        /// </summary>
+        public static string TodoMarkerBug {
+            get {
+                return ResourceManager.GetString("TodoMarkerBug", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to NOTE.
+        /// </summary>
+        public static string TodoMarkerNote {
+            get {
+                return ResourceManager.GetString("TodoMarkerNote", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to TODO.
+        /// </summary>
+        public static string TodoMarkerTodo {
+            get {
+                return ResourceManager.GetString("TodoMarkerTodo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Type.
         /// </summary>
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index a116e60b28..5656b4d894 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -638,4 +638,40 @@ Import přerušen.</value>
   <data name="CodeInspectionsWindowSettings_AccessKey" xml:space="preserve">
     <value>_Inspekce kódu</value>
   </data>
+  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
+    <value>Navigovat na předchozí problém</value>
+  </data>
+  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
+    <value>Řešit problém</value>
+  </data>
+  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
+    <value>Spustit inspekci kódu</value>
+  </data>
+  <data name="CodeInspections_Run" xml:space="preserve">
+    <value>Spustit inspekce kódu</value>
+  </data>
+  <data name="CodeInspections_GoToolTip" xml:space="preserve">
+    <value>Navigovat na vybraný problém</value>
+  </data>
+  <data name="CodeInspections_NextToolTip" xml:space="preserve">
+    <value>Navigovat na následující problém</value>
+  </data>
+  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
+    <value>Parametr ParamArray musí být specifikován naposled.</value>
+  </data>
+  <data name="TestExplorer_AppendHeader" xml:space="preserve">
+    <value>Rubberduck: Výsledky Testů - {0}</value>
+  </data>
+  <data name="TodoMarkerBug" xml:space="preserve">
+    <value>BUG</value>
+  </data>
+  <data name="TodoMarkerNote" xml:space="preserve">
+    <value>NOTE</value>
+  </data>
+  <data name="TodoMarkerTodo" xml:space="preserve">
+    <value>TODO</value>
+  </data>
+  <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
+    <value>Výběr není proměnná.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
index 2e6ab5dad0..10d4978960 100644
--- a/Rubberduck.Resources/RubberduckUI.de.resx
+++ b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -635,4 +635,40 @@ Import abgebrochen.</value>
   <data name="CodeInspectionsWindowSettings_AccessKey" xml:space="preserve">
     <value>Code _Untersuchung</value>
   </data>
+  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
+    <value>Zum vorigen Problem navigieren</value>
+  </data>
+  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
+    <value>Das Problem beheben</value>
+  </data>
+  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
+    <value>Code-Untersuchung ausführen</value>
+  </data>
+  <data name="CodeInspections_Run" xml:space="preserve">
+    <value>Code-Untersuchung ausführen</value>
+  </data>
+  <data name="CodeInspections_GoToolTip" xml:space="preserve">
+    <value>Zum ausgewählten Problem navigieren</value>
+  </data>
+  <data name="CodeInspections_NextToolTip" xml:space="preserve">
+    <value>Zum nächsten Problem navigieren</value>
+  </data>
+  <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
+    <value>{0} {1} {2} {3} {4} {5}</value>
+  </data>
+  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
+    <value>ParamArray-Parameter muss als letztes spezifiziert werden.</value>
+  </data>
+  <data name="TodoMarkerBug" xml:space="preserve">
+    <value>BUG</value>
+  </data>
+  <data name="TodoMarkerNote" xml:space="preserve">
+    <value>NOTE</value>
+  </data>
+  <data name="TodoMarkerTodo" xml:space="preserve">
+    <value>TODO</value>
+  </data>
+  <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
+    <value>Die Auswahl ist keine Variable.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.es.resx b/Rubberduck.Resources/RubberduckUI.es.resx
index 997e72972d..3ff5ce47f0 100644
--- a/Rubberduck.Resources/RubberduckUI.es.resx
+++ b/Rubberduck.Resources/RubberduckUI.es.resx
@@ -646,4 +646,44 @@ Importación cancelada.</value>
   <data name="CodeInspectionsWindowSettings_AccessKey" xml:space="preserve">
     <value>_Inspecciones de código</value>
   </data>
+  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
+    <value>Navegar al problema anterior</value>
+  </data>
+  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
+    <value>Arreglar el problema</value>
+  </data>
+  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
+    <value>Ejecutar inspecciones de código</value>
+  </data>
+  <data name="CodeInspections_Run" xml:space="preserve">
+    <value>Ejecutar inspecciones de código</value>
+  </data>
+  <data name="CodeInspections_GoToolTip" xml:space="preserve">
+    <value>Navegar al problema seleccionado</value>
+  </data>
+  <data name="CodeInspections_NextToolTip" xml:space="preserve">
+    <value>Navegar al problema siguiente</value>
+  </data>
+  <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
+    <value>{0} {1} {2} {3} {4} {5}</value>
+  </data>
+  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
+    <value>El parámetro ParamArray debe especificarse al final.</value>
+  </data>
+  <data name="TestExplorer_AppendHeader" xml:space="preserve">
+    <value>Rubberduck Resultados de pruebas - {0}</value>
+  </data>
+  <data name="TodoMarkerBug" xml:space="preserve">
+    <value>BUG</value>
+  </data>
+  <data name="TodoMarkerNote" xml:space="preserve">
+    <value>NOTA</value>
+  </data>
+  <data name="TodoMarkerTodo" xml:space="preserve">
+    <value>TODO</value>
+  </data>
+  <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
+    <value>La selección no es una variable.</value>
+    <comment>Utilizado tanto en Introducir parámetro como en Introducir campo</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index b29b7edf72..6621d14b59 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -643,4 +643,43 @@ Mise à jour annulée.</value>
   <data name="PeekDefinitionCommandText" xml:space="preserve">
     <value>Aperçu de la définition</value>
   </data>
+  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
+    <value>Naviguer au problème précédent</value>
+  </data>
+  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
+    <value>Appliquer une solution</value>
+  </data>
+  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
+    <value>Exécuter les inspections à nouveau</value>
+  </data>
+  <data name="CodeInspections_Run" xml:space="preserve">
+    <value>Exécuter les inspections</value>
+  </data>
+  <data name="CodeInspections_GoToolTip" xml:space="preserve">
+    <value>Naviguer au problème sélectionné</value>
+  </data>
+  <data name="CodeInspections_NextToolTip" xml:space="preserve">
+    <value>Naviguer au prochain problème</value>
+  </data>
+  <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
+    <value>{0} {1} {2} {3} {4} {5}</value>
+  </data>
+  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
+    <value>Un paramètre ParamArray doit être spécifié en dernier.</value>
+  </data>
+  <data name="TestExplorer_AppendHeader" xml:space="preserve">
+    <value>Rubberduck - Résultats des tests : {0}</value>
+  </data>
+  <data name="TodoMarkerBug" xml:space="preserve">
+    <value>BUG</value>
+  </data>
+  <data name="TodoMarkerNote" xml:space="preserve">
+    <value>NOTE</value>
+  </data>
+  <data name="TodoMarkerTodo" xml:space="preserve">
+    <value>TODO</value>
+  </data>
+  <data name="PromoteVariable_InvalidSelection" xml:space="preserve">
+    <value>La sélection n'est pas une variable.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
index 30aee16891..48879e796e 100644
--- a/Rubberduck.Resources/RubberduckUI.resx
+++ b/Rubberduck.Resources/RubberduckUI.resx
@@ -768,4 +768,44 @@ Import aborted.</value>
   <data name="PeekDefinition_DefaultDescription" xml:space="preserve">
     <value>(no description annotation or attribute)</value>
   </data>
+  <data name="CodeInspections_PreviousToolTip" xml:space="preserve">
+    <value>Navigate to previous issue</value>
+  </data>
+  <data name="CodeInspections_QuickFixToolTip" xml:space="preserve">
+    <value>Address the issue</value>
+  </data>
+  <data name="CodeInspections_RefreshToolTip" xml:space="preserve">
+    <value>Run code inspections</value>
+  </data>
+  <data name="CodeInspections_Run" xml:space="preserve">
+    <value>Run code inspections</value>
+  </data>
+  <data name="CodeInspections_GoToolTip" xml:space="preserve">
+    <value>Navigate to selected issue</value>
+  </data>
+  <data name="CodeInspections_NextToolTip" xml:space="preserve">
+    <value>Navigate to next issue</value>
+  </data>
+  <data name="EmptyUIRefreshMessage" xml:space="preserve">
+    <value>to parse and process the projects in the VBE.</value>
+    <comment>Follows the text for "Refresh"</comment>
+  </data>
+  <data name="EmptyUIRefreshMessage_Title" xml:space="preserve">
+    <value>Rubberduck doesn't see anything yet.</value>
+  </data>
+  <data name="ReorderPresenter_ParamArrayError" xml:space="preserve">
+    <value>ParamArray parameter must be specified last.</value>
+  </data>
+  <data name="TestExplorer_AppendHeader" xml:space="preserve">
+    <value>Rubberduck Test Results - {0}</value>
+  </data>
+  <data name="TodoMarkerBug" xml:space="preserve">
+    <value>BUG</value>
+  </data>
+  <data name="TodoMarkerNote" xml:space="preserve">
+    <value>NOTE</value>
+  </data>
+  <data name="TodoMarkerTodo" xml:space="preserve">
+    <value>TODO</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs b/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs
index e644b2892e..97f7a0b200 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.Designer.cs
@@ -60,6 +60,15 @@ internal ToDoExplorerPage() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to TODO Explorer.
+        /// </summary>
+        public static string TodoSettings_Caption {
+            get {
+                return ResourceManager.GetString("TodoSettings_Caption", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Text:.
         /// </summary>
@@ -68,5 +77,23 @@ public static string TodoSettings_TextLabel {
                 return ResourceManager.GetString("TodoSettings_TextLabel", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Token Text:.
+        /// </summary>
+        public static string TodoSettings_TokenLabel {
+            get {
+                return ResourceManager.GetString("TodoSettings_TokenLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Token List:.
+        /// </summary>
+        public static string TodoSettings_TokenListLabel {
+            get {
+                return ResourceManager.GetString("TodoSettings_TokenListLabel", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx
index 7c6a470a71..3ecc28a390 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.cs.resx
@@ -120,4 +120,13 @@
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
+  <data name="TodoSettings_Caption" xml:space="preserve">
+    <value>TODO Průzkumník</value>
+  </data>
+  <data name="TodoSettings_TokenLabel" xml:space="preserve">
+    <value>Text tokenu:</value>
+  </data>
+  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
+    <value>Seznam tokenu:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx
index 7c6a470a71..8cb834f298 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.de.resx
@@ -120,4 +120,13 @@
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
+  <data name="TodoSettings_Caption" xml:space="preserve">
+    <value>TODO Explorer</value>
+  </data>
+  <data name="TodoSettings_TokenLabel" xml:space="preserve">
+    <value>Markierungstext:</value>
+  </data>
+  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
+    <value>Markierungen:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx
index 6cdad8cd07..e8c79f1b56 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.es.resx
@@ -120,4 +120,13 @@
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Texto:</value>
   </data>
+  <data name="TodoSettings_TokenLabel" xml:space="preserve">
+    <value>Etiqueta:</value>
+  </data>
+  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
+    <value>Lista de Etiquetas:</value>
+  </data>
+  <data name="TodoSettings_Caption" xml:space="preserve">
+    <value>Explorador TODO</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx
index d350b1281d..79d632fe65 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.fr.resx
@@ -120,4 +120,13 @@
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Texte:</value>
   </data>
+  <data name="TodoSettings_Caption" xml:space="preserve">
+    <value>Explorateur de tâches</value>
+  </data>
+  <data name="TodoSettings_TokenLabel" xml:space="preserve">
+    <value>Texte du jeton:</value>
+  </data>
+  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
+    <value>Liste:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/ToDoExplorerPage.resx b/Rubberduck.Resources/Settings/ToDoExplorerPage.resx
index 7c6a470a71..f0abf1d0ec 100644
--- a/Rubberduck.Resources/Settings/ToDoExplorerPage.resx
+++ b/Rubberduck.Resources/Settings/ToDoExplorerPage.resx
@@ -120,4 +120,13 @@
   <data name="TodoSettings_TextLabel" xml:space="preserve">
     <value>Text:</value>
   </data>
+  <data name="TodoSettings_Caption" xml:space="preserve">
+    <value>TODO Explorer</value>
+  </data>
+  <data name="TodoSettings_TokenLabel" xml:space="preserve">
+    <value>Token Text:</value>
+  </data>
+  <data name="TodoSettings_TokenListLabel" xml:space="preserve">
+    <value>Token List:</value>
+  </data>
 </root>
\ No newline at end of file

From b5d0ba041211e13c6a071433188dab7360597306 Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 12 May 2021 11:55:42 -0700
Subject: [PATCH 63/64] Correct xaml closing element tag

---
 Rubberduck.Core/UI/Settings/GeneralSettings.xaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
index 6e6190354e..ab1626eae6 100644
--- a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
+++ b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
@@ -102,18 +102,18 @@
 
                     <Label Target="{Binding ElementName=minimumLogLevel}"
                            Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=MinimumLogLevelLabel}" FontWeight="SemiBold" Margin="1,0,-1,0" />
-                        <ComboBox x:Name="minimumLogLevel"
+                    <ComboBox x:Name="minimumLogLevel"
                                   Width="210"
                                   HorizontalAlignment="Left"
                                   Margin="5"
                                   SelectedItem="{Binding SelectedLogLevel, Mode=TwoWay}"
                                   ItemsSource="{Binding LogLevels, UpdateSourceTrigger=PropertyChanged}"
                                   DisplayMemberPath="Name"/>
-                        <Button 
+                    <Button 
                             Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=ShowLogFolder}"
                             Padding="5"
                             Command="{Binding ShowLogFolderCommand}"/>
-                    </StackPanel>
+
 
                     <DockPanel>
                         <Label DockPanel.Dock="Left" Content="{Resx ResxName=Rubberduck.UI.Settings.GeneralSettingsUI, Key=HotkeysLabel}" FontWeight="SemiBold" />
@@ -224,6 +224,7 @@
                             </DataTemplate>
                         </ListView.ItemTemplate>
                     </ListView>
+                </StackPanel>
             </Grid>
         </ScrollViewer>
     </Grid>

From 66d55c6d7f2e8b808037de74352d0b2e731ad10c Mon Sep 17 00:00:00 2001
From: IvenBach <ivenbach@gmail.com>
Date: Wed, 12 May 2021 11:57:12 -0700
Subject: [PATCH 64/64] Add access keys for GeneralSettings

---
 Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx
index 713f028135..381b187ff2 100644
--- a/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx
+++ b/Rubberduck.Core/UI/Settings/GeneralSettingsUI.resx
@@ -130,13 +130,13 @@
     <value>Slash (/)</value>
   </data>
   <data name="ShowSplash" xml:space="preserve">
-    <value>Show splash screen at startup</value>
+    <value>Show _splash screen at startup</value>
   </data>
   <data name="ShowLogFolder" xml:space="preserve">
     <value>Show Log Folder</value>
   </data>
   <data name="SetDpiUnaware" xml:space="preserve">
-    <value>Correction for high-resolution display scalings</value>
+    <value>Correction for high-_resolution display scalings</value>
   </data>
   <data name="PeriodDelimiter" xml:space="preserve">
     <value>Period (.)</value>
@@ -148,7 +148,7 @@
     <value>Modifier Warning</value>
   </data>
   <data name="MinimumLogLevelLabel" xml:space="preserve">
-    <value>Minimum Log Level:</value>
+    <value>Minimum _Log Level:</value>
   </data>
   <data name="LanguageLabel" xml:space="preserve">
     <value>Display l_anguage:</value>
@@ -157,7 +157,7 @@
     <value>Info</value>
   </data>
   <data name="IncludePreRelease" xml:space="preserve">
-    <value>Tell me if a newer pre-release build is available.</value>
+    <value>Tell me if a newer _pre-release build is available.</value>
   </data>
   <data name="HotkeysLabel" xml:space="preserve">
     <value>Hotkeys:</value>
@@ -202,7 +202,7 @@
     <value>Error</value>
   </data>
   <data name="EnableDragAndDrop" xml:space="preserve">
-    <value>Enable drag and drop in Code Explorer</value>
+    <value>Enable _drag and drop in Code Explorer</value>
   </data>
   <data name="DebugLogLevel" xml:space="preserve">
     <value>Debug</value>
@@ -216,9 +216,9 @@
 NOTE: Restart is required for the setting to take effect.</value>
   </data>
   <data name="CompileBeforeParse" xml:space="preserve">
-    <value>Compile code before parsing</value>
+    <value>_Compile code before parsing</value>
   </data>
   <data name="CheckVersion" xml:space="preserve">
-    <value>Check if a newer version is available at startup.</value>
+    <value>Check if a newer _version is available at startup.</value>
   </data>
 </root>
\ No newline at end of file