import 0.9.4

[handbrake-jp/handbrake-jp.git] / win / C# / frmOptions.resx

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 74bf186..f16c6a9 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,9 +120,24 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>132, 18</value>\r
   </metadata>\r
+  <data name="check_m4v.ToolTip" xml:space="preserve">\r
+    <value>Use .m4v instead of .mp4 for MP4 files\r
+\r
+Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if you are using QuickTime for playback.\r
+When this option is disabled, Chapter Markers, AC3 audio and SRT subtitiles will still automatically change the file extension to m4v.\r
+</value>\r
+  </data>\r
+  <data name="check_disableResCalc.ToolTip" xml:space="preserve">\r
+    <value>If the new Picture Settings panel is causing you problems, enable this option.\r
+It disables some of the resolution calcuation code for None and Custom modes.\r
+When enabled, the values in the text boxes will simply be passed through to the CLI so it is up to you to get the values correct.</value>\r
+  </data>\r
   <metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r
+  <metadata name="openFile_vlc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>224, 18</value>\r
+  </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r