summaryrefslogtreecommitdiffstats
path: root/win/C#/frmOptions.resx
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-07-22 18:20:19 +0000
committersr55 <[email protected]>2010-07-22 18:20:19 +0000
commita7a9e89446f318ae286a7cf45182b3f1dee978a6 (patch)
tree017e2548bba5315d7e32d86fe728b20f2761fb21 /win/C#/frmOptions.resx
parent925dfe6a2292889fd623d4092747ad798b5d1606 (diff)
Reverting 3452
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3454 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmOptions.resx')
-rw-r--r--win/C#/frmOptions.resx23
1 files changed, 17 insertions, 6 deletions
diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 8a1811c83..df466a44b 100644
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,6 +120,19 @@
<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_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="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
@@ -127,12 +140,10 @@ Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if y
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_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 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>