fix some merge error

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index f28402b..3805ea2 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.21022</ProductVersion>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
     <ProjectGuid>{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}</ProjectGuid>\r
     <OutputType>WinExe</OutputType>\r
@@ -20,7 +20,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>\r
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
     <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <SignManifests>true</SignManifests>\r
+    <SignManifests>false</SignManifests>\r
     <TargetFrameworkSubset>\r
     </TargetFrameworkSubset>\r
     <ManifestCertificateThumbprint>951B5E0B0DA7DC7D66E1AE6C0B40C5932766882D</ManifestCertificateThumbprint>\r
@@ -314,7 +314,6 @@
   <ItemGroup>\r
     <Content Include="Changelog.html" />\r
     <Content Include="handbrakepineapple.ico" />\r
-    <None Include="HandBrakeCS_TemporaryKey.pfx" />\r
     <None Include="Resources\logo64.png" />\r
     <None Include="Resources\logo128.png" />\r
     <None Include="Resources\ActivityWindow.png" />\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 21ca237..bb9d93b 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -686,9 +686,9 @@ namespace Handbrake
             dataGridViewCellStyle10.NullValue = null;\r
             this.number.DefaultCellStyle = dataGridViewCellStyle10;\r
 */\r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle10.Format = "N0";\r
+            dataGridViewCellStyle10.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle10;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 6f3beee..1659829 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -282,7 +282,7 @@ namespace Handbrake
             this.btn_pause.Name = "btn_pause";\r
             this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
             this.btn_pause.Size = new System.Drawing.Size(74, 36);\r
-            this.btn_stop.Text = "\88ê\8e\9e\92â\8e~";\r
+            this.btn_pause.Text = "\88ê\8e\9e\92â\8e~";\r
             this.btn_pause.Visible = false;\r
             this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);\r
             // \r
@@ -451,7 +451,7 @@ namespace Handbrake
             this.lbl_progressValue.Name = "lbl_progressValue";\r
             this.lbl_progressValue.Size = new System.Drawing.Size(35, 26);\r
             this.lbl_progressValue.Text = " 0 %";\r
-/*\r
+*/\r
             this.toolStripSeparator3.Name = "toolStripSeparator3";\r
             this.toolStripSeparator3.Size = new System.Drawing.Size(135, 6);\r
             // \r