• R/O
  • HTTP
  • SSH
  • HTTPS

handbrake-jp: Commit

handbrake-jp project\'s main repository.


Commit MetaInfo

Revisión75ee40042736f39c93722310813004e1d107b087 (tree)
Tiempo2011-01-04 21:57:45
Autorunknown <hirom@.(no...>
Commiterhylom

Log Message

GUI translation with Designer

Cambiar Resumen

Diferencia

--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -114,11 +114,11 @@ namespace Handbrake.Controls
114114 this.btn_RemoveAudioTrack.BackColor = System.Drawing.Color.Transparent;
115115 this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
116116 this.btn_RemoveAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
117- this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(99, 38);
117+ this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(115, 38);
118118 this.btn_RemoveAudioTrack.Name = "btn_RemoveAudioTrack";
119- this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(71, 23);
119+ this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(87, 23);
120120 this.btn_RemoveAudioTrack.TabIndex = 64;
121- this.btn_RemoveAudioTrack.Text = "Remove";
121+ this.btn_RemoveAudioTrack.Text = "削除";
122122 this.btn_RemoveAudioTrack.UseVisualStyleBackColor = false;
123123 this.btn_RemoveAudioTrack.Click += new System.EventHandler(this.btn_RemoveAudioTrack_Click);
124124 //
@@ -129,9 +129,9 @@ namespace Handbrake.Controls
129129 this.btn_addAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
130130 this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 38);
131131 this.btn_addAudioTrack.Name = "btn_addAudioTrack";
132- this.btn_addAudioTrack.Size = new System.Drawing.Size(77, 23);
132+ this.btn_addAudioTrack.Size = new System.Drawing.Size(93, 23);
133133 this.btn_addAudioTrack.TabIndex = 63;
134- this.btn_addAudioTrack.Text = "Add Track";
134+ this.btn_addAudioTrack.Text = "トラックを追加";
135135 this.btn_addAudioTrack.UseVisualStyleBackColor = false;
136136 this.btn_addAudioTrack.Click += new System.EventHandler(this.btn_addAudioTrack_Click);
137137 //
@@ -175,9 +175,9 @@ namespace Handbrake.Controls
175175 this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
176176 this.label68.Location = new System.Drawing.Point(13, 13);
177177 this.label68.Name = "label68";
178- this.label68.Size = new System.Drawing.Size(80, 13);
178+ this.label68.Size = new System.Drawing.Size(68, 13);
179179 this.label68.TabIndex = 49;
180- this.label68.Text = "Audio Tracks";
180+ this.label68.Text = "音声トラック";
181181 //
182182 // lbl_sampleRate
183183 //
@@ -187,7 +187,7 @@ namespace Handbrake.Controls
187187 this.lbl_sampleRate.Name = "lbl_sampleRate";
188188 this.lbl_sampleRate.Size = new System.Drawing.Size(61, 13);
189189 this.lbl_sampleRate.TabIndex = 57;
190- this.lbl_sampleRate.Text = "Samplerate";
190+ this.lbl_sampleRate.Text = "サンプルレート";
191191 //
192192 // lbl_bitrate
193193 //
@@ -197,7 +197,7 @@ namespace Handbrake.Controls
197197 this.lbl_bitrate.Name = "lbl_bitrate";
198198 this.lbl_bitrate.Size = new System.Drawing.Size(39, 13);
199199 this.lbl_bitrate.TabIndex = 59;
200- this.lbl_bitrate.Text = "Bitrate";
200+ this.lbl_bitrate.Text = "ビットレート";
201201 //
202202 // label65
203203 //
@@ -205,9 +205,9 @@ namespace Handbrake.Controls
205205 this.label65.BackColor = System.Drawing.Color.Transparent;
206206 this.label65.Location = new System.Drawing.Point(234, 17);
207207 this.label65.Name = "label65";
208- this.label65.Size = new System.Drawing.Size(67, 13);
208+ this.label65.Size = new System.Drawing.Size(74, 13);
209209 this.label65.TabIndex = 53;
210- this.label65.Text = "Audio Codec";
210+ this.label65.Text = "音声コーデック";
211211 //
212212 // lbl_mixdown
213213 //
@@ -217,7 +217,7 @@ namespace Handbrake.Controls
217217 this.lbl_mixdown.Name = "lbl_mixdown";
218218 this.lbl_mixdown.Size = new System.Drawing.Size(49, 13);
219219 this.lbl_mixdown.TabIndex = 55;
220- this.lbl_mixdown.Text = "Mixdown";
220+ this.lbl_mixdown.Text = "ミックスダウン";
221221 //
222222 // drp_audioEncoder
223223 //
@@ -242,9 +242,9 @@ namespace Handbrake.Controls
242242 this.label27.BackColor = System.Drawing.Color.Transparent;
243243 this.label27.Location = new System.Drawing.Point(86, 17);
244244 this.label27.Name = "label27";
245- this.label27.Size = new System.Drawing.Size(40, 13);
245+ this.label27.Size = new System.Drawing.Size(35, 13);
246246 this.label27.TabIndex = 51;
247- this.label27.Text = "Source";
247+ this.label27.Text = "ソース";
248248 //
249249 // drp_audioMix
250250 //
@@ -334,7 +334,7 @@ namespace Handbrake.Controls
334334 this.AudioTrackGroup.Size = new System.Drawing.Size(685, 77);
335335 this.AudioTrackGroup.TabIndex = 66;
336336 this.AudioTrackGroup.TabStop = false;
337- this.AudioTrackGroup.Text = "Selected Track: New Track";
337+ this.AudioTrackGroup.Text = "選択中のトラック: 新規トラック";
338338 //
339339 // AudioMenuRowHeightHack
340340 //
--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -54,7 +54,7 @@
5454 //
5555 this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
5656 | System.Windows.Forms.AnchorStyles.Right)));
57- this.text_customDT.Location = new System.Drawing.Point(251, 3);
57+ this.text_customDT.Location = new System.Drawing.Point(281, 3);
5858 this.text_customDT.Name = "text_customDT";
5959 this.text_customDT.Size = new System.Drawing.Size(115, 21);
6060 this.text_customDT.TabIndex = 47;
@@ -70,7 +70,7 @@
7070 this.label18.Name = "label18";
7171 this.label18.Size = new System.Drawing.Size(61, 13);
7272 this.label18.TabIndex = 46;
73- this.label18.Text = "Detelecine:";
73+ this.label18.Text = "逆テレシネ:";
7474 //
7575 // drop_detelecine
7676 //
@@ -82,7 +82,7 @@
8282 "Off",
8383 "Custom",
8484 "Default"});
85- this.drop_detelecine.Location = new System.Drawing.Point(71, 3);
85+ this.drop_detelecine.Location = new System.Drawing.Point(101, 3);
8686 this.drop_detelecine.Name = "drop_detelecine";
8787 this.drop_detelecine.Size = new System.Drawing.Size(174, 21);
8888 this.drop_detelecine.TabIndex = 45;
@@ -92,7 +92,7 @@
9292 //
9393 this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
9494 | System.Windows.Forms.AnchorStyles.Right)));
95- this.text_customDC.Location = new System.Drawing.Point(251, 30);
95+ this.text_customDC.Location = new System.Drawing.Point(281, 30);
9696 this.text_customDC.Name = "text_customDC";
9797 this.text_customDC.Size = new System.Drawing.Size(115, 21);
9898 this.text_customDC.TabIndex = 50;
@@ -120,7 +120,7 @@
120120 "Off",
121121 "Custom",
122122 "Default"});
123- this.drop_decomb.Location = new System.Drawing.Point(71, 30);
123+ this.drop_decomb.Location = new System.Drawing.Point(101, 30);
124124 this.drop_decomb.Name = "drop_decomb";
125125 this.drop_decomb.Size = new System.Drawing.Size(174, 21);
126126 this.drop_decomb.TabIndex = 48;
@@ -130,7 +130,7 @@
130130 //
131131 this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
132132 | System.Windows.Forms.AnchorStyles.Right)));
133- this.text_customDI.Location = new System.Drawing.Point(251, 57);
133+ this.text_customDI.Location = new System.Drawing.Point(281, 57);
134134 this.text_customDI.Name = "text_customDI";
135135 this.text_customDI.Size = new System.Drawing.Size(115, 21);
136136 this.text_customDI.TabIndex = 53;
@@ -144,9 +144,9 @@
144144 this.label2.Location = new System.Drawing.Point(0, 61);
145145 this.label2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
146146 this.label2.Name = "label2";
147- this.label2.Size = new System.Drawing.Size(65, 13);
147+ this.label2.Size = new System.Drawing.Size(85, 13);
148148 this.label2.TabIndex = 52;
149- this.label2.Text = "Deinterlace:";
149+ this.label2.Text = "デインターレース:";
150150 //
151151 // drop_deinterlace
152152 //
@@ -160,7 +160,7 @@
160160 "Fast",
161161 "Slow",
162162 "Slower"});
163- this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);
163+ this.drop_deinterlace.Location = new System.Drawing.Point(101, 57);
164164 this.drop_deinterlace.Name = "drop_deinterlace";
165165 this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);
166166 this.drop_deinterlace.TabIndex = 51;
@@ -170,7 +170,7 @@
170170 //
171171 this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
172172 | System.Windows.Forms.AnchorStyles.Right)));
173- this.text_customDN.Location = new System.Drawing.Point(251, 84);
173+ this.text_customDN.Location = new System.Drawing.Point(281, 84);
174174 this.text_customDN.Name = "text_customDN";
175175 this.text_customDN.Size = new System.Drawing.Size(115, 21);
176176 this.text_customDN.TabIndex = 56;
@@ -184,9 +184,9 @@
184184 this.label3.Location = new System.Drawing.Point(0, 88);
185185 this.label3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
186186 this.label3.Name = "label3";
187- this.label3.Size = new System.Drawing.Size(49, 13);
187+ this.label3.Size = new System.Drawing.Size(62, 13);
188188 this.label3.TabIndex = 55;
189- this.label3.Text = "Denoise:";
189+ this.label3.Text = "ノイズ軽減:";
190190 //
191191 // drop_denoise
192192 //
@@ -200,7 +200,7 @@
200200 "Weak",
201201 "Medium",
202202 "Strong"});
203- this.drop_denoise.Location = new System.Drawing.Point(71, 84);
203+ this.drop_denoise.Location = new System.Drawing.Point(101, 84);
204204 this.drop_denoise.Name = "drop_denoise";
205205 this.drop_denoise.Size = new System.Drawing.Size(174, 21);
206206 this.drop_denoise.TabIndex = 54;
@@ -210,8 +210,12 @@
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
213214 this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;
214215 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
215219 this.slider_deblock.Maximum = 15;
216220 this.slider_deblock.Minimum = 4;
217221 this.slider_deblock.Name = "slider_deblock";
@@ -224,11 +228,11 @@
224228 //
225229 this.check_grayscale.AutoSize = true;
226230 this.check_grayscale.BackColor = System.Drawing.Color.Transparent;
227- this.check_grayscale.Location = new System.Drawing.Point(71, 162);
231+ this.check_grayscale.Location = new System.Drawing.Point(101, 162);
228232 this.check_grayscale.Name = "check_grayscale";
229- this.check_grayscale.Size = new System.Drawing.Size(119, 17);
233+ this.check_grayscale.Size = new System.Drawing.Size(115, 17);
230234 this.check_grayscale.TabIndex = 57;
231- this.check_grayscale.Text = "Grayscale Encoding";
235+ this.check_grayscale.Text = "グレイスケール変換";
232236 this.check_grayscale.UseVisualStyleBackColor = false;
233237 //
234238 // label8
@@ -238,15 +242,15 @@
238242 this.label8.Location = new System.Drawing.Point(0, 115);
239243 this.label8.Margin = new System.Windows.Forms.Padding(0, 7, 3, 3);
240244 this.label8.Name = "label8";
241- this.label8.Size = new System.Drawing.Size(48, 13);
245+ this.label8.Size = new System.Drawing.Size(95, 13);
242246 this.label8.TabIndex = 60;
243- this.label8.Text = "Deblock:";
247+ this.label8.Text = "ブロックノイズ軽減:";
244248 //
245249 // lbl_deblockVal
246250 //
247251 this.lbl_deblockVal.AutoSize = true;
248252 this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;
249- this.lbl_deblockVal.Location = new System.Drawing.Point(251, 115);
253+ this.lbl_deblockVal.Location = new System.Drawing.Point(281, 115);
250254 this.lbl_deblockVal.Margin = new System.Windows.Forms.Padding(3, 7, 3, 3);
251255 this.lbl_deblockVal.Name = "lbl_deblockVal";
252256 this.lbl_deblockVal.Size = new System.Drawing.Size(23, 13);
@@ -260,9 +264,9 @@
260264 this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
261265 this.label68.Location = new System.Drawing.Point(13, 13);
262266 this.label68.Name = "label68";
263- this.label68.Size = new System.Drawing.Size(42, 13);
267+ this.label68.Size = new System.Drawing.Size(44, 13);
264268 this.label68.TabIndex = 61;
265- this.label68.Text = "Filters";
269+ this.label68.Text = "フィルタ";
266270 //
267271 // tableLayoutPanel1
268272 //
@@ -296,7 +300,7 @@
296300 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
297301 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
298302 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
299- this.tableLayoutPanel1.Size = new System.Drawing.Size(369, 182);
303+ this.tableLayoutPanel1.Size = new System.Drawing.Size(399, 182);
300304 this.tableLayoutPanel1.TabIndex = 62;
301305 //
302306 // Filters
--- a/win/C#/Controls/PictureSettings.Designer.cs
+++ b/win/C#/Controls/PictureSettings.Designer.cs
@@ -118,9 +118,9 @@ namespace Handbrake.Controls
118118 this.Label15.Location = new System.Drawing.Point(0, 99);
119119 this.Label15.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
120120 this.Label15.Name = "Label15";
121- this.Label15.Size = new System.Drawing.Size(26, 13);
121+ this.Label15.Size = new System.Drawing.Size(19, 13);
122122 this.Label15.TabIndex = 97;
123- this.Label15.Text = "Left";
123+ this.Label15.Text = "左";
124124 //
125125 // crop_left
126126 //
@@ -130,7 +130,7 @@ namespace Handbrake.Controls
130130 0,
131131 0,
132132 0});
133- this.crop_left.Location = new System.Drawing.Point(32, 95);
133+ this.crop_left.Location = new System.Drawing.Point(25, 95);
134134 this.crop_left.Maximum = new decimal(new int[] {
135135 1920,
136136 0,
@@ -149,7 +149,7 @@ namespace Handbrake.Controls
149149 0,
150150 0,
151151 0});
152- this.crop_right.Location = new System.Drawing.Point(132, 95);
152+ this.crop_right.Location = new System.Drawing.Point(125, 95);
153153 this.crop_right.Maximum = new decimal(new int[] {
154154 1920,
155155 0,
@@ -169,10 +169,10 @@ namespace Handbrake.Controls
169169 this.check_autoCrop.Location = new System.Drawing.Point(0, 3);
170170 this.check_autoCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
171171 this.check_autoCrop.Name = "check_autoCrop";
172- this.check_autoCrop.Size = new System.Drawing.Size(73, 17);
172+ this.check_autoCrop.Size = new System.Drawing.Size(49, 17);
173173 this.check_autoCrop.TabIndex = 105;
174174 this.check_autoCrop.TabStop = true;
175- this.check_autoCrop.Text = "Automatic";
175+ this.check_autoCrop.Text = "自動";
176176 this.check_autoCrop.UseVisualStyleBackColor = true;
177177 this.check_autoCrop.CheckedChanged += new System.EventHandler(this.CheckAutoCropCheckedChanged);
178178 //
@@ -182,12 +182,12 @@ namespace Handbrake.Controls
182182 this.Label51.AutoSize = true;
183183 this.Label51.BackColor = System.Drawing.Color.Transparent;
184184 this.Label51.ImeMode = System.Windows.Forms.ImeMode.NoControl;
185- this.Label51.Location = new System.Drawing.Point(182, 99);
185+ this.Label51.Location = new System.Drawing.Point(175, 99);
186186 this.Label51.Margin = new System.Windows.Forms.Padding(3);
187187 this.Label51.Name = "Label51";
188- this.Label51.Size = new System.Drawing.Size(32, 13);
188+ this.Label51.Size = new System.Drawing.Size(19, 13);
189189 this.Label51.TabIndex = 102;
190- this.Label51.Text = "Right";
190+ this.Label51.Text = "右";
191191 //
192192 // crop_top
193193 //
@@ -197,7 +197,7 @@ namespace Handbrake.Controls
197197 0,
198198 0,
199199 0});
200- this.crop_top.Location = new System.Drawing.Point(82, 68);
200+ this.crop_top.Location = new System.Drawing.Point(75, 68);
201201 this.crop_top.Maximum = new decimal(new int[] {
202202 1080,
203203 0,
@@ -214,12 +214,12 @@ namespace Handbrake.Controls
214214 this.Label53.AutoSize = true;
215215 this.Label53.BackColor = System.Drawing.Color.Transparent;
216216 this.Label53.ImeMode = System.Windows.Forms.ImeMode.NoControl;
217- this.Label53.Location = new System.Drawing.Point(83, 149);
217+ this.Label53.Location = new System.Drawing.Point(87, 149);
218218 this.Label53.Margin = new System.Windows.Forms.Padding(3);
219219 this.Label53.Name = "Label53";
220- this.Label53.Size = new System.Drawing.Size(41, 13);
220+ this.Label53.Size = new System.Drawing.Size(19, 13);
221221 this.Label53.TabIndex = 104;
222- this.Label53.Text = "Bottom";
222+ this.Label53.Text = "下";
223223 //
224224 // Label52
225225 //
@@ -227,12 +227,12 @@ namespace Handbrake.Controls
227227 this.Label52.AutoSize = true;
228228 this.Label52.BackColor = System.Drawing.Color.Transparent;
229229 this.Label52.ImeMode = System.Windows.Forms.ImeMode.NoControl;
230- this.Label52.Location = new System.Drawing.Point(91, 49);
230+ this.Label52.Location = new System.Drawing.Point(87, 49);
231231 this.Label52.Margin = new System.Windows.Forms.Padding(3);
232232 this.Label52.Name = "Label52";
233- this.Label52.Size = new System.Drawing.Size(25, 13);
233+ this.Label52.Size = new System.Drawing.Size(19, 13);
234234 this.Label52.TabIndex = 99;
235- this.Label52.Text = "Top";
235+ this.Label52.Text = "上";
236236 //
237237 // crop_bottom
238238 //
@@ -242,7 +242,7 @@ namespace Handbrake.Controls
242242 0,
243243 0,
244244 0});
245- this.crop_bottom.Location = new System.Drawing.Point(82, 122);
245+ this.crop_bottom.Location = new System.Drawing.Point(75, 122);
246246 this.crop_bottom.Maximum = new decimal(new int[] {
247247 1080,
248248 0,
@@ -263,7 +263,7 @@ namespace Handbrake.Controls
263263 this.check_customCrop.Name = "check_customCrop";
264264 this.check_customCrop.Size = new System.Drawing.Size(61, 17);
265265 this.check_customCrop.TabIndex = 106;
266- this.check_customCrop.Text = "Custom";
266+ this.check_customCrop.Text = "カスタム";
267267 this.check_customCrop.UseVisualStyleBackColor = true;
268268 //
269269 // tableLayoutPanel2
@@ -300,9 +300,9 @@ namespace Handbrake.Controls
300300 this.label7.Location = new System.Drawing.Point(0, 3);
301301 this.label7.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
302302 this.label7.Name = "label7";
303- this.label7.Size = new System.Drawing.Size(44, 13);
303+ this.label7.Size = new System.Drawing.Size(39, 13);
304304 this.label7.TabIndex = 76;
305- this.label7.Text = "Source:";
305+ this.label7.Text = "ソース:";
306306 //
307307 // lbl_src_res
308308 //
@@ -310,7 +310,7 @@ namespace Handbrake.Controls
310310 this.lbl_src_res.AutoSize = true;
311311 this.lbl_src_res.BackColor = System.Drawing.Color.Transparent;
312312 this.lbl_src_res.ImeMode = System.Windows.Forms.ImeMode.NoControl;
313- this.lbl_src_res.Location = new System.Drawing.Point(50, 3);
313+ this.lbl_src_res.Location = new System.Drawing.Point(45, 3);
314314 this.lbl_src_res.Margin = new System.Windows.Forms.Padding(3);
315315 this.lbl_src_res.Name = "lbl_src_res";
316316 this.lbl_src_res.Size = new System.Drawing.Size(15, 13);
@@ -327,13 +327,13 @@ namespace Handbrake.Controls
327327 this.Label55.Location = new System.Drawing.Point(0, 26);
328328 this.Label55.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
329329 this.Label55.Name = "Label55";
330- this.Label55.Size = new System.Drawing.Size(39, 13);
330+ this.Label55.Size = new System.Drawing.Size(23, 13);
331331 this.Label55.TabIndex = 80;
332- this.Label55.Text = "Width:";
332+ this.Label55.Text = "幅:";
333333 //
334334 // text_width
335335 //
336- this.text_width.Location = new System.Drawing.Point(50, 22);
336+ this.text_width.Location = new System.Drawing.Point(45, 22);
337337 this.text_width.Maximum = new decimal(new int[] {
338338 2560,
339339 0,
@@ -351,12 +351,12 @@ namespace Handbrake.Controls
351351 this.label4.BackColor = System.Drawing.Color.Transparent;
352352 this.label4.ForeColor = System.Drawing.Color.Black;
353353 this.label4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
354- this.label4.Location = new System.Drawing.Point(120, 26);
354+ this.label4.Location = new System.Drawing.Point(115, 26);
355355 this.label4.Margin = new System.Windows.Forms.Padding(3);
356356 this.label4.Name = "label4";
357- this.label4.Size = new System.Drawing.Size(42, 13);
357+ this.label4.Size = new System.Drawing.Size(31, 13);
358358 this.label4.TabIndex = 84;
359- this.label4.Text = "Height:";
359+ this.label4.Text = "高さ:";
360360 //
361361 // text_height
362362 //
@@ -378,11 +378,11 @@ namespace Handbrake.Controls
378378 this.check_KeepAR.CheckState = System.Windows.Forms.CheckState.Checked;
379379 this.tableLayoutPanel2.SetColumnSpan(this.check_KeepAR, 3);
380380 this.check_KeepAR.ImeMode = System.Windows.Forms.ImeMode.NoControl;
381- this.check_KeepAR.Location = new System.Drawing.Point(50, 49);
381+ this.check_KeepAR.Location = new System.Drawing.Point(45, 49);
382382 this.check_KeepAR.Name = "check_KeepAR";
383- this.check_KeepAR.Size = new System.Drawing.Size(114, 17);
383+ this.check_KeepAR.Size = new System.Drawing.Size(95, 17);
384384 this.check_KeepAR.TabIndex = 95;
385- this.check_KeepAR.Text = "Keep Aspect Ratio";
385+ this.check_KeepAR.Text = "縦横比を維持";
386386 this.check_KeepAR.UseVisualStyleBackColor = true;
387387 this.check_KeepAR.CheckedChanged += new System.EventHandler(this.CheckKeepArCheckedChanged);
388388 //
@@ -414,12 +414,12 @@ namespace Handbrake.Controls
414414 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
415415 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
416416 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
417- this.tableLayoutPanel1.Size = new System.Drawing.Size(195, 154);
417+ this.tableLayoutPanel1.Size = new System.Drawing.Size(188, 154);
418418 this.tableLayoutPanel1.TabIndex = 115;
419419 //
420420 // updownParHeight
421421 //
422- this.updownParHeight.Location = new System.Drawing.Point(82, 111);
422+ this.updownParHeight.Location = new System.Drawing.Point(75, 111);
423423 this.updownParHeight.Maximum = new decimal(new int[] {
424424 10000,
425425 0,
@@ -439,16 +439,16 @@ namespace Handbrake.Controls
439439 this.label6.Location = new System.Drawing.Point(0, 7);
440440 this.label6.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
441441 this.label6.Name = "label6";
442- this.label6.Size = new System.Drawing.Size(67, 13);
442+ this.label6.Size = new System.Drawing.Size(69, 13);
443443 this.label6.TabIndex = 81;
444- this.label6.Text = "Anamorphic:";
444+ this.label6.Text = "アナモフィック:";
445445 //
446446 // labelDisplaySize
447447 //
448448 this.labelDisplaySize.AutoSize = true;
449449 this.labelDisplaySize.BackColor = System.Drawing.Color.Transparent;
450450 this.labelDisplaySize.ImeMode = System.Windows.Forms.ImeMode.NoControl;
451- this.labelDisplaySize.Location = new System.Drawing.Point(82, 138);
451+ this.labelDisplaySize.Location = new System.Drawing.Point(75, 138);
452452 this.labelDisplaySize.Margin = new System.Windows.Forms.Padding(3);
453453 this.labelDisplaySize.Name = "labelDisplaySize";
454454 this.labelDisplaySize.Size = new System.Drawing.Size(15, 13);
@@ -464,9 +464,9 @@ namespace Handbrake.Controls
464464 this.lbl_parHeight.Location = new System.Drawing.Point(0, 115);
465465 this.lbl_parHeight.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
466466 this.lbl_parHeight.Name = "lbl_parHeight";
467- this.lbl_parHeight.Size = new System.Drawing.Size(65, 13);
467+ this.lbl_parHeight.Size = new System.Drawing.Size(51, 13);
468468 this.lbl_parHeight.TabIndex = 94;
469- this.lbl_parHeight.Text = "PAR Height:";
469+ this.lbl_parHeight.Text = "PAR高さ:";
470470 //
471471 // labelStaticDisplaySize
472472 //
@@ -477,13 +477,13 @@ namespace Handbrake.Controls
477477 this.labelStaticDisplaySize.Location = new System.Drawing.Point(0, 138);
478478 this.labelStaticDisplaySize.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
479479 this.labelStaticDisplaySize.Name = "labelStaticDisplaySize";
480- this.labelStaticDisplaySize.Size = new System.Drawing.Size(67, 13);
480+ this.labelStaticDisplaySize.Size = new System.Drawing.Size(64, 13);
481481 this.labelStaticDisplaySize.TabIndex = 107;
482- this.labelStaticDisplaySize.Text = "Display Size:";
482+ this.labelStaticDisplaySize.Text = "表示サイズ:";
483483 //
484484 // updownParWidth
485485 //
486- this.updownParWidth.Location = new System.Drawing.Point(82, 84);
486+ this.updownParWidth.Location = new System.Drawing.Point(75, 84);
487487 this.updownParWidth.Maximum = new decimal(new int[] {
488488 10000,
489489 0,
@@ -503,7 +503,7 @@ namespace Handbrake.Controls
503503 "Strict",
504504 "Loose",
505505 "Custom"});
506- this.drp_anamorphic.Location = new System.Drawing.Point(82, 3);
506+ this.drp_anamorphic.Location = new System.Drawing.Point(75, 3);
507507 this.drp_anamorphic.Name = "drp_anamorphic";
508508 this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);
509509 this.drp_anamorphic.TabIndex = 82;
@@ -518,13 +518,13 @@ namespace Handbrake.Controls
518518 this.lbl_parWidth.Location = new System.Drawing.Point(0, 88);
519519 this.lbl_parWidth.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
520520 this.lbl_parWidth.Name = "lbl_parWidth";
521- this.lbl_parWidth.Size = new System.Drawing.Size(62, 13);
521+ this.lbl_parWidth.Size = new System.Drawing.Size(43, 13);
522522 this.lbl_parWidth.TabIndex = 92;
523- this.lbl_parWidth.Text = "PAR Width:";
523+ this.lbl_parWidth.Text = "PAR幅:";
524524 //
525525 // updownDisplayWidth
526526 //
527- this.updownDisplayWidth.Location = new System.Drawing.Point(82, 57);
527+ this.updownDisplayWidth.Location = new System.Drawing.Point(75, 57);
528528 this.updownDisplayWidth.Maximum = new decimal(new int[] {
529529 2560,
530530 0,
@@ -557,9 +557,9 @@ namespace Handbrake.Controls
557557 this.lbl_displayWidth.Location = new System.Drawing.Point(0, 61);
558558 this.lbl_displayWidth.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
559559 this.lbl_displayWidth.Name = "lbl_displayWidth";
560- this.lbl_displayWidth.Size = new System.Drawing.Size(76, 13);
560+ this.lbl_displayWidth.Size = new System.Drawing.Size(47, 13);
561561 this.lbl_displayWidth.TabIndex = 90;
562- this.lbl_displayWidth.Text = "Display Width:";
562+ this.lbl_displayWidth.Text = "表示幅:";
563563 //
564564 // drp_modulus
565565 //
@@ -570,7 +570,7 @@ namespace Handbrake.Controls
570570 "8",
571571 "4",
572572 "2"});
573- this.drp_modulus.Location = new System.Drawing.Point(82, 30);
573+ this.drp_modulus.Location = new System.Drawing.Point(75, 30);
574574 this.drp_modulus.Name = "drp_modulus";
575575 this.drp_modulus.Size = new System.Drawing.Size(110, 21);
576576 this.drp_modulus.TabIndex = 88;
@@ -584,9 +584,9 @@ namespace Handbrake.Controls
584584 this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl;
585585 this.label8.Location = new System.Drawing.Point(416, 13);
586586 this.label8.Name = "label8";
587- this.label8.Size = new System.Drawing.Size(57, 13);
587+ this.label8.Size = new System.Drawing.Size(55, 13);
588588 this.label8.TabIndex = 114;
589- this.label8.Text = "Cropping";
589+ this.label8.Text = "切り抜き:";
590590 //
591591 // label26
592592 //
@@ -596,9 +596,9 @@ namespace Handbrake.Controls
596596 this.label26.ImeMode = System.Windows.Forms.ImeMode.NoControl;
597597 this.label26.Location = new System.Drawing.Point(13, 13);
598598 this.label26.Name = "label26";
599- this.label26.Size = new System.Drawing.Size(30, 13);
599+ this.label26.Size = new System.Drawing.Size(42, 13);
600600 this.label26.TabIndex = 113;
601- this.label26.Text = "Size";
601+ this.label26.Text = "サイズ:";
602602 //
603603 // lbl_presetCropWarning
604604 //
--- a/win/C#/Controls/Subtitles.Designer.cs
+++ b/win/C#/Controls/Subtitles.Designer.cs
@@ -75,10 +75,10 @@
7575 this.btn_addTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
7676 this.btn_addTrack.Location = new System.Drawing.Point(16, 38);
7777 this.btn_addTrack.Name = "btn_addTrack";
78- this.btn_addTrack.Size = new System.Drawing.Size(57, 23);
78+ this.btn_addTrack.Size = new System.Drawing.Size(65, 23);
7979 this.btn_addTrack.TabIndex = 68;
80- this.btn_addTrack.Text = "Add";
81- this.toolTip.SetToolTip(this.btn_addTrack, "Add a new subtitle track to the list below");
80+ this.btn_addTrack.Text = "追加";
81+ this.toolTip.SetToolTip(this.btn_addTrack, "リストに新規字幕トラックを追加");
8282 this.btn_addTrack.UseVisualStyleBackColor = false;
8383 this.btn_addTrack.Click += new System.EventHandler(this.BtnAddSubTrackClick);
8484 //
@@ -87,11 +87,11 @@
8787 this.btn_RemoveSubTrack.BackColor = System.Drawing.Color.Transparent;
8888 this.btn_RemoveSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
8989 this.btn_RemoveSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
90- this.btn_RemoveSubTrack.Location = new System.Drawing.Point(79, 38);
90+ this.btn_RemoveSubTrack.Location = new System.Drawing.Point(87, 38);
9191 this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack";
92- this.btn_RemoveSubTrack.Size = new System.Drawing.Size(73, 23);
92+ this.btn_RemoveSubTrack.Size = new System.Drawing.Size(65, 23);
9393 this.btn_RemoveSubTrack.TabIndex = 69;
94- this.btn_RemoveSubTrack.Text = "Remove";
94+ this.btn_RemoveSubTrack.Text = "削除";
9595 this.btn_RemoveSubTrack.UseVisualStyleBackColor = false;
9696 this.btn_RemoveSubTrack.Click += new System.EventHandler(this.BtnRemoveSubTrackClick);
9797 //
@@ -121,36 +121,36 @@
121121 //
122122 // col_Source
123123 //
124- this.col_Source.Text = "Track";
124+ this.col_Source.Text = "トラック";
125125 this.col_Source.Width = 139;
126126 //
127127 // col_forced
128128 //
129- this.col_forced.Text = "Forced Only";
129+ this.col_forced.Text = "強制字幕のみ";
130130 this.col_forced.Width = 74;
131131 //
132132 // col_burned
133133 //
134- this.col_burned.Text = "Burned In";
134+ this.col_burned.Text = "焼き込み";
135135 this.col_burned.Width = 64;
136136 //
137137 // col_defaultTrack
138138 //
139- this.col_defaultTrack.Text = "Default";
139+ this.col_defaultTrack.Text = "デフォルト";
140140 this.col_defaultTrack.Width = 56;
141141 //
142142 // col_srtLang
143143 //
144- this.col_srtLang.Text = "Srt Lang";
144+ this.col_srtLang.Text = "SRT言語";
145145 //
146146 // col_srtChar
147147 //
148- this.col_srtChar.Text = "Srt CharCode";
148+ this.col_srtChar.Text = "文字コード";
149149 this.col_srtChar.Width = 110;
150150 //
151151 // col_srtOffset
152152 //
153- this.col_srtOffset.Text = "Srt Offset";
153+ this.col_srtOffset.Text = "オフセット";
154154 this.col_srtOffset.Width = 70;
155155 //
156156 // subMenu
@@ -197,9 +197,9 @@
197197 this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
198198 this.label68.Location = new System.Drawing.Point(13, 13);
199199 this.label68.Name = "label68";
200- this.label68.Size = new System.Drawing.Size(57, 13);
200+ this.label68.Size = new System.Drawing.Size(33, 13);
201201 this.label68.TabIndex = 67;
202- this.label68.Text = "Subtitles";
202+ this.label68.Text = "字幕";
203203 //
204204 // SubGroupBox
205205 //
@@ -223,7 +223,7 @@
223223 this.SubGroupBox.Size = new System.Drawing.Size(688, 73);
224224 this.SubGroupBox.TabIndex = 72;
225225 this.SubGroupBox.TabStop = false;
226- this.SubGroupBox.Text = "Selected Track: New Track";
226+ this.SubGroupBox.Text = "選択中のトラック: 新規トラック";
227227 //
228228 // drp_subtitleTracks
229229 //
@@ -240,27 +240,27 @@
240240 this.label10.AutoSize = true;
241241 this.label10.Location = new System.Drawing.Point(308, 19);
242242 this.label10.Name = "label10";
243- this.label10.Size = new System.Drawing.Size(42, 13);
243+ this.label10.Size = new System.Drawing.Size(51, 13);
244244 this.label10.TabIndex = 81;
245- this.label10.Text = "Default";
245+ this.label10.Text = "デフォルト";
246246 //
247247 // label9
248248 //
249249 this.label9.AutoSize = true;
250- this.label9.Location = new System.Drawing.Point(248, 19);
250+ this.label9.Location = new System.Drawing.Point(254, 19);
251251 this.label9.Name = "label9";
252- this.label9.Size = new System.Drawing.Size(54, 13);
252+ this.label9.Size = new System.Drawing.Size(51, 13);
253253 this.label9.TabIndex = 80;
254- this.label9.Text = "Burned In";
254+ this.label9.Text = "焼き込み";
255255 //
256256 // label2
257257 //
258258 this.label2.AutoSize = true;
259- this.label2.Location = new System.Drawing.Point(371, 19);
259+ this.label2.Location = new System.Drawing.Point(390, 19);
260260 this.label2.Name = "label2";
261- this.label2.Size = new System.Drawing.Size(71, 13);
261+ this.label2.Size = new System.Drawing.Size(31, 13);
262262 this.label2.TabIndex = 72;
263- this.label2.Text = "Srt Language";
263+ this.label2.Text = "言語";
264264 //
265265 // srt_offset
266266 //
@@ -302,9 +302,10 @@
302302 this.label8.AutoSize = true;
303303 this.label8.Location = new System.Drawing.Point(177, 19);
304304 this.label8.Name = "label8";
305- this.label8.Size = new System.Drawing.Size(65, 13);
305+ this.label8.Size = new System.Drawing.Size(76, 13);
306306 this.label8.TabIndex = 79;
307- this.label8.Text = "Forced Only";
307+ this.label8.Text = "強制字幕のみ";
308+ this.toolTip.SetToolTip(this.label8, "「Forced」フラグがつけられた字幕のみを字幕化します。");
308309 //
309310 // srt_charcode
310311 //
@@ -354,9 +355,9 @@
354355 this.label4.AutoSize = true;
355356 this.label4.Location = new System.Drawing.Point(548, 19);
356357 this.label4.Name = "label4";
357- this.label4.Size = new System.Drawing.Size(62, 13);
358+ this.label4.Size = new System.Drawing.Size(87, 13);
358359 this.label4.TabIndex = 76;
359- this.label4.Text = "Offset (ms)";
360+ this.label4.Text = "オフセット(ミリ秒)";
360361 //
361362 // check_forced
362363 //
@@ -373,23 +374,23 @@
373374 this.label7.AutoSize = true;
374375 this.label7.Location = new System.Drawing.Point(69, 19);
375376 this.label7.Name = "label7";
376- this.label7.Size = new System.Drawing.Size(37, 13);
377+ this.label7.Size = new System.Drawing.Size(42, 13);
377378 this.label7.TabIndex = 78;
378- this.label7.Text = "Track:";
379+ this.label7.Text = "トラック:";
379380 //
380381 // label3
381382 //
382383 this.label3.AutoSize = true;
383- this.label3.Location = new System.Drawing.Point(471, 19);
384+ this.label3.Location = new System.Drawing.Point(475, 19);
384385 this.label3.Name = "label3";
385386 this.label3.Size = new System.Drawing.Size(58, 13);
386387 this.label3.TabIndex = 74;
387- this.label3.Text = "Char Code";
388+ this.label3.Text = "文字コード";
388389 //
389390 // check_default
390391 //
391392 this.check_default.AutoSize = true;
392- this.check_default.Location = new System.Drawing.Point(320, 38);
393+ this.check_default.Location = new System.Drawing.Point(324, 38);
393394 this.check_default.Name = "check_default";
394395 this.check_default.Size = new System.Drawing.Size(15, 14);
395396 this.check_default.TabIndex = 77;
@@ -399,7 +400,7 @@
399400 // check_burned
400401 //
401402 this.check_burned.AutoSize = true;
402- this.check_burned.Location = new System.Drawing.Point(260, 38);
403+ this.check_burned.Location = new System.Drawing.Point(266, 38);
403404 this.check_burned.Name = "check_burned";
404405 this.check_burned.Size = new System.Drawing.Size(15, 14);
405406 this.check_burned.TabIndex = 76;
@@ -413,10 +414,10 @@
413414 this.btn_srtAdd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
414415 this.btn_srtAdd.Location = new System.Drawing.Point(158, 38);
415416 this.btn_srtAdd.Name = "btn_srtAdd";
416- this.btn_srtAdd.Size = new System.Drawing.Size(88, 23);
417+ this.btn_srtAdd.Size = new System.Drawing.Size(139, 23);
417418 this.btn_srtAdd.TabIndex = 73;
418- this.btn_srtAdd.Text = "Import SRT";
419- this.toolTip.SetToolTip(this.btn_srtAdd, "Add a new SRT file to the \"track\" dropdown menu.");
419+ this.btn_srtAdd.Text = "SRTファイルのインポート";
420+ this.toolTip.SetToolTip(this.btn_srtAdd, "SRT字幕ファイルを字幕トラックとしてインポートします。");
420421 this.btn_srtAdd.UseVisualStyleBackColor = false;
421422 this.btn_srtAdd.Click += new System.EventHandler(this.BtnSrtAddClick);
422423 //
@@ -432,8 +433,8 @@
432433 this.Controls.Add(this.SubGroupBox);
433434 this.Controls.Add(this.btn_addTrack);
434435 this.Controls.Add(this.label68);
435- this.Controls.Add(this.btn_RemoveSubTrack);
436436 this.Controls.Add(this.lv_subList);
437+ this.Controls.Add(this.btn_RemoveSubTrack);
437438 this.Controls.Add(this.btn_srtAdd);
438439 this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
439440 this.Name = "Subtitles";
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -167,7 +167,7 @@ namespace Handbrake.Controls
167167 this.btn_reset.Name = "btn_reset";
168168 this.btn_reset.Size = new System.Drawing.Size(75, 23);
169169 this.btn_reset.TabIndex = 79;
170- this.btn_reset.Text = "Reset All";
170+ this.btn_reset.Text = "リセット";
171171 this.btn_reset.UseVisualStyleBackColor = true;
172172 this.btn_reset.Click += new System.EventHandler(this.btn_reset_Click);
173173 //
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -52,7 +52,7 @@ namespace Handbrake
5252 this.lbl_name.AutoSize = true;
5353 this.lbl_name.Location = new System.Drawing.Point(12, 18);
5454 this.lbl_name.Name = "lbl_name";
55- this.lbl_name.Size = new System.Drawing.Size(75, 13);
55+ this.lbl_name.Size = new System.Drawing.Size(66, 13);
5656 this.lbl_name.TabIndex = 1;
5757 this.lbl_name.Text = "プリセット名:";
5858 //
@@ -71,7 +71,7 @@ namespace Handbrake
7171 this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
7272 this.btn_add.Location = new System.Drawing.Point(185, 133);
7373 this.btn_add.Name = "btn_add";
74- this.btn_add.Size = new System.Drawing.Size(57, 22);
74+ this.btn_add.Size = new System.Drawing.Size(79, 22);
7575 this.btn_add.TabIndex = 2;
7676 this.btn_add.Text = "追加";
7777 this.btn_add.UseVisualStyleBackColor = false;
@@ -85,7 +85,7 @@ namespace Handbrake
8585 this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
8686 this.btn_cancel.Location = new System.Drawing.Point(248, 133);
8787 this.btn_cancel.Name = "btn_cancel";
88- this.btn_cancel.Size = new System.Drawing.Size(57, 22);
88+ this.btn_cancel.Size = new System.Drawing.Size(79, 22);
8989 this.btn_cancel.TabIndex = 3;
9090 this.btn_cancel.Text = "キャンセル";
9191 this.btn_cancel.UseVisualStyleBackColor = false;
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -39,7 +39,7 @@ namespace Handbrake
3939 this.components = new System.ComponentModel.Container();
4040 System.Windows.Forms.ContextMenuStrip notifyIconMenu;
4141 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
42- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
42+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
4343 this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
4444 this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
4545 this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
@@ -120,13 +120,11 @@ namespace Handbrake
120120 this.radio_avgBitrate = new System.Windows.Forms.RadioButton();
121121 this.radio_targetFilesize = new System.Windows.Forms.RadioButton();
122122 this.label25 = new System.Windows.Forms.Label();
123- this.check_2PassEncode = new System.Windows.Forms.CheckBox();
124123 this.Label2 = new System.Windows.Forms.Label();
125124 this.lbl_SliderValue = new System.Windows.Forms.Label();
126125 this.lbl_framerate = new System.Windows.Forms.Label();
127126 this.tab_picture = new System.Windows.Forms.TabPage();
128127 this.PictureSettings = new Handbrake.Controls.PictureSettings();
129- this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();
130128 this.tabs_panel = new System.Windows.Forms.TabControl();
131129 this.tab_filters = new System.Windows.Forms.TabPage();
132130 this.Filters = new Handbrake.Controls.Filters();
@@ -240,9 +238,9 @@ namespace Handbrake
240238 //
241239 this.text_destination.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
242240 | System.Windows.Forms.AnchorStyles.Right)));
243- this.text_destination.Location = new System.Drawing.Point(36, 3);
241+ this.text_destination.Location = new System.Drawing.Point(90, 3);
244242 this.text_destination.Name = "text_destination";
245- this.text_destination.Size = new System.Drawing.Size(603, 21);
243+ this.text_destination.Size = new System.Drawing.Size(549, 21);
246244 this.text_destination.TabIndex = 1;
247245 this.ToolTip.SetToolTip(this.text_destination, "エンコードしたファイルの保存先を指定します");
248246 this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);
@@ -269,7 +267,7 @@ namespace Handbrake
269267 this.check_largeFile.BackColor = System.Drawing.Color.Transparent;
270268 this.check_largeFile.Location = new System.Drawing.Point(179, 5);
271269 this.check_largeFile.Name = "check_largeFile";
272- this.check_largeFile.Size = new System.Drawing.Size(91, 17);
270+ this.check_largeFile.Size = new System.Drawing.Size(81, 17);
273271 this.check_largeFile.TabIndex = 4;
274272 this.check_largeFile.Text = "64ビットMP4";
275273 this.ToolTip.SetToolTip(this.check_largeFile, "64ビットMP4を作成することで、4GB以上のサイズの動画ファイルが作成可能になります。\r\nただし、AppleTV Take 2以外での再生互換性が無くなる可能性" +
@@ -346,7 +344,7 @@ namespace Handbrake
346344 this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;
347345 this.btn_setDefault.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
348346 this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
349- this.btn_setDefault.Location = new System.Drawing.Point(135, 8);
347+ this.btn_setDefault.Location = new System.Drawing.Point(135, 7);
350348 this.btn_setDefault.Name = "btn_setDefault";
351349 this.btn_setDefault.Size = new System.Drawing.Size(101, 22);
352350 this.btn_setDefault.TabIndex = 1;
@@ -363,7 +361,7 @@ namespace Handbrake
363361 this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;
364362 this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5);
365363 this.check_optimiseMP4.Name = "check_optimiseMP4";
366- this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17);
364+ this.check_optimiseMP4.Size = new System.Drawing.Size(105, 17);
367365 this.check_optimiseMP4.TabIndex = 25;
368366 this.check_optimiseMP4.Text = "Web用に最適化";
369367 this.ToolTip.SetToolTip(this.check_optimiseMP4, "Webからのダウンロード再生に最適化されたプログレッシブ形式MP4ファイルを作成できます。\r\nただし、QuickTimeでは拡張子が.mp4の場合にのみ再生可能で" +
@@ -455,7 +453,7 @@ namespace Handbrake
455453 this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
456454 this.btn_addPreset.Location = new System.Drawing.Point(3, 7);
457455 this.btn_addPreset.Name = "btn_addPreset";
458- this.btn_addPreset.Size = new System.Drawing.Size(49, 22);
456+ this.btn_addPreset.Size = new System.Drawing.Size(60, 22);
459457 this.btn_addPreset.TabIndex = 3;
460458 this.btn_addPreset.TabStop = false;
461459 this.btn_addPreset.Text = "追加";
@@ -468,9 +466,9 @@ namespace Handbrake
468466 this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;
469467 this.btn_removePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
470468 this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
471- this.btn_removePreset.Location = new System.Drawing.Point(58, 8);
469+ this.btn_removePreset.Location = new System.Drawing.Point(69, 7);
472470 this.btn_removePreset.Name = "btn_removePreset";
473- this.btn_removePreset.Size = new System.Drawing.Size(71, 22);
471+ this.btn_removePreset.Size = new System.Drawing.Size(60, 22);
474472 this.btn_removePreset.TabIndex = 4;
475473 this.btn_removePreset.TabStop = false;
476474 this.btn_removePreset.Text = "削除";
@@ -485,7 +483,7 @@ namespace Handbrake
485483 this.drop_format.Items.AddRange(new object[] {
486484 "MP4 File",
487485 "MKV File"});
488- this.drop_format.Location = new System.Drawing.Point(67, 3);
486+ this.drop_format.Location = new System.Drawing.Point(56, 3);
489487 this.drop_format.Name = "drop_format";
490488 this.drop_format.Size = new System.Drawing.Size(106, 21);
491489 this.drop_format.TabIndex = 28;
@@ -518,7 +516,7 @@ namespace Handbrake
518516 //
519517 this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
520518 this.drop_angle.FormattingEnabled = true;
521- this.drop_angle.Location = new System.Drawing.Point(209, 3);
519+ this.drop_angle.Location = new System.Drawing.Point(234, 3);
522520 this.drop_angle.Name = "drop_angle";
523521 this.drop_angle.Size = new System.Drawing.Size(45, 21);
524522 this.drop_angle.TabIndex = 45;
@@ -530,7 +528,7 @@ namespace Handbrake
530528 this.drp_dvdtitle.FormattingEnabled = true;
531529 this.drp_dvdtitle.Items.AddRange(new object[] {
532530 "Automatic"});
533- this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);
531+ this.drp_dvdtitle.Location = new System.Drawing.Point(55, 3);
534532 this.drp_dvdtitle.Name = "drp_dvdtitle";
535533 this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);
536534 this.drp_dvdtitle.TabIndex = 7;
@@ -544,14 +542,6 @@ namespace Handbrake
544542 this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
545543 this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
546544 this.btn_importChapters.Location = new System.Drawing.Point(544, 28);
547- this.btn_importChapters.Name = "btn_importChapters";
548- this.btn_importChapters.Size = new System.Drawing.Size(75, 23);
549- this.btn_importChapters.TabIndex = 14;
550- this.btn_importChapters.Text = "Import";
551- this.ToolTip.SetToolTip(this.btn_importChapters, resources.GetString("btn_importChapters.ToolTip"));
552- this.btn_importChapters.UseVisualStyleBackColor = true;
553- this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);
554- //
555545 // btn_export
556546 //
557547 this.btn_export.AutoSize = true;
@@ -676,6 +666,8 @@ namespace Handbrake
676666 this.pmnu_delete.Text = "Delete";
677667 this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);
678668 //
669+=======
670+>>>>>>> GUI translation with Designer
679671 // DVD_Open
680672 //
681673 this.DVD_Open.Description = "DVDドライブにセットされたDVDの「VIDEO_TS」フォルダを選択します";
@@ -705,7 +697,7 @@ namespace Handbrake
705697 //
706698 this.mnu_killCLI.Name = "mnu_killCLI";
707699 this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);
708- this.mnu_killCLI.Text = "Cancel Scan";
700+ this.mnu_killCLI.Text = "スキャンの中止";
709701 this.mnu_killCLI.Visible = false;
710702 this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);
711703 //
@@ -781,7 +773,7 @@ namespace Handbrake
781773 // mnu_presetReset
782774 //
783775 this.mnu_presetReset.Name = "mnu_presetReset";
784- this.mnu_presetReset.Size = new System.Drawing.Size(194, 22);
776+ this.mnu_presetReset.Size = new System.Drawing.Size(268, 22);
785777 this.mnu_presetReset.Text = "組み込みプリセットのアップデート";
786778 this.mnu_presetReset.ToolTipText = "Resets all presets.";
787779 this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);
@@ -789,19 +781,19 @@ namespace Handbrake
789781 // mnu_delete_preset
790782 //
791783 this.mnu_delete_preset.Name = "mnu_delete_preset";
792- this.mnu_delete_preset.Size = new System.Drawing.Size(194, 22);
784+ this.mnu_delete_preset.Size = new System.Drawing.Size(268, 22);
793785 this.mnu_delete_preset.Text = "組み込みプリセットの削除";
794786 this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click);
795787 //
796788 // toolStripSeparator7
797789 //
798790 this.toolStripSeparator7.Name = "toolStripSeparator7";
799- this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6);
791+ this.toolStripSeparator7.Size = new System.Drawing.Size(265, 6);
800792 //
801793 // btn_new_preset
802794 //
803795 this.btn_new_preset.Name = "btn_new_preset";
804- this.btn_new_preset.Size = new System.Drawing.Size(194, 22);
796+ this.btn_new_preset.Size = new System.Drawing.Size(268, 22);
805797 this.btn_new_preset.Text = "新規プリセット";
806798 this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click);
807799 //
@@ -809,7 +801,7 @@ namespace Handbrake
809801 //
810802 this.mnu_importMacPreset.Name = "mnu_importMacPreset";
811803 this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22);
812- this.mnu_importMacPreset.Text = "Import";
804+ this.mnu_importMacPreset.Text = "インポート";
813805 this.mnu_importMacPreset.ToolTipText = "Import a (plist - mac format) preset.\r\nYou can import plist presets from the Mac," +
814806 " Linux and Windows GUI\'s";
815807 this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click);
@@ -826,7 +818,7 @@ namespace Handbrake
826818 // mnu_SelectDefault
827819 //
828820 this.mnu_SelectDefault.Name = "mnu_SelectDefault";
829- this.mnu_SelectDefault.Size = new System.Drawing.Size(194, 22);
821+ this.mnu_SelectDefault.Size = new System.Drawing.Size(268, 22);
830822 this.mnu_SelectDefault.Text = "デフォルトプリセットに設定";
831823 this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset";
832824 this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click);
@@ -847,32 +839,32 @@ namespace Handbrake
847839 //
848840 this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;
849841 this.mnu_user_guide.Name = "mnu_user_guide";
850- this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);
842+ this.mnu_user_guide.Size = new System.Drawing.Size(224, 22);
851843 this.mnu_user_guide.Text = "HandBrakeユーザーガイド";
852844 this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);
853845 //
854846 // ToolStripSeparator3
855847 //
856848 this.ToolStripSeparator3.Name = "ToolStripSeparator3";
857- this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);
849+ this.ToolStripSeparator3.Size = new System.Drawing.Size(221, 6);
858850 //
859851 // mnu_UpdateCheck
860852 //
861853 this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";
862- this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);
854+ this.mnu_UpdateCheck.Size = new System.Drawing.Size(224, 22);
863855 this.mnu_UpdateCheck.Text = "アップデートの確認...";
864856 this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);
865857 //
866858 // toolStripSeparator6
867859 //
868860 this.toolStripSeparator6.Name = "toolStripSeparator6";
869- this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);
861+ this.toolStripSeparator6.Size = new System.Drawing.Size(221, 6);
870862 //
871863 // mnu_about
872864 //
873865 this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;
874866 this.mnu_about.Name = "mnu_about";
875- this.mnu_about.Size = new System.Drawing.Size(192, 22);
867+ this.mnu_about.Size = new System.Drawing.Size(224, 22);
876868 this.mnu_about.Text = "HandBrakeについて...";
877869 this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
878870 //
@@ -886,7 +878,7 @@ namespace Handbrake
886878 this.frmMainMenu.Location = new System.Drawing.Point(0, 0);
887879 this.frmMainMenu.Name = "frmMainMenu";
888880 this.frmMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
889- this.frmMainMenu.Size = new System.Drawing.Size(1002, 24);
881+ this.frmMainMenu.Size = new System.Drawing.Size(1002, 26);
890882 this.frmMainMenu.TabIndex = 0;
891883 this.frmMainMenu.Text = "MenuStrip";
892884 //
@@ -897,7 +889,7 @@ namespace Handbrake
897889 this.label5.ForeColor = System.Drawing.Color.Black;
898890 this.label5.Location = new System.Drawing.Point(3, 7);
899891 this.label5.Name = "label5";
900- this.label5.Size = new System.Drawing.Size(58, 13);
892+ this.label5.Size = new System.Drawing.Size(47, 13);
901893 this.label5.TabIndex = 27;
902894 this.label5.Text = "フォーマット:";
903895 //
@@ -908,7 +900,7 @@ namespace Handbrake
908900 this.Label47.ForeColor = System.Drawing.Color.Black;
909901 this.Label47.Location = new System.Drawing.Point(13, 36);
910902 this.Label47.Name = "Label47";
911- this.Label47.Size = new System.Drawing.Size(70, 13);
903+ this.Label47.Size = new System.Drawing.Size(78, 13);
912904 this.Label47.TabIndex = 0;
913905 this.Label47.Text = "動画コーデック:";
914906 //
@@ -919,7 +911,7 @@ namespace Handbrake
919911 this.Label3.ForeColor = System.Drawing.Color.Black;
920912 this.Label3.Location = new System.Drawing.Point(3, 8);
921913 this.Label3.Name = "Label3";
922- this.Label3.Size = new System.Drawing.Size(27, 13);
914+ this.Label3.Size = new System.Drawing.Size(81, 13);
923915 this.Label3.TabIndex = 0;
924916 this.Label3.Text = "保存先ファイル:";
925917 //
@@ -975,7 +967,7 @@ namespace Handbrake
975967 this.tab_video.Padding = new System.Windows.Forms.Padding(3);
976968 this.tab_video.Size = new System.Drawing.Size(724, 308);
977969 this.tab_video.TabIndex = 2;
978- this.tab_video.Text = "Video";
970+ this.tab_video.Text = "動画";
979971 this.tab_video.UseVisualStyleBackColor = true;
980972 //
981973 // lbl_rfwarn
@@ -1047,7 +1039,7 @@ namespace Handbrake
10471039 this.label25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
10481040 this.label25.Location = new System.Drawing.Point(13, 13);
10491041 this.label25.Name = "label25";
1050- this.label25.Size = new System.Drawing.Size(38, 13);
1042+ this.label25.Size = new System.Drawing.Size(33, 13);
10511043 this.label25.TabIndex = 0;
10521044 this.label25.Text = "動画";
10531045 //
@@ -1071,7 +1063,7 @@ namespace Handbrake
10711063 this.Label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
10721064 this.Label2.Location = new System.Drawing.Point(363, 13);
10731065 this.Label2.Name = "Label2";
1074- this.Label2.Size = new System.Drawing.Size(47, 13);
1066+ this.Label2.Size = new System.Drawing.Size(33, 13);
10751067 this.Label2.TabIndex = 8;
10761068 this.Label2.Text = "品質";
10771069 //
@@ -1105,7 +1097,7 @@ namespace Handbrake
11051097 this.tab_picture.Padding = new System.Windows.Forms.Padding(3);
11061098 this.tab_picture.Size = new System.Drawing.Size(724, 308);
11071099 this.tab_picture.TabIndex = 0;
1108- this.tab_picture.Text = "Picture";
1100+ this.tab_picture.Text = "サイズ";
11091101 this.tab_picture.UseVisualStyleBackColor = true;
11101102 //
11111103 // PictureSettings
@@ -1157,7 +1149,7 @@ namespace Handbrake
11571149 this.tab_filters.Name = "tab_filters";
11581150 this.tab_filters.Size = new System.Drawing.Size(724, 308);
11591151 this.tab_filters.TabIndex = 9;
1160- this.tab_filters.Text = "Video Filters";
1152+ this.tab_filters.Text = "フィルタ";
11611153 this.tab_filters.UseVisualStyleBackColor = true;
11621154 //
11631155 // Filters
@@ -1177,7 +1169,7 @@ namespace Handbrake
11771169 this.tab_subtitles.Padding = new System.Windows.Forms.Padding(3);
11781170 this.tab_subtitles.Size = new System.Drawing.Size(724, 308);
11791171 this.tab_subtitles.TabIndex = 10;
1180- this.tab_subtitles.Text = "Subtitles";
1172+ this.tab_subtitles.Text = "字幕";
11811173 this.tab_subtitles.UseVisualStyleBackColor = true;
11821174 //
11831175 // Subtitles
@@ -1211,7 +1203,7 @@ namespace Handbrake
12111203 this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
12121204 this.label31.Location = new System.Drawing.Point(13, 13);
12131205 this.label31.Name = "label31";
1214- this.label31.Size = new System.Drawing.Size(102, 13);
1206+ this.label31.Size = new System.Drawing.Size(98, 13);
12151207 this.label31.TabIndex = 0;
12161208 this.label31.Text = "チャプターマーカー";
12171209 //
@@ -1224,7 +1216,7 @@ namespace Handbrake
12241216 this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
12251217 this.tab_advanced.Size = new System.Drawing.Size(724, 308);
12261218 this.tab_advanced.TabIndex = 8;
1227- this.tab_advanced.Text = "Advanced";
1219+ this.tab_advanced.Text = "詳細設定";
12281220 this.tab_advanced.UseVisualStyleBackColor = true;
12291221 //
12301222 // x264Panel
@@ -1248,7 +1240,7 @@ namespace Handbrake
12481240 this.tab_query.Name = "tab_query";
12491241 this.tab_query.Size = new System.Drawing.Size(724, 308);
12501242 this.tab_query.TabIndex = 7;
1251- this.tab_query.Text = "クエリーエディタ";
1243+ this.tab_query.Text = "コマンドライン";
12521244 this.tab_query.UseVisualStyleBackColor = true;
12531245 //
12541246 // btn_clear
@@ -1280,7 +1272,7 @@ namespace Handbrake
12801272 this.label33.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
12811273 this.label33.Location = new System.Drawing.Point(13, 13);
12821274 this.label33.Name = "label33";
1283- this.label33.Size = new System.Drawing.Size(77, 13);
1275+ this.label33.Size = new System.Drawing.Size(83, 13);
12841276 this.label33.TabIndex = 0;
12851277 this.label33.Text = "クエリーエディタ";
12861278 //
@@ -1336,7 +1328,7 @@ namespace Handbrake
13361328 this.toolStripSeparator4,
13371329 this.tb_preview,
13381330 this.btn_ActivityWindow});
1339- this.toolStrip1.Location = new System.Drawing.Point(0, 24);
1331+ this.toolStrip1.Location = new System.Drawing.Point(0, 26);
13401332 this.toolStrip1.Name = "toolStrip1";
13411333 this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
13421334 this.toolStrip1.Size = new System.Drawing.Size(1002, 39);
@@ -1411,7 +1403,7 @@ namespace Handbrake
14111403 this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
14121404 this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;
14131405 this.btn_start.Name = "btn_start";
1414- this.btn_start.Size = new System.Drawing.Size(67, 36);
1406+ this.btn_start.Size = new System.Drawing.Size(92, 36);
14151407 this.btn_start.Text = "変換開始";
14161408 this.btn_start.ToolTipText = "エンコード処理を開始します";
14171409 this.btn_start.Click += new System.EventHandler(this.btn_start_Click);
@@ -1620,20 +1612,20 @@ namespace Handbrake
16201612 this.Label10.ForeColor = System.Drawing.Color.Black;
16211613 this.Label10.Location = new System.Drawing.Point(3, 7);
16221614 this.Label10.Name = "Label10";
1623- this.Label10.Size = new System.Drawing.Size(31, 13);
1615+ this.Label10.Size = new System.Drawing.Size(46, 13);
16241616 this.Label10.TabIndex = 6;
1625- this.Label10.Text = "Title:";
1617+ this.Label10.Text = "タイトル:";
16261618 //
16271619 // lbl_angle
16281620 //
16291621 this.lbl_angle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
16301622 this.lbl_angle.AutoSize = true;
16311623 this.lbl_angle.ForeColor = System.Drawing.Color.Black;
1632- this.lbl_angle.Location = new System.Drawing.Point(165, 7);
1624+ this.lbl_angle.Location = new System.Drawing.Point(180, 7);
16331625 this.lbl_angle.Name = "lbl_angle";
1634- this.lbl_angle.Size = new System.Drawing.Size(38, 13);
1626+ this.lbl_angle.Size = new System.Drawing.Size(48, 13);
16351627 this.lbl_angle.TabIndex = 44;
1636- this.lbl_angle.Text = "Angle:";
1628+ this.lbl_angle.Text = "アングル:";
16371629 //
16381630 // Label13
16391631 //
@@ -1641,9 +1633,9 @@ namespace Handbrake
16411633 this.Label13.AutoSize = true;
16421634 this.Label13.Location = new System.Drawing.Point(458, 7);
16431635 this.Label13.Name = "Label13";
1644- this.Label13.Size = new System.Drawing.Size(45, 13);
1636+ this.Label13.Size = new System.Drawing.Size(25, 13);
16451637 this.Label13.TabIndex = 10;
1646- this.Label13.Text = "through";
1638+ this.Label13.Text = "から";
16471639 //
16481640 // label_duration
16491641 //
@@ -1652,9 +1644,9 @@ namespace Handbrake
16521644 this.label_duration.BackColor = System.Drawing.Color.Transparent;
16531645 this.label_duration.Location = new System.Drawing.Point(584, 7);
16541646 this.label_duration.Name = "label_duration";
1655- this.label_duration.Size = new System.Drawing.Size(52, 13);
1647+ this.label_duration.Size = new System.Drawing.Size(59, 13);
16561648 this.label_duration.TabIndex = 42;
1657- this.label_duration.Text = "Duration:";
1649+ this.label_duration.Text = "合計時間:";
16581650 //
16591651 // lbl_duration
16601652 //
@@ -1673,9 +1665,9 @@ namespace Handbrake
16731665 this.labelStaticDestination.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
16741666 this.labelStaticDestination.Location = new System.Drawing.Point(9, 116);
16751667 this.labelStaticDestination.Name = "labelStaticDestination";
1676- this.labelStaticDestination.Size = new System.Drawing.Size(75, 13);
1668+ this.labelStaticDestination.Size = new System.Drawing.Size(49, 13);
16771669 this.labelStaticDestination.TabIndex = 53;
1678- this.labelStaticDestination.Text = "Destination:";
1670+ this.labelStaticDestination.Text = "保存先:";
16791671 //
16801672 // labelPreset
16811673 //
@@ -1683,18 +1675,18 @@ namespace Handbrake
16831675 this.labelPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
16841676 this.labelPreset.Location = new System.Drawing.Point(9, 164);
16851677 this.labelPreset.Name = "labelPreset";
1686- this.labelPreset.Size = new System.Drawing.Size(180, 13);
1678+ this.labelPreset.Size = new System.Drawing.Size(146, 13);
16871679 this.labelPreset.TabIndex = 54;
1688- this.labelPreset.Text = "Output Settings (Preset: None)";
1680+ this.labelPreset.Text = "出力設定(プリセット: なし)";
16891681 //
16901682 // labelSource
16911683 //
16921684 this.labelSource.AutoSize = true;
16931685 this.labelSource.Location = new System.Drawing.Point(55, 0);
16941686 this.labelSource.Name = "labelSource";
1695- this.labelSource.Size = new System.Drawing.Size(137, 13);
1687+ this.labelSource.Size = new System.Drawing.Size(145, 13);
16961688 this.labelSource.TabIndex = 52;
1697- this.labelSource.Text = "Select \"Source\" to continue";
1689+ this.labelSource.Text = "「変換元」をクリックしてください";
16981690 //
16991691 // labelStaticSource
17001692 //
@@ -1705,7 +1697,7 @@ namespace Handbrake
17051697 this.labelStaticSource.Name = "labelStaticSource";
17061698 this.labelStaticSource.Size = new System.Drawing.Size(49, 13);
17071699 this.labelStaticSource.TabIndex = 51;
1708- this.labelStaticSource.Text = "Source:";
1700+ this.labelStaticSource.Text = "変換元:";
17091701 //
17101702 // SourceLayoutPanel
17111703 //
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -118,16 +118,9 @@ namespace Handbrake
118118 InitializeComponent();
119119
120120 // Update the users config file with the CLI version data.
121-<<<<<<< HEAD
122121 Main.SetCliVersionData();
123122
124123 if (Settings.Default.hb_version.Contains("svn"))
125-=======
126- lblStatus.Text = "バージョン情報の取得中...";
127- Application.DoEvents();
128- ArrayList x = hb_common_func.getCliVersionData();
129- if (x != null)
130->>>>>>> import jp-0.9.3
131124 {
132125 this.Text += " " + Settings.Default.hb_version;
133126 }
@@ -150,32 +143,12 @@ namespace Handbrake
150143 // Clear the log files in the background
151144 if (Settings.Default.clearOldLogs)
152145 {
153-<<<<<<< HEAD
154146 Thread clearLog = new Thread(Main.ClearOldLogs);
155147 clearLog.Start();
156148 }
157149
158150 // Setup the GUI components
159151 LoadPresetPanel(); // Load the Preset Panel
160-=======
161- lblStatus.Text = "アップデートの確認中...";
162- Application.DoEvents();
163- Thread updateCheckThread = new Thread(startupUpdateCheck);
164- updateCheckThread.Start();
165- }
166-
167- // Setup the GUI components
168- lblStatus.Text = "GUIの設定中...";
169- Application.DoEvents();
170- setupH264Panel(); // Initalize the H.264 Panel
171- loadPresetPanel(); // Load the Preset Panel
172- // Load the user's default settings or Normal Preset
173- if (Properties.Settings.Default.defaultSettings == "Checked")
174- loadUserDefaults();
175- else
176- loadNormalPreset();
177- // Expand the preset Nodes
178->>>>>>> import jp-0.9.3
179152 treeView_presets.ExpandAll();
180153 lbl_encode.Text = string.Empty;
181154 drop_mode.SelectedIndex = 0;
@@ -185,7 +158,6 @@ namespace Handbrake
185158 if (Settings.Default.tooltipEnable)
186159 ToolTip.Active = true;
187160
188-<<<<<<< HEAD
189161 // Load the user's default settings or Normal Preset
190162 if (Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
191163 {
@@ -196,11 +168,6 @@ namespace Handbrake
196168
197169 QueryParser presetQuery = QueryParser.Parse(query);
198170 PresetLoader.LoadPreset(this, presetQuery, Settings.Default.defaultPreset);
199-=======
200- //Finished Loading
201- lblStatus.Text = "ロード完了!";
202- Application.DoEvents();
203->>>>>>> import jp-0.9.3
204171
205172 x264Panel.StandardizeOptString();
206173 x264Panel.SetCurrentSettingsInPanel();
@@ -340,15 +307,9 @@ namespace Handbrake
340307
341308 private void changePresetLabel(object sender, EventArgs e)
342309 {
343-<<<<<<< HEAD
344310 labelPreset.Text = "Output Settings (Preset: Custom)";
345311 this.currentlySelectedPreset = null;
346312 }
347-=======
348- if (hb_common_func.check_queue_recovery() == true)
349- {
350- DialogResult result = MessageBox.Show("キューに未完了のアイテムが残されています。これらを復元しますか?", "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
351->>>>>>> import jp-0.9.3
352313
353314 private static void frmMain_DragEnter(object sender, DragEventArgs e)
354315 {
@@ -485,13 +446,7 @@ namespace Handbrake
485446 presetHandler.UpdateBuiltInPresets();
486447 LoadPresetPanel();
487448 if (treeView_presets.Nodes.Count == 0)
488-<<<<<<< HEAD
489- MessageBox.Show(
490- "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",
491- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
492-=======
493449 MessageBox.Show("presets.datのロードに失敗しました。「プリセット」メニューから「組み込みプリセットのアップデート」を実行してください。\nまた、Vistaの場合管理者モードで実行しているかどうか確認してください。", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
494->>>>>>> import jp-0.9.3
495450 else
496451 MessageBox.Show("組み込みプリセットをアップデートしました!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);
497452
@@ -509,29 +464,8 @@ namespace Handbrake
509464 /// </param>
510465 private void mnu_delete_preset_Click(object sender, EventArgs e)
511466 {
512-<<<<<<< HEAD
513467 presetHandler.RemoveBuiltInPresets();
514468 LoadPresetPanel(); // Reload the preset panel
515-=======
516- // Empty the preset file
517- string presetsFile = Application.StartupPath.ToString() + "\\presets.dat";
518- if (File.Exists(presetsFile))
519- File.Delete(presetsFile);
520-
521- try
522- {
523- FileStream strm = new FileStream(presetsFile, FileMode.Create, FileAccess.Write);
524- strm.Close();
525- strm.Dispose();
526- }
527- catch (Exception exc)
528- {
529- MessageBox.Show("プリセットの削除処理でエラーが発生しました。\nWindows Vistaの場合、管理者モードで実行してください\n" + exc.ToString());
530- }
531-
532- // Reload the preset panel
533- loadPresetPanel();
534->>>>>>> import jp-0.9.3
535469 }
536470
537471 /// <summary>
@@ -599,7 +533,6 @@ namespace Handbrake
599533 #endregion
600534
601535 #region Help Menu
602-<<<<<<< HEAD
603536
604537 /// <summary>
605538 /// Menu - Display the User Guide Web Page
@@ -610,19 +543,11 @@ namespace Handbrake
610543 /// <param name="e">
611544 /// The e.
612545 /// </param>
613-=======
614- private void mnu_handbrake_forums_Click(object sender, EventArgs e)
615- {
616- // Process.Start("http://forum.handbrake.fr/");
617- Process.Start("http://sourceforge.jp/projects/handbrake-jp/wiki/Forum");
618- }
619->>>>>>> import jp-0.9.3
620546 private void mnu_user_guide_Click(object sender, EventArgs e)
621547 {
622548 // Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");
623549 Process.Start("http://sourceforge.jp/projects/handbrake-jp/wiki/Guide");
624550 }
625-<<<<<<< HEAD
626551
627552 /// <summary>
628553 /// Menu - Check for Updates
@@ -642,23 +567,6 @@ namespace Handbrake
642567 ? Settings.Default.appcast_unstable
643568 : Settings.Default.appcast;
644569 UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDoneMenu), false, url, Settings.Default.hb_build, Settings.Default.skipversion, Settings.Default.hb_version);
645-=======
646- private void mnu_handbrake_home_Click(object sender, EventArgs e)
647- {
648- // Process.Start("http://handbrake.fr");
649- Process.Start("http://sourceforge.jp/projects/handbrake-jp/wiki/");
650- }
651- private void mnu_UpdateCheck_Click(object sender, EventArgs e)
652- {
653- Boolean update = hb_common_func.updateCheck(true);
654- if (update == true)
655- {
656- frmUpdater updateWindow = new frmUpdater();
657- updateWindow.Show();
658- }
659- else
660- MessageBox.Show("現在利用可能なアップデートはありません", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information);
661->>>>>>> import jp-0.9.3
662570 }
663571
664572 /// <summary>
@@ -823,7 +731,6 @@ namespace Handbrake
823731 /// </param>
824732 private void btn_removePreset_Click(object sender, EventArgs e)
825733 {
826-<<<<<<< HEAD
827734 DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
828735 MessageBoxButtons.YesNo, MessageBoxIcon.Question);
829736 if (result == DialogResult.Yes)
@@ -833,29 +740,6 @@ namespace Handbrake
833740 presetHandler.Remove(treeView_presets.SelectedNode.Text);
834741 treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);
835742 }
836-=======
837- if (text_source.Text == string.Empty || text_source.Text == "「変換元」ボタンをクリックして選択..." || text_destination.Text == string.Empty)
838- MessageBox.Show("変換元もしくは保存先が選択されていません", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
839- else
840- {
841- // Set the last action to encode.
842- // This is used for tracking which file to load in the activity window
843- lastAction = "encode";
844-
845- String query;
846- if (rtf_query.Text != "")
847- query = rtf_query.Text;
848- else
849- query = queryGen.GenerateTheQuery(this);
850-
851- ThreadPool.QueueUserWorkItem(procMonitor, query);
852- lbl_encode.Visible = true;
853- lbl_encode.Text = "エンコード実行中";
854-
855- btn_start.Text = "変換停止";
856- btn_start.ToolTipText = "エンコード処理を中止します。\nWarning: これにより、ファイルが破壊される可能性があります。安全にエンコードを中止するには、コマンドウィンドウでctrl-Cを入力してください。";
857- btn_start.Image = Properties.Resources.stop;
858->>>>>>> import jp-0.9.3
859743 }
860744 treeView_presets.Select();
861745 }
@@ -871,13 +755,7 @@ namespace Handbrake
871755 /// </param>
872756 private void btn_setDefault_Click(object sender, EventArgs e)
873757 {
874-<<<<<<< HEAD
875758 if (treeView_presets.SelectedNode != null)
876-=======
877- if (text_source.Text == string.Empty || text_source.Text == "「変換元」ボタンをクリックして選択..." || text_destination.Text == string.Empty)
878- MessageBox.Show("変換元もしくは保存先が選択されていません", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
879- else
880->>>>>>> import jp-0.9.3
881759 {
882760 DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?",
883761 "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
@@ -903,50 +781,15 @@ namespace Handbrake
903781 /// </param>
904782 private void treeview_presets_mouseUp(object sender, MouseEventArgs e)
905783 {
906-<<<<<<< HEAD
907784 if (e.Button == MouseButtons.Right)
908785 treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);
909786 else if (e.Button == MouseButtons.Left)
910-=======
911- // Enable the creation of chapter markers.
912- Check_ChapterMarkers.Enabled = true;
913-
914- // Set the last action to scan.
915- // This is used for tracking which file to load in the activity window
916- lastAction = "scan";
917-
918- String filename = "";
919- text_source.Text = "";
920-
921- DVD_Open.ShowDialog();
922- filename = DVD_Open.SelectedPath;
923-
924- if (filename.StartsWith("\\"))
925- MessageBox.Show("HandBrakeはUNCパスに対応していません。\n共有フォルダをマウントして実行してください。", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
926- else
927->>>>>>> import jp-0.9.3
928787 {
929788 if (treeView_presets.GetNodeAt(e.Location) != null)
930789 {
931-<<<<<<< HEAD
932790 if (labelPreset.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text))
933791 selectPreset();
934792 }
935-=======
936- Form frmRD = new frmReadDVD(filename, this);
937- text_source.Text = filename;
938- lbl_encode.Text = "スキャン中...";
939- frmRD.ShowDialog();
940- }
941- else
942- text_source.Text = "「変換元」ボタンをクリックして選択...";
943-
944- // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.
945- if (drp_dvdtitle.Items.Count == 0)
946- MessageBox.Show("タイトルが見つかりません。正しい変換元を選択しているかご確認ください。また、コピープロテクトされたディスクには対応していません。", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
947-
948- lbl_encode.Text = "";
949->>>>>>> import jp-0.9.3
950793 }
951794
952795 treeView_presets.Select();
@@ -975,43 +818,12 @@ namespace Handbrake
975818 {
976819 TreeNode theNode = this.treeView_presets.GetNodeAt(e.X, e.Y);
977820
978-<<<<<<< HEAD
979821 if ((theNode != null))
980-=======
981- if (filename.StartsWith("\\"))
982- MessageBox.Show("HandBrakeはUNCパスに対応していません。\n共有フォルダをマウントして実行してください。", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
983- else
984->>>>>>> import jp-0.9.3
985822 {
986823 // Change the ToolTip only if the pointer moved to a new node.
987824 if (theNode.ToolTipText != this.ToolTip.GetToolTip(this.treeView_presets))
988825 {
989-<<<<<<< HEAD
990826 this.ToolTip.SetToolTip(this.treeView_presets, theNode.ToolTipText);
991-=======
992- Form frmRD = new frmReadDVD(filename, this);
993- text_source.Text = filename;
994- lbl_encode.Text = "Scanning ...";
995- frmRD.ShowDialog();
996- }
997- else
998- text_source.Text = "「変換元」ボタンをクリックして選択...";
999-
1000- // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.
1001- if (drp_dvdtitle.Items.Count == 0)
1002- MessageBox.Show("タイトルが見つかりません。正しい変換元を選択しているかご確認ください。また、コピープロテクトされたディスクには対応していません。", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
1003-
1004- lbl_encode.Text = "";
1005-
1006- // Enable the creation of chapter markers if the file is an image of a dvd.
1007- if (filename.ToLower().Contains(".iso"))
1008- Check_ChapterMarkers.Enabled = true;
1009- else
1010- {
1011- Check_ChapterMarkers.Enabled = false;
1012- Check_ChapterMarkers.Checked = false;
1013- data_chpt.Rows.Clear();
1014->>>>>>> import jp-0.9.3
1015827 }
1016828 }
1017829 else // Pointer is not over a node so clear the ToolTip.
@@ -1045,7 +857,6 @@ namespace Handbrake
1045857 foreach (TreeNode node in treeView_presets.Nodes)
1046858 nodeStatus.Add(node.IsExpanded);
1047859
1048-<<<<<<< HEAD
1049860 // Now reload the preset panel
1050861 LoadPresetPanel();
1051862
@@ -1055,22 +866,6 @@ namespace Handbrake
1055866 {
1056867 if (nodeStatus[i])
1057868 node.Expand();
1058-=======
1059- String filename = "";
1060- if (mnu_dvd_drive.Text.Contains("VIDEO_TS"))
1061- {
1062- string[] path = mnu_dvd_drive.Text.Split(' ');
1063- filename = path[0];
1064- lbl_encode.Text = "スキャン中...";
1065- Form frmRD = new frmReadDVD(filename, this);
1066- text_source.Text = filename;
1067- frmRD.ShowDialog();
1068- }
1069-
1070- // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.
1071- if (drp_dvdtitle.Items.Count == 0)
1072- MessageBox.Show("タイトルが見つかりません。正しい変換元を選択しているかご確認ください。また、コピープロテクトされたディスクには対応していません。", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
1073->>>>>>> import jp-0.9.3
1074869
1075870 i++;
1076871 }
@@ -1078,19 +873,10 @@ namespace Handbrake
1078873 }
1079874 }
1080875
1081-<<<<<<< HEAD
1082876 /// <summary>
1083877 /// Select the selected preset and setup the GUI
1084878 /// </summary>
1085879 private void selectPreset()
1086-=======
1087- private void drp_dvdtitle_Click(object sender, EventArgs e)
1088- {
1089- if ((drp_dvdtitle.Items.Count == 1) && (drp_dvdtitle.Items[0].ToString() == "Automatic"))
1090- MessageBox.Show("タイトルが選択されていません。「変換元」をクリックして変換元を選択してください", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
1091- }
1092- private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)
1093->>>>>>> import jp-0.9.3
1094880 {
1095881 if (treeView_presets.SelectedNode != null)
1096882 {
@@ -1385,17 +1171,11 @@ namespace Handbrake
13851171 BatchAdd batchAdd = new BatchAdd();
13861172 if (batchAdd.ShowDialog() == DialogResult.OK)
13871173 {
1388-<<<<<<< HEAD
13891174 int min = batchAdd.Min;
13901175 int max = batchAdd.Max;
13911176 bool errors = false;
13921177
13931178 foreach (Title title in this.SourceScan.SouceData.Titles)
1394-=======
1395- if (DVD_Save.FileName.StartsWith("\\"))
1396- MessageBox.Show("HandBrakeはUNCパスに対応していません。\n共有フォルダをマウントして実行してください。","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
1397- else
1398->>>>>>> import jp-0.9.3
13991179 {
14001180 if (title.Duration.TotalMinutes > min && title.Duration.TotalMinutes < max)
14011181 {
@@ -2314,20 +2094,7 @@ namespace Handbrake
23142094
23152095 // MainWindow Components, Actions and Functions ***********************
23162096
2317-<<<<<<< HEAD
23182097 #region Source Scan
2319-=======
2320- // Now reload the TreeView states
2321- loadTreeViewStates(nodeStatus);
2322- }
2323- private void btn_removePreset_Click(object sender, EventArgs e)
2324- {
2325- DialogResult result = MessageBox.Show("選択したプリセットを削除しますか?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
2326- if (result == DialogResult.Yes)
2327- {
2328- if (treeView_presets.SelectedNode != null)
2329- presetHandler.remove(treeView_presets.SelectedNode.Text);
2330->>>>>>> import jp-0.9.3
23312098
23322099 /// <summary>
23332100 /// Start the Scan Process
@@ -2367,15 +2134,7 @@ namespace Handbrake
23672134 /// </param>
23682135 private void SourceScan_ScanStatusChanged(object sender, EventArgs e)
23692136 {
2370-<<<<<<< HEAD
23712137 UpdateScanStatusLabel();
2372-=======
2373- String query = queryGen.GenerateTheQuery(this);
2374- Properties.Settings.Default.defaultUserSettings = query;
2375- // Save the new default Settings
2376- Properties.Settings.Default.Save();
2377- MessageBox.Show("デフォルト設定が保存されました", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
2378->>>>>>> import jp-0.9.3
23792138 }
23802139
23812140 /// <summary>
@@ -2433,21 +2192,7 @@ namespace Handbrake
24332192 }
24342193 }
24352194
2436-<<<<<<< HEAD
24372195 if (drp_dvdtitle.SelectedItem == null && drp_dvdtitle.Items.Count > 0)
2438-=======
2439- // The x264 widgets will need updated, so do this now:
2440- x264PanelFunctions.X264_StandardizeOptString(this);
2441- x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);
2442- }
2443- }
2444- private void treeView_presets_deleteKey(object sender, KeyEventArgs e)
2445- {
2446- if (e.KeyCode == Keys.Delete)
2447- {
2448- DialogResult result = MessageBox.Show("選択したプリセットを削除しますか?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
2449- if (result == DialogResult.Yes)
2450->>>>>>> import jp-0.9.3
24512196 {
24522197 drp_dvdtitle.SelectedIndex = 0;
24532198 }
@@ -2631,28 +2376,11 @@ namespace Handbrake
26312376 return;
26322377 }
26332378
2634-<<<<<<< HEAD
26352379 lbl_encode.Text = "Encoding Finished";
26362380 ProgressBarStatus.Visible = false;
26372381 btn_start.Text = "Start";
26382382 btn_start.ToolTipText = "Start the encoding process";
26392383 btn_start.Image = Properties.Resources.Play;
2640-=======
2641- Boolean foundDrive = false;
2642- DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives();
2643- foreach (DriveInfo curDrive in theCollectionOfDrives)
2644- {
2645- if (curDrive.DriveType == DriveType.CDRom)
2646- {
2647- if (curDrive.IsReady)
2648- {
2649- if (File.Exists(curDrive.RootDirectory.ToString() + "VIDEO_TS\\VIDEO_TS.IFO"))
2650- mnu_dvd_drive.Text = curDrive.RootDirectory.ToString() + "VIDEO_TS (" + curDrive.VolumeLabel + ")";
2651- else
2652- mnu_dvd_drive.Text = "[DVDドライブにディスクがありません]";
2653-
2654- foundDrive = true;
2655->>>>>>> import jp-0.9.3
26562384
26572385 // If the window is minimized, display the notification in a popup.
26582386 if (Properties.Settings.Default.trayIconAlerts)
@@ -2661,21 +2389,10 @@ namespace Handbrake
26612389 notifyIcon.BalloonTipText = lbl_encode.Text;
26622390 notifyIcon.ShowBalloonTip(500);
26632391 }
2664-<<<<<<< HEAD
2665-=======
2666- }
2667-
2668- if (foundDrive == false)
2669- mnu_dvd_drive.Text = "[DVDドライブにディスクがありません]";
2670->>>>>>> import jp-0.9.3
26712392 }
26722393 catch (Exception exc)
26732394 {
2674-<<<<<<< HEAD
26752395 MessageBox.Show(exc.ToString());
2676-=======
2677- mnu_dvd_drive.Text = "[DVDドライブにディスクがありません]";
2678->>>>>>> import jp-0.9.3
26792396 }
26802397 }
26812398
@@ -2842,13 +2559,6 @@ namespace Handbrake
28422559 "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex,
28432560 "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
28442561 }
2845-<<<<<<< HEAD
2846-=======
2847- lbl_encode.Text = "エンコード完了";
2848- btn_start.Text = "変換開始";
2849- btn_start.ToolTipText = "エンコード処理を開始します";
2850- btn_start.Image = Properties.Resources.Play;
2851->>>>>>> import jp-0.9.3
28522562 }
28532563
28542564 #endregion
@@ -2922,12 +2632,6 @@ namespace Handbrake
29222632
29232633 #endregion
29242634
2925-<<<<<<< HEAD
29262635 // This is the END of the road ****************************************
2927-=======
2928-
2929-
2930- // This is the END of the road ------------------------------------------------------------------------------
2931->>>>>>> import jp-0.9.3
29322636 }
29332637 }
\ No newline at end of file
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -268,13 +268,12 @@ namespace Handbrake
268268 //
269269 this.check_growlEncode.AutoSize = true;
270270 this.check_growlEncode.BackColor = System.Drawing.Color.Transparent;
271- this.check_growlEncode.Location = new System.Drawing.Point(282, 122);
271+ this.check_growlEncode.Location = new System.Drawing.Point(322, 122);
272272 this.check_growlEncode.Name = "check_growlEncode";
273- this.check_growlEncode.Size = new System.Drawing.Size(171, 17);
273+ this.check_growlEncode.Size = new System.Drawing.Size(156, 17);
274274 this.check_growlEncode.TabIndex = 99;
275- this.check_growlEncode.Text = "Growl after Encode Completes";
276- this.ToolTip.SetToolTip(this.check_growlEncode, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " +
277- "alerts on your desktop.");
275+ this.check_growlEncode.Text = "変換完了後にGrowlで通知";
276+ this.ToolTip.SetToolTip(this.check_growlEncode, "デスクトップにGrowl経由でアラートを表示します。この機能を利用するにはGrowlのインストールが必要です");
278277 this.check_growlEncode.UseVisualStyleBackColor = false;
279278 this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged);
280279 //
@@ -284,11 +283,10 @@ namespace Handbrake
284283 this.check_GrowlQueue.BackColor = System.Drawing.Color.Transparent;
285284 this.check_GrowlQueue.Location = new System.Drawing.Point(108, 122);
286285 this.check_GrowlQueue.Name = "check_GrowlQueue";
287- this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17);
286+ this.check_GrowlQueue.Size = new System.Drawing.Size(205, 17);
288287 this.check_GrowlQueue.TabIndex = 98;
289- this.check_GrowlQueue.Text = "Growl after Queue Completes";
290- this.ToolTip.SetToolTip(this.check_GrowlQueue, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " +
291- "alerts on your desktop.");
288+ this.check_GrowlQueue.Text = "すべての変換の完了後にGrowlで通知";
289+ this.ToolTip.SetToolTip(this.check_GrowlQueue, "デスクトップにGrowl経由でアラートを表示します。この機能を利用するにはGrowlのインストールが必要です");
292290 this.check_GrowlQueue.UseVisualStyleBackColor = false;
293291 this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged);
294292 //
@@ -297,10 +295,12 @@ namespace Handbrake
297295 this.check_m4v.AutoSize = true;
298296 this.check_m4v.Location = new System.Drawing.Point(108, 321);
299297 this.check_m4v.Name = "check_m4v";
300- this.check_m4v.Size = new System.Drawing.Size(319, 17);
298+ this.check_m4v.Size = new System.Drawing.Size(199, 17);
301299 this.check_m4v.TabIndex = 82;
302- this.check_m4v.Text = "Always use iPod/iTunes friendly file extension (.m4v) for MP4";
303- this.ToolTip.SetToolTip(this.check_m4v, resources.GetString("check_m4v.ToolTip"));
300+ this.check_m4v.Text = "MP4ファイルの拡張子を「.m4v」にする";
301+ this.ToolTip.SetToolTip(this.check_m4v, "MP4ファイルの拡張子として「.mp4」の代わりに「.m4v」を使用します。 QuickTimeで再生する場合、チャプターマーカーやAC3音声、SRT字幕を利用す" +
302+ "るためには拡張子として「.m4v」を使用する必要があります。このオプションをOffにしても、これらの機能を利用する場合は自動的に拡張子が「.m4v」に設定されま" +
303+ "す。");
304304 this.check_m4v.UseVisualStyleBackColor = true;
305305 this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);
306306 //
@@ -309,12 +309,12 @@ namespace Handbrake
309309 this.label1.AutoSize = true;
310310 this.label1.BackColor = System.Drawing.Color.Transparent;
311311 this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
312- this.label1.Location = new System.Drawing.Point(15, 15);
312+ this.label1.Location = new System.Drawing.Point(4, 15);
313313 this.label1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
314314 this.label1.Name = "label1";
315- this.label1.Size = new System.Drawing.Size(66, 13);
315+ this.label1.Size = new System.Drawing.Size(86, 13);
316316 this.label1.TabIndex = 67;
317- this.label1.Text = "At Launch:";
317+ this.label1.Text = "起動時の処理:";
318318 //
319319 // label7
320320 //
@@ -322,7 +322,7 @@ namespace Handbrake
322322 this.label7.Location = new System.Drawing.Point(179, 278);
323323 this.label7.Margin = new System.Windows.Forms.Padding(3);
324324 this.label7.Name = "label7";
325- this.label7.Size = new System.Drawing.Size(225, 13);
325+ this.label7.Size = new System.Drawing.Size(233, 13);
326326 this.label7.TabIndex = 81;
327327 this.label7.Text = "利用可能オプション: {source} {title} {chapters}";
328328 //
@@ -338,7 +338,7 @@ namespace Handbrake
338338 this.drop_updateCheckDays.Name = "drop_updateCheckDays";
339339 this.drop_updateCheckDays.Size = new System.Drawing.Size(97, 21);
340340 this.drop_updateCheckDays.TabIndex = 97;
341- this.ToolTip.SetToolTip(this.drop_updateCheckDays, "Check for updates: Daily, Weekly or Monthly\r\nDefault: Weekly");
341+ this.ToolTip.SetToolTip(this.drop_updateCheckDays, "アップデートの確認頻度を指定します。デフォルトは「週1回」です");
342342 this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged);
343343 //
344344 // check_autoNaming
@@ -346,7 +346,7 @@ namespace Handbrake
346346 this.check_autoNaming.AutoSize = true;
347347 this.check_autoNaming.Location = new System.Drawing.Point(108, 174);
348348 this.check_autoNaming.Name = "check_autoNaming";
349- this.check_autoNaming.Size = new System.Drawing.Size(176, 17);
349+ this.check_autoNaming.Size = new System.Drawing.Size(193, 17);
350350 this.check_autoNaming.TabIndex = 72;
351351 this.check_autoNaming.Text = "出力ファイル名を自動的に設定する";
352352 this.ToolTip.SetToolTip(this.check_autoNaming, "出力ファイル名を自動的に設定します");
@@ -357,11 +357,10 @@ namespace Handbrake
357357 //
358358 this.txt_autoNameFormat.Location = new System.Drawing.Point(182, 251);
359359 this.txt_autoNameFormat.Name = "txt_autoNameFormat";
360- this.txt_autoNameFormat.Size = new System.Drawing.Size(349, 21);
360+ this.txt_autoNameFormat.Size = new System.Drawing.Size(319, 21);
361361 this.txt_autoNameFormat.TabIndex = 79;
362- this.ToolTip.SetToolTip(this.txt_autoNameFormat, "Define the format of the automatically named file.\r\ne.g {source}_{title}_some-te" +
363- "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
364- "sources values.");
362+ this.ToolTip.SetToolTip(this.txt_autoNameFormat, "ファイル名の命名規則を指定します。指定した文字列中の「{source}」「{title}」「{chapters}」はそれぞれ変換元、タイトル、チャプターに置換され" +
363+ "ます。例: 「{source}_{title}_適当な文字列\r\n{source}」");
365364 this.txt_autoNameFormat.TextChanged += new System.EventHandler(this.txt_autoNameFormat_TextChanged);
366365 //
367366 // check_tooltip
@@ -370,7 +369,7 @@ namespace Handbrake
370369 this.check_tooltip.BackColor = System.Drawing.Color.Transparent;
371370 this.check_tooltip.Location = new System.Drawing.Point(108, 62);
372371 this.check_tooltip.Name = "check_tooltip";
373- this.check_tooltip.Size = new System.Drawing.Size(117, 17);
372+ this.check_tooltip.Size = new System.Drawing.Size(132, 17);
374373 this.check_tooltip.TabIndex = 70;
375374 this.check_tooltip.Text = "ツールチップを表示する";
376375 this.ToolTip.SetToolTip(this.check_tooltip, "ツールチップの表示/非表示を設定します");
@@ -382,9 +381,9 @@ namespace Handbrake
382381 this.label5.AutoSize = true;
383382 this.label5.Location = new System.Drawing.Point(105, 254);
384383 this.label5.Name = "label5";
385- this.label5.Size = new System.Drawing.Size(45, 13);
384+ this.label5.Size = new System.Drawing.Size(105, 13);
386385 this.label5.TabIndex = 80;
387- this.label5.Text = "Format:";
386+ this.label5.Text = "ファイル名命名規則:";
388387 //
389388 // check_updateCheck
390389 //
@@ -392,7 +391,7 @@ namespace Handbrake
392391 this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;
393392 this.check_updateCheck.Location = new System.Drawing.Point(108, 14);
394393 this.check_updateCheck.Name = "check_updateCheck";
395- this.check_updateCheck.Size = new System.Drawing.Size(114, 17);
394+ this.check_updateCheck.Size = new System.Drawing.Size(112, 17);
396395 this.check_updateCheck.TabIndex = 68;
397396 this.check_updateCheck.Text = "アップデートを確認";
398397 this.ToolTip.SetToolTip(this.check_updateCheck, "アップデート確認機能を有効にします。アップデートの確認はHandBrakeの起動時に行われます");
@@ -404,9 +403,9 @@ namespace Handbrake
404403 this.label10.AutoSize = true;
405404 this.label10.Location = new System.Drawing.Point(105, 209);
406405 this.label10.Name = "label10";
407- this.label10.Size = new System.Drawing.Size(71, 13);
406+ this.label10.Size = new System.Drawing.Size(101, 13);
408407 this.label10.TabIndex = 77;
409- this.label10.Text = "Default Path:";
408+ this.label10.Text = "デフォルトの保存先:";
410409 //
411410 // btn_browse
412411 //
@@ -417,7 +416,7 @@ namespace Handbrake
417416 this.btn_browse.Name = "btn_browse";
418417 this.btn_browse.Size = new System.Drawing.Size(75, 23);
419418 this.btn_browse.TabIndex = 78;
420- this.btn_browse.Text = "Browse";
419+ this.btn_browse.Text = "閲覧";
421420 this.btn_browse.UseVisualStyleBackColor = true;
422421 this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);
423422 //
@@ -425,11 +424,11 @@ namespace Handbrake
425424 //
426425 this.label2.AutoSize = true;
427426 this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
428- this.label2.Location = new System.Drawing.Point(7, 98);
427+ this.label2.Location = new System.Drawing.Point(3, 98);
429428 this.label2.Name = "label2";
430- this.label2.Size = new System.Drawing.Size(74, 13);
429+ this.label2.Size = new System.Drawing.Size(75, 13);
431430 this.label2.TabIndex = 54;
432- this.label2.Text = "処理完了後:";
431+ this.label2.Text = "変換完了後:";
433432 //
434433 // label13
435434 //
@@ -438,15 +437,15 @@ namespace Handbrake
438437 this.label13.Location = new System.Drawing.Point(4, 174);
439438 this.label13.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
440439 this.label13.Name = "label13";
441- this.label13.Size = new System.Drawing.Size(77, 13);
440+ this.label13.Size = new System.Drawing.Size(74, 13);
442441 this.label13.TabIndex = 71;
443- this.label13.Text = "Output Files:";
442+ this.label13.Text = "出力ファイル:";
444443 //
445444 // text_an_path
446445 //
447446 this.text_an_path.Location = new System.Drawing.Point(182, 206);
448447 this.text_an_path.Name = "text_an_path";
449- this.text_an_path.Size = new System.Drawing.Size(253, 21);
448+ this.text_an_path.Size = new System.Drawing.Size(223, 21);
450449 this.text_an_path.TabIndex = 76;
451450 this.ToolTip.SetToolTip(this.text_an_path, resources.GetString("text_an_path.ToolTip"));
452451 this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);
@@ -479,7 +478,7 @@ namespace Handbrake
479478 this.tableLayoutPanel2.RowCount = 2;
480479 this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
481480 this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
482- this.tableLayoutPanel2.Size = new System.Drawing.Size(560, 28);
481+ this.tableLayoutPanel2.Size = new System.Drawing.Size(563, 28);
483482 this.tableLayoutPanel2.TabIndex = 84;
484483 //
485484 // label29
@@ -491,9 +490,9 @@ namespace Handbrake
491490 this.label29.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
492491 this.label29.Name = "label29";
493492 this.tableLayoutPanel2.SetRowSpan(this.label29, 2);
494- this.label29.Size = new System.Drawing.Size(59, 13);
493+ this.label29.Size = new System.Drawing.Size(62, 13);
495494 this.label29.TabIndex = 79;
496- this.label29.Text = "VLC Path:";
495+ this.label29.Text = "VLCのパス:";
497496 //
498497 // btn_vlcPath
499498 //
@@ -501,18 +500,18 @@ namespace Handbrake
501500 this.btn_vlcPath.FlatAppearance.BorderColor = System.Drawing.Color.Black;
502501 this.btn_vlcPath.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
503502 this.btn_vlcPath.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
504- this.btn_vlcPath.Location = new System.Drawing.Point(489, 3);
503+ this.btn_vlcPath.Location = new System.Drawing.Point(492, 3);
505504 this.btn_vlcPath.Name = "btn_vlcPath";
506505 this.btn_vlcPath.Size = new System.Drawing.Size(68, 22);
507506 this.btn_vlcPath.TabIndex = 83;
508- this.btn_vlcPath.Text = "Browse";
507+ this.btn_vlcPath.Text = "閲覧";
509508 this.btn_vlcPath.UseVisualStyleBackColor = true;
510509 this.btn_vlcPath.Click += new System.EventHandler(this.btn_vlcPath_Click);
511510 //
512511 // txt_vlcPath
513512 //
514513 this.txt_vlcPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
515- this.txt_vlcPath.Location = new System.Drawing.Point(88, 3);
514+ this.txt_vlcPath.Location = new System.Drawing.Point(91, 3);
516515 this.txt_vlcPath.Name = "txt_vlcPath";
517516 this.txt_vlcPath.Size = new System.Drawing.Size(395, 21);
518517 this.txt_vlcPath.TabIndex = 81;
@@ -534,7 +533,7 @@ namespace Handbrake
534533 this.tab_audio_sub.Padding = new System.Windows.Forms.Padding(3);
535534 this.tab_audio_sub.Size = new System.Drawing.Size(580, 357);
536535 this.tab_audio_sub.TabIndex = 6;
537- this.tab_audio_sub.Text = "Audio / Subtitles";
536+ this.tab_audio_sub.Text = "音声 / 字幕";
538537 this.tab_audio_sub.UseVisualStyleBackColor = true;
539538 //
540539 // radio_preferredAudioAndSubs
@@ -570,18 +569,18 @@ namespace Handbrake
570569 this.label31.Location = new System.Drawing.Point(16, 19);
571570 this.label31.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
572571 this.label31.Name = "label31";
573- this.label31.Size = new System.Drawing.Size(52, 13);
572+ this.label31.Size = new System.Drawing.Size(36, 13);
574573 this.label31.TabIndex = 91;
575- this.label31.Text = "Actions:";
574+ this.label31.Text = "動作:";
576575 //
577576 // label15
578577 //
579578 this.label15.AutoSize = true;
580- this.label15.Location = new System.Drawing.Point(87, 19);
579+ this.label15.Location = new System.Drawing.Point(71, 19);
581580 this.label15.Name = "label15";
582- this.label15.Size = new System.Drawing.Size(107, 13);
581+ this.label15.Size = new System.Drawing.Size(123, 13);
583582 this.label15.TabIndex = 88;
584- this.label15.Text = "Preferred Language:";
583+ this.label15.Text = "優先的に使用する言語:";
585584 //
586585 // radio_foreignAndSubs
587586 //
@@ -591,8 +590,8 @@ namespace Handbrake
591590 this.radio_foreignAndSubs.Size = new System.Drawing.Size(347, 17);
592591 this.radio_foreignAndSubs.TabIndex = 90;
593592 this.radio_foreignAndSubs.TabStop = true;
594- this.radio_foreignAndSubs.Text = "Use foreign language audio and add first preferred language subtitle.";
595- this.ToolTip.SetToolTip(this.radio_foreignAndSubs, "Use foreign language audio and add first subtitle track of prefered language.\r\n");
593+ this.radio_foreignAndSubs.Text = "オリジナルの音声を使用する";
594+ this.ToolTip.SetToolTip(this.radio_foreignAndSubs, "オリジナルの言語の音声を使用し、字幕でのみ指定した言語のものを使用します。");
596595 this.radio_foreignAndSubs.UseVisualStyleBackColor = true;
597596 this.radio_foreignAndSubs.CheckedChanged += new System.EventHandler(this.radio_foreignAndSubs_CheckedChanged);
598597 //
@@ -604,8 +603,7 @@ namespace Handbrake
604603 this.drop_preferredLang.Name = "drop_preferredLang";
605604 this.drop_preferredLang.Size = new System.Drawing.Size(118, 21);
606605 this.drop_preferredLang.TabIndex = 87;
607- this.ToolTip.SetToolTip(this.drop_preferredLang, "The number of processor\'s / processor cores. Unless your having problems, leave o" +
608- "n Automatic.");
606+ this.ToolTip.SetToolTip(this.drop_preferredLang, "字幕で優先して使用する言語を指定します。");
609607 this.drop_preferredLang.SelectedIndexChanged += new System.EventHandler(this.drop_preferredLang_SelectedIndexChanged);
610608 //
611609 // radio_dub
@@ -616,9 +614,8 @@ namespace Handbrake
616614 this.radio_dub.Size = new System.Drawing.Size(167, 17);
617615 this.radio_dub.TabIndex = 89;
618616 this.radio_dub.TabStop = true;
619- this.radio_dub.Text = "DUB Foreign Language Audio";
620- this.ToolTip.SetToolTip(this.radio_dub, "This option will select your prefered language of audio for the source if one exi" +
621- "sts.");
617+ this.radio_dub.Text = "ここで指定した言語の音声を使用する";
618+ this.ToolTip.SetToolTip(this.radio_dub, "ここで選択した言語に対応する音声が利用できる場合、その音声を使用します。");
622619 this.radio_dub.UseVisualStyleBackColor = true;
623620 this.radio_dub.CheckedChanged += new System.EventHandler(this.radio_dub_CheckedChanged);
624621 //
@@ -775,8 +772,8 @@ namespace Handbrake
775772 this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";
776773 this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);
777774 this.check_logsInSpecifiedLocation.TabIndex = 87;
778- this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";
779- this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");
775+ this.check_logsInSpecifiedLocation.Text = "変換ログのコピーを指定したフォルダにも保存";
776+ this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "変換ログのコピーを指定したフォルダにも保存します。");
780777 this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;
781778 this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);
782779 //
@@ -786,10 +783,10 @@ namespace Handbrake
786783 this.check_saveLogWithVideo.AutoSize = true;
787784 this.check_saveLogWithVideo.Location = new System.Drawing.Point(73, 116);
788785 this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";
789- this.check_saveLogWithVideo.Size = new System.Drawing.Size(382, 17);
786+ this.check_saveLogWithVideo.Size = new System.Drawing.Size(277, 17);
790787 this.check_saveLogWithVideo.TabIndex = 83;
791- this.check_saveLogWithVideo.Text = "Put a copy of individual encode logs in the same location as encoded video";
792- this.ToolTip.SetToolTip(this.check_saveLogWithVideo, "Place a copy of the encode log in the same folder as the encoded movie.");
788+ this.check_saveLogWithVideo.Text = "個別の変換ログを変換後のファイルと同じ場所に保存";
789+ this.ToolTip.SetToolTip(this.check_saveLogWithVideo, "個別の変換ログを変換後のファイルと同じ場所に保存します。");
793790 this.check_saveLogWithVideo.UseVisualStyleBackColor = true;
794791 this.check_saveLogWithVideo.CheckedChanged += new System.EventHandler(this.check_saveLogWithVideo_CheckedChanged);
795792 //
@@ -800,9 +797,9 @@ namespace Handbrake
800797 this.label3.BackColor = System.Drawing.Color.Transparent;
801798 this.label3.Location = new System.Drawing.Point(70, 92);
802799 this.label3.Name = "label3";
803- this.label3.Size = new System.Drawing.Size(101, 13);
800+ this.label3.Size = new System.Drawing.Size(75, 13);
804801 this.label3.TabIndex = 85;
805- this.label3.Text = "Log verbosity level:";
802+ this.label3.Text = "ログの詳細度:";
806803 //
807804 // btn_saveLog
808805 //
@@ -831,7 +828,7 @@ namespace Handbrake
831828 this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";
832829 this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);
833830 this.cb_logVerboseLvl.TabIndex = 86;
834- this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level");
831+ this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "ログをどれだけ詳しく記録するかを指定します。");
835832 this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged);
836833 //
837834 // text_logPath
@@ -850,7 +847,7 @@ namespace Handbrake
850847 this.label14.AutoSize = true;
851848 this.label14.Location = new System.Drawing.Point(70, 172);
852849 this.label14.Name = "label14";
853- this.label14.Size = new System.Drawing.Size(53, 13);
850+ this.label14.Size = new System.Drawing.Size(75, 13);
854851 this.label14.TabIndex = 81;
855852 this.label14.Text = "Log Path:";
856853 //
@@ -971,7 +968,7 @@ namespace Handbrake
971968 this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";
972969 this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(300, 17);
973970 this.check_promptOnUnmatchingQueries.TabIndex = 63;
974- this.check_promptOnUnmatchingQueries.Text = "Prompt when a manual query does not match GUI settings";
971+ this.check_promptOnUnmatchingQueries.Text = "入力したクエリーがGUI設定と矛盾する場合に警告";
975972 this.check_promptOnUnmatchingQueries.UseVisualStyleBackColor = true;
976973 this.check_promptOnUnmatchingQueries.CheckedChanged += new System.EventHandler(this.check_promptOnUnmatchingQueries_CheckedChanged);
977974 //
@@ -984,7 +981,8 @@ namespace Handbrake
984981 this.check_dvdnav.Name = "check_dvdnav";
985982 this.check_dvdnav.Size = new System.Drawing.Size(277, 17);
986983 this.check_dvdnav.TabIndex = 90;
987- this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)";
984+ this.check_dvdnav.Text = "LibDVDNavの代わりにlibdvdreadを使用";
985+ this.ToolTip.SetToolTip(this.check_dvdnav, "LibDVDNavを無効にし、代わりにlibdvdreadを使用します。");
988986 this.check_dvdnav.UseVisualStyleBackColor = false;
989987 this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);
990988 //
@@ -1027,7 +1025,7 @@ namespace Handbrake
10271025 this.drop_x264step.Name = "drop_x264step";
10281026 this.drop_x264step.Size = new System.Drawing.Size(85, 21);
10291027 this.drop_x264step.TabIndex = 86;
1030- this.ToolTip.SetToolTip(this.drop_x264step, "Quality Slider Control Granularity for x264 encoding only.");
1028+ this.ToolTip.SetToolTip(this.drop_x264step, "粒度を指定します。");
10311029 this.drop_x264step.SelectedIndexChanged += new System.EventHandler(this.x264step_SelectedIndexChanged);
10321030 //
10331031 // label30
@@ -1036,9 +1034,9 @@ namespace Handbrake
10361034 this.label30.AutoSize = true;
10371035 this.label30.Location = new System.Drawing.Point(78, 213);
10381036 this.label30.Name = "label30";
1039- this.label30.Size = new System.Drawing.Size(189, 13);
1037+ this.label30.Size = new System.Drawing.Size(165, 13);
10401038 this.label30.TabIndex = 87;
1041- this.label30.Text = "Constant quality fractional granularity";
1039+ this.label30.Text = "「一定品質」設定時の分割粒度:";
10421040 //
10431041 // check_disablePresetNotification
10441042 //
@@ -1049,9 +1047,8 @@ namespace Handbrake
10491047 this.check_disablePresetNotification.Name = "check_disablePresetNotification";
10501048 this.check_disablePresetNotification.Size = new System.Drawing.Size(216, 17);
10511049 this.check_disablePresetNotification.TabIndex = 91;
1052- this.check_disablePresetNotification.Text = "Disable built-in preset update notification";
1053- this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +
1054- " of HandBrake is installed.");
1050+ this.check_disablePresetNotification.Text = "組み込みプリセットのアップデート通知を無効化";
1051+ this.ToolTip.SetToolTip(this.check_disablePresetNotification, "HandBrakeをアップデートした場合に表示される、組み込みプリセットのアップデート通知を無効にします。");
10551052 this.check_disablePresetNotification.UseVisualStyleBackColor = false;
10561053 this.check_disablePresetNotification.CheckedChanged += new System.EventHandler(this.check_disablePresetNotification_CheckedChanged);
10571054 //
@@ -1072,7 +1069,7 @@ namespace Handbrake
10721069 this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
10731070 this.label8.Location = new System.Drawing.Point(51, 19);
10741071 this.label8.Name = "label8";
1075- this.label8.Size = new System.Drawing.Size(115, 13);
1072+ this.label8.Size = new System.Drawing.Size(143, 13);
10761073 this.label8.TabIndex = 61;
10771074 this.label8.Text = "HandBrakeオプション設定";
10781075 //
@@ -1100,7 +1097,7 @@ namespace Handbrake
11001097 //
11011098 this.textBox1.Location = new System.Drawing.Point(199, 198);
11021099 this.textBox1.Name = "textBox1";
1103- this.textBox1.Size = new System.Drawing.Size(255, 20);
1100+ this.textBox1.Size = new System.Drawing.Size(255, 19);
11041101 this.textBox1.TabIndex = 79;
11051102 this.ToolTip.SetToolTip(this.textBox1, "Define the format of the automatically named file.\r\ne.g {source}_{title}_some-te" +
11061103 "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
@@ -1110,7 +1107,7 @@ namespace Handbrake
11101107 //
11111108 this.textBox2.Location = new System.Drawing.Point(199, 171);
11121109 this.textBox2.Name = "textBox2";
1113- this.textBox2.Size = new System.Drawing.Size(181, 20);
1110+ this.textBox2.Size = new System.Drawing.Size(181, 19);
11141111 this.textBox2.TabIndex = 76;
11151112 this.ToolTip.SetToolTip(this.textBox2, "The default location where auto named files are stored.");
11161113 //
@@ -1189,7 +1186,7 @@ namespace Handbrake
11891186 //
11901187 this.textBox3.Location = new System.Drawing.Point(199, 198);
11911188 this.textBox3.Name = "textBox3";
1192- this.textBox3.Size = new System.Drawing.Size(255, 20);
1189+ this.textBox3.Size = new System.Drawing.Size(255, 19);
11931190 this.textBox3.TabIndex = 79;
11941191 this.ToolTip.SetToolTip(this.textBox3, "Define the format of the automatically named file.\r\ne.g {source}_{title}_some-te" +
11951192 "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
@@ -1199,7 +1196,7 @@ namespace Handbrake
11991196 //
12001197 this.textBox4.Location = new System.Drawing.Point(199, 171);
12011198 this.textBox4.Name = "textBox4";
1202- this.textBox4.Size = new System.Drawing.Size(181, 20);
1199+ this.textBox4.Size = new System.Drawing.Size(181, 19);
12031200 this.textBox4.TabIndex = 76;
12041201 this.ToolTip.SetToolTip(this.textBox4, "The default location where auto named files are stored.");
12051202 //
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -524,4 +524,4 @@ When disabled, Presseting "Stop" on the main winow will render the encode unplay
524524 AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
525525 </value>
526526 </data>
527-</root>
\ No newline at end of file
527+</root>
--- a/win/C#/frmPreview.Designer.cs
+++ b/win/C#/frmPreview.Designer.cs
@@ -74,8 +74,8 @@
7474 //
7575 this.lbl_preview.BackColor = System.Drawing.Color.Transparent;
7676 this.lbl_preview.Name = "lbl_preview";
77- this.lbl_preview.Size = new System.Drawing.Size(91, 22);
78- this.lbl_preview.Text = "Start at Preview:";
77+ this.lbl_preview.Size = new System.Drawing.Size(61, 22);
78+ this.lbl_preview.Text = "開始時刻:";
7979 //
8080 // cb_preview
8181 //
@@ -101,8 +101,8 @@
101101 //
102102 this.toolStripLabel2.BackColor = System.Drawing.Color.Transparent;
103103 this.toolStripLabel2.Name = "toolStripLabel2";
104- this.toolStripLabel2.Size = new System.Drawing.Size(107, 22);
105- this.toolStripLabel2.Text = "Duration (seconds)";
104+ this.toolStripLabel2.Size = new System.Drawing.Size(68, 22);
105+ this.toolStripLabel2.Text = "時間(秒)";
106106 //
107107 // cb_duration
108108 //
@@ -134,7 +134,7 @@
134134 this.btn_playQT.ImageTransparentColor = System.Drawing.Color.Magenta;
135135 this.btn_playQT.Name = "btn_playQT";
136136 this.btn_playQT.Size = new System.Drawing.Size(96, 22);
137- this.btn_playQT.Text = "Play with QT";
137+ this.btn_playQT.Text = "QuickTimeで再生";
138138 this.btn_playQT.Click += new System.EventHandler(this.PlayQtClick);
139139 //
140140 // btn_playVLC
@@ -144,7 +144,7 @@
144144 this.btn_playVLC.ImageTransparentColor = System.Drawing.Color.Magenta;
145145 this.btn_playVLC.Name = "btn_playVLC";
146146 this.btn_playVLC.Size = new System.Drawing.Size(101, 22);
147- this.btn_playVLC.Text = "Play with VLC";
147+ this.btn_playVLC.Text = "VLCで再生";
148148 this.btn_playVLC.Click += new System.EventHandler(this.PlayVlcClick);
149149 //
150150 // toolStripSeparator1
@@ -201,7 +201,7 @@
201201 this.MinimumSize = new System.Drawing.Size(730, 32);
202202 this.Name = "frmPreview";
203203 this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
204- this.Text = "Video Preview";
204+ this.Text = "動画のプレビュー";
205205 this.toolBar.ResumeLayout(false);
206206 this.toolBar.PerformLayout();
207207 this.panel1.ResumeLayout(false);
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -146,7 +146,7 @@ namespace Handbrake
146146 this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
147147 this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;
148148 this.btn_encode.Name = "btn_encode";
149- this.btn_encode.Size = new System.Drawing.Size(82, 36);
149+ this.btn_encode.Size = new System.Drawing.Size(92, 36);
150150 this.btn_encode.Text = "変換開始";
151151 this.btn_encode.Click += new System.EventHandler(this.BtnEncodeClick);
152152 //
@@ -157,7 +157,7 @@ namespace Handbrake
157157 this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;
158158 this.btn_pause.Name = "btn_pause";
159159 this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
160- this.btn_pause.Size = new System.Drawing.Size(74, 36);
160+ this.btn_pause.Size = new System.Drawing.Size(92, 36);
161161 this.btn_pause.Text = "一時停止";
162162 this.btn_pause.Visible = false;
163163 this.btn_pause.Click += new System.EventHandler(this.BtnPauseClick);
@@ -179,7 +179,7 @@ namespace Handbrake
179179 this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
180180 this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;
181181 this.drop_button_queue.Name = "drop_button_queue";
182- this.drop_button_queue.Size = new System.Drawing.Size(87, 36);
182+ this.drop_button_queue.Size = new System.Drawing.Size(89, 36);
183183 this.drop_button_queue.Text = "キュー";
184184 //
185185 // mnu_batch
@@ -321,21 +321,21 @@ namespace Handbrake
321321 // mnu_up
322322 //
323323 this.mnu_up.Name = "mnu_up";
324- this.mnu_up.Size = new System.Drawing.Size(138, 22);
324+ this.mnu_up.Size = new System.Drawing.Size(144, 22);
325325 this.mnu_up.Text = "Move Up";
326326 this.mnu_up.Click += new System.EventHandler(this.MnuUpClick);
327327 //
328328 // mnu_Down
329329 //
330330 this.mnu_Down.Name = "mnu_Down";
331- this.mnu_Down.Size = new System.Drawing.Size(138, 22);
331+ this.mnu_Down.Size = new System.Drawing.Size(144, 22);
332332 this.mnu_Down.Text = "Move Down";
333333 this.mnu_Down.Click += new System.EventHandler(this.MnuDownClick);
334334 //
335335 // toolStripSeparator3
336336 //
337337 this.toolStripSeparator3.Name = "toolStripSeparator3";
338- this.toolStripSeparator3.Size = new System.Drawing.Size(135, 6);
338+ this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
339339 //
340340 // mnu_edit
341341 //
@@ -352,7 +352,7 @@ namespace Handbrake
352352 // mnu_delete
353353 //
354354 this.mnu_delete.Name = "mnu_delete";
355- this.mnu_delete.Size = new System.Drawing.Size(138, 22);
355+ this.mnu_delete.Size = new System.Drawing.Size(144, 22);
356356 this.mnu_delete.Text = "Delete";
357357 this.mnu_delete.Click += new System.EventHandler(this.MnuDeleteClick);
358358 //
@@ -373,8 +373,8 @@ namespace Handbrake
373373 this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
374374 this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);
375375 this.lbl_encodesPending.Name = "lbl_encodesPending";
376- this.lbl_encodesPending.Size = new System.Drawing.Size(115, 17);
377- this.lbl_encodesPending.Text = "0 encode(s) pending";
376+ this.lbl_encodesPending.Size = new System.Drawing.Size(176, 18);
377+ this.lbl_encodesPending.Text = "変換待ちファイルはありません";
378378 //
379379 // OpenFile
380380 //
@@ -468,7 +468,7 @@ namespace Handbrake
468468 this.MinimumSize = new System.Drawing.Size(677, 417);
469469 this.Name = "frmQueue";
470470 this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
471- this.Text = "Encode Queue";
471+ this.Text = "変換キュー";
472472 this.toolStrip1.ResumeLayout(false);
473473 this.toolStrip1.PerformLayout();
474474 this.mnu_queue.ResumeLayout(false);
Show on old repository browser