WinGui: New option to control the file overwrite default behaviour. Overwrite or Ask.

4 files changed, 64 insertions, 40 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 062dd694a..88d9ba549 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -800,6 +800,33 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Ask to overwrite file.
+        /// </summary>
+        public static string FileOverwriteBehaviours_Ask {
+            get {
+                return ResourceManager.GetString("FileOverwriteBehaviours_Ask", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Try to automatically rename file.
+        /// </summary>
+        public static string FileOverwriteBehaviours_Autoname {
+            get {
+                return ResourceManager.GetString("FileOverwriteBehaviours_Autoname", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Overwrite the file.
+        /// </summary>
+        public static string FileOverwriteBehaviours_Overwrite {
+            get {
+                return ResourceManager.GetString("FileOverwriteBehaviours_Overwrite", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Custom:.
         /// </summary>
         public static string FiltersView_Custom {
@@ -2608,24 +2635,6 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Experimental Features.
-        /// </summary>
-        public static string Options_Experimental {
-            get {
-                return ResourceManager.GetString("Options_Experimental", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Experimental features are ideas we are working on. These may or may not make it into a final release and may not work!.
-        /// </summary>
-        public static string Options_ExperimentalFeatures {
-            get {
-                return ResourceManager.GetString("Options_ExperimentalFeatures", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to File Format:.
         /// </summary>
         public static string Options_Format {
@@ -2860,7 +2869,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show Queue in line with the main UI..
+        ///   Looks up a localized string similar to Show Queue in line with the main UI. (Experimental Feature).
         /// </summary>
         public static string Options_ShowQueueInline {
             get {
@@ -2896,6 +2905,15 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to User Interface Behaviour.
+        /// </summary>
+        public static string Options_UIBehaviour {
+            get {
+                return ResourceManager.GetString("Options_UIBehaviour", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Updates.
         /// </summary>
         public static string Options_Updates {
@@ -3040,6 +3058,15 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to File overwrite behaviour:.
+        /// </summary>
+        public static string OptionsView_FileOverwriteBehaviour {
+            get {
+                return ResourceManager.GetString("OptionsView_FileOverwriteBehaviour", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Live Update Options: {source} {title} {chapters} 
         ///Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters).
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.de.resx b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
index 2821b1713..c4043d20a 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -1215,12 +1215,6 @@ Soll sie überschrieben werden?</value>
   <data name="Options_Encoding" xml:space="preserve">
     <value>Enkodieren</value>
   </data>
-  <data name="Options_Experimental" xml:space="preserve">
-    <value>Experimentelle Funktionen</value>
-  </data>
-  <data name="Options_ExperimentalFeatures" xml:space="preserve">
-    <value>Experimentelle Funktionen sind Ideen an denen wir zur Zeit arbeiten. Dies kann es in eine finale Version schaffen, muss es aber nicht und es kann sein, dass es nicht korrekt funktioniert!</value>
-  </data>
   <data name="Options_Format" xml:space="preserve">
     <value>Dateiformat:</value>
   </data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index fca7a267f..b81d9dbe2 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1230,12 +1230,6 @@ Would you like to overwrite it?</value>
   <data name="Options_Encoding" xml:space="preserve">

     <value>Encoding</value>

   </data>

-  <data name="Options_Experimental" xml:space="preserve">

-    <value>Experimental Features</value>

-  </data>

-  <data name="Options_ExperimentalFeatures" xml:space="preserve">

-    <value>Experimental features are ideas we are working on. These may or may not make it into a final release and may not work!</value>

-  </data>

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

     <value>File Format:</value>

   </data>

@@ -1315,7 +1309,7 @@ Would you like to overwrite it?</value>
     <value>Show the new experimental queue design.</value>

   </data>

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

-    <value>Show Queue in line with the main UI.</value>

+    <value>Show Queue in line with the main UI. (Experimental Feature)</value>

   </data>

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

     <value>Change case to Title Case</value>

@@ -1945,4 +1939,19 @@ Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitra
   <data name="OptionsView_PathOptions" xml:space="preserve">

     <value>Available Options: {source_path} {source_folder_name}  (Not both at the same time!)</value>

   </data>

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

+    <value>Ask to overwrite file</value>

+  </data>

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

+    <value>Try to automatically rename file</value>

+  </data>

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

+    <value>Overwrite the file</value>

+  </data>

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

+    <value>User Interface Behaviour</value>

+  </data>

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

+    <value>File overwrite behaviour:</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.zh.resx b/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
index ba8824273..d691e981a 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -1219,12 +1219,6 @@ FPS: {3:000.0},  平均FPS: {4:000.0}
   <data name="Options_Encoding" xml:space="preserve">
     <value>编码中</value>
   </data>
-  <data name="Options_Experimental" xml:space="preserve">
-    <value>实验功能</value>
-  </data>
-  <data name="Options_ExperimentalFeatures" xml:space="preserve">
-    <value>实验特性是我们正在研究的想法。这些可能或不可能使其成为最终版本，也可能不起作用！</value>
-  </data>
   <data name="Options_Format" xml:space="preserve">
     <value>文件格式：</value>
   </data>