Commit: 06ca0558f6ca04cda0ab853d2cca3d8d841c8be2 - handbrake-jp (git)

handbrake-jp project\'s main repository.

Commit MetaInfo

• Revision: 06ca0558f6ca04cda0ab853d2cca3d8d841c8be2 (tree)
• Time: 2011-01-04 22:48:33
• Author: unknown <hirom@.(no...>
• Commiter: hylom

Log Message

translate some x264 tooltips...

Change Summary

• modified: win/C#/Controls/Filters.Designer.cs
• modified: win/C#/frmAddPreset.Designer.cs

Incremental Difference

--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -210,12 +210,8 @@
             // 
             this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                         | System.Windows.Forms.AnchorStyles.Right)));
-<<<<<<< HEAD
             this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;
             this.slider_deblock.Location = new System.Drawing.Point(71, 111);
-=======
-            this.slider_deblock.Location = new System.Drawing.Point(101, 111);
->>>>>>> GUI translation with Designer
             this.slider_deblock.Maximum = 15;
             this.slider_deblock.Minimum = 4;
             this.slider_deblock.Name = "slider_deblock";

--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -89,7 +89,6 @@ namespace Handbrake
             this.btn_cancel.TabIndex = 3;
             this.btn_cancel.Text = "キャンセル";
             this.btn_cancel.UseVisualStyleBackColor = false;
-<<<<<<< HEAD
             this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);
             // 
             // check_useFilters
@@ -134,59 +133,6 @@ namespace Handbrake
             this.label3.Size = new System.Drawing.Size(87, 13);
             this.label3.TabIndex = 8;
             this.label3.Text = "Use Picture Size:";
-=======
-            this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);
-            // 
-            // check_pictureSettings
-            // 
-            this.check_pictureSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_pictureSettings.AutoSize = true;
-            this.tableLayoutPanel1.SetColumnSpan(this.check_pictureSettings, 2);
-            this.check_pictureSettings.Location = new System.Drawing.Point(75, 30);
-            this.check_pictureSettings.Name = "check_pictureSettings";
-            this.check_pictureSettings.Size = new System.Drawing.Size(143, 17);
-            this.check_pictureSettings.TabIndex = 1;
-            this.check_pictureSettings.Text = "切り抜き設定も保存する";
-            this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");
-            this.check_pictureSettings.UseVisualStyleBackColor = true;
-            // 
-            // label1
-            // 
-            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label1.AutoSize = true;
-            this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);
-            this.label1.Location = new System.Drawing.Point(75, 53);
-            this.label1.Margin = new System.Windows.Forms.Padding(3);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(205, 13);
-            this.label1.TabIndex = 4;
-            this.label1.Text = "注意: 字幕設定については保存されません";
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSize = true;
-            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel1.ColumnCount = 3;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.lbl_name, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 2, 3);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.btn_add, 1, 3);
-            this.tableLayoutPanel1.Controls.Add(this.txt_preset_name, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.check_pictureSettings, 1, 1);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(9, 9);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 4;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(295, 125);
-            this.tableLayoutPanel1.TabIndex = 5;
->>>>>>> translate almost string data. TODO: check preset loader
             // 
             // frmAddPreset
             //