Tidy up the Preset Service. Preset version checking should now be working for the new format.

2 files changed, 24 insertions, 4 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 6cc8e0f60..30084463c 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1131,7 +1131,9 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to HandBrake is unable to load your user presets because they are from an older version of HandBrake. Your old presets file has been renamed so that it doesn&apos;t get loaded on next launch..

+        ///   Looks up a localized string similar to HandBrake has detected your presets file is from an older version.

+        ///It will try and load the file anyway.

+        ///If it fails, it will archive off the old file and create a new one..

         /// </summary>

         public static string PresetService_PresetsOutOfDate {

             get {

@@ -1140,7 +1142,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Unable to load user presets..

+        ///   Looks up a localized string similar to Unable to load presets..

         /// </summary>

         public static string PresetService_UnableToLoad {

             get {

@@ -1149,6 +1151,17 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to HandBrake was unable to load your presets file. It may have been from an older unsupported version of HandBrake or corrupted. 

+        ///

+        ///Your old presets file was archived to:.

+        /// </summary>

+        public static string PresetService_UnableToLoadPresets {

+            get {

+                return ResourceManager.GetString("PresetService_UnableToLoadPresets", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Preview.

         /// </summary>

         public static string Preview {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 26770ab9e..7ce2bf391 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -718,9 +718,16 @@ Please make sure VLC is installed and the directory specified in HandBrake's opt
     <value>Archived File:</value>

   </data>

   <data name="PresetService_PresetsOutOfDate" xml:space="preserve">

-    <value>HandBrake is unable to load your user presets because they are from an older version of HandBrake. Your old presets file has been renamed so that it doesn't get loaded on next launch.</value>

+    <value>HandBrake has detected your presets file is from an older version.

+It will try and load the file anyway.

+If it fails, it will archive off the old file and create a new one.</value>

   </data>

   <data name="PresetService_UnableToLoad" xml:space="preserve">

-    <value>Unable to load user presets.</value>

+    <value>Unable to load presets.</value>

+  </data>

+  <data name="PresetService_UnableToLoadPresets" xml:space="preserve">

+    <value>HandBrake was unable to load your presets file. It may have been from an older unsupported version of HandBrake or corrupted. 

+

+Your old presets file was archived to:</value>

   </data>

 </root>
\ No newline at end of file