OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmOptions.Designer.cs
index f7aa396..51a7cc9 100644 (file)
@@ -39,6 +39,7 @@ namespace Handbrake
             this.drp_completeOption = new System.Windows.Forms.ComboBox();\r
             this.tab_options = new System.Windows.Forms.TabControl();\r
             this.tab_general = new System.Windows.Forms.TabPage();\r
+            this.label34 = new System.Windows.Forms.Label();\r
             this.check_TitleCase = new System.Windows.Forms.CheckBox();\r
             this.check_removeUnderscores = new System.Windows.Forms.CheckBox();\r
             this.check_growlEncode = new System.Windows.Forms.CheckBox();\r
@@ -63,6 +64,8 @@ namespace Handbrake
             this.btn_vlcPath = new System.Windows.Forms.Button();\r
             this.txt_vlcPath = new System.Windows.Forms.TextBox();\r
             this.tab_audio_sub = new System.Windows.Forms.TabPage();\r
+            this.radio_preferredAudioAndSubs = new System.Windows.Forms.RadioButton();\r
+            this.check_AddCCTracks = new System.Windows.Forms.CheckBox();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.label15 = new System.Windows.Forms.Label();\r
             this.radio_foreignAndSubs = new System.Windows.Forms.RadioButton();\r
@@ -133,7 +136,8 @@ namespace Handbrake
             this.label26 = new System.Windows.Forms.Label();\r
             this.label27 = new System.Windows.Forms.Label();\r
             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();\r
-            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.panel1 = new System.Windows.Forms.Panel();\r
+            this.panel2 = new System.Windows.Forms.Panel();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
@@ -142,17 +146,17 @@ namespace Handbrake
             this.tab_cli.SuspendLayout();\r
             this.tab_advanced.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
-            this.tableLayoutPanel5.SuspendLayout();\r
+            this.panel1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // btn_close\r
             // \r
-            this.btn_close.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));\r
             this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(519, 404);\r
+            this.btn_close.Location = new System.Drawing.Point(528, 463);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(72, 22);\r
             this.btn_close.TabIndex = 53;\r
@@ -162,7 +166,6 @@ namespace Handbrake
             // \r
             // drp_completeOption\r
             // \r
