• R/O
  • HTTP
  • SSH
  • HTTPS

handbrake-jp: Commit

handbrake-jp project\'s main repository.


Commit MetaInfo

Revisión06ca0558f6ca04cda0ab853d2cca3d8d841c8be2 (tree)
Tiempo2011-01-04 22:48:33
Autorunknown <hirom@.(no...>
Commiterhylom

Log Message

translate some x264 tooltips...

Cambiar Resumen

Diferencia

--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -210,12 +210,8 @@
210210 //
211211 this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
212212 | System.Windows.Forms.AnchorStyles.Right)));
213-<<<<<<< HEAD
214213 this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;
215214 this.slider_deblock.Location = new System.Drawing.Point(71, 111);
216-=======
217- this.slider_deblock.Location = new System.Drawing.Point(101, 111);
218->>>>>>> GUI translation with Designer
219215 this.slider_deblock.Maximum = 15;
220216 this.slider_deblock.Minimum = 4;
221217 this.slider_deblock.Name = "slider_deblock";
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -89,7 +89,6 @@ namespace Handbrake
8989 this.btn_cancel.TabIndex = 3;
9090 this.btn_cancel.Text = "キャンセル";
9191 this.btn_cancel.UseVisualStyleBackColor = false;
92-<<<<<<< HEAD
9392 this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);
9493 //
9594 // check_useFilters
@@ -134,59 +133,6 @@ namespace Handbrake
134133 this.label3.Size = new System.Drawing.Size(87, 13);
135134 this.label3.TabIndex = 8;
136135 this.label3.Text = "Use Picture Size:";
137-=======
138- this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);
139- //
140- // check_pictureSettings
141- //
142- this.check_pictureSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;
143- this.check_pictureSettings.AutoSize = true;
144- this.tableLayoutPanel1.SetColumnSpan(this.check_pictureSettings, 2);
145- this.check_pictureSettings.Location = new System.Drawing.Point(75, 30);
146- this.check_pictureSettings.Name = "check_pictureSettings";
147- this.check_pictureSettings.Size = new System.Drawing.Size(143, 17);
148- this.check_pictureSettings.TabIndex = 1;
149- this.check_pictureSettings.Text = "切り抜き設定も保存する";
150- this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");
151- this.check_pictureSettings.UseVisualStyleBackColor = true;
152- //
153- // label1
154- //
155- this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
156- this.label1.AutoSize = true;
157- this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);
158- this.label1.Location = new System.Drawing.Point(75, 53);
159- this.label1.Margin = new System.Windows.Forms.Padding(3);
160- this.label1.Name = "label1";
161- this.label1.Size = new System.Drawing.Size(205, 13);
162- this.label1.TabIndex = 4;
163- this.label1.Text = "注意: 字幕設定については保存されません";
164- //
165- // tableLayoutPanel1
166- //
167- this.tableLayoutPanel1.AutoSize = true;
168- this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
169- this.tableLayoutPanel1.ColumnCount = 3;
170- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
171- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
172- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
173- this.tableLayoutPanel1.Controls.Add(this.lbl_name, 0, 0);
174- this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 2, 3);
175- this.tableLayoutPanel1.Controls.Add(this.label1, 1, 2);
176- this.tableLayoutPanel1.Controls.Add(this.btn_add, 1, 3);
177- this.tableLayoutPanel1.Controls.Add(this.txt_preset_name, 1, 0);
178- this.tableLayoutPanel1.Controls.Add(this.check_pictureSettings, 1, 1);
179- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
180- this.tableLayoutPanel1.Location = new System.Drawing.Point(9, 9);
181- this.tableLayoutPanel1.Name = "tableLayoutPanel1";
182- this.tableLayoutPanel1.RowCount = 4;
183- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
184- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
185- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
186- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
187- this.tableLayoutPanel1.Size = new System.Drawing.Size(295, 125);
188- this.tableLayoutPanel1.TabIndex = 5;
189->>>>>>> translate almost string data. TODO: check preset loader
190136 //
191137 // frmAddPreset
192138 //
Show on old repository browser