merge 0.9.4 to jp

[handbrake-jp/handbrake-jp.git] / macosx / HBAdvancedController.m

diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m
index e08cf4f..f57e05d 100644 (file)
--- a/macosx/HBAdvancedController.m
+++ b/macosx/HBAdvancedController.m
@@ -49,7 +49,7 @@
     if(hide)
     {
         [fOptionsBox setContentView:fEmptyView];
-        [fX264optViewTitleLabel setStringValue: @"Only Used With The x264 (H.264) Codec"];
+        [fX264optViewTitleLabel setStringValue: NSLocalizedStringFromTable(@"Only Used With The x264 (H.264) Codec", @"Advanced", @"")];
     }
     else
     {
@@ -109,6 +109,9 @@
     /*B-Frames fX264optBframesPopUp*/
     int i;
     [fX264optBframesPopUp removeAllItems];
+    /*
+    [fX264optBframesPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (0)", @"Advanced", @"")];
+    */
     [fX264optBframesPopUp addItemWithTitle:@"Default (3)"];
     for (i=0; i<17;i++)
     {
@@ -121,6 +124,9 @@
     
     /*Reference Frames fX264optRefPopUp*/
     [fX264optRefPopUp removeAllItems];
+    /*
+    [fX264optRefPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (1)", @"Advanced", @"")];
+    */
     [fX264optRefPopUp addItemWithTitle:@"Default (3)"];
     for (i=0; i<17;i++)
     {
@@ -147,7 +153,10 @@
     
     /*Sub Me fX264optSubmePopUp*/
     [fX264optSubmePopUp removeAllItems];
+    /*
+    [fX264optSubmePopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (6)", @"Advanced", @"")];
     [fX264optSubmePopUp addItemWithTitle:@"Default (7)"];
+    */
     for (i=0; i<10;i++)
     {
         [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
@@ -159,6 +168,9 @@
     
     /*Trellis fX264optTrellisPopUp*/
     [fX264optTrellisPopUp removeAllItems];
+    /*
+    [fX264optTrellisPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (0)", @"Advanced", @"")];
+    */
     [fX264optTrellisPopUp addItemWithTitle:@"Default (1)"];
     for (i=0; i<3;i++)
     {
@@ -180,6 +192,13 @@
     
     /*Motion Estimation fX264optMotionEstPopUp*/
     [fX264optMotionEstPopUp removeAllItems];
+    /*
+    [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (Hexagon)", @"Advanced", @"")];
+    [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Diamond", @"Advanced", @"")];
+    [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Hexagon", @"Advanced", @"")];
+    [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Uneven Multi-Hexagon", @"Advanced", @"")];
+    [fX264optMotionEstPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Exhaustive", @"Advanced", @"")];
+    */
     [fX264optMotionEstPopUp addItemWithTitle:@"Default (Hexagon)"];
     [fX264optMotionEstPopUp addItemWithTitle:@"Diamond"];
     [fX264optMotionEstPopUp addItemWithTitle:@"Hexagon"];
@@ -193,7 +212,7 @@
     
     /*Motion Estimation range fX264optMERangePopUp*/
     [fX264optMERangePopUp removeAllItems];
-    [fX264optMERangePopUp addItemWithTitle:@"Default (16)"];
+    [fX264optMERangePopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (16)", @"Advanced", @"")];
     for (i=4; i<65;i++)
     {
         [fX264optMERangePopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
@@ -221,11 +240,11 @@
     
     /*Direct B-Frame Prediction Mode fX264optDirectPredPopUp*/
     [fX264optDirectPredPopUp removeAllItems];
-    [fX264optDirectPredPopUp addItemWithTitle:@"Default (Spatial)"];
-    [fX264optDirectPredPopUp addItemWithTitle:@"None"];
-    [fX264optDirectPredPopUp addItemWithTitle:@"Spatial"];
-    [fX264optDirectPredPopUp addItemWithTitle:@"Temporal"];
-    [fX264optDirectPredPopUp addItemWithTitle:@"Automatic"];
+    [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (Spatial)", @"Advanced", @"")];
+    [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"None", @"Advanced", @"")];
+    [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Spatial", @"Advanced", @"")];
+    [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Temporal", @"Advanced", @"")];
+    [fX264optDirectPredPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Automatic", @"Advanced", @"")];
     [fX264optDirectPredPopUp setWantsLayer:YES];
     toolTip =
         @"Direct prediction tells x264 what method to use when guessing motion for certain parts of a B-frame. It can either look at other parts of the current frame (spatial) or compare against the following P-frameframe (temporal). You're best off setting this to automatic, so x264 decides which method is best on its own. Don't select none assuming it will be faster; instead it will take longer and look worse. If you're going to choose between spatial and temporal, spatial is usually better.";
@@ -246,7 +265,7 @@
     
     /*Alpha Deblock*/
     [fX264optAlphaDeblockPopUp removeAllItems];
-    [fX264optAlphaDeblockPopUp addItemWithTitle:@"Default (0)"];
+    [fX264optAlphaDeblockPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (0)", @"Advanced", @"")];
     for (i=-6; i<7;i++)
     {
         [fX264optAlphaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
@@ -258,7 +277,7 @@
 
     /*Beta Deblock*/
     [fX264optBetaDeblockPopUp removeAllItems];
-    [fX264optBetaDeblockPopUp addItemWithTitle:@"Default (0)"];
+    [fX264optBetaDeblockPopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (0)", @"Advanced", @"")];
     for (i=-6; i<7;i++)
     {
         [fX264optBetaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
@@ -268,6 +287,11 @@
 
     /* Analysis fX264optAnalysePopUp */
     [fX264optAnalysePopUp removeAllItems];
+    /*
+    [fX264optAnalysePopUp addItemWithTitle:NSLocalizedStringFromTable(@"Default (some)", @"Advanced", @"")]; /* 0=default */
+    [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"None", @"Advanced", @"")]]; /* 1=none */
+    [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"All", @"Advanced", @"")]]; /* 2=all */
+    */
     [fX264optAnalysePopUp addItemWithTitle:@"Default (some)"]; /* 0=default */
     [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"None"]]; /* 1=none */
     [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"All"]]; /* 2=all */
@@ -826,12 +850,16 @@
                 /*Motion Estimation NSPopUpButton*/
                 if ([optName isEqualToString:@"me"])
                 {
-                    if ([optValue isEqualToString:@"dia"])
+                    if ([optValue isEqualToString:NSLocalizedStringFromTable(@"dia", @"Advanced", @"")])
                         [fX264optMotionEstPopUp selectItemAtIndex:1];
-                    else if ([optValue isEqualToString:@"hex"])
+                    else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"hex", @"Advanced", @"")])
                         [fX264optMotionEstPopUp selectItemAtIndex:2];
-                    else if ([optValue isEqualToString:@"umh"])
+                    else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"umh", @"Advanced", @"")])
                         [fX264optMotionEstPopUp selectItemAtIndex:3];
+                   /*
+                    else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"esa", @"Advanced", @"")])
+                        [fX264optMotionEstPopUp selectItemAtIndex:4];                        
+                   */
                     else if ([optValue isEqualToString:@"esa"])
                         [fX264optMotionEstPopUp selectItemAtIndex:4];
                     else if ([optValue isEqualToString:@"tesa"])
@@ -860,13 +888,13 @@
                 /*Direct B-frame Prediction NSPopUpButton*/
                 if ([optName isEqualToString:@"direct"])
                 {
-                    if ([optValue isEqualToString:@"none"])
+                    if ([optValue isEqualToString:NSLocalizedStringFromTable(@"none", @"Advanced", @"")])
                         [fX264optDirectPredPopUp selectItemAtIndex:1];
-                    else if ([optValue isEqualToString:@"spatial"])
+                    else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"spatial", @"Advanced", @"")])
                         [fX264optDirectPredPopUp selectItemAtIndex:2];
-                    else if ([optValue isEqualToString:@"temporal"])
+                    else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"temporal", @"Advanced", @"")])
                         [fX264optDirectPredPopUp selectItemAtIndex:3];
-                    else if ([optValue isEqualToString:@"auto"])
+                    else if ([optValue isEqualToString:NSLocalizedStringFromTable(@"auto", @"Advanced", @"")])
                         [fX264optDirectPredPopUp selectItemAtIndex:4];                        
                 }
                 /*Deblocking NSPopUpButtons*/
@@ -915,16 +943,16 @@
                 /* Analysis NSPopUpButton */
                 if ([optName isEqualToString:@"analyse"])
                 {
-                    if ([optValue isEqualToString:@"p8x8,b8x8,i8x8,i4x4"])
+                    if ([optValue isEqualToString:NSLocalizedStringFromTable(@"p8x8,b8x8,i8x8,i4x4", @"Advanced", @"")])
                     {
                         /* Default ("some") */
                         [fX264optAnalysePopUp selectItemAtIndex:0];
                     }
-                    if ([optValue isEqualToString:@"none"])
+                    if ([optValue isEqualToString:NSLocalizedStringFromTable(@"none", @"Advanced", @"")])
                     {
                         [fX264optAnalysePopUp selectItemAtIndex:1];
                     }
-                    if ([optValue isEqualToString:@"all"])
+                    if ([optValue isEqualToString:NSLocalizedStringFromTable(@"all", @"Advanced", @"")])
                     {
                         [fX264optAnalysePopUp selectItemAtIndex:2];
                     }