fix CLI version reader, and translate some x264 panel's tooltip

diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs
index 0b2354a..1ab09f5 100644 (file)
--- a/win/C#/Controls/Subtitles.Designer.cs
+++ b/win/C#/Controls/Subtitles.Designer.cs
@@ -78,7 +78,7 @@
             this.btn_addTrack.Size = new System.Drawing.Size(65, 23);\r
             this.btn_addTrack.TabIndex = 68;\r
             this.btn_addTrack.Text = "追加";\r
-            this.toolTip.SetToolTip(this.btn_addTrack, "リストに新規字幕トラックを追加");\r
+            this.toolTip.SetToolTip(this.btn_addTrack, "リストに新規字幕トラックを追加します。");\r
             this.btn_addTrack.UseVisualStyleBackColor = false;\r
             this.btn_addTrack.Click += new System.EventHandler(this.btn_addSubTrack_Click);\r
             // \r

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index 6e4db57..db72d7a 100644 (file)
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -85,9 +85,8 @@ namespace Handbrake.Controls
             this.slider_psytrellis.Name = "slider_psytrellis";\r
             this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);\r
             this.slider_psytrellis.TabIndex = 86;\r
-            this.ToolTip.SetToolTip(this.slider_psytrellis, "Psychovisual Trellis tries to retain more sharpness and detail, but can cause art" +\r
-                    "ifacting. \r\nIt is considered experimental, which is why it\'s off by default. Goo" +\r
-                    "d values are 0.1 to 0.2.");\r
+            this.ToolTip.SetToolTip(this.slider_psytrellis, "この値を大きくすると、映像のシャープさやディテールをより維持するようになりますが、その一方で映像がより人工的にもなります。\r\nこの機能は実験的機能であり、そのため" +\r
+                    "デフォルトではOffに設定されています。適切な値は0.1から0.2の間です。");\r
             this.slider_psytrellis.Scroll += new System.EventHandler(this.widgetControlChanged);\r
             // \r
             // lbl_psytrellis\r
@@ -114,7 +113,7 @@ namespace Handbrake.Controls
             this.slider_psyrd.Name = "slider_psyrd";\r
             this.slider_psyrd.Size = new System.Drawing.Size(131, 45);\r
             this.slider_psyrd.TabIndex = 83;\r
-            this.ToolTip.SetToolTip(this.slider_psyrd, resources.GetString("slider_psyrd.ToolTip"));\r
+            this.ToolTip.SetToolTip(this.slider_psyrd, "視覚心理を考慮した歪み最適化（Psy RDO）レベルを調整します。\r\nこの値を調整することで、映像品質が向上する可能性があります。");\r
             this.slider_psyrd.Scroll += new System.EventHandler(this.widgetControlChanged);\r
             // \r
             // lbl_adaptBFrames\r
@@ -218,8 +217,7 @@ namespace Handbrake.Controls
             this.check_noFastPSkip.TabIndex = 76;\r
             this.check_noFastPSkip.Text = "No Fast-P-Skip:";\r
             this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_noFastPSkip, "This can help with blocking on solid colors like blue skies, but it also slows do" +\r
-                    "wn the encode.");\r
+            this.ToolTip.SetToolTip(this.check_noFastPSkip, "これをOnにすると青空のような単色部分のブロックノイズを軽減できますが、エンコードは遅くなります。");\r
             this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
             this.check_noFastPSkip.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
@@ -245,7 +243,8 @@ namespace Handbrake.Controls
             this.drop_trellis.Name = "drop_trellis";\r
             this.drop_trellis.Size = new System.Drawing.Size(94, 21);\r
             this.drop_trellis.TabIndex = 75;\r
-            this.ToolTip.SetToolTip(this.drop_trellis, resources.GetString("drop_trellis.ToolTip"));\r
+            this.ToolTip.SetToolTip(this.drop_trellis, "どのようにビットレートを分配するかを調整するパラメータです。\r\nこれにより、ファイルサイズ/ビットレートを減らしたり、映像品質を向上させることが可能です。\r\n「1" +\r
+                    "」を指定すると、ピクセルブロックの最終エンコード時にのみチューニングを行います。\r\n「2」を指定すると、それ以外の処理時でもチューニングを行います。");\r
             this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
             // drop_deblockBeta\r
@@ -347,7 +346,8 @@ namespace Handbrake.Controls
             this.check_8x8DCT.TabIndex = 72;\r
             this.check_8x8DCT.Text = "8x8 DCT:";\r
             this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));\r
+            this.ToolTip.SetToolTip(this.check_8x8DCT, "このオプションをOnにすると、キーフレームは8×8のブロックに分割されて解析されるようになります。\r\nこれにより、多少の動画サイズの削減や映像品質の向上が期待でき" +\r
+                    "るので、できれば有効にしておくと良いでしょう。\r\nこのオプションはHigh Profileの機能です。");\r
             this.check_8x8DCT.UseVisualStyleBackColor = true;\r
             this.check_8x8DCT.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
@@ -528,7 +528,9 @@ namespace Handbrake.Controls
             this.check_pyrmidalBFrames.Size = new System.Drawing.Size(124, 17);\r
             this.check_pyrmidalBFrames.TabIndex = 59;\r
             this.check_pyrmidalBFrames.Text = "Pyramidal B-Frames:";\r