-            this.drp_completeOption.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drp_completeOption.FormattingEnabled = true;\r
             this.drp_completeOption.Items.AddRange(new object[] {\r
@@ -182,21 +185,20 @@ namespace Handbrake
             // \r
             // tab_options\r
             // \r
-            this.tableLayoutPanel5.SetColumnSpan(this.tab_options, 2);\r
             this.tab_options.Controls.Add(this.tab_general);\r
             this.tab_options.Controls.Add(this.tab_picture);\r
             this.tab_options.Controls.Add(this.tab_audio_sub);\r
             this.tab_options.Controls.Add(this.tab_cli);\r
             this.tab_options.Controls.Add(this.tab_advanced);\r
-            this.tab_options.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.tab_options.Location = new System.Drawing.Point(3, 38);\r
+            this.tab_options.Location = new System.Drawing.Point(12, 74);\r
             this.tab_options.Name = "tab_options";\r
             this.tab_options.SelectedIndex = 0;\r
-            this.tab_options.Size = new System.Drawing.Size(588, 360);\r
+            this.tab_options.Size = new System.Drawing.Size(588, 383);\r
             this.tab_options.TabIndex = 58;\r
             // \r
             // tab_general\r
             // \r
+            this.tab_general.Controls.Add(this.label34);\r
             this.tab_general.Controls.Add(this.check_TitleCase);\r
             this.tab_general.Controls.Add(this.check_removeUnderscores);\r
             this.tab_general.Controls.Add(this.check_growlEncode);\r
@@ -219,16 +221,28 @@ namespace Handbrake
             this.tab_general.Location = new System.Drawing.Point(4, 22);\r
             this.tab_general.Name = "tab_general";\r
             this.tab_general.Padding = new System.Windows.Forms.Padding(10);\r
-            this.tab_general.Size = new System.Drawing.Size(580, 334);\r
+            this.tab_general.Size = new System.Drawing.Size(580, 357);\r
             this.tab_general.TabIndex = 3;\r
             this.tab_general.Text = "General";\r
             this.tab_general.UseVisualStyleBackColor = true;\r
             // \r
+            // label34\r
+            // \r
+            this.label34.AutoSize = true;\r
+            this.label34.Location = new System.Drawing.Point(179, 233);\r
+            this.label34.Margin = new System.Windows.Forms.Padding(3);\r
+            this.label34.Name = "label34";\r
+            this.label34.Size = new System.Drawing.Size(167, 13);\r
+            this.label34.TabIndex = 102;\r
+            this.label34.Text = "Available Options: {source_path}";\r
+            this.ToolTip.SetToolTip(this.label34, "{source_path} = Use the same directory as the source is in.\r\nNote: you can not us" +\r
+                    "e {source_path} within a path.  It has to be the only text in the path above to " +\r
+                    "work.");\r
+            // \r
             // check_TitleCase\r
             // \r
-            this.check_TitleCase.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_TitleCase.AutoSize = true;\r
-            this.check_TitleCase.Location = new System.Drawing.Point(297, 279);\r
+            this.check_TitleCase.Location = new System.Drawing.Point(297, 297);\r
             this.check_TitleCase.Name = "check_TitleCase";\r
             this.check_TitleCase.Size = new System.Drawing.Size(151, 17);\r
             this.check_TitleCase.TabIndex = 101;\r
@@ -240,9 +254,8 @@ namespace Handbrake
             // \r
             // check_removeUnderscores\r
             // \r
-            this.check_removeUnderscores.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_removeUnderscores.AutoSize = true;\r
-            this.check_removeUnderscores.Location = new System.Drawing.Point(108, 279);\r
+            this.check_removeUnderscores.Location = new System.Drawing.Point(108, 297);\r
             this.check_removeUnderscores.Name = "check_removeUnderscores";\r
             this.check_removeUnderscores.Size = new System.Drawing.Size(183, 17);\r
             this.check_removeUnderscores.TabIndex = 100;\r
@@ -253,7 +266,6 @@ namespace Handbrake
             // \r
             // check_growlEncode\r
             // \r
-            this.check_growlEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_growlEncode.AutoSize = true;\r
             this.check_growlEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_growlEncode.Location = new System.Drawing.Point(282, 122);\r
@@ -268,7 +280,6 @@ namespace Handbrake
             // \r
             // check_GrowlQueue\r
             // \r
-            this.check_GrowlQueue.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_GrowlQueue.AutoSize = true;\r
             this.check_GrowlQueue.BackColor = System.Drawing.Color.Transparent;\r
             this.check_GrowlQueue.Location = new System.Drawing.Point(108, 122);\r
@@ -283,9 +294,8 @@ namespace Handbrake
             // \r
             // check_m4v\r
             // \r
-            this.check_m4v.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_m4v.AutoSize = true;\r
-            this.check_m4v.Location = new System.Drawing.Point(108, 303);\r
+            this.check_m4v.Location = new System.Drawing.Point(108, 321);\r
             this.check_m4v.Name = "check_m4v";\r
             this.check_m4v.Size = new System.Drawing.Size(319, 17);\r
             this.check_m4v.TabIndex = 82;\r
@@ -296,7 +306,6 @@ namespace Handbrake
             // \r
             // label1\r
             // \r
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label1.AutoSize = true;\r
             this.label1.BackColor = System.Drawing.Color.Transparent;\r
             this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -309,9 +318,8 @@ namespace Handbrake
             // \r
             // label7\r
             // \r
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label7.AutoSize = true;\r
-            this.label7.Location = new System.Drawing.Point(179, 260);\r
+            this.label7.Location = new System.Drawing.Point(179, 278);\r
             this.label7.Margin = new System.Windows.Forms.Padding(3);\r
             this.label7.Name = "label7";\r
             this.label7.Size = new System.Drawing.Size(225, 13);\r
@@ -320,7 +328,6 @@ namespace Handbrake
             // \r
             // drop_updateCheckDays\r
             // \r
-            this.drop_updateCheckDays.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.drop_updateCheckDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_updateCheckDays.FormattingEnabled = true;\r
             this.drop_updateCheckDays.Items.AddRange(new object[] {\r
@@ -336,7 +343,6 @@ namespace Handbrake
             // \r
             // check_autoNaming\r
             // \r
-            this.check_autoNaming.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_autoNaming.AutoSize = true;\r
             this.check_autoNaming.Location = new System.Drawing.Point(108, 174);\r
             this.check_autoNaming.Name = "check_autoNaming";\r
@@ -349,8 +355,7 @@ namespace Handbrake
             // \r
             // txt_autoNameFormat\r
             // \r
-            this.txt_autoNameFormat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.txt_autoNameFormat.Location = new System.Drawing.Point(182, 233);\r
+            this.txt_autoNameFormat.Location = new System.Drawing.Point(182, 251);\r
             this.txt_autoNameFormat.Name = "txt_autoNameFormat";\r
             this.txt_autoNameFormat.Size = new System.Drawing.Size(349, 21);\r
             this.txt_autoNameFormat.TabIndex = 79;\r
@@ -361,7 +366,6 @@ namespace Handbrake
             // \r
             // check_tooltip\r
             // \r
-            this.check_tooltip.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_tooltip.AutoSize = true;\r
             this.check_tooltip.BackColor = System.Drawing.Color.Transparent;\r
             this.check_tooltip.Location = new System.Drawing.Point(108, 62);\r
@@ -375,9 +379,8 @@ namespace Handbrake
             // \r
             // label5\r
             // \r
-            this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label5.AutoSize = true;\r
-            this.label5.Location = new System.Drawing.Point(105, 236);\r
+            this.label5.Location = new System.Drawing.Point(105, 254);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(45, 13);\r
             this.label5.TabIndex = 80;\r
@@ -385,7 +388,6 @@ namespace Handbrake
             // \r
             // check_updateCheck\r
             // \r
-            this.check_updateCheck.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_updateCheck.AutoSize = true;\r
             this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;\r
             this.check_updateCheck.Location = new System.Drawing.Point(108, 14);\r
@@ -400,7 +402,6 @@ namespace Handbrake
             // \r
             // label10\r
             // \r
-            this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label10.AutoSize = true;\r
             this.label10.Location = new System.Drawing.Point(105, 209);\r
             this.label10.Name = "label10";\r
@@ -410,7 +411,6 @@ namespace Handbrake
             // \r
             // btn_browse\r
             // \r
-            this.btn_browse.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
@@ -424,7 +424,6 @@ namespace Handbrake
             // \r
             // label2\r
             // \r
-            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.label2.AutoSize = true;\r
             this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.label2.Location = new System.Drawing.Point(7, 98);\r
@@ -435,10 +434,9 @@ namespace Handbrake
             // \r
             // label13\r
             // \r
-            this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label13.AutoSize = true;\r
             this.label13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label13.Location = new System.Drawing.Point(4, 164);\r
+            this.label13.Location = new System.Drawing.Point(4, 174);\r
             this.label13.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
             this.label13.Name = "label13";\r
             this.label13.Size = new System.Drawing.Size(77, 13);\r
@@ -447,13 +445,11 @@ namespace Handbrake
             // \r
             // text_an_path\r
             // \r
-            this.text_an_path.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
             this.text_an_path.Location = new System.Drawing.Point(182, 206);\r
             this.text_an_path.Name = "text_an_path";\r
             this.text_an_path.Size = new System.Drawing.Size(253, 21);\r
             this.text_an_path.TabIndex = 76;\r
-            this.ToolTip.SetToolTip(this.text_an_path, "This is the default location where your encoded files will be stored if \"Automati" +\r
-                    "cally name output files\" is enabled.");\r
+            this.ToolTip.SetToolTip(this.text_an_path, resources.GetString("text_an_path.ToolTip"));\r
             this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);\r
             // \r
             // tab_picture\r
@@ -462,7 +458,7 @@ namespace Handbrake
             this.tab_picture.Location = new System.Drawing.Point(4, 22);\r
             this.tab_picture.Name = "tab_picture";\r
             this.tab_picture.Padding = new System.Windows.Forms.Padding(10);\r
-            this.tab_picture.Size = new System.Drawing.Size(580, 334);\r
+            this.tab_picture.Size = new System.Drawing.Size(580, 357);\r
             this.tab_picture.TabIndex = 5;\r
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
@@ -527,6 +523,8 @@ namespace Handbrake
             // \r
             // tab_audio_sub\r
             // \r
+            this.tab_audio_sub.Controls.Add(this.radio_preferredAudioAndSubs);\r
+            this.tab_audio_sub.Controls.Add(this.check_AddCCTracks);\r
             this.tab_audio_sub.Controls.Add(this.label31);\r
             this.tab_audio_sub.Controls.Add(this.label15);\r
             this.tab_audio_sub.Controls.Add(this.radio_foreignAndSubs);\r
@@ -535,11 +533,36 @@ namespace Handbrake
             this.tab_audio_sub.Location = new System.Drawing.Point(4, 22);\r
             this.tab_audio_sub.Name = "tab_audio_sub";\r
             this.tab_audio_sub.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_audio_sub.Size = new System.Drawing.Size(580, 334);\r
+            this.tab_audio_sub.Size = new System.Drawing.Size(580, 357);\r
             this.tab_audio_sub.TabIndex = 6;\r
             this.tab_audio_sub.Text = "Audio / Subtitles";\r
             this.tab_audio_sub.UseVisualStyleBackColor = true;\r
             // \r
+            // radio_preferredAudioAndSubs\r
+            // \r
+            this.radio_preferredAudioAndSubs.AutoSize = true;\r
+            this.radio_preferredAudioAndSubs.Location = new System.Drawing.Point(200, 99);\r
+            this.radio_preferredAudioAndSubs.Name = "radio_preferredAudioAndSubs";\r
+            this.radio_preferredAudioAndSubs.Size = new System.Drawing.Size(250, 17);\r
+            this.radio_preferredAudioAndSubs.TabIndex = 93;\r
+            this.radio_preferredAudioAndSubs.TabStop = true;\r
+            this.radio_preferredAudioAndSubs.Text = "Use Preferred Language for Audio and Subtitles";\r
+            this.ToolTip.SetToolTip(this.radio_preferredAudioAndSubs, "Use Preferred Language for Audio and Subtitle.");\r
+            this.radio_preferredAudioAndSubs.UseVisualStyleBackColor = true;\r
+            this.radio_preferredAudioAndSubs.CheckedChanged += new System.EventHandler(this.radio_preferredAudioAndSubs_CheckedChanged);\r
+            // \r
+            // check_AddCCTracks\r
+            // \r
+            this.check_AddCCTracks.AutoSize = true;\r
+            this.check_AddCCTracks.Location = new System.Drawing.Point(200, 131);\r
+            this.check_AddCCTracks.Name = "check_AddCCTracks";\r
+            this.check_AddCCTracks.Size = new System.Drawing.Size(198, 17);\r
+            this.check_AddCCTracks.TabIndex = 92;\r
+            this.check_AddCCTracks.Text = "Add Closed Captions when available";\r
+            this.ToolTip.SetToolTip(this.check_AddCCTracks, "Add any CC tracks if they exist");\r
+            this.check_AddCCTracks.UseVisualStyleBackColor = true;\r
+            this.check_AddCCTracks.CheckedChanged += new System.EventHandler(this.check_AddCCTracks_CheckedChanged);\r
+            // \r
             // label31\r
             // \r
             this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
@@ -566,7 +589,7 @@ namespace Handbrake
             this.radio_foreignAndSubs.AutoSize = true;\r
             this.radio_foreignAndSubs.Location = new System.Drawing.Point(200, 76);\r
             this.radio_foreignAndSubs.Name = "radio_foreignAndSubs";\r
-            this.radio_foreignAndSubs.Size = new System.Drawing.Size(358, 17);\r
+            this.radio_foreignAndSubs.Size = new System.Drawing.Size(347, 17);\r
             this.radio_foreignAndSubs.TabIndex = 90;\r
             this.radio_foreignAndSubs.TabStop = true;\r
             this.radio_foreignAndSubs.Text = "Use foreign language audio and add first preferred language subtitle.";\r
@@ -591,7 +614,7 @@ namespace Handbrake
             this.radio_dub.AutoSize = true;\r
             this.radio_dub.Location = new System.Drawing.Point(200, 53);\r
             this.radio_dub.Name = "radio_dub";\r
-            this.radio_dub.Size = new System.Drawing.Size(164, 17);\r
+            this.radio_dub.Size = new System.Drawing.Size(167, 17);\r
             this.radio_dub.TabIndex = 89;\r
             this.radio_dub.TabStop = true;\r
             this.radio_dub.Text = "DUB Foreign Language Audio";\r
@@ -621,7 +644,7 @@ namespace Handbrake
             this.tab_cli.Location = new System.Drawing.Point(4, 22);\r
             this.tab_cli.Name = "tab_cli";\r
             this.tab_cli.Padding = new System.Windows.Forms.Padding(10);\r
-            this.tab_cli.Size = new System.Drawing.Size(580, 334);\r
+            this.tab_cli.Size = new System.Drawing.Size(580, 357);\r
             this.tab_cli.TabIndex = 2;\r
             this.tab_cli.Text = "CLI / System / Logging";\r
             this.tab_cli.UseVisualStyleBackColor = true;\r
@@ -644,9 +667,9 @@ namespace Handbrake
             this.check_preventSleep.AutoSize = true;\r
             this.check_preventSleep.Location = new System.Drawing.Point(73, 45);\r
             this.check_preventSleep.Name = "check_preventSleep";\r
-            this.check_preventSleep.Size = new System.Drawing.Size(272, 17);\r
+            this.check_preventSleep.Size = new System.Drawing.Size(260, 17);\r
             this.check_preventSleep.TabIndex = 91;\r
-            this.check_preventSleep.Text = "Prevent the system from sleepping when encoding.";\r
+            this.check_preventSleep.Text = "Prevent the system from sleeping when encoding.";\r
             this.ToolTip.SetToolTip(this.check_preventSleep, "Prevent system from sleeping during encoding.");\r
             this.check_preventSleep.UseVisualStyleBackColor = true;\r
             this.check_preventSleep.CheckedChanged += new System.EventHandler(this.check_preventSleep_CheckedChanged);\r
@@ -657,7 +680,7 @@ namespace Handbrake
             this.check_clearOldLogs.AutoSize = true;\r
             this.check_clearOldLogs.Location = new System.Drawing.Point(73, 234);\r
             this.check_clearOldLogs.Name = "check_clearOldLogs";\r
-            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);\r
+            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 17);\r
             this.check_clearOldLogs.TabIndex = 90;\r
             this.check_clearOldLogs.Text = "Clear logs older than 30 days";\r
             this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +\r
@@ -752,7 +775,7 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.AutoSize = true;\r
             this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 139);\r
             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";\r
