X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.resx;h=42c24c337e933f15df15d9cf96fb3db7bfca2c36;hb=3166f4bf518b12ef658ce4a249f9a265b16693bd;hp=380b3873063d67e9ae957cdf2c318585a9b6e602;hpb=f38b5e6c4125a13bbe1c2c7d497359cf31f77e78;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 380b3873..42c24c33 100644
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,13 +120,23 @@
   <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_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 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="text_an_path.ToolTip" xml:space="preserve">
+    <value>This is the default location where your encoded files will be stored if "Automatically name output files" is enabled.
+You can enter {source_path} instead of a path to use the same path as the source file.</value>
+  </data>
+  <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">
+    <value>Shows the CLI window when encoding.
+You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c
+meaing you'll have playable files if you choose to end the encode early. 
+
+When disabled, Presseting "Stop" on the main winow will render the encode unplayable.</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>