-            this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));\r
+            this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, "このオプションをOnにすると、Bフレームは参照フレームだけでなく、直前のBフレームも参照フレームとして利用するようになります。\r\n映像品質の向上や動画サイズの削減" +\r
+                    "が期待できます。\r\nこの機能を利用するには、少なくとも2つ以上のBフレームを使用するように設定する必要があります。\r\nこのオプションはHigh Profileで" +\r
+                    "のみ利用できます。");\r
             this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
             this.check_pyrmidalBFrames.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
@@ -542,7 +544,9 @@ namespace Handbrake.Controls
             this.check_weightedBFrames.Size = new System.Drawing.Size(124, 17);\r
             this.check_weightedBFrames.TabIndex = 58;\r
             this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
-            this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip"));\r
+            this.ToolTip.SetToolTip(this.check_weightedBFrames, "Bフレームの重み付き予測を行うかを指定します。\r\nx264では、処理対象フレームの前/後フレームを元にしてBフレームを生成します。\r\n重み付き予測を使用する（この" +\r
+                    "オプションをOnにする）と、前後のフレームとの距離を考慮してBフレームを生成します。\r\nこのオプションをOnにすると、Apple TVでの再生に問題が発生する可" +\r
+                    "能性があります。");\r
             this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
             this.check_weightedBFrames.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
@@ -608,9 +612,8 @@ namespace Handbrake.Controls
             this.drop_bFrames.Name = "drop_bFrames";\r
             this.drop_bFrames.Size = new System.Drawing.Size(121, 21);\r
             this.drop_bFrames.TabIndex = 56;\r
-            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +\r
-                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +\r
-                    "l.");\r
+            this.ToolTip.SetToolTip(this.drop_bFrames, "Bフレームの最大連続数を指定します。1～6程度が適切です。\r\nBフレームはほかのフレームよりも高圧縮で、同じビットレートでもより高品質な映像が期待できます。\r\nア" +\r
+                    "ニメなどの場合は大きめに設定してください。");\r
             this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
             // label64\r
@@ -649,9 +652,8 @@ namespace Handbrake.Controls
             this.drop_refFrames.Name = "drop_refFrames";\r
             this.drop_refFrames.Size = new System.Drawing.Size(121, 21);\r
             this.drop_refFrames.TabIndex = 54;\r
-            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. \r\nThe more you add, the higher the quality, but the slower t" +\r
-                    "he encode. Be careful... too many and QuickTime struggles to play the video back" +\r
-                    ".");\r
+            this.ToolTip.SetToolTip(this.drop_refFrames, "参照フレームの数を指定します。1～6程度が適切です。\r\n大きくすると映像品質が向上しますが、エンコードが遅くなります。また、大きくしすぎるとQuickTimeでの" +\r
+                    "再生が重くなります。");\r
             this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r
             // check_mixedReferences\r
@@ -665,8 +667,8 @@ namespace Handbrake.Controls
             this.check_mixedReferences.TabIndex = 55;\r
             this.check_mixedReferences.Text = "Mixed References:";\r
             this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_mixedReferences, "With this on, different references can be used for different parts of each 16x16 " +\r
-                    "pixel macroblock, increasing quality.");\r
+            this.ToolTip.SetToolTip(this.check_mixedReferences, "Onにすると、複数のフレームを参照フレームとして利用します。フレームを16×16のブロックに分割し、それぞれで複数のフレームを参照フレームとして利用できます。これ" +\r
+                    "により、映像品質の向上が期待できます。");\r
             this.check_mixedReferences.UseVisualStyleBackColor = true;\r
             this.check_mixedReferences.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
             // \r

diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx
index 97759c0..160e62c 100644 (file)
--- a/win/C#/Controls/x264Panel.resx
+++ b/win/C#/Controls/x264Panel.resx
@@ -120,25 +120,20 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r
-  <data name="slider_psyrd.ToolTip" xml:space="preserve">\r
-    <value>Psychovisual Rate Distortion Optimization sure is a mouthful, isn't it? Basically, it means x264 tries to retain detail, for better quality to the human eye, \r
-as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.</value>\r
-  </data>\r
   <data name="drop_adaptBFrames.ToolTip" xml:space="preserve">\r
-    <value>When adaptive B-Frames are disabled, the number of B-Frames you specify is the constant length of every B-Frame sequence. \r
-When one of the adaptive modes is enabled, the number of B-Frames is treated as a maximum, with the length of each sequence varying, but never exceeding the max.\r
-\r
-Fast mode takes the same amount of time no matter how many B-frames you specify. However, it doesn't always make the best decisions on how many B-Frames to use in a sequence.\r
-\r
-Optimal mode gets slower as the maximum number of B-Frames increases, but does a much better job at deciding sequence length, which can mean smaller file sizes and better quality.</value>\r
+    <value>Bフレーム数の決定方法を指定します。\r
+「Off」に設定すると常に一定となり、Bフレーム数は「B-Frames」で設定した値になります。それ以外の値の場合、Bフレーム数は「B-Frames」で設定した値を上限として変動します。\r
+「Fast」に設定すると、「B-Frames」で設定した値に関わらずエンコード時間は一定となります。ただし、この場合状況によっては最適でないBフレーム数が選択される場合があります。\r
+「Optimal」に設定すると、より小さいサイズで高品位な値が決定されます。ただし、「B-Frames」で設定した値が大きくなるに従ってエンコードが遅くなります。</value>\r
   </data>\r
   <data name="check_Cabac.ToolTip" xml:space="preserve">\r