-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);\r
+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);\r
             this.check_logsInSpecifiedLocation.TabIndex = 87;\r
             this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";\r
             this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");\r
@@ -852,7 +875,7 @@ namespace Handbrake
             this.tab_advanced.Location = new System.Drawing.Point(4, 22);\r
             this.tab_advanced.Name = "tab_advanced";\r
             this.tab_advanced.Padding = new System.Windows.Forms.Padding(10);\r
-            this.tab_advanced.Size = new System.Drawing.Size(580, 334);\r
+            this.tab_advanced.Size = new System.Drawing.Size(580, 357);\r
             this.tab_advanced.TabIndex = 4;\r
             this.tab_advanced.Text = "Advanced / Other";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
@@ -864,7 +887,7 @@ namespace Handbrake
             this.check_showCliForInGUIEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_showCliForInGUIEncode.Location = new System.Drawing.Point(81, 129);\r
             this.check_showCliForInGUIEncode.Name = "check_showCliForInGUIEncode";\r
-            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(330, 17);\r
+            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(324, 17);\r
             this.check_showCliForInGUIEncode.TabIndex = 96;\r
             this.check_showCliForInGUIEncode.Text = "Show CLI window (Allows you to cleanly exit encode with ctrl-c)";\r
             this.ToolTip.SetToolTip(this.check_showCliForInGUIEncode, resources.GetString("check_showCliForInGUIEncode.ToolTip"));\r
