summaryrefslogtreecommitdiffstats
path: root/win/C#/frmOptions.resx
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-07-13 22:02:00 +0000
committersr55 <[email protected]>2010-07-13 22:02:00 +0000
commit07de1ce8ff81af998b294103206bdeb4d5591efd (patch)
treed7a86034f5a0a4a85cb719d5fcf5a8148bec8386 /win/C#/frmOptions.resx
parentd484afb3733d33d42392b915a195769aee2a0ba5 (diff)
WinGui:
- Major rework of the Encode Service. This allows previews to be generated while an encode is running. I've left in a bunch of debug code for the moment so it may be a bit noisy at times if something goes a bit wrong. Will remove later when the code is known to work. - The windows 7 Encode Progress Bar on the Task bar is working again. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3436 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmOptions.resx')
-rw-r--r--win/C#/frmOptions.resx16
1 files changed, 5 insertions, 11 deletions
diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index a69782119..02f2ee7e0 100644
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,17 +120,6 @@
<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_showCliForInGUIEncode.ToolTip" xml:space="preserve">
- <value>Shows the CLI window when "Encode In-Gui encode status" is enabled.
-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.</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>
<data name="check_m4v.ToolTip" xml:space="preserve">
<value>Use .m4v instead of .mp4 for MP4 files
@@ -138,6 +127,11 @@ 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 "Encode In-Gui encode status" is enabled.
+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.</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.