-    <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15\%. \r
-This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod, and makes the AppleTV struggle. So turn it off for those.\r
-\r
-CABAC is a kind of entropy coding, which means that it compresses data by making shorthand symbols to represent long streams of data. The \"entropy\" part means that the symbols it uses the most often are the smallest. \r
-When you disable CABAC, another entropy coding scheme gets enabled, called CAVLC (context adaptive variable-length coding). \r
-CAVLC is a lot less efficient, which is why it needs 15\% more bitrate to achieve the same quality as CABAC.</value>\r
+    <value>このオプションをOnにするとCABAC（context adaptive binary arithmetic coding）が有効になり、映像品質はそのままでファイルサイズを約15％削減できます。\r
+この機能は非常に有用なので、できるだけOnにすることをおすすめします。\r
+ただし、iPodでの再生互換性に問題があるほか、AppleTVでの再生が難しくなるため、これらのデバイス用のファイルを作成する場合は無効にしてください。\r
+CABACはentropy codingの一種で、長いデータ列を記述するために短いシンボルを利用してデータを圧縮します。\r
+「entropy」は頻繁に使われるシンボルを最小にする、ということを意味しています。\r
+このオプションをOffにすると、CABACの代わりにCAVLC（context adaptive variable-length coding）と呼ばれるentropy coding方式が利用されます。\r
+CAVLSは効率の面ではCABACに劣っているため、同じ映像品質でもCABACを利用した場合と比べてビットレートが15％ほど増加します。</value>\r
   </data>\r
   <data name="check_noDCTDecimate.ToolTip" xml:space="preserve">\r
     <value>To save space, x264 will \"zero out\" blocks when it thinks they won't be perceptible by the viewer. \r
@@ -148,10 +143,6 @@ This situation can be alleviated by telling x264 not to decimate DCT blocks.
 It increases quality but also bitrate/file size, so if you use it when you've specified a target bitrate you will end up with a worse picture than without it. \r
 However, when used with constant quality encoding, or if you boost the average bitrate to compensate, you might get a better result.</value>\r
   </data>\r
-  <data name="drop_trellis.ToolTip" xml:space="preserve">\r
-    <value>Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate or increase quality. \r
-A value of 1 means it only fine-tunes the final encode of a block of pixels, while 2 means it is considered during earlier phases of the decision-making process as well.</value>\r
-  </data>\r
   <data name="drop_deblockBeta.ToolTip" xml:space="preserve">\r
     <value>x264 includes an in-loop deblocking filter. What this means is that blocky compression artifacts are smoothed away when you play back the video. \r
 It has two settings: strength and threshold, just like a simple filter in Photoshop.\r
@@ -188,11 +179,6 @@ other people disagree.
 Some prefer a slightly less blurred image for live action material, and use values like -2,-1 or -2,-2. Others will raise it to 1,1 or even 3,3 for animation. \r
 While the values for each setting extend from -6 to 6, the consensus is that going below -3 or above 3 is worthless.</value>\r
   </data>\r
-  <data name="check_8x8DCT.ToolTip" xml:space="preserve">\r
-    <value>Checking this box lets x264 break key frames down into 8x8 blocks of pixels for analysis. \r
-This is a high profile feature of H.264, which makes it less compatible. It should slightly decrease bitrate or improve quality. \r
-Turn it on whenever possible.</value>\r
-  </data>\r
   <data name="drop_analysis.ToolTip" xml:space="preserve">\r
     <value>Analysis controls how finely x264 divides up a frame to capture detail. Full macroblocks are 16x16 pixels, but x264 can go down all the way to 4x4 blocks if it judges it necessary. \r
 By default it only breaks up key frames that much. To give x264 the freedom to make the best decisions for all frames, use \"all\" analysis. \r