@@ -918,7 +941,7 @@ namespace Handbrake
             this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;\r
             this.check_trayStatusAlerts.Location = new System.Drawing.Point(81, 37);\r
             this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";\r
-            this.check_trayStatusAlerts.Size = new System.Drawing.Size(296, 17);\r
+            this.check_trayStatusAlerts.Size = new System.Drawing.Size(288, 17);\r
             this.check_trayStatusAlerts.TabIndex = 93;\r
             this.check_trayStatusAlerts.Text = "Display status messages from tray icon (balloon popups)";\r
             this.ToolTip.SetToolTip(this.check_trayStatusAlerts, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
@@ -934,7 +957,7 @@ namespace Handbrake
             this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;\r
             this.check_mainMinimize.Location = new System.Drawing.Point(81, 14);\r
             this.check_mainMinimize.Name = "check_mainMinimize";\r
-            this.check_mainMinimize.Size = new System.Drawing.Size(230, 17);\r
+            this.check_mainMinimize.Size = new System.Drawing.Size(221, 17);\r
             this.check_mainMinimize.TabIndex = 82;\r
             this.check_mainMinimize.Text = "Minimize to system tray (Requires Restart)";\r
             this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
@@ -948,7 +971,7 @@ namespace Handbrake
             this.check_promptOnUnmatchingQueries.AutoSize = true;\r
             this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(100, 83);\r
             this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";\r
-            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(305, 17);\r
+            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(300, 17);\r
             this.check_promptOnUnmatchingQueries.TabIndex = 63;\r
             this.check_promptOnUnmatchingQueries.Text = "Prompt when a manual query does not match GUI settings";\r
             this.check_promptOnUnmatchingQueries.UseVisualStyleBackColor = true;\r
@@ -961,7 +984,7 @@ namespace Handbrake
             this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;\r
             this.check_dvdnav.Location = new System.Drawing.Point(82, 247);\r
             this.check_dvdnav.Name = "check_dvdnav";\r
-            this.check_dvdnav.Size = new System.Drawing.Size(276, 17);\r
+            this.check_dvdnav.Size = new System.Drawing.Size(277, 17);\r
             this.check_dvdnav.TabIndex = 90;\r
             this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)";\r
             this.check_dvdnav.UseVisualStyleBackColor = false;\r
