fix translate in preset-loader

diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs
index ba6423f..330e528 100644 (file)
--- a/win/C#/Controls/Filters.cs
+++ b/win/C#/Controls/Filters.cs
@@ -156,6 +156,7 @@ namespace Handbrake.Controls
         }\r
 \r
         // Setup for each component for the preset loader.\r
+        // PresetLoaderから呼び出される。引数には英語が入るので、下記は日本語化不要\r
         public void setDeTelecine(string value)\r
         {\r
             text_customDT.Text = "";\r
@@ -165,7 +166,7 @@ namespace Handbrake.Controls
                 case "Off":\r
                     drop_detelecine.SelectedIndex = 0;\r
                     break;\r
-                case "デフォルト":\r
+                case "Default":\r
                     drop_detelecine.SelectedIndex = 2;\r
                     break;\r
                 default:\r
@@ -184,13 +185,13 @@ namespace Handbrake.Controls
                 case "Off":\r
                     drop_denoise.SelectedIndex = 0;\r
                     break;\r
-                case "弱":\r
+                case "Weak":\r
                     drop_denoise.SelectedIndex = 2;\r
                     break;\r
-                case "中":\r
+                case "Medium":\r
                     drop_denoise.SelectedIndex = 3;\r
                     break;\r
-                case "強":\r
+                case "Strong":\r
                     drop_denoise.SelectedIndex = 4;\r
                     break;\r
                 default:\r
@@ -210,13 +211,13 @@ namespace Handbrake.Controls
                 case "Off":\r
                     drop_deinterlace.SelectedIndex = 0;\r
                     break;\r
-                case "高速":\r
+                case "Fast":\r
                     drop_deinterlace.SelectedIndex = 2;\r
                     break;\r
-                case "低速":\r
+                case "Slow":\r
                     drop_deinterlace.SelectedIndex = 3;\r
                     break;\r
-                case "最低":\r
+                case "Slower":\r
                     drop_deinterlace.SelectedIndex = 4;\r
 \r
                     break;\r
@@ -236,7 +237,7 @@ namespace Handbrake.Controls
                 case "Off":\r
                     drop_decomb.SelectedIndex = 0;\r
                     break;\r
-                case "デフォルト":\r
+                case "Default":\r
                     drop_decomb.SelectedIndex = 2;\r
                     break;\r
                 default:\r

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 6b7f3df..e7b47e2 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -191,7 +191,8 @@ namespace Handbrake.Functions
 \r
             mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;\r
 \r
-            mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;\r
+            //mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;\r
+            mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate == "Same as source" ? "変換元と同じ" : presetQuery.VideoFramerate;\r
 \r
             mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;\r
 \r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 748aaae..7fa9d75 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -381,11 +381,11 @@ namespace Handbrake.Functions
 \r
                     if (trackBitrates != null)\r
                         if (trackBitrates.Length >= (x + 1))                     // Audio Encoder\r
-                            track.Bitrate = trackBitrates[x].Trim() == "auto" ? "Auto" : trackBitrates[x].Trim();\r
+                            track.Bitrate = trackBitrates[x].Trim() == "auto" ? "\8e©\93®" : trackBitrates[x].Trim();\r
 \r
                     if (trackSamplerates != null)\r
                         if (trackSamplerates.Length >= (x + 1))                  // Audio SampleRate\r
-                            track.SampleRate = trackSamplerates[x].Trim() == "0" ? "Auto" : trackSamplerates[x].Trim();\r
+                            track.SampleRate = trackSamplerates[x].Trim() == "Auto" ? "\8e©\93®" : trackSamplerates[x].Trim();\r
 \r
                     if (trackDRCvalues != null)\r
                         if (trackDRCvalues.Length >= (x + 1))                   // Audio DRC Values\r