MacGui: disk -> disc, plus a bunch of NSLocalizedString.

diff --git a/macosx/HBController.m b/macosx/HBController.m
index 3aac062c9e069641b6696240fe023440623acba3..2c6595380b2b4bb2c1c13a463e94cc4dd89b9e9e 100644 (file)
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -326,9 +326,9 @@
         if (action == @selector(browseSources:))
         {
             [toolbarItem setImage: [NSImage imageNamed: @"stopencode"]];
-            [toolbarItem setLabel: @"Cancel Scan"];
-            [toolbarItem setPaletteLabel: @"Cancel Scanning"];
-            [toolbarItem setToolTip: @"Cancel Scanning Source"];
+            [toolbarItem setLabel: NSLocalizedString(@"Cancel Scan", nil)];
+            [toolbarItem setPaletteLabel: NSLocalizedString(@"Cancel Scanning", nil)];
+            [toolbarItem setToolTip: NSLocalizedString(@"Cancel Scanning Source", nil)];
             return YES;
         }
 
@@ -354,17 +354,17 @@
         if (action == @selector(rip:))
         {
             [toolbarItem setImage: [NSImage imageNamed: @"stopencode"]];
-            [toolbarItem setLabel: @"Stop"];
-            [toolbarItem setPaletteLabel: @"Stop"];
-            [toolbarItem setToolTip: @"Stop Encoding"];
+            [toolbarItem setLabel: NSLocalizedString(@"Stop", nil)];
+            [toolbarItem setPaletteLabel: NSLocalizedString(@"Stop", nil)];
+            [toolbarItem setToolTip: NSLocalizedString(@"Stop Encoding", nil)];
             return YES;
         }
         if (action == @selector(pause:))
         {
             [toolbarItem setImage: [NSImage imageNamed: @"pauseencode"]];
-            [toolbarItem setLabel: @"Pause"];
-            [toolbarItem setPaletteLabel: @"Pause Encoding"];
-            [toolbarItem setToolTip: @"Pause Encoding"];
+            [toolbarItem setLabel: NSLocalizedString(@"Pause", nil)];
+            [toolbarItem setPaletteLabel: NSLocalizedString(@"Pause Encoding", nil)];
+            [toolbarItem setToolTip: NSLocalizedString(@"Pause Encoding", nil)];
             return YES;
         }
     }
@@ -373,9 +373,9 @@
         if (action == @selector(pause:))
         {
             [toolbarItem setImage: [NSImage imageNamed: @"encode"]];
-            [toolbarItem setLabel: @"Resume"];
-            [toolbarItem setPaletteLabel: @"Resume Encoding"];
-            [toolbarItem setToolTip: @"Resume Encoding"];
+            [toolbarItem setLabel: NSLocalizedString(@"Resume", nil)];
+            [toolbarItem setPaletteLabel: NSLocalizedString(@"Resume Encoding", nil)];
+            [toolbarItem setToolTip: NSLocalizedString(@"Resume Encoding", nil)];
             return YES;
         }
         if (action == @selector(rip:))
@@ -387,11 +387,11 @@
         {
             [toolbarItem setImage: [NSImage imageNamed: @"encode"]];
             if (fQueueController.pendingItemsCount > 0)
-                [toolbarItem setLabel: @"Start Queue"];
+                [toolbarItem setLabel: NSLocalizedString(@"Start Queue", nil)];
             else
-                [toolbarItem setLabel: @"Start"];
-            [toolbarItem setPaletteLabel: @"Start Encoding"];
-            [toolbarItem setToolTip: @"Start Encoding"];
+                [toolbarItem setLabel: NSLocalizedString(@"Start", nil)];
+            [toolbarItem setPaletteLabel: NSLocalizedString(@"Start Encoding", nil)];
+            [toolbarItem setToolTip: NSLocalizedString(@"Start Encoding", nil)];
         }
 
         if (action == @selector(rip:))

diff --git a/macosx/HBCore.m b/macosx/HBCore.m
index ec08b2caa8f4cb6fea34a6050fc2e6b1f0fcde72..cdb831fb3e7fe62432e9d4b653f7c161a060c356 100644 (file)
--- a/macosx/HBCore.m
+++ b/macosx/HBCore.m
@@ -158,7 +158,7 @@ static void hb_error_handler(const char *errmsg)
 
     if (detector.isVideoDVD || detector.isVideoBluRay)
     {
-        [HBUtilities writeToActivityLog:"%s trying to open a physical disk at: %s", self.name.UTF8String, url.path.UTF8String];
+        [HBUtilities writeToActivityLog:"%s trying to open a physical disc at: %s", self.name.UTF8String, url.path.UTF8String];
         void *lib = NULL;
 
         if (detector.isVideoDVD)
@@ -173,17 +173,17 @@ static void hb_error_handler(const char *errmsg)
         if (lib)
         {
             dlclose(lib);
-            [HBUtilities writeToActivityLog:"%s library found for decrypting physical disk", self.name.UTF8String];
+            [HBUtilities writeToActivityLog:"%s library found for decrypting physical disc", self.name.UTF8String];
         }
         else
         {
             // Notify the user that we don't support removal of copy protection.
-            [HBUtilities writeToActivityLog:"%s, library not found for decrypting physical disk", self.name.UTF8String];
+            [HBUtilities writeToActivityLog:"%s, library not found for decrypting physical disc", self.name.UTF8String];
 
             if (error) {
                 *error = [NSError errorWithDomain:@"HBErrorDomain"
                                              code:101
-                                         userInfo:@{ NSLocalizedDescriptionKey: @"library not found for decrypting physical disk" }];
+                                         userInfo:@{ NSLocalizedDescriptionKey: @"library not found for decrypting physical disc" }];
             }
         }
     }