@@ -974,7 +997,7 @@ namespace Handbrake
             this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;\r
             this.check_queryEditorTab.Location = new System.Drawing.Point(81, 60);\r
             this.check_queryEditorTab.Name = "check_queryEditorTab";\r
-            this.check_queryEditorTab.Size = new System.Drawing.Size(241, 17);\r
+            this.check_queryEditorTab.Size = new System.Drawing.Size(236, 17);\r
             this.check_queryEditorTab.TabIndex = 84;\r
             this.check_queryEditorTab.Text = "Enable \"Query Editor\" tab (Requires Restart)";\r
             this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +\r
@@ -1026,7 +1049,7 @@ namespace Handbrake
             this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;\r
             this.check_disablePresetNotification.Location = new System.Drawing.Point(81, 106);\r
             this.check_disablePresetNotification.Name = "check_disablePresetNotification";\r
-            this.check_disablePresetNotification.Size = new System.Drawing.Size(222, 17);\r
+            this.check_disablePresetNotification.Size = new System.Drawing.Size(216, 17);\r
             this.check_disablePresetNotification.TabIndex = 91;\r
             this.check_disablePresetNotification.Text = "Disable built-in preset update notification";\r
             this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +\r
@@ -1047,10 +1070,9 @@ namespace Handbrake
             // \r
             // label8\r
             // \r
