WinGui: Improved an Add All Error message in relation to the Auto File Naming feature.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5945 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index d0aefd209aff67f09e07eb67e11c489ff250c4ae..b3f489a54d0d26f55369db1bb808804dcd5f7a72 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.18052\r
+//     Runtime Version:4.0.30319.18408\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -206,8 +206,7 @@ namespace HandBrakeWPF.Properties {
         ///Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\r
         ///\r
         ///Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\r
-        ///\r
-        /// [rest of string was truncated]&quot;;.\r
+        ///\r        /// [rest of string was truncated]&quot;;.\r
         /// </summary>\r
         public static string Advanced_MotionEstimationMethodToolTip {\r
             get {\r
@@ -338,6 +337,42 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Error.\r
+        /// </summary>\r
+        public static string Error {\r
+            get {\r
+                return ResourceManager.GetString("Error", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn&apos;t support! Tracks are reset with every new source / title selected..\r
+        /// </summary>\r
+        public static string Main_AutoAdd_AudioAndSubWarning {\r
+            get {\r
+                return ResourceManager.GetString("Main_AutoAdd_AudioAndSubWarning", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to You must first scan a source and setup your job before adding to the queue..\r
+        /// </summary>\r
+        public static string Main_ScanSourceFirst {\r
+            get {\r
+                return ResourceManager.GetString("Main_ScanSourceFirst", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to You must turn on automatic file naming AND set a default path in preferences before you can add to the queue..\r
+        /// </summary>\r
+        public static string Main_TurnOnAutoFileNaming {\r
+            get {\r
+                return ResourceManager.GetString("Main_TurnOnAutoFileNaming", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to The Built-in presets have been reset..\r
         /// </summary>\r
@@ -540,5 +575,14 @@ namespace HandBrakeWPF.Properties {
                 return ResourceManager.GetString("Video_x264Tune", resourceCulture);\r
             }\r
         }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Warning.\r
+        /// </summary>\r
+        public static string Warning {\r
+            get {\r
+                return ResourceManager.GetString("Warning", resourceCulture);\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 388ccc16664bdff742e1d309f1b1886fd4c95a2e..530bedfd68c0496b84c0c32f94ef37e755f6ae76 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -362,4 +362,19 @@ In order to use the QuickSync encoder, you must:
   <data name="Video_ScalingModes" xml:space="preserve">\r
     <value>OpenCL Scaling is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use.  Performance gain up to 5%. Minor decrease in quality in some cases.</value>\r
   </data>\r
+  <data name="Error" xml:space="preserve">\r
+    <value>Error</value>\r
+  </data>\r
+  <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">\r
+    <value>Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn't support! Tracks are reset with every new source / title selected.</value>\r
+  </data>\r
+  <data name="Main_ScanSourceFirst" xml:space="preserve">\r
+    <value>You must first scan a source and setup your job before adding to the queue.</value>\r
+  </data>\r
+  <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">\r
+    <value>You must turn on automatic file naming AND set a default path in preferences before you can add to the queue.</value>\r
+  </data>\r
+  <data name="Warning" xml:space="preserve">\r
+    <value>Warning</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 355aad73dd371bafaae5e5662a52f232285529e8..d15fe931af3af46a031f5e7cb227fec1b5704a1a 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1159,19 +1159,19 @@ namespace HandBrakeWPF.ViewModels
         {\r
             if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)\r
             {\r
-                this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);\r
+                this.errorService.ShowMessageBox(Resources.Main_ScanSourceFirst, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
                 return;\r
             }\r
 \r
             if (!AutoNameHelper.IsAutonamingEnabled())\r
             {\r
-                this.errorService.ShowMessageBox("You must turn on automatic file naming in preferences before you can add to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);\r
+                this.errorService.ShowMessageBox(Resources.Main_TurnOnAutoFileNaming, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
                 return;\r
             }\r
 \r
             if (this.CurrentTask != null && this.CurrentTask.SubtitleTracks != null && this.CurrentTask.SubtitleTracks.Count > 0)\r
             {\r
-                this.errorService.ShowMessageBox("Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn't support! Tracks are reset with every new source / title selected.", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);\r
+                this.errorService.ShowMessageBox(Resources.Main_AutoAdd_AudioAndSubWarning, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Error);\r
             }\r
 \r
             foreach (Title title in this.ScannedSource.Titles)\r