summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Properties
diff options
context:
space:
mode:
authorsr55 <[email protected]>2014-12-12 20:59:12 +0000
committersr55 <[email protected]>2014-12-12 20:59:12 +0000
commitfa74388f8e5a42a400daba5ecff61e856d04e6c2 (patch)
tree2b904e6cfef563cf7ebd13e81c3a806596118821 /win/CS/HandBrakeWPF/Properties
parent6fc41d211e4cbc3c83bdff3c3327deeb072bc1a3 (diff)
WinGui: Switching the preset format over to JSON and adding a container object for the presets which should make the archiving of presets when the app is unable to load them a bit more reliable. The app will try and bring forward the settings it can, but will not migrate ones it can't.
Backup your presets before updating to this build incase something goes wrong! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6599 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Properties')
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs5
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx3
2 files changed, 5 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 32236a77b..f027e6ba7 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -556,7 +556,8 @@ namespace HandBrakeWPF.Properties {
/// <summary>
/// Looks up a localized string similar to HandBrake has determined your built-in presets are out of date... These presets will now be updated.
- ///Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them..
+ ///Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them.
+ ///The previous user_presets.xml file was backed up..
/// </summary>
public static string Main_PresetUpdateNotification {
get {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 918a6b44a..e1697925f 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -433,7 +433,8 @@ In order to use the QuickSync encoder, you must:
</data>
<data name="Main_PresetUpdateNotification" xml:space="preserve">
<value>HandBrake has determined your built-in presets are out of date... These presets will now be updated.
-Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them.</value>
+Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them.
+The previous user_presets.xml file was backed up.</value>
</data>
<data name="Main_QueueFinished" xml:space="preserve">
<value>Queue Finished</value>