-            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label8.AutoSize = true;\r
             this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label8.Location = new System.Drawing.Point(41, 11);\r
+            this.label8.Location = new System.Drawing.Point(51, 19);\r
             this.label8.Name = "label8";\r
             this.label8.Size = new System.Drawing.Size(115, 13);\r
             this.label8.TabIndex = 61;\r
@@ -1059,7 +1081,7 @@ namespace Handbrake
             // pictureBox2\r
             // \r
             this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;\r
-            this.pictureBox2.Location = new System.Drawing.Point(3, 0);\r
+            this.pictureBox2.Location = new System.Drawing.Point(12, 9);\r
             this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);\r
             this.pictureBox2.Name = "pictureBox2";\r
             this.pictureBox2.Size = new System.Drawing.Size(32, 32);\r
@@ -1405,25 +1427,29 @@ namespace Handbrake
             this.openFile_vlc.DefaultExt = "exe";\r
             this.openFile_vlc.Filter = "exe|*.exe";\r
             // \r
-            // tableLayoutPanel5\r
-            // \r
-            this.tableLayoutPanel5.AutoSize = true;\r
-            this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.tableLayoutPanel5.ColumnCount = 2;\r
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel5.Controls.Add(this.pictureBox2, 0, 0);\r
-            this.tableLayoutPanel5.Controls.Add(this.btn_close, 1, 2);\r
-            this.tableLayoutPanel5.Controls.Add(this.label8, 1, 0);\r
-            this.tableLayoutPanel5.Controls.Add(this.tab_options, 0, 1);\r
-            this.tableLayoutPanel5.Location = new System.Drawing.Point(12, 12);\r
-            this.tableLayoutPanel5.Name = "tableLayoutPanel5";\r
-            this.tableLayoutPanel5.RowCount = 3;\r
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 429);\r
-            this.tableLayoutPanel5.TabIndex = 62;\r
+            // panel1\r
+            // \r
+            this.panel1.BackColor = System.Drawing.Color.White;\r
+            this.panel1.Controls.Add(this.panel2);\r
+            this.panel1.Controls.Add(this.label8);\r
+            this.panel1.Controls.Add(this.pictureBox2);\r
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.panel1.Location = new System.Drawing.Point(0, 0);\r
+            this.panel1.Margin = new System.Windows.Forms.Padding(0);\r
+            this.panel1.Name = "panel1";\r
+            this.panel1.Size = new System.Drawing.Size(615, 65);\r
+            this.panel1.TabIndex = 62;\r
+            // \r
+            // panel2\r
+            // \r
+            this.panel2.BackColor = System.Drawing.SystemColors.Control;\r
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+            this.panel2.Location = new System.Drawing.Point(0, 55);\r
+            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);\r
+            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);\r
+            this.panel2.Name = "panel2";\r
+            this.panel2.Size = new System.Drawing.Size(615, 10);\r
+            this.panel2.TabIndex = 59;\r
             // \r
             // frmOptions\r
             // \r
