X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.resx;h=f16c6a9a206b2356d0a2b474592af923613e8ed2;hb=e16dcaf99da57f9013549aeed6260d5095d17e5d;hp=427cdd9646d31d6d393ce4e3906d744da4a9ecb7;hpb=30d4d77e02a3d873f51ff57edaf8a12a3d9a3131;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 427cdd96..f16c6a9a 100644
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,9 +120,18 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>132, 18</value>
   </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>132, 18</value>
-  </metadata>
+  <data name="check_m4v.ToolTip" xml:space="preserve">
+    <value>Use .m4v instead of .mp4 for MP4 files
+
+Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if you are using QuickTime for playback.
+When this option is disabled, Chapter Markers, AC3 audio and SRT subtitiles will still automatically change the file extension to m4v.
+</value>
+  </data>
+  <data name="check_disableResCalc.ToolTip" xml:space="preserve">
+    <value>If the new Picture Settings panel is causing you problems, enable this option.
+It disables some of the resolution calcuation code for None and Custom modes.
+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>
+  </data>
   <metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>