From: unknown <hirom@.(none)>
Date: Tue, 8 Dec 2009 10:54:24 +0000 (+0900)
Subject: fix some merge error
X-Git-Url: http://git.osdn.net/view?p=handbrake-jp%2Fhandbrake-jp.git;a=commitdiff_plain;h=295107a988b0d598ab6582c4af6eb0f41bee2106

fix some merge error
---

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index f28402b..3805ea2 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -20,7 +20,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
     <TargetFrameworkSubset>
     </TargetFrameworkSubset>
     <ManifestCertificateThumbprint>951B5E0B0DA7DC7D66E1AE6C0B40C5932766882D</ManifestCertificateThumbprint>
@@ -314,7 +314,6 @@
   <ItemGroup>
     <Content Include="Changelog.html" />
     <Content Include="handbrakepineapple.ico" />
-    <None Include="HandBrakeCS_TemporaryKey.pfx" />
     <None Include="Resources\logo64.png" />
     <None Include="Resources\logo128.png" />
     <None Include="Resources\ActivityWindow.png" />
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 21ca237..bb9d93b 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -686,9 +686,9 @@ namespace Handbrake
             dataGridViewCellStyle10.NullValue = null;
             this.number.DefaultCellStyle = dataGridViewCellStyle10;
 */
-            dataGridViewCellStyle1.Format = "N0";
-            dataGridViewCellStyle1.NullValue = null;
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle10.Format = "N0";
+            dataGridViewCellStyle10.NullValue = null;
+            this.number.DefaultCellStyle = dataGridViewCellStyle10;
             this.number.Frozen = true;
             this.number.HeaderText = "Chapter Number";
             this.number.MaxInputLength = 3;
diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 6f3beee..1659829 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -282,7 +282,7 @@ namespace Handbrake
             this.btn_pause.Name = "btn_pause";
             this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
             this.btn_pause.Size = new System.Drawing.Size(74, 36);
-            this.btn_stop.Text = "ˆêŽž’âŽ~";
+            this.btn_pause.Text = "ˆêŽž’âŽ~";
             this.btn_pause.Visible = false;
             this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);
             // 
@@ -451,7 +451,7 @@ namespace Handbrake
             this.lbl_progressValue.Name = "lbl_progressValue";
             this.lbl_progressValue.Size = new System.Drawing.Size(35, 26);
             this.lbl_progressValue.Text = " 0 %";
-/*
+*/
             this.toolStripSeparator3.Name = "toolStripSeparator3";
             this.toolStripSeparator3.Size = new System.Drawing.Size(135, 6);
             //