summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/C#/frmOptions.Designer.cs6
-rw-r--r--win/C#/frmOptions.resx18
2 files changed, 16 insertions, 8 deletions
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 53d5ef9d1..2541defc3 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -890,7 +890,7 @@ namespace Handbrake
this.drop_previewScanCount.Size = new System.Drawing.Size(85, 21);
this.drop_previewScanCount.TabIndex = 95;
this.ToolTip.SetToolTip(this.drop_previewScanCount, "Allows a greater number of preview frames to be selectable on the \"Preview\" windo" +
- "w.");
+ "w.\r\n\r\nThis can in some cases improve the accuracy of the auto crop feature.");
this.drop_previewScanCount.SelectedIndexChanged += new System.EventHandler(this.drop_previewScanCount_SelectedIndexChanged);
//
// label33
@@ -938,9 +938,9 @@ namespace Handbrake
this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;
this.check_mainMinimize.Location = new System.Drawing.Point(81, 14);
this.check_mainMinimize.Name = "check_mainMinimize";
- this.check_mainMinimize.Size = new System.Drawing.Size(138, 17);
+ this.check_mainMinimize.Size = new System.Drawing.Size(230, 17);
this.check_mainMinimize.TabIndex = 82;
- this.check_mainMinimize.Text = "Minimize to system tray";
+ this.check_mainMinimize.Text = "Minimize to system tray (Requires Restart)";
this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +
" icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +
"");
diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 02f2ee7e0..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,11 +140,6 @@ 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.