@@ -1431,15 +1457,16 @@ namespace Handbrake
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.AutoSize = true;\r
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.ClientSize = new System.Drawing.Size(627, 456);\r
-            this.Controls.Add(this.tableLayoutPanel5);\r
+            this.ClientSize = new System.Drawing.Size(615, 495);\r
+            this.Controls.Add(this.panel1);\r
+            this.Controls.Add(this.btn_close);\r
+            this.Controls.Add(this.tab_options);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MinimizeBox = false;\r
             this.Name = "frmOptions";\r
-            this.Padding = new System.Windows.Forms.Padding(12);\r
             this.ShowIcon = false;\r
             this.ShowInTaskbar = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
@@ -1458,10 +1485,9 @@ namespace Handbrake
             this.tab_advanced.ResumeLayout(false);\r
             this.tab_advanced.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
-            this.tableLayoutPanel5.ResumeLayout(false);\r
-            this.tableLayoutPanel5.PerformLayout();\r
+            this.panel1.ResumeLayout(false);\r
+            this.panel1.PerformLayout();\r
             this.ResumeLayout(false);\r
-            this.PerformLayout();\r
 \r
         }\r
 \r
@@ -1547,7 +1573,6 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drop_updateCheckDays;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;\r
         internal System.Windows.Forms.ComboBox drp_Priority;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;\r
         private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries;\r
         private System.Windows.Forms.TabPage tab_audio_sub;\r
         internal System.Windows.Forms.ComboBox drop_preferredLang;\r
@@ -1566,5 +1591,10 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_removeUnderscores;\r
         internal System.Windows.Forms.CheckBox check_preventSleep;\r
         private System.Windows.Forms.Label label11;\r
+        private System.Windows.Forms.Panel panel1;\r
+        private System.Windows.Forms.Panel panel2;\r
+        private System.Windows.Forms.RadioButton radio_preferredAudioAndSubs;\r
+        private System.Windows.Forms.CheckBox check_AddCCTracks;\r
+        private System.Windows.Forms.Label label34;\r
     }\r
 }
\ No newline at end of file