@@ -226,21 +212,12 @@ esa, an exhaustive search of a square around each pixel (whose size is controlle
 \r
 tesa, transformed exhaustive search, which performs just as thorough a search, is slower still but offers further slight improvements to quality.</value>\r
   </data>\r
-  <data name="check_pyrmidalBFrames.ToolTip" xml:space="preserve">\r
-    <value>B-frame pyramids are a High Profile feature. Pyramidal B-frames mean that B-frames don't just reference surrounding reference frames - \r
-instead, it also treats a previous B-frame as a reference, improving quality/lowering bitrate at the expense of complexity. \r
-Logically, to reference an earlier B-frame, you must tell x264 to use at least 2 B-frames.</value>\r
-  </data>\r
-  <data name="check_weightedBFrames.ToolTip" xml:space="preserve">\r
-    <value>Sometimes x264 will base a B-frame's motion compensation on frames both before and after. \r
-With weighted B-frames, the amount of influence each frame has is related to its distance from the frame being encoded, \r
-instead of both having equal influence. \r
-The AppleTV can have issues with this.</value>\r
-  </data>\r
   <data name="drop_directPrediction.ToolTip" xml:space="preserve">\r
-    <value>Direct prediction tells x264 what method to use when guessing motion for certain parts of a B-frame. \r
-It can either look at other parts of the current frame (spatial) or compare against the following P-frameframe (temporal). \r
-You're best off setting this to automatic, so x264 decides which method is best on its own. \r
-Don't select none assuming it will be faster; instead it will take longer and look worse. If you're going to choose between spatial and temporal, spatial is usually better.</value>\r
+    <value>Bフレーム内のブロックに対してどのように動き予測を行うかを指定します。\r
+「Spatial」では、処理対象フレームのほかのブロックについても考慮します。\r
+「Temporal」では、続くPフレームと比較します。\r
+「Automatic」は自動的に最適な方法を選択します。「Automatic」が最適な設定です。\r
+「None」は選択しないことをおすすめします。予測を行わないため高速と思われがちですが、逆に低速になり、映像品質も悪化する可能性があります。\r
+なお、「Spatial」と「Temporal」では、通常は「Spatioal」のほうが高品質です。</value>\r
   </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 5d807ce..b9c0744 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -223,7 +223,7 @@ namespace Handbrake.Functions
             Properties.Settings.Default.cliLastModified = lastModified;\r
             \r
             Process cliProcess = new Process();\r
-            ProcessStartInfo handBrakeCLI = new ProcessStartInfo("HandBrakeCLI.exe", " -u")\r
+            ProcessStartInfo handBrakeCLI = new ProcessStartInfo("HandBrakeCLI.exe", " -u -v0")\r
                                                 {\r
                                                     UseShellExecute = false,\r
                                                     RedirectStandardError = true,\r
@@ -241,7 +241,7 @@ namespace Handbrake.Functions
                 while (!cliProcess.HasExited)\r
                 {\r
                     line = stdOutput.ReadLine() ?? "";\r
-                    Match m = Regex.Match(line, @"HandBrake ([0-9.]*)(svn[0-9M]*) \([0-9]*\)");\r
+                    Match m = Regex.Match(line, @"HandBrake ([svn0-9.]*) \([0-9]*\)");\r
                     Match platform = Regex.Match(line, @"- ([A-Za-z0-9\s ]*) -");\r
 \r
                     if (m.Success)\r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index 282f9f5..a1dc1a1 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -21,7 +21,7 @@ namespace Handbrake
         {\r
             Screen scr = Screen.PrimaryScreen;\r
             if ((scr.Bounds.Width < 1024) || (scr.Bounds.Height < 620))\r
-                MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n" + "Your screen is running at: " + scr.Bounds.Width + "x" + scr.Bounds.Height + " \nScreen resolution is too Low. Must be 1024x620 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                MessageBox.Show("\89æ\96Ê\89ð\91\9c\93x\82ª\8f¬\82³\82·\82¬\82Ü\82·\81B\n" + "\8c»\8dÝ\82Ì\89æ\96Ê\83T\83C\83Y\82Í" + scr.Bounds.Width + "\81~" + scr.Bounds.Height + " \82Å\82·\81B\nHandBrake\82Ì\8eÀ\8ds\82É\82Í\81A1024\81~620\88È\8fã\82Ì\89æ\96Ê\89ð\91\9c\93x\82ª\95K\97v\82Å\82·\81B", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             else\r
             {\r
                 string logDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\logs");\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 088c6eb..91cc4fc 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
-//     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.4927\r
+//     このコードはツールによって生成されました。\r
+//     ランタイム バージョン:2.0.50727.4927\r
 //\r
 //     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、\r
 //     コードが再生成されるときに損失したりします。\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 896b44a..ebe5d23 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -102,7 +102,6 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
@@ -113,16 +112,12 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_filters = new System.Windows.Forms.TabPage();\r
-            this.Filters = new Handbrake.Controls.Filters();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -176,6 +171,11 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
+            this.Filters = new Handbrake.Controls.Filters();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -254,7 +254,7 @@ namespace Handbrake
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21);\r
             this.drp_videoEncoder.TabIndex = 1;\r
-            this.ToolTip.SetToolTip(this.drp_videoEncoder, "\93®\89æ\83G\83\93\83R\81[\83_\82ð\91I\91ð\82µ\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.drp_videoEncoder, "\93®\89æ\83G\83\93\83R\81[\83_\82ð\91I\91ð\82µ\82Ü\82·\81B");\r
             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);\r
             // \r
             // check_largeFile\r
@@ -268,7 +268,7 @@ namespace Handbrake
             this.check_largeFile.TabIndex = 4;\r
             this.check_largeFile.Text = "64\83r\83b\83gMP4";\r
             this.ToolTip.SetToolTip(this.check_largeFile, "64\83r\83b\83gMP4\82ð\8dì\90¬\82·\82é\82±\82Æ\82Å\81A4GB\88È\8fã\82Ì\83T\83C\83Y\82Ì\93®\89æ\83t\83@\83C\83\8b\82ª\8dì\90¬\89Â\94\\82É\82È\82è\82Ü\82·\81B\r\n\82½\82¾\82µ\81AAppleTV Take 2\88È\8aO\82Å\82Ì\8dÄ\90¶\8cÝ\8a·\90«\82ª\96³\82­\82È\82é\89Â\94\\90«" +\r
-                    "\82ª\82 \82è\82Ü\82·");\r
+                    "\82ª\82 \82è\82Ü\82·\81B");\r
             this.check_largeFile.UseVisualStyleBackColor = false;\r
             // \r
             // check_turbo\r
@@ -281,7 +281,7 @@ namespace Handbrake
             this.check_turbo.Size = new System.Drawing.Size(166, 17);\r
             this.check_turbo.TabIndex = 7;\r
             this.check_turbo.Text = "1\89ñ\96Ú\82Ì\83X\83L\83\83\83\93\82ð\8d\82\91¬\89»\82·\82é";\r
-            this.ToolTip.SetToolTip(this.check_turbo, "\83`\83F\83b\83N\82ð\93ü\82ê\82é\82Æ\81A2\83p\83X\83G\83\93\83R\81[\83h\82Ì\8eg\97p\8e\9e\82É1\89ñ\96Ú\82Ì\83p\83X\82ð\8d\82\91¬\82É\8ds\82¢\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.check_turbo, "\83`\83F\83b\83N\82ð\93ü\82ê\82é\82Æ\81A2\83p\83X\83G\83\93\83R\81[\83h\82Ì\8eg\97p\8e\9e\82É1\89ñ\96Ú\82Ì\83X\83L\83\83\83\93\82ð\8d\82\91¬\82É\8ds\82¢\82Ü\82·\81B");\r
             this.check_turbo.UseVisualStyleBackColor = false;\r
             // \r
             // drp_videoFramerate\r
@@ -302,7 +302,7 @@ namespace Handbrake
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
             this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21);\r
             this.drp_videoFramerate.TabIndex = 2;\r
-            this.ToolTip.SetToolTip(this.drp_videoFramerate, "\92Ê\8fí\82Í\81uSame as source\81v\82ð\91I\91ð\82µ\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.drp_videoFramerate, "\83t\83\8c\81[\83\80\83\8c\81[\83g\82ð\91I\91ð\82µ\82Ü\82·\81B\r\n\92Ê\8fí\82Í\81u\95Ï\8a·\8c³\82Æ\93¯\82¶\81v\82ð\91I\91ð\82µ\82Ü\82·\81B");\r
             // \r
             // slider_videoQuality\r
             // \r
@@ -314,7 +314,7 @@ namespace Handbrake
             this.slider_videoQuality.Size = new System.Drawing.Size(322, 45);\r
             this.slider_videoQuality.TabIndex = 14;\r
             this.slider_videoQuality.TickFrequency = 17;\r
-            this.ToolTip.SetToolTip(this.slider_videoQuality, "\93®\89æ\82Ì\95i\8e¿\83\8c\83x\83\8b\82ð\91I\91ð\82µ\82Ü\82·\81B59\81`63\81\93\82ª\93K\90Ø\82È\92l\82Å\82·\81B70\81\93\82æ\82è\91å\82«\82¢\92l\82ð\91I\91ð\82·\82é\82Æ\81A\8fo\97Í\83t\83@\83C\83\8b\82ª\93ü\97Í\83t\83@\83C\83\8b\82æ\82è\82à\91å\82«\82­\82È\82é\82©\82à\82µ\82ê\82Ü\82¹\82ñ\81B");\r
+            this.ToolTip.SetToolTip(this.slider_videoQuality, "\93®\89æ\82Ì\95i\8e¿\83\8c\83x\83\8b\82ð\91I\91ð\82µ\82Ü\82·\81B59\81`63\81\93\82ª\93K\90Ø\82È\92l\82Å\82·\81B\r\n70\81\93\82æ\82è\91å\82«\82¢\92l\82ð\91I\91ð\82·\82é\82Æ\81A\8fo\97Í\83t\83@\83C\83\8b\82ª\93ü\97Í\83t\83@\83C\83\8b\82æ\82è\82à\91å\82«\82­\82È\82é\82©\82à\82µ\82ê\82Ü\82¹\82ñ\81B");\r
             this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll);\r
             // \r
             // text_filesize\r
@@ -345,7 +345,7 @@ namespace Handbrake
             this.btn_setDefault.TabIndex = 1;\r
             this.btn_setDefault.TabStop = false;\r
             this.btn_setDefault.Text = "\83f\83t\83H\83\8b\83g\82É\90Ý\92è";\r
-            this.ToolTip.SetToolTip(this.btn_setDefault, "\8c»\8dÝ\82Ì\90Ý\92è\82ð\83f\83t\83H\83\8b\83g\90Ý\92è\82Æ\82µ\82Ä\95Û\91¶");\r
+            this.ToolTip.SetToolTip(this.btn_setDefault, "\91I\91ð\82µ\82½\83v\83\8a\83Z\83b\83g\82ð\83f\83t\83H\83\8b\83g\90Ý\92è\82Æ\82µ\82Ä\8eg\97p\82µ\82Ü\82·\81B");\r
             this.btn_setDefault.UseVisualStyleBackColor = true;\r
             this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);\r
             // \r
@@ -360,7 +360,7 @@ namespace Handbrake
             this.check_optimiseMP4.TabIndex = 25;\r
             this.check_optimiseMP4.Text = "Web\97p\82É\8dÅ\93K\89»";\r
             this.ToolTip.SetToolTip(this.check_optimiseMP4, "Web\82©\82ç\82Ì\83_\83E\83\93\83\8d\81[\83h\8dÄ\90¶\82É\8dÅ\93K\89»\82³\82ê\82½\83v\83\8d\83O\83\8c\83b\83V\83u\8c`\8e®MP4\83t\83@\83C\83\8b\82ð\8dì\90¬\82Å\82«\82Ü\82·\81B\r\n\82½\82¾\82µ\81AQuickTime\82Å\82Í\8ag\92£\8eq\82ª.mp4\82Ì\8fê\8d\87\82É\82Ì\82Ý\8dÄ\90¶\89Â\94\\82Å" +\r
-                    "\82·\81B\r\nH.264\82Å\82Ì\82Ý\97\98\97p\89Â\94\\82Å\82·");\r
+                    "\82·\81B\r\nH.264\82Å\82Ì\82Ý\97\98\97p\89Â\94\\82Å\82·\81B");\r
             this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
             // \r
             // check_iPodAtom\r
@@ -373,7 +373,7 @@ namespace Handbrake
             this.check_iPodAtom.Size = new System.Drawing.Size(95, 17);\r
             this.check_iPodAtom.TabIndex = 26;\r
             this.check_iPodAtom.Text = "iPod 5G\82É\91Î\89\9e";\r
-            this.ToolTip.SetToolTip(this.check_iPodAtom, "iPod 5G\82É\91Î\89\9e\82µ\82½\93®\89æ\82ð\8dì\90¬\82·\82é\8fê\8d\87\81A\83`\83F\83b\83N\82ð\93ü\82ê\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.check_iPodAtom, "iPod 5G\82É\91Î\89\9e\82µ\82½\93®\89æ\82ð\8dì\90¬\82·\82é\8fê\8d\87\81A\83`\83F\83b\83N\82ð\93ü\82ê\82Ü\82·\81B");\r
             this.check_iPodAtom.UseVisualStyleBackColor = false;\r
             // \r
             // data_chpt\r
@@ -397,9 +397,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle4.Format = "N0";\r
+            dataGridViewCellStyle4.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle4;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "\83`\83\83\83v\83^\81[";\r
             this.number.MaxInputLength = 3;\r
@@ -439,7 +439,7 @@ namespace Handbrake
             this.btn_addPreset.TabIndex = 3;\r
             this.btn_addPreset.TabStop = false;\r
             this.btn_addPreset.Text = "\92Ç\89Á";\r
-            this.ToolTip.SetToolTip(this.btn_addPreset, "\83v\83\8a\83Z\83b\83g\90Ý\92è\82ð\92Ç\89Á");\r
+            this.ToolTip.SetToolTip(this.btn_addPreset, "\8c»\8dÝ\82Ì\90Ý\92è\82ð\83v\83\8a\83Z\83b\83g\82Æ\82µ\82Ä\95Û\91¶\82µ\82Ü\82·\81B");\r
             this.btn_addPreset.UseVisualStyleBackColor = true;\r
             this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
             // \r
@@ -454,7 +454,7 @@ namespace Handbrake
             this.btn_removePreset.TabIndex = 4;\r
             this.btn_removePreset.TabStop = false;\r
             this.btn_removePreset.Text = "\8dí\8f\9c";\r
-            this.ToolTip.SetToolTip(this.btn_removePreset, "\83v\83\8a\83Z\83b\83g\90Ý\92è\82ð\8dí\8f\9c");\r
+            this.ToolTip.SetToolTip(this.btn_removePreset, "\91I\91ð\82µ\82½\83v\83\8a\83Z\83b\83g\90Ý\92è\82ð\8dí\8f\9c\82µ\82Ü\82·\81B");\r
             this.btn_removePreset.UseVisualStyleBackColor = true;\r
             this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
             // \r
@@ -469,7 +469,7 @@ namespace Handbrake
             this.drop_format.Name = "drop_format";\r
             this.drop_format.Size = new System.Drawing.Size(106, 21);\r
             this.drop_format.TabIndex = 28;\r
-            this.ToolTip.SetToolTip(this.drop_format, "\83R\83\93\83e\83i\83t\83H\81[\83}\83b\83g\82ð\91I\91ð\82µ\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.drop_format, "\83R\83\93\83e\83i\83t\83H\81[\83}\83b\83g\82ð\91I\91ð\82µ\82Ü\82·\81B");\r
             this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
             // \r
             // drop_chapterFinish\r
@@ -480,7 +480,7 @@ namespace Handbrake
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 10;\r
-            this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
+            this.ToolTip.SetToolTip(this.drop_chapterFinish, "\83G\83\93\83R\81[\83h\82·\82é\83`\83\83\83v\83^\81[\82ð\8ew\92è\82µ\82Ü\82·\81B\r\n\83f\83t\83H\83\8b\83g\82Å\82Í\82·\82×\82Ä\82Ì\83`\83\83\83v\83^\81[\82ª\91I\91ð\82³\82ê\82Ü\82·\81B");\r
             this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);\r
             // \r
             // drop_chapterStart\r
@@ -491,7 +491,7 @@ namespace Handbrake
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 9;\r
-            this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
+            this.ToolTip.SetToolTip(this.drop_chapterStart, "\83G\83\93\83R\81[\83h\82·\82é\83`\83\83\83v\83^\81[\82ð\8ew\92è\82µ\82Ü\82·\81B\r\n\83f\83t\83H\83\8b\83g\82Å\82Í\82·\82×\82Ä\82Ì\83`\83\83\83v\83^\81[\82ª\91I\91ð\82³\82ê\82Ü\82·\81B");\r
             this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);\r
             // \r
             // drop_angle\r
@@ -502,7 +502,7 @@ namespace Handbrake
             this.drop_angle.Name = "drop_angle";\r
             this.drop_angle.Size = new System.Drawing.Size(45, 21);\r
             this.drop_angle.TabIndex = 45;\r
-            this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
+            this.ToolTip.SetToolTip(this.drop_angle, "\83G\83\93\83R\81[\83h\82·\82é\83J\83\81\83\89\83A\83\93\83O\83\8b\82ð\8ew\92è\82µ\82Ü\82·\81B");\r
             // \r
             // drp_dvdtitle\r
             // \r
@@ -514,8 +514,7 @@ namespace Handbrake
             this.drp_dvdtitle.Name = "drp_dvdtitle";\r
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
             this.drp_dvdtitle.TabIndex = 7;\r
-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +\r
-                    "ter you have scanned a source.");\r
+            this.ToolTip.SetToolTip(this.drp_dvdtitle, "\83G\83\93\83R\81[\83h\82·\82é\83^\83C\83g\83\8b\82ð\91I\91ð\82µ\82Ü\82·\81B\r\n\83f\83t\83H\83\8b\83g\82Å\82Í\82à\82Á\82Æ\82à\92·\82¢\83^\83C\83g\83\8b\82ª\91I\91ð\82³\82ê\82Ü\82·\81B");\r
             this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);\r
             this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);\r
             // \r
@@ -528,7 +527,7 @@ namespace Handbrake
             this.check_2PassEncode.Size = new System.Drawing.Size(103, 17);\r
             this.check_2PassEncode.TabIndex = 6;\r
             this.check_2PassEncode.Text = "2-Pass\83G\83\93\83R\81[\83h";\r
-            this.ToolTip.SetToolTip(this.check_2PassEncode, "2\83p\83X\83G\83\93\83R\81[\83h\82ð\8ds\82¤\8fê\8d\87\81A\83`\83F\83b\83N\82ð\93ü\82ê\82Ü\82·\81B2\83p\83X\83G\83\93\83R\81[\83h\82Í\83G\83\93\83R\81[\83h\82ª\92x\82­\82È\82è\82Ü\82·\82ª\81A\95i\8e¿\82ª\8cü\8fã\82µ\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.check_2PassEncode, "2\83p\83X\83G\83\93\83R\81[\83h\82ð\8ds\82¤\8fê\8d\87\81A\83`\83F\83b\83N\82ð\93ü\82ê\82Ü\82·\81B\r\n\83G\83\93\83R\81[\83h\82ª\92x\82­\82È\82è\82Ü\82·\82ª\81A\95i\8e¿\82ª\8cü\8fã\82µ\82Ü\82·\81B");\r
             this.check_2PassEncode.UseVisualStyleBackColor = false;\r
             this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);\r
             // \r
@@ -541,7 +540,7 @@ namespace Handbrake
             this.Check_ChapterMarkers.Size = new System.Drawing.Size(141, 17);\r
             this.Check_ChapterMarkers.TabIndex = 1;\r
             this.Check_ChapterMarkers.Text = "\83`\83\83\83v\83^\81[\83}\81[\83J\81[\82ð\8dì\90¬";\r
-            this.ToolTip.SetToolTip(this.Check_ChapterMarkers, "\83`\83\83\83v\83^\81[\83}\81[\83J\81[\82ð\8dì\90¬\82·\82é\8fê\8d\87\83`\83F\83b\83N\82ð\93ü\82ê\82Ü\82·");\r
+            this.ToolTip.SetToolTip(this.Check_ChapterMarkers, "\83`\83\83\83v\83^\81[\83}\81[\83J\81[\82ð\8dì\90¬\82·\82é\8fê\8d\87\83`\83F\83b\83N\82ð\93ü\82ê\82Ü\82·\81B");\r
             this.Check_ChapterMarkers.UseVisualStyleBackColor = false;\r
             this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);\r
             // \r
@@ -555,7 +554,8 @@ namespace Handbrake
             this.btn_importChapters.Size = new System.Drawing.Size(125, 23);\r
             this.btn_importChapters.TabIndex = 14;\r
             this.btn_importChapters.Text = "\83t\83@\83C\83\8b\82©\82ç\93Ç\82Ý\8d\9e\82Ý";\r
-            this.ToolTip.SetToolTip(this.btn_importChapters, resources.GetString("btn_importChapters.ToolTip"));\r
+            this.ToolTip.SetToolTip(this.btn_importChapters, "\83J\83\93\83}\8bæ\90Ø\82è\8c`\8e®\82Å\83`\83\83\83v\83^\81[\8fî\95ñ\82ª\95Û\91¶\82³\82ê\82½\83t\83@\83C\83\8b\82ð\83C\83\93\83|\81[\83g\82µ\82Ü\82·\81B\r\n\83t\83@\83C\83\8b\82Í\88È\89º\82Ì\82æ\82¤\82É\82È\82Á\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B\r\n\r\n1,\83`\83\83\83v\83^\81[1\82Ì\96¼\91O\r\n2," +\r
+                    "\83`\83\83\83v\83^\81[2\82Ì\96¼\91O\r\n3,\83`\83\83\83v\83^\81[3\82Ì\96¼\91O\r\n\r\n\92\8d\81F\83`\83\83\83v\83^\81[\96¼\82É\81u,\81v\82ð\8eg\97p\82µ\82½\82¢\8fê\8d\87\81A\81u\\,\81v\82Ì\82æ\82¤\82É\83G\83X\83P\81[\83v\82·\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B");\r
             this.btn_importChapters.UseVisualStyleBackColor = true;\r
             this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);\r
             // \r
@@ -821,15 +821,6 @@ namespace Handbrake
             this.tab_audio.Text = "\89¹\90º";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
-            this.AudioSettings.TabIndex = 0;\r
-            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -954,16 +945,6 @@ namespace Handbrake
             this.tab_picture.Text = "\83T\83C\83Y";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.PictureSettings.Enabled = false;\r
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
-            this.PictureSettings.TabIndex = 0;\r
-            // \r
             // tabs_panel\r
             // \r
             this.tabs_panel.Controls.Add(this.tab_picture);\r
@@ -991,15 +972,6 @@ namespace Handbrake
             this.tab_filters.Text = "\83t\83B\83\8b\83^";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
-            // Filters\r
-            // \r
-            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Filters.Location = new System.Drawing.Point(0, 0);\r
-            this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(713, 310);\r
-            this.Filters.TabIndex = 0;\r
-            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -1011,15 +983,6 @@ namespace Handbrake
             this.tab_subtitles.Text = "\8e\9a\96\8b";\r
             this.tab_subtitles.UseVisualStyleBackColor = true;\r
             // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
-            this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
-            this.Subtitles.TabIndex = 0;\r
-            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1057,16 +1020,6 @@ namespace Handbrake
             this.tab_advanced.Text = "\8fÚ\8d×\90Ý\92è";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
-            this.x264Panel.Name = "x264Panel";\r
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
-            this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.x264Query = "";\r
-            // \r
             // tab_query\r
             // \r
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1277,7 +1230,7 @@ namespace Handbrake
             this.btn_source.Name = "btn_source";\r
             this.btn_source.Size = new System.Drawing.Size(89, 36);\r
             this.btn_source.Text = "\95Ï\8a·\8c³";\r
-            this.btn_source.ToolTipText = "\95Ï\8a·\8c³\83t\83@\83C\83\8b/\83t\83H\83\8b\83_\82ð\91I\91ð\82µ\82Ü\82·";\r
+            this.btn_source.ToolTipText = "\95Ï\8a·\8c³\83t\83@\83C\83\8b/\83t\83H\83\8b\83_\82ð\91I\91ð\82µ\82Ü\82·\81B";\r
             this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
             // \r
             // btn_file_source\r
@@ -1324,7 +1277,7 @@ namespace Handbrake
             this.btn_start.Name = "btn_start";\r
             this.btn_start.Size = new System.Drawing.Size(92, 36);\r
             this.btn_start.Text = "\95Ï\8a·\8aJ\8en";\r
-            this.btn_start.ToolTipText = "\83G\83\93\83R\81[\83h\8f\88\97\9d\82ð\8aJ\8en\82µ\82Ü\82·";\r
+            this.btn_start.ToolTipText = "\83G\83\93\83R\81[\83h\8f\88\97\9d\82ð\8aJ\8en\82µ\82Ü\82·\81B";\r
             this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
             // \r
             // btn_add2Queue\r
@@ -1335,7 +1288,7 @@ namespace Handbrake
             this.btn_add2Queue.Name = "btn_add2Queue";\r
             this.btn_add2Queue.Size = new System.Drawing.Size(116, 36);\r
             this.btn_add2Queue.Text = "\83L\83\85\81[\82É\92Ç\89Á";\r
-            this.btn_add2Queue.ToolTipText = "\90V\8bK\83A\83C\83e\83\80\82ð\83L\83\85\81[\82É\92Ç\89Á\82µ\82Ü\82·";\r
+            this.btn_add2Queue.ToolTipText = "\95Ï\8a·\8f\88\97\9d\82ð\83L\83\85\81[\82É\92Ç\89Á\82µ\82Ü\82·\81B";\r
             this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
             // \r
             // btn_showQueue\r
@@ -1347,6 +1300,7 @@ namespace Handbrake
             this.btn_showQueue.Size = new System.Drawing.Size(116, 36);\r
             this.btn_showQueue.Tag = "";\r
             this.btn_showQueue.Text = "\83L\83\85\81[\82Ì\95\\8e¦";\r
+            this.btn_showQueue.ToolTipText = "\83L\83\85\81[\82ð\95\\8e¦\82µ\82Ü\82·\81B";\r
             this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
             // \r
             // toolStripSeparator4\r
@@ -1362,6 +1316,7 @@ namespace Handbrake
             this.tb_preview.Name = "tb_preview";\r
             this.tb_preview.Size = new System.Drawing.Size(104, 36);\r
             this.tb_preview.Text = "\83v\83\8c\83r\83\85\81[";\r
+            this.tb_preview.ToolTipText = "\95Ï\8a·\8c\8b\89Ê\82Ì\83v\83\8c\83r\83\85\81[\82ð\95\\8e¦\82µ\82Ü\82·\81B";\r
             this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
             // \r
             // btn_ActivityWindow\r
@@ -1372,7 +1327,7 @@ namespace Handbrake
             this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
             this.btn_ActivityWindow.Size = new System.Drawing.Size(128, 36);\r
             this.btn_ActivityWindow.Text = "\97\9a\97ð\83E\83B\83\93\83h\83E";\r
-            this.btn_ActivityWindow.ToolTipText = "\97\9a\97ð\83E\83B\83\93\83h\83E\82Å\83\8d\83O\82â\83G\83\93\83R\81[\83h\8dì\8bÆ\82Ì\90i\92»\82ð\8am\94F\82µ\82Ü\82·";\r
+            this.btn_ActivityWindow.ToolTipText = "\97\9a\97ð\83E\83B\83\93\83h\83E\82Å\83\8d\83O\82â\83G\83\93\83R\81[\83h\8dì\8bÆ\82Ì\90i\92»\82ð\8am\94F\82µ\82Ü\82·\81B";\r
             this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
             // \r
             // notifyIcon\r
@@ -1456,7 +1411,7 @@ namespace Handbrake
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);\r
             this.btn_destBrowse.TabIndex = 13;\r
-            this.btn_destBrowse.Text = "Browse";\r
+            this.btn_destBrowse.Text = "\8eQ\8fÆ";\r
             this.btn_destBrowse.UseVisualStyleBackColor = true;\r
             this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);\r
             // \r
@@ -1638,6 +1593,53 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.PictureSettings.Enabled = false;\r
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
+            // Filters\r
+            // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
+            // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.x264Query = "";\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 057cc54..0f26e40 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -144,16 +144,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <data name="btn_importChapters.ToolTip" xml:space="preserve">\r
-    <value>Import a comma separated file containing the chapter information.\r
-The CSV should be formatted as follows:\r
-\r
-1,Chapter 1 Name\r
-2,Chapter 2 Name\r
-3,Chapter 3 Name\r
-\r
-Note: Currently, if you wish to use a , in your chapter name, you must escape it with a \</value>\r
-  </data>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>232, 15</value>\r
   </metadata>\r