diff options
26 files changed, 217 insertions, 223 deletions
diff --git a/macosx/HBAddPresetController.m b/macosx/HBAddPresetController.m index d100a330e..ab011155b 100644 --- a/macosx/HBAddPresetController.m +++ b/macosx/HBAddPresetController.m @@ -89,17 +89,17 @@ typedef NS_ENUM(NSUInteger, HBAddPresetControllerMode) { // Default to Source Maximum HBAddPresetControllerMode mode = HBAddPresetControllerModeSourceMaximum; - [self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"None", nil)]; + [self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"None", @"Add preset window -> picture setting")]; [[self.picSettingsPopUp lastItem] setTag:HBAddPresetControllerModeNone]; - [self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Custom", nil)]; + [self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Custom", @"Add preset window -> picture setting")]; [[self.picSettingsPopUp lastItem] setTag:HBAddPresetControllerModeCustom]; if (self.defaultToCustom) { mode = HBAddPresetControllerModeCustom; } - [self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Source Maximum", nil)]; + [self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Source Maximum", @"Add preset window -> picture setting")]; [[self.picSettingsPopUp lastItem] setTag:HBAddPresetControllerModeSourceMaximum]; @@ -208,8 +208,8 @@ typedef NS_ENUM(NSUInteger, HBAddPresetControllerMode) { if (self.name.stringValue.length == 0) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"The preset name cannot be empty.", @"")]; - [alert setInformativeText:NSLocalizedString(@"Please enter a name.", @"")]; + [alert setMessageText:NSLocalizedString(@"The preset name cannot be empty.", @"Add preset window -> name alert message")]; + [alert setInformativeText:NSLocalizedString(@"Please enter a name.", @"Add preset window -> name alert informative text")]; [alert runModal]; } else diff --git a/macosx/HBAppDelegate.m b/macosx/HBAppDelegate.m index b8072ca78..10a8cc0ca 100644 --- a/macosx/HBAppDelegate.m +++ b/macosx/HBAppDelegate.m @@ -98,8 +98,8 @@ if (instances > 1) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"There is already an instance of HandBrake running.", nil)]; - [alert setInformativeText:NSLocalizedString(@"The queue will be shared between the instances.", nil)]; + [alert setMessageText:NSLocalizedString(@"There is already an instance of HandBrake running.", @"Queue -> Multiple instances alert message")]; + [alert setInformativeText:NSLocalizedString(@"The queue will be shared between the instances.", @"Queue -> Multiple instances alert informative text")]; [alert runModal]; } else @@ -149,10 +149,10 @@ if (self.queueController.core.state != HBStateIdle) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"Are you sure you want to quit HandBrake?", nil)]; - [alert setInformativeText:NSLocalizedString(@"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Quit", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Don't Quit", nil)]; + [alert setMessageText:NSLocalizedString(@"Are you sure you want to quit HandBrake?", @"Quit Alert -> message")]; + [alert setInformativeText:NSLocalizedString(@"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?", @"Quit Alert -> informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"Quit", @"Quit Alert -> first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Don't Quit", @"Quit Alert -> second button")]; [alert.buttons[1] setKeyEquivalent:@"\E"]; [alert setAlertStyle:NSCriticalAlertStyle]; diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index 0d7958668..4daf72e36 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -44,7 +44,7 @@ NSString *HBAudioEncoderChangedNotification = @"HBAudioEncoderChangedNotificatio // Add the none and foreign track to the source array NSMutableArray *sourceTracks = [job.title.audioTracks mutableCopy]; - NSDictionary *none = @{keyAudioTrackName: NSLocalizedString(@"None", nil)}; + NSDictionary *none = @{keyAudioTrackName: NSLocalizedString(@"None", @"HBAudio -> none track name")}; [sourceTracks insertObject:none atIndex:0]; _sourceTracks = [sourceTracks copy]; } diff --git a/macosx/HBChapterTitlesController.m b/macosx/HBChapterTitlesController.m index d98594248..5cc567f91 100644 --- a/macosx/HBChapterTitlesController.m +++ b/macosx/HBChapterTitlesController.m @@ -251,8 +251,8 @@ { if (NULL != outError) { - *outError = [NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Invalid chapters CSV file", nil), - NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The CSV file is not a valid chapters CSV file.", nil)}]; + *outError = [NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Invalid chapters CSV file", @"Chapters import -> invalid CSV description"), + NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The CSV file is not a valid chapters CSV file.", @"Chapters import -> invalid CSV recovery suggestion")}]; } return NO; } @@ -270,8 +270,8 @@ if (NULL != outError) { - *outError = [NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Incorrect line count", nil), - NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The line count in the chapters CSV file does not match the number of chapters in the movie.", nil)}]; + *outError = [NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Incorrect line count", @"Chapters import -> invalid CSV line count description"), + NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The line count in the chapters CSV file does not match the number of chapters in the movie.", @"Chapters import -> invalid CSV line count recovery suggestion")}]; } return NO; diff --git a/macosx/HBController.m b/macosx/HBController.m index d4393aa50..3c4d60c38 100644 --- a/macosx/HBController.m +++ b/macosx/HBController.m @@ -379,9 +379,9 @@ if (action == @selector(browseSources:)) { [toolbarItem setImage: [NSImage imageNamed: @"stopencode"]]; - [toolbarItem setLabel: NSLocalizedString(@"Cancel Scan", nil)]; - [toolbarItem setPaletteLabel: NSLocalizedString(@"Cancel Scanning", nil)]; - [toolbarItem setToolTip: NSLocalizedString(@"Cancel Scanning Source", nil)]; + [toolbarItem setLabel: NSLocalizedString(@"Cancel Scan", @"Toolbar Open/Cancel Item")]; + [toolbarItem setPaletteLabel: NSLocalizedString(@"Cancel Scanning", @"Toolbar Open/Cancel Item")]; + [toolbarItem setToolTip: NSLocalizedString(@"Cancel Scanning Source", @"Toolbar Open/Cancel Item")]; return YES; } @@ -393,9 +393,9 @@ if (action == @selector(browseSources:)) { [toolbarItem setImage:[NSImage imageNamed:@"source"]]; - [toolbarItem setLabel:NSLocalizedString(@"Open Source", nil)]; - [toolbarItem setPaletteLabel:NSLocalizedString(@"Open Source", nil)]; - [toolbarItem setToolTip:NSLocalizedString(@"Open Source", nil)]; + [toolbarItem setLabel:NSLocalizedString(@"Open Source", @"Toolbar Open/Cancel Item")]; + [toolbarItem setPaletteLabel:NSLocalizedString(@"Open Source", @"Toolbar Open/Cancel Item")]; + [toolbarItem setToolTip:NSLocalizedString(@"Open Source", @"Toolbar Open/Cancel Item")]; return YES; } } @@ -407,17 +407,17 @@ if (action == @selector(rip:)) { [toolbarItem setImage: [NSImage imageNamed: @"stopencode"]]; - [toolbarItem setLabel: NSLocalizedString(@"Stop", nil)]; - [toolbarItem setPaletteLabel: NSLocalizedString(@"Stop", nil)]; - [toolbarItem setToolTip: NSLocalizedString(@"Stop Encoding", nil)]; + [toolbarItem setLabel: NSLocalizedString(@"Stop", @"Toolbar Start/Stop Item")]; + [toolbarItem setPaletteLabel: NSLocalizedString(@"Stop", @"Toolbar Start/Stop Item")]; + [toolbarItem setToolTip: NSLocalizedString(@"Stop Encoding", @"Toolbar Start/Stop Item")]; return YES; } if (action == @selector(pause:)) { [toolbarItem setImage: [NSImage imageNamed: @"pauseencode"]]; - [toolbarItem setLabel: NSLocalizedString(@"Pause", nil)]; - [toolbarItem setPaletteLabel: NSLocalizedString(@"Pause Encoding", nil)]; - [toolbarItem setToolTip: NSLocalizedString(@"Pause Encoding", nil)]; + [toolbarItem setLabel: NSLocalizedString(@"Pause", @"Toolbar Pause Item")]; + [toolbarItem setPaletteLabel: NSLocalizedString(@"Pause Encoding", @"Pause Item")]; + [toolbarItem setToolTip: NSLocalizedString(@"Pause Encoding", @"Toolbar Pause Item")]; return YES; } } @@ -426,9 +426,9 @@ if (action == @selector(pause:)) { [toolbarItem setImage: [NSImage imageNamed: @"encode"]]; - [toolbarItem setLabel: NSLocalizedString(@"Resume", nil)]; - [toolbarItem setPaletteLabel: NSLocalizedString(@"Resume Encoding", nil)]; - [toolbarItem setToolTip: NSLocalizedString(@"Resume Encoding", nil)]; + [toolbarItem setLabel: NSLocalizedString(@"Resume", @"Toolbar Pause Item")]; + [toolbarItem setPaletteLabel: NSLocalizedString(@"Resume Encoding", @"Toolbar Pause Item")]; + [toolbarItem setToolTip: NSLocalizedString(@"Resume Encoding", @"Toolbar Pause Item")]; return YES; } if (action == @selector(rip:)) @@ -440,11 +440,11 @@ { [toolbarItem setImage: [NSImage imageNamed: @"encode"]]; if (fQueueController.pendingItemsCount > 0) - [toolbarItem setLabel: NSLocalizedString(@"Start Queue", nil)]; + [toolbarItem setLabel: NSLocalizedString(@"Start Queue", @"Toolbar Start/Stop Item")]; else - [toolbarItem setLabel: NSLocalizedString(@"Start", nil)]; - [toolbarItem setPaletteLabel: NSLocalizedString(@"Start Encoding", nil)]; - [toolbarItem setToolTip: NSLocalizedString(@"Start Encoding", nil)]; + [toolbarItem setLabel: NSLocalizedString(@"Start", @"Toolbar Start/Stop Item")]; + [toolbarItem setPaletteLabel: NSLocalizedString(@"Start Encoding", @"Toolbar Start/Stop Item")]; + [toolbarItem setToolTip: NSLocalizedString(@"Start Encoding", @"Toolbar Start/Stop Item")]; } if (action == @selector(rip:)) @@ -487,7 +487,7 @@ { BOOL result = [fQueueController validateMenuItem:menuItem]; - if ([menuItem.title isEqualToString:NSLocalizedString(@"Start Encoding", nil)]) + if ([menuItem.title isEqualToString:NSLocalizedString(@"Start Encoding", @"Menu Start/Stop Item")]) { if (!result && self.job) { @@ -553,10 +553,10 @@ - (NSModalResponse)runCopyProtectionAlert { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"Copy-Protected sources are not supported.", nil)]; - [alert setInformativeText:NSLocalizedString(@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish use any other 3rd party software for this function. This warning will be shown only once each time HandBrake is run.", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Attempt Scan Anyway", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)]; + [alert setMessageText:NSLocalizedString(@"Copy-Protected sources are not supported.", @"Copy Protection Alert -> message")]; + [alert setInformativeText:NSLocalizedString(@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish use any other 3rd party software for this function. This warning will be shown only once each time HandBrake is run.", @"Copy Protection Alert -> informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"Attempt Scan Anyway", @"Copy Protection Alert -> first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Copy Protection Alert -> second button")]; [NSApp requestUserAttention:NSCriticalRequest]; @@ -577,7 +577,7 @@ self.job = nil; [fSrcTitlePopUp removeAllItems]; self.window.representedURL = nil; - self.window.title = NSLocalizedString(@"HandBrake", nil); + self.window.title = NSLocalizedString(@"HandBrake", @"Main Window -> title"); NSURL *mediaURL = [HBUtilities mediaURLFromURL:fileURL]; @@ -637,7 +637,7 @@ else { // We display a message if a valid source was not chosen - self->fSrcDVD2Field.stringValue = NSLocalizedString(@"No Valid Source Found", @""); + self->fSrcDVD2Field.stringValue = NSLocalizedString(@"No Valid Source Found", @"Main Window -> Info text"); } // Set the last searched source directory in the prefs here @@ -903,7 +903,7 @@ panel.canChooseFiles = NO; panel.canChooseDirectories = YES; panel.canCreateDirectories = YES; - panel.prompt = NSLocalizedString(@"Choose", nil); + panel.prompt = NSLocalizedString(@"Choose", @"Main Window -> Destination open panel"); if (self.job.outputURL) { @@ -992,9 +992,9 @@ if (!(undo.isUndoing || undo.isRedoing)) { // Change UI to show "Custom" settings are being used - if (![self.job.presetName hasSuffix:NSLocalizedString(@"(Modified)", nil)]) + if (![self.job.presetName hasSuffix:NSLocalizedString(@"(Modified)", @"Main Window -> preset modified")]) { - self.job.presetName = [NSString stringWithFormat:@"%@ %@", self.job.presetName, NSLocalizedString(@"(Modified)", nil)]; + self.job.presetName = [NSString stringWithFormat:@"%@ %@", self.job.presetName, NSLocalizedString(@"(Modified)", @"Main Window -> preset modified")]; } self.edited = YES; [self updateFileName]; @@ -1078,24 +1078,24 @@ if ([[NSFileManager defaultManager] fileExistsAtPath:job.outputURL.path] == 0) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"Warning!", @"")]; - [alert setInformativeText:NSLocalizedString(@"This is not a valid destination directory!", @"")]; + [alert setMessageText:NSLocalizedString(@"Warning!", @"Invalid destination alert -> message")]; + [alert setInformativeText:NSLocalizedString(@"This is not a valid destination directory!", @"Invalid destination alert -> informative text")]; [alert beginSheetModalForWindow:self.window completionHandler:handler]; } else if ([job.fileURL isEqual:job.completeOutputURL]) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"")]; - [alert setInformativeText:NSLocalizedString(@"The destination is the same as the source, you can not overwrite your source file!", @"")]; + [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"Destination same as source alert -> message")]; + [alert setInformativeText:NSLocalizedString(@"The destination is the same as the source, you can not overwrite your source file!", @"Destination same as source alert -> informative text")]; [alert beginSheetModalForWindow:self.window completionHandler:handler]; } else if ([[NSFileManager defaultManager] fileExistsAtPath:job.completeOutputURL.path]) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"")]; - [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @""), job.completeOutputURL.path]]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"")]; - [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"")]; + [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"File already exists alert -> message")]; + [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @"File already exists alert -> informative text"), job.completeOutputURL.path]]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists alert -> first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists alert -> second button")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert beginSheetModalForWindow:self.window completionHandler:handler]; @@ -1103,10 +1103,10 @@ else if ([fQueueController jobExistAtURL:job.completeOutputURL]) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"There is already a queue item for this destination.", @"")]; - [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @""), job.completeOutputURL.path]]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"")]; - [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"")]; + [alert setMessageText:NSLocalizedString(@"There is already a queue item for this destination.", @"File already exists in queue alert -> message")]; + [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @"File already exists in queue alert -> informative text"), job.completeOutputURL.path]]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists in queue alert -> first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists in queue alert -> second button")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert beginSheetModalForWindow:self.window completionHandler:handler]; @@ -1258,18 +1258,18 @@ if (fileOverwritesSource) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"")]; - [alert setInformativeText:NSLocalizedString(@"The destination is the same as the source, you can not overwrite your source file!", @"")]; + [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"Destination same as source alert -> message")]; + [alert setInformativeText:NSLocalizedString(@"The destination is the same as the source, you can not overwrite your source file!", @"Destination same as source alert -> informative text")]; [alert beginSheetModalForWindow:self.window completionHandler:nil]; } else if (fileExists) { // File exist, warn user NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"File already exists.", nil)]; - [alert setInformativeText:NSLocalizedString(@"One or more file already exists. Do you want to overwrite?", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", nil)]; + [alert setMessageText:NSLocalizedString(@"File already exists.", @"File already exists alert -> message")]; + [alert setInformativeText:NSLocalizedString(@"One or more file already exists. Do you want to overwrite?", @"File already exists alert -> informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists alert -> first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists alert -> second button")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { diff --git a/macosx/HBFilters+UIAdditions.m b/macosx/HBFilters+UIAdditions.m index e96a5c6dc..b143181dc 100644 --- a/macosx/HBFilters+UIAdditions.m +++ b/macosx/HBFilters+UIAdditions.m @@ -256,16 +256,16 @@ static NSDictionary *sharpenTypesDict = nil; { if (!deinterlaceTypesDict) { - deinterlaceTypesDict = @{NSLocalizedString(@"Off", nil): @"off", - NSLocalizedString(@"Yadif", nil): @"deinterlace", - NSLocalizedString(@"Decomb", nil): @"decomb"};; + deinterlaceTypesDict = @{NSLocalizedString(@"Off", @"HBFilters -> filter display name"): @"off", + NSLocalizedString(@"Yadif", @"HBFilters -> filter display name"): @"deinterlace", + NSLocalizedString(@"Decomb", @"HBFilters -> filter display name"): @"decomb"};; } return deinterlaceTypesDict; } - (NSArray *)deinterlaceTypes { - return @[@"Off", @"Yadif", @"Decomb"]; + return @[NSLocalizedString(@"Off", @"HBFilters -> filter display name"), NSLocalizedString(@"Yadif", @"HBFilters -> filter display name"), NSLocalizedString(@"Decomb", @"HBFilters -> filter display name")]; } + (NSDictionary *)decombPresetsDict @@ -308,9 +308,9 @@ static NSDictionary *sharpenTypesDict = nil; { if (!denoiseTypesDict) { - denoiseTypesDict = @{NSLocalizedString(@"Off", nil): @"off", - NSLocalizedString(@"NLMeans", nil): @"nlmeans", - NSLocalizedString(@"HQDN3D", nil): @"hqdn3d"};; + denoiseTypesDict = @{NSLocalizedString(@"Off", @"HBFilters -> filter display name"): @"off", + NSLocalizedString(@"NLMeans", @"HBFilters -> filter display name"): @"nlmeans", + NSLocalizedString(@"HQDN3D", @"HBFilters -> filter display name"): @"hqdn3d"};; } return denoiseTypesDict; } @@ -343,9 +343,9 @@ static NSDictionary *sharpenTypesDict = nil; { if (!sharpenTypesDict) { - sharpenTypesDict = @{NSLocalizedString(@"Off", nil): @"off", - NSLocalizedString(@"Unsharp", nil): @"unsharp", - NSLocalizedString(@"Lapsharp", nil): @"lapsharp"};; + sharpenTypesDict = @{NSLocalizedString(@"Off", @"HBFilters -> filter display name"): @"off", + NSLocalizedString(@"Unsharp", @"HBFilters -> filter display name"): @"unsharp", + NSLocalizedString(@"Lapsharp", @"HBFilters -> filter display name"): @"lapsharp"};; } return sharpenTypesDict; } @@ -374,7 +374,7 @@ static NSDictionary *sharpenTypesDict = nil; - (NSArray *)denoiseTypes { - return @[@"Off", @"NLMeans", @"HQDN3D"]; + return @[NSLocalizedString(@"Off", @"HBFilters -> filter display name"), NSLocalizedString(@"NLMeans", @"HBFilters -> filter display name"), NSLocalizedString(@"HQDN3D", @"HBFilters -> filter display name")]; } - (NSArray *)denoisePresets @@ -389,7 +389,7 @@ static NSDictionary *sharpenTypesDict = nil; - (NSArray *)sharpenTypes { - return @[@"Off", @"Unsharp", @"Lapsharp"]; + return @[NSLocalizedString(@"Off", @"HBFilters -> filter display name"), NSLocalizedString(@"Unsharp", @"HBFilters -> filter display name"), NSLocalizedString(@"Lapsharp", @"HBFilters -> filter display name")]; } - (NSArray *)sharpenPresets @@ -470,7 +470,7 @@ static NSDictionary *sharpenTypesDict = nil; { if (self.deblock == 0) { - return NSLocalizedString(@"Off", nil); + return NSLocalizedString(@"Off", @"HBFilters -> filter summary"); } else { diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m index a4a603699..85f2fc929 100644 --- a/macosx/HBJob+UIAdditions.m +++ b/macosx/HBJob+UIAdditions.m @@ -70,11 +70,11 @@ static NSDictionary *shortHeightAttr; NSString *title = nil; if (container->format & HB_MUX_MASK_MP4) { - title = NSLocalizedString(@"MP4 File", @""); + title = NSLocalizedString(@"MP4 File", @"HBJob -> Format display name"); } else if (container->format & HB_MUX_MASK_MKV) { - title = NSLocalizedString(@"MKV File", @""); + title = NSLocalizedString(@"MKV File", @"HBJob -> Format display name"); } else { @@ -626,7 +626,7 @@ static NSDictionary *shortHeightAttr; NSMutableString *info = [NSMutableString string]; const char *encoderName = hb_video_encoder_get_name(self.video.encoder); - [info appendString:encoderName ? @(encoderName) : NSLocalizedString(@"Unknown", nil)]; + [info appendString:encoderName ? @(encoderName) : NSLocalizedString(@"Unknown", @"HBJob -> video short description encoder name")]; [info appendString:@", "]; @@ -635,11 +635,11 @@ static NSDictionary *shortHeightAttr; if (self.video.frameRateMode == 0) { // we are using same as source with vfr - [info appendFormat:NSLocalizedString(@"VFR", nil)]; + [info appendFormat:NSLocalizedString(@"VFR", @"HBJob -> video short description framerate")]; } else { - [info appendFormat:NSLocalizedString(@"CRF", nil)]; + [info appendFormat:NSLocalizedString(@"CRF", @"HBJob -> video short description framerate")]; } } else @@ -702,11 +702,11 @@ static NSDictionary *shortHeightAttr; NSUInteger count = self.audio.tracks.count - 3; if (count == 1) { - [info appendString:NSLocalizedString(@"+ 1 additional audio track", nil)]; + [info appendString:NSLocalizedString(@"+ 1 additional audio track", @"HBJob -> audio short description")]; } else { - [info appendFormat:NSLocalizedString(@"+ %lu additional audio tracks", nil), (unsigned long)count]; + [info appendFormat:NSLocalizedString(@"+ %lu additional audio tracks", @"HBJob -> audio short description"), (unsigned long)count]; } } @@ -733,7 +733,7 @@ static NSDictionary *shortHeightAttr; if (track.burnedIn) { - [info appendString:NSLocalizedString(@", Burned", nil)]; + [info appendString:NSLocalizedString(@", Burned", @"HBJob -> subtitles short description")]; } [info appendString:@"\n"]; @@ -750,11 +750,11 @@ static NSDictionary *shortHeightAttr; NSUInteger count = self.subtitles.tracks.count - 3; if (count == 1) { - [info appendString:NSLocalizedString(@"+ 1 additional subtitles track", nil)]; + [info appendString:NSLocalizedString(@"+ 1 additional subtitles track", @"HBJob -> subtitles short description")]; } else { - [info appendFormat:NSLocalizedString(@"+ %lu additional subtitles tracks", nil), (unsigned long)count]; + [info appendFormat:NSLocalizedString(@"+ %lu additional subtitles tracks", @"HBJob -> subtitles short description"), (unsigned long)count]; } } @@ -789,7 +789,7 @@ static NSDictionary *shortHeightAttr; if (self.chaptersEnabled && self.chapterTitles.count > 1) { [info appendString:@"\n"]; - [info appendString:NSLocalizedString(@"Chapter Markers", nil)]; + [info appendString:NSLocalizedString(@"Chapter Markers", @"HBJob -> chapters short description")]; } return info; @@ -803,14 +803,14 @@ static NSDictionary *shortHeightAttr; // Detelecine if (![filters.detelecine isEqualToString:@"off"]) { - [summary appendString:NSLocalizedString(@"Detelecine", nil)]; + [summary appendString:NSLocalizedString(@"Detelecine", @"HBJob -> filters short description")]; [summary appendString:@", "]; } // Comb detect if (![filters.combDetection isEqualToString:@"off"]) { - [summary appendString:NSLocalizedString(@"Comb Detect", nil)]; + [summary appendString:NSLocalizedString(@"Comb Detect", @"HBJob -> filters short description")]; [summary appendString:@", "]; } @@ -829,7 +829,7 @@ static NSDictionary *shortHeightAttr; // Deblock if (filters.deblock > 0) { - [summary appendString:NSLocalizedString(@"Deblock", nil)]; + [summary appendString:NSLocalizedString(@"Deblock", @"HBJob -> filters short description")]; [summary appendString:@", "]; } @@ -858,14 +858,14 @@ static NSDictionary *shortHeightAttr; // Grayscale if (filters.grayscale) { - [summary appendString:NSLocalizedString(@"Grayscale", nil)]; + [summary appendString:NSLocalizedString(@"Grayscale", @"HBJob -> filters short description")]; [summary appendString:@", "]; } // Rotation if (filters.rotate || filters.flip) { - [summary appendString:NSLocalizedString(@"Rotation", nil)]; + [summary appendString:NSLocalizedString(@"Rotation", @"HBJob -> filters short description")]; [summary appendString:@", "]; } @@ -876,7 +876,7 @@ static NSDictionary *shortHeightAttr; if (summary.length == 0) { - [summary appendString:NSLocalizedString(@"None", nil)]; + [summary appendString:NSLocalizedString(@"None", @"HBJob -> filters short description")]; } return summary; @@ -896,11 +896,11 @@ static NSDictionary *shortHeightAttr; int container = [value intValue]; if (container & HB_MUX_MASK_MP4) { - return NSLocalizedString(@"MP4 File", @""); + return NSLocalizedString(@"MP4 File", @"HBJob -> Format display name"); } else if (container & HB_MUX_MASK_MKV) { - return NSLocalizedString(@"MKV File", @""); + return NSLocalizedString(@"MKV File", @"HBJob -> Format display name"); } else { @@ -923,11 +923,11 @@ static NSDictionary *shortHeightAttr; - (id)reverseTransformedValue:(id)value { - if ([value isEqualToString:NSLocalizedString(@"MP4 File", @"")]) + if ([value isEqualToString:NSLocalizedString(@"MP4 File", @"HBJob -> Format display name")]) { return @(HB_MUX_AV_MP4); } - else if ([value isEqualToString:NSLocalizedString(@"MKV File", @"")]) + else if ([value isEqualToString:NSLocalizedString(@"MKV File", @"HBJob -> Format display name")]) { return @(HB_MUX_AV_MKV); } diff --git a/macosx/HBJob.m b/macosx/HBJob.m index 09193a847..ccebe8a0c 100644 --- a/macosx/HBJob.m +++ b/macosx/HBJob.m @@ -178,8 +178,8 @@ NSString *HBChaptersChangedNotification = @"HBChaptersChangedNotification"; { if (outError) { - *outError = [NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Invalid name", nil), - NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The file name can't contain the / character.", nil)}]; + *outError = [NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Invalid name", @"HBJob -> invalid name error description"), + NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The file name can't contain the / character.", @"HBJob -> invalid name error recovery suggestion")}]; } return NO; } diff --git a/macosx/HBPicture+UIAdditions.m b/macosx/HBPicture+UIAdditions.m index dee5aa8c3..39b0d378d 100644 --- a/macosx/HBPicture+UIAdditions.m +++ b/macosx/HBPicture+UIAdditions.m @@ -91,7 +91,7 @@ - (NSString *)shortInfo { - return [NSString stringWithFormat:NSLocalizedString(@"%dx%d Storage, %dx%d Display", nil), self.width, self.height, self.displayWidth, self.height]; + return [NSString stringWithFormat:NSLocalizedString(@"%dx%d Storage, %dx%d Display", @"HBPicture -> short info"), self.width, self.height, self.displayWidth, self.height]; } + (NSSet<NSString *> *)keyPathsForValuesAffectingSummary diff --git a/macosx/HBPictureHUDController.m b/macosx/HBPictureHUDController.m index 86ccbe3e0..1312e1a5d 100644 --- a/macosx/HBPictureHUDController.m +++ b/macosx/HBPictureHUDController.m @@ -110,11 +110,11 @@ [self.delegate toggleScaleToScreen]; if (self.fitToView == YES) { - self.scaleToScreenButton.title = NSLocalizedString(@"Scale To Screen", nil); + self.scaleToScreenButton.title = NSLocalizedString(@"Scale To Screen", @"Picture HUD -> scale button"); } else { - self.scaleToScreenButton.title = NSLocalizedString(@"Actual Scale", nil); + self.scaleToScreenButton.title = NSLocalizedString(@"Actual Scale", @"Picture HUD -> scale button"); } self.fitToView = !self.fitToView; } diff --git a/macosx/HBPlayerHUDController.m b/macosx/HBPlayerHUDController.m index 98ab96fa5..b3b391cbd 100644 --- a/macosx/HBPlayerHUDController.m +++ b/macosx/HBPlayerHUDController.m @@ -119,7 +119,7 @@ NSArray<HBPlayerTrack *> *audioTracks = self.player.audioTracks; if (audioTracks.count) { - [self _addSectionTitle:NSLocalizedString(@"Audio", nil)]; + [self _addSectionTitle:NSLocalizedString(@"Audio", @"Player HUD -> audio menu")]; [self _addTracksItemFromArray:audioTracks selector:@selector(enableAudioTrack:)]; } @@ -130,7 +130,7 @@ { [self.tracksSelection.menu addItem:[NSMenuItem separatorItem]]; } - [self _addSectionTitle:NSLocalizedString(@"Subtitles", nil)]; + [self _addSectionTitle:NSLocalizedString(@"Subtitles", @"Player HUD -> subtitles menu")]; [self _addTracksItemFromArray:subtitlesTracks selector:@selector(enableSubtitlesTrack:)]; } } diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m index 2141b0f54..57bf60627 100644 --- a/macosx/HBPreferencesController.m +++ b/macosx/HBPreferencesController.m @@ -177,7 +177,7 @@ [panel setCanChooseFiles:YES]; [panel setCanChooseDirectories:NO]; [panel setAllowedFileTypes:@[@"app"]]; - [panel setMessage:NSLocalizedString(@"Select the desired external application", nil)]; + [panel setMessage:NSLocalizedString(@"Select the desired external application", @"Preferences -> send to app destination open panel")]; NSString *sendToAppDirectory; if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastSendToAppDirectory"]) diff --git a/macosx/HBPreset.m b/macosx/HBPreset.m index 067f49773..4d3c2f095 100644 --- a/macosx/HBPreset.m +++ b/macosx/HBPreset.m @@ -197,9 +197,9 @@ - (NSError *)invalidPresetErrorForUrl:(NSURL *)url { - NSString *description = [NSString stringWithFormat:NSLocalizedString(@"The preset \"%@\" could not be imported.", nil), + NSString *description = [NSString stringWithFormat:NSLocalizedString(@"The preset \"%@\" could not be imported.", @"Preset -> import error description"), url.lastPathComponent]; - NSString *reason = NSLocalizedString(@"The selected preset is invalid.", nil); + NSString *reason = NSLocalizedString(@"The selected preset is invalid.", @"Preset -> import error reason"); return [NSError errorWithDomain:@"HBPresetDomain" code:1 userInfo:@{NSLocalizedDescriptionKey: description, NSLocalizedRecoverySuggestionErrorKey: reason}]; @@ -208,9 +208,9 @@ - (NSError *)newerPresetErrorForUrl:(NSURL *)url { - NSString *description = [NSString stringWithFormat:NSLocalizedString(@"The preset \"%@\" could not be imported.", nil), + NSString *description = [NSString stringWithFormat:NSLocalizedString(@"The preset \"%@\" could not be imported.", @"Preset -> import error description"), url.lastPathComponent]; - NSString *reason = NSLocalizedString(@"The selected preset was created with a newer version of HandBrake.", nil); + NSString *reason = NSLocalizedString(@"The selected preset was created with a newer version of HandBrake.", @"Preset -> import error reason"); return [NSError errorWithDomain:@"HBPresetDomain" code:2 userInfo:@{NSLocalizedDescriptionKey: description, NSLocalizedRecoverySuggestionErrorKey: reason}]; diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m index 0c1a8abe7..1f9ba0c8b 100644 --- a/macosx/HBPresetsViewController.m +++ b/macosx/HBPresetsViewController.m @@ -155,7 +155,7 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext; // Open a panel to let the user choose where and how to save the export file NSSavePanel *panel = [NSSavePanel savePanel]; - panel.title = NSLocalizedString(@"Export presets", nil); + panel.title = NSLocalizedString(@"Export presets", @"Export presets save panel title"); // We get the current file name and path from the destination field here NSURL *defaultExportDirectory = [[NSURL fileURLWithPath:NSHomeDirectory()] URLByAppendingPathComponent:@"Desktop"]; @@ -177,7 +177,7 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext; - (IBAction)importPreset:(id)sender { NSOpenPanel *panel = [NSOpenPanel openPanel]; - panel.title = NSLocalizedString(@"Import presets", nil); + panel.title = NSLocalizedString(@"Import presets", @"Import preset open panel title"); panel.allowsMultipleSelection = YES; panel.canChooseFiles = YES; panel.canChooseDirectories = NO; @@ -258,10 +258,10 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext; { // Alert user before deleting preset NSAlert *alert = [NSAlert init]; - alert.messageText = NSLocalizedString(@"Are you sure you want to permanently delete the selected preset?", nil); - alert.informativeText = NSLocalizedString(@"You can't undo this action.", nil); - [alert addButtonWithTitle:NSLocalizedString(@"Delete Preset", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)]; + alert.messageText = NSLocalizedString(@"Are you sure you want to permanently delete the selected preset?", @"Delete preset alert -> message"); + alert.informativeText = NSLocalizedString(@"You can't undo this action.", @"Delete preset alert -> informative text"); + [alert addButtonWithTitle:NSLocalizedString(@"Delete Preset", @"Delete preset alert -> first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Delete preset alert -> second button")]; alert.alertStyle = NSCriticalAlertStyle; NSInteger status = [alert runModal]; diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m index fb0105f23..26d76d94f 100644 --- a/macosx/HBPreviewController.m +++ b/macosx/HBPreviewController.m @@ -166,7 +166,7 @@ else { self.previewView.image = nil; - self.window.title = NSLocalizedString(@"Preview", nil); + self.window.title = NSLocalizedString(@"Preview", @"Preview -> window title"); } [self switchStateToHUD:self.pictureHUD]; } @@ -248,16 +248,16 @@ NSMutableString *scaleString = [NSMutableString string]; if (scale * 100.0 != 100) { - [scaleString appendFormat:NSLocalizedString(@"(%.0f%% actual size)", nil), scale * 100.0]; + [scaleString appendFormat:NSLocalizedString(@"(%.0f%% actual size)", @"Preview -> size info label"), scale * 100.0]; } else { - [scaleString appendString:NSLocalizedString(@"(Actual size)", nil)]; + [scaleString appendString:NSLocalizedString(@"(Actual size)", @"Preview -> size info label")]; } if (self.previewView.fitToView == YES) { - [scaleString appendString:NSLocalizedString(@" Scaled To Screen", nil)]; + [scaleString appendString:NSLocalizedString(@" Scaled To Screen", @"Preview -> size info label")]; } // Set the info fields in the hud controller @@ -265,7 +265,7 @@ self.pictureHUD.scale = scaleString; // Set the info field in the window title bar - self.window.title = [NSString stringWithFormat:NSLocalizedString(@"Preview - %@ %@", nil), + self.window.title = [NSString stringWithFormat:NSLocalizedString(@"Preview - %@ %@", @"Preview -> window title format"), self.generator.info, scaleString]; } } @@ -525,24 +525,18 @@ - (void)showAlert:(NSURL *)fileURL; { - NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"HandBrake can't open the preview.", nil) - defaultButton:NSLocalizedString(@"Open in external player", nil) - alternateButton:NSLocalizedString(@"Cancel", nil) + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"HandBrake can't open the preview.", @"Preview -> live preview alert message") + defaultButton:NSLocalizedString(@"Open in external player", @"Preview -> live preview alert default button") + alternateButton:NSLocalizedString(@"Cancel", @"Preview -> live preview alert alternate button") otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"HandBrake can't playback this combination of video/audio/container format. Do you want to open it in an external player?", nil)]; + informativeTextWithFormat:NSLocalizedString(@"HandBrake can't playback this combination of video/audio/container format. Do you want to open it in an external player?", @"Preview -> live preview alert informative text")]; - [alert beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:(void *)CFBridgingRetain(fileURL)]; -} - -- (void)alertDidEnd:(NSAlert *)alert - returnCode:(NSInteger)returnCode - contextInfo:(void *)contextInfo -{ - NSURL *fileURL = CFBridgingRelease(contextInfo); - if (returnCode == NSModalResponseOK) - { - [[NSWorkspace sharedWorkspace] openURL:fileURL]; - } + [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + if (returnCode == NSModalResponseOK) + { + [[NSWorkspace sharedWorkspace] openURL:fileURL]; + } + }]; } - (void)setUpPlaybackOfURL:(NSURL *)fileURL playerClass:(Class)class; diff --git a/macosx/HBPreviewGenerator.m b/macosx/HBPreviewGenerator.m index f30115e4e..47eb0d576 100644 --- a/macosx/HBPreviewGenerator.m +++ b/macosx/HBPreviewGenerator.m @@ -213,7 +213,7 @@ HBStateFormatter *formatter = [[HBStateFormatter alloc] init]; formatter.twoLines = NO; formatter.showPassNumber = NO; - formatter.title = NSLocalizedString(@"preview", nil); + formatter.title = NSLocalizedString(@"preview", @"Preview -> progress formatter title"); self.core.stateFormatter = formatter; diff --git a/macosx/HBPreviewView.m b/macosx/HBPreviewView.m index deec210a7..705f5c750 100644 --- a/macosx/HBPreviewView.m +++ b/macosx/HBPreviewView.m @@ -294,7 +294,7 @@ { if (self.image) { - return [NSString stringWithFormat:NSLocalizedString(@"Preview Image, Size: %zu x %zu, Scale: %.0f%%", nil), CGImageGetWidth(self.image), CGImageGetHeight(self.image), self.scale * 100]; + return [NSString stringWithFormat:NSLocalizedString(@"Preview Image, Size: %zu x %zu, Scale: %.0f%%", @"Preview -> accessibility label"), CGImageGetWidth(self.image), CGImageGetHeight(self.image), self.scale * 100]; } return NSLocalizedString(@"No image", nil); } diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m index b67c85063..de91f35f9 100644 --- a/macosx/HBQueueController.m +++ b/macosx/HBQueueController.m @@ -118,13 +118,13 @@ { if (self.core.state == HBStateIdle) { - menuItem.title = NSLocalizedString(@"Start Encoding", nil); + menuItem.title = NSLocalizedString(@"Start Encoding", @"Queue -> start/stop menu"); return (self.pendingItemsCount > 0); } else if (self.core.state != HBStateIdle) { - menuItem.title = NSLocalizedString(@"Stop Encoding", nil); + menuItem.title = NSLocalizedString(@"Stop Encoding", @"Queue -> start/stop menu"); return YES; } @@ -134,11 +134,11 @@ { if (self.core.state != HBStatePaused) { - menuItem.title = NSLocalizedString(@"Pause Encoding", nil); + menuItem.title = NSLocalizedString(@"Pause Encoding", @"Queue -> pause/resume menu"); } else { - menuItem.title = NSLocalizedString(@"Resume Encoding", nil); + menuItem.title = NSLocalizedString(@"Resume Encoding", @"Queue -> pause/resume men"); } return (self.core.state == HBStateWorking || self.core.state == HBStatePaused); @@ -179,15 +179,15 @@ if ((s == HBStateScanning) || (s == HBStatePaused) || (s == HBStateWorking) || (s == HBStateMuxing)) { theItem.image = [NSImage imageNamed:@"stopencode"]; - theItem.label = NSLocalizedString(@"Stop", @""); - theItem.toolTip = NSLocalizedString(@"Stop Encoding", @""); + theItem.label = NSLocalizedString(@"Stop", @"Queue Toolbar -> start/stop item title"); + theItem.toolTip = NSLocalizedString(@"Stop Encoding", @"Queue Toolbar -> start/stop item tooltip"); return YES; } else { theItem.image = [NSImage imageNamed:@"encode"]; - theItem.label = NSLocalizedString(@"Start", @""); - theItem.toolTip = NSLocalizedString(@"Start Encoding", @""); + theItem.label = NSLocalizedString(@"Start", @"Queue Toolbar -> start/stop item title"); + theItem.toolTip = NSLocalizedString(@"Start Encoding", @"Queue Toolbar -> start/stop item tooltip"); return (self.pendingItemsCount > 0); } } @@ -197,15 +197,15 @@ if (s == HBStatePaused) { theItem.image = [NSImage imageNamed:@"encode"]; - theItem.label = NSLocalizedString(@"Resume", @""); - theItem.toolTip = NSLocalizedString(@"Resume Encoding", @""); + theItem.label = NSLocalizedString(@"Resume", @"Queue Toolbar -> pause/resume item title"); + theItem.toolTip = NSLocalizedString(@"Resume Encoding", @"Queue Toolbar -> pause/resume item tooltip"); return YES; } else { theItem.image = [NSImage imageNamed:@"pauseencode"]; - theItem.label = NSLocalizedString(@"Pause", @""); - theItem.toolTip = NSLocalizedString(@"Pause Encoding", @""); + theItem.label = NSLocalizedString(@"Pause", @"Queue Toolbar -> pause/resume item title"); + theItem.toolTip = NSLocalizedString(@"Pause Encoding", @"Queue Toolbar -> pause/resume item tooltip"); return (s == HBStateWorking || s == HBStateMuxing); } } @@ -359,11 +359,11 @@ { if (items.count == 1) { - [undo setActionName:NSLocalizedString(@"Add Job To Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Add Job To Queue", @"Queue undo action name")]; } else { - [undo setActionName:NSLocalizedString(@"Add Jobs To Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Add Jobs To Queue", @"Queue undo action name")]; } } @@ -411,11 +411,11 @@ { if (indexes.count == 1) { - [undo setActionName:NSLocalizedString(@"Remove Job From Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Remove Job From Queue", @"Queue undo action name")]; } else { - [undo setActionName:NSLocalizedString(@"Remove Jobs From Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Remove Jobs From Queue", @"Queue undo action name")]; } } @@ -458,11 +458,11 @@ { if (items.count == 1) { - [undo setActionName:NSLocalizedString(@"Move Job in Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Move Job in Queue", @"Queue undo action name")]; } else { - [undo setActionName:NSLocalizedString(@"Move Jobs in Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Move Jobs in Queue", @"Queue undo action name")]; } } @@ -500,11 +500,11 @@ { if (source.count == 1) { - [undo setActionName:NSLocalizedString(@"Move Job in Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Move Job in Queue", @"Queue undo action name")]; } else { - [undo setActionName:NSLocalizedString(@"Move Jobs in Queue", nil)]; + [undo setActionName:NSLocalizedString(@"Move Jobs in Queue", @"Queue undo action name")]; } } @@ -559,15 +559,15 @@ NSString *string; if (pendingCount == 0) { - string = NSLocalizedString(@"No encode pending", @""); + string = NSLocalizedString(@"No encode pending", @"Queue status"); } else if (pendingCount == 1) { - string = [NSString stringWithFormat: NSLocalizedString(@"%d encode pending", @""), pendingCount]; + string = [NSString stringWithFormat: NSLocalizedString(@"%d encode pending", @"Queue status"), pendingCount]; } else { - string = [NSString stringWithFormat: NSLocalizedString(@"%d encodes pending", @""), pendingCount]; + string = [NSString stringWithFormat: NSLocalizedString(@"%d encodes pending", @"Queue status"), pendingCount]; } self.countTextField.stringValue = string; @@ -734,14 +734,14 @@ NSString *info = nil; switch (result) { case HBCoreResultDone: - info = NSLocalizedString(@"Encode Finished.", @""); + info = NSLocalizedString(@"Encode Finished.", @"Queue status"); [self jobCompletedAlerts:job result:result]; break; case HBCoreResultCanceled: - info = NSLocalizedString(@"Encode Canceled.", @""); + info = NSLocalizedString(@"Encode Canceled.", @"Queue status"); break; default: - info = NSLocalizedString(@"Encode Failed.", @""); + info = NSLocalizedString(@"Encode Failed.", @"Queue status"); [self jobCompletedAlerts:job result:result]; break; } @@ -962,14 +962,14 @@ if (result == HBCoreResultDone) { title = NSLocalizedString(@"Put down that cocktail…", nil); - description = [NSString stringWithFormat:NSLocalizedString(@"Your encode %@ is done!", nil), + description = [NSString stringWithFormat:NSLocalizedString(@"Your encode %@ is done!", @"Queue done notification message"), job.outputFileName]; } else { title = NSLocalizedString(@"Encode failed", nil); - description = [NSString stringWithFormat:NSLocalizedString(@"Your encode %@ couldn't be completed.", nil), + description = [NSString stringWithFormat:NSLocalizedString(@"Your encode %@ couldn't be completed.", @"Queue done notification message"), job.outputFileName]; } @@ -996,8 +996,8 @@ { // On Screen Notification NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"Put down that cocktail…", @"")]; - [alert setInformativeText:NSLocalizedString(@"Your HandBrake queue is done!", @"")]; + [alert setMessageText:NSLocalizedString(@"Put down that cocktail…", @"Queue done alert message")]; + [alert setInformativeText:NSLocalizedString(@"Your HandBrake queue is done!", @"Queue done alert informative text")]; [NSApp requestUserAttention:NSCriticalRequest]; [alert runModal]; } @@ -1024,8 +1024,8 @@ - (void)queueLowDiskSpaceAlert { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"Your destination disk is almost full.", @"")]; - [alert setInformativeText:NSLocalizedString(@"You need to make more space available on your destination disk.", @"")]; + [alert setMessageText:NSLocalizedString(@"Your destination disk is almost full.", @"Queue -> disk almost full alert message")]; + [alert setInformativeText:NSLocalizedString(@"You need to make more space available on your destination disk.",@"Queue -> disk almost full alert informative text")]; [NSApp requestUserAttention:NSCriticalRequest]; [alert runModal]; } @@ -1070,7 +1070,7 @@ if ([workingJobs containsObject:self.currentJob]) { - NSString *alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It?", nil)]; + NSString *alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It?", @"Queue Stop Alert -> stop and remove message")]; // Which window to attach the sheet to? NSWindow *targetWindow = self.window; @@ -1081,9 +1081,9 @@ NSAlert *alert = [[NSAlert alloc] init]; [alert setMessageText:alertTitle]; - [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", nil)]; + [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Stop Alert -> stop and remove informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Stop Alert -> stop and remove first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", @"Queue Stop Alert -> stop and remove second button")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert beginSheetModalForWindow:targetWindow completionHandler:^(NSModalResponse returnCode) { @@ -1134,10 +1134,10 @@ [NSApp requestUserAttention:NSCriticalRequest]; NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"The computer will sleep after encoding is done.", @"")]; - [alert setInformativeText:NSLocalizedString(@"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences.", @"")]; - [alert addButtonWithTitle:NSLocalizedString(@"OK", @"")]; - [alert addButtonWithTitle:NSLocalizedString(@"Preferences…",@"")]; + [alert setMessageText:NSLocalizedString(@"The computer will sleep after encoding is done.", @"Queue Done Alert -> sleep message")]; + [alert setInformativeText:NSLocalizedString(@"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences.", @"Queue Done Alert -> sleep informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Queue Done Alert -> sleep first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Preferences…", @"Queue Done Alert -> sleep second button")]; NSInteger response = [alert runModal]; if (response == NSAlertSecondButtonReturn) @@ -1152,10 +1152,10 @@ [NSApp requestUserAttention:NSCriticalRequest]; NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"The computer will shut down after encoding is done.", @"")]; - [alert setInformativeText:NSLocalizedString(@"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences.", @"")]; - [alert addButtonWithTitle:NSLocalizedString(@"OK", @"")]; - [alert addButtonWithTitle:NSLocalizedString(@"Preferences…", @"")]; + [alert setMessageText:NSLocalizedString(@"The computer will shut down after encoding is done.", @"Queue Done Alert -> shut down message")]; + [alert setInformativeText:NSLocalizedString(@"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences.", @"Queue Done Alert -> shut down informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Queue Done Alert -> shut down first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Preferences…", @"Queue Done Alert -> shut down second button")]; NSInteger response = [alert runModal]; if (response == NSAlertSecondButtonReturn) @@ -1202,12 +1202,12 @@ } NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"You are currently encoding. What would you like to do?", nil)]; - [alert setInformativeText:NSLocalizedString(@"Your encode will be canceled if you don't continue encoding.", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Continue Encoding", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Stop", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Continue", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Finish Current and Stop", nil)]; + [alert setMessageText:NSLocalizedString(@"You are currently encoding. What would you like to do?", @"Queue Alert -> cancel rip message")]; + [alert setInformativeText:NSLocalizedString(@"Your encode will be canceled if you don't continue encoding.", @"Queue Alert -> cancel rip informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"Continue Encoding", @"Queue Alert -> cancel rip first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Stop", @"Queue Alert -> cancel rip second button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Continue", @"Queue Alert -> cancel rip third button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Finish Current and Stop", @"Queue Alert -> cancel rip fourth button")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert beginSheetModalForWindow:window completionHandler:^(NSModalResponse returnCode) { @@ -1345,7 +1345,7 @@ HBJob *job = self.jobs[row]; if (job == self.currentJob) { - NSString *alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Edit It?", nil)]; + NSString *alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Edit It?", @"Queue Edit Alert -> stop and edit message")]; // Which window to attach the sheet to? NSWindow *docWindow = self.window; @@ -1356,9 +1356,9 @@ NSAlert *alert = [[NSAlert alloc] init]; [alert setMessageText:alertTitle]; - [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", nil)]; - [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Edit", nil)]; + [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Edit Alert -> stop and edit informative text")]; + [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Edit Alert -> stop and edit first button")]; + [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Edit", @"Queue Edit Alert -> stop and edit second button")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert beginSheetModalForWindow:docWindow completionHandler:^(NSModalResponse returnCode) { diff --git a/macosx/HBRange+UIAdditions.m b/macosx/HBRange+UIAdditions.m index e004fd724..04c7bfdac 100644 --- a/macosx/HBRange+UIAdditions.m +++ b/macosx/HBRange+UIAdditions.m @@ -20,9 +20,9 @@ - (NSArray *)types { - return @[NSLocalizedString(@"Chapters", @""), - NSLocalizedString(@"Seconds", @""), - NSLocalizedString(@"Frames", @"")]; + return @[NSLocalizedString(@"Chapters", @"HBRange -> display name"), + NSLocalizedString(@"Seconds", @"HBRange -> display name"), + NSLocalizedString(@"Frames", @"HBRange -> display name")]; } - (BOOL)chaptersSelected diff --git a/macosx/HBRenamePresetController.m b/macosx/HBRenamePresetController.m index baeee738e..33a2f8ec5 100644 --- a/macosx/HBRenamePresetController.m +++ b/macosx/HBRenamePresetController.m @@ -68,8 +68,8 @@ if (self.name.stringValue.length == 0) { NSAlert *alert = [[NSAlert alloc] init]; - [alert setMessageText:NSLocalizedString(@"The preset name cannot be empty.", @"")]; - [alert setInformativeText:NSLocalizedString(@"Please enter a name.", @"")]; + [alert setMessageText:NSLocalizedString(@"The preset name cannot be empty.", @"Rename preset window -> name alert message")]; + [alert setInformativeText:NSLocalizedString(@"Please enter a name.", @"Rename preset window -> name alert informative text")]; [alert runModal]; } else diff --git a/macosx/HBStateFormatter+Private.m b/macosx/HBStateFormatter+Private.m index e4728661f..d02484a74 100644 --- a/macosx/HBStateFormatter+Private.m +++ b/macosx/HBStateFormatter+Private.m @@ -21,12 +21,12 @@ case HB_STATE_SEARCHING: { [string appendFormat: - NSLocalizedString(@"Searching for start point: %.2f %%", nil), + NSLocalizedString(@"Searching for start point: %.2f %%", @"HBStateFormatter -> search pass display name"), 100.0 * p.progress]; if (p.seconds > -1) { - [string appendFormat:NSLocalizedString(@" (ETA %02dh%02dm%02ds)", nil), p.hours, p.minutes, p.seconds]; + [string appendFormat:NSLocalizedString(@" (ETA %02dh%02dm%02ds)", @"HBStateFormatter -> search time format"), p.hours, p.minutes, p.seconds]; } break; @@ -34,7 +34,7 @@ case HB_STATE_WORKING: { - [string appendFormat:NSLocalizedString(@"Encoding %@ ", nil), self.title]; + [string appendFormat:NSLocalizedString(@"Encoding %@ ", @"HBStateFormatter -> work pass display name"), self.title]; if (self.twoLines) { @@ -46,15 +46,15 @@ if (p.pass_id == HB_PASS_SUBTITLE) { [string appendFormat: - NSLocalizedString(@"Pass %d %@ of %d, %.2f %%", nil), + NSLocalizedString(@"Pass %d %@ of %d, %.2f %%", @"HBStateFormatter -> work pass number format"), p.pass, - NSLocalizedString(@"(subtitle scan)", nil), + NSLocalizedString(@"(subtitle scan)", @"HBStateFormatter -> work pass type format"), p.pass_count, 100.0 * p.progress]; } else { [string appendFormat: - NSLocalizedString(@"Pass %d of %d, %.2f %%", nil), + NSLocalizedString(@"Pass %d of %d, %.2f %%", @"HBStateFormatter -> work pass number format"), p.pass, p.pass_count, 100.0 * p.progress]; } } @@ -64,13 +64,13 @@ if (p.rate_cur > 0.0) { [string appendFormat: - NSLocalizedString(@" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", nil), + NSLocalizedString(@" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"HBStateFormatter -> work time format"), p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds]; } else { [string appendFormat: - NSLocalizedString(@" (ETA %02dh%02dm%02ds)", nil), + NSLocalizedString(@" (ETA %02dh%02dm%02ds)", @"HBStateFormatter -> work time format"), p.hours, p.minutes, p.seconds]; } } @@ -81,13 +81,13 @@ case HB_STATE_MUXING: { - [string appendString:NSLocalizedString(@"Muxing…", nil)]; + [string appendString:NSLocalizedString(@"Muxing…", @"HBStateFormatter -> pass display name")]; break; } case HB_STATE_PAUSED: { - [string appendString:NSLocalizedString(@"Paused", nil)]; + [string appendString:NSLocalizedString(@"Paused", @"HBStateFormatter -> pass display name")]; break; } @@ -97,14 +97,14 @@ if (p.preview_cur) { [string appendFormat: - NSLocalizedString(@"Scanning title %d of %d, preview %d…", nil), + NSLocalizedString(@"Scanning title %d of %d, preview %d…", @"HBStateFormatter -> scan pass format"), p.title_cur, p.title_count, p.preview_cur]; } else { [string appendFormat: - NSLocalizedString(@"Scanning title %d of %d…", nil), + NSLocalizedString(@"Scanning title %d of %d…", @"HBStateFormatter -> scan pass format"), p.title_cur, p.title_count]; } #undef p diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m index fcfefdbb7..39f9d20b8 100644 --- a/macosx/HBSubtitles.m +++ b/macosx/HBSubtitles.m @@ -63,10 +63,10 @@ extern NSString *keySubTrackSrtFileURLBookmark; int foreignAudioType = VOBSUB; // now set the name of the Foreign Audio Search track - NSMutableString *foreignAudioSearchTrackName = [@"Foreign Audio Search" mutableCopy]; + NSMutableString *foreignAudioSearchTrackName = [NSLocalizedString(@"Foreign Audio Search", "HBSubtitles -> search pass name") mutableCopy]; // Add the none and foreign track to the source array - NSDictionary *none = @{ keySubTrackName: NSLocalizedString(@"None", nil)}; + NSDictionary *none = @{ keySubTrackName: NSLocalizedString(@"None", @"HBSubtitles -> none track name")}; [sourceTracks insertObject:none atIndex:0]; NSDictionary *foreign = @{ keySubTrackName: [foreignAudioSearchTrackName copy], diff --git a/macosx/HBTitle.m b/macosx/HBTitle.m index 027201833..7d1cbbcdf 100644 --- a/macosx/HBTitle.m +++ b/macosx/HBTitle.m @@ -125,11 +125,11 @@ extern NSString *keySubTrackType; if (audioCount > 1) { - [format appendFormat:NSLocalizedString(@", %d audio tracks", nil), audioCount]; + [format appendFormat:NSLocalizedString(@", %d audio tracks", @"Title short description -> audio format"), audioCount]; } else if (audioCount == 1) { - [format appendFormat:NSLocalizedString(@", 1 audio track", nil)]; + [format appendFormat:NSLocalizedString(@", 1 audio track", @"Title short description -> audio format")]; } hb_list_t *subList = _hb_title->list_subtitle; @@ -137,11 +137,11 @@ extern NSString *keySubTrackType; if (subCount > 1) { - [format appendFormat:NSLocalizedString(@", %d subtitles tracks", nil), subCount]; + [format appendFormat:NSLocalizedString(@", %d subtitles tracks", @"Title short description -> subtitles format"), subCount]; } else if (subCount == 1) { - [format appendFormat:NSLocalizedString(@", 1 subtitles track", nil)]; + [format appendFormat:NSLocalizedString(@", 1 subtitles track", @"Title short description -> subtitles format")]; } return format; diff --git a/macosx/HBTitleSelectionController.m b/macosx/HBTitleSelectionController.m index 05d44354f..b0bf0a2fd 100644 --- a/macosx/HBTitleSelectionController.m +++ b/macosx/HBTitleSelectionController.m @@ -53,7 +53,7 @@ if (self) { _delegate = delegate; - _message = [NSString stringWithFormat:NSLocalizedString(@"Select the titles to add to the queue using the %@ preset:" , nil), presetName]; + _message = [NSString stringWithFormat:NSLocalizedString(@"Select the titles to add to the queue using the %@ preset:" , @"Titles selection sheet -> informative text"), presetName]; NSMutableArray<HBTitleSelection *> *array = [[NSMutableArray alloc] init]; for (HBTitle *title in titles) diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m index 0c0410b3a..46667a82e 100644 --- a/macosx/HBVideo+UIAdditions.m +++ b/macosx/HBVideo+UIAdditions.m @@ -43,7 +43,7 @@ { NSMutableArray *framerates = [NSMutableArray array]; - [framerates addObject:NSLocalizedString(@"Same as source", @"")]; + [framerates addObject:NSLocalizedString(@"Same as source", @"HBVideo -> frame rates display name")]; for (const hb_rate_t *video_framerate = hb_video_framerate_get_next(NULL); video_framerate != NULL; @@ -265,7 +265,7 @@ } else { - return NSLocalizedString(@"Same as source", @""); + return NSLocalizedString(@"Same as source", @"HBVideo -> frame rates display name"); } } @@ -276,7 +276,7 @@ - (id)reverseTransformedValue:(id)value { - if ([value isEqualTo:NSLocalizedString(@"Same as source", @"")]) + if ([value isEqualTo:NSLocalizedString(@"Same as source", @"HBVideo -> frame rates display name")]) { return @0; } diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m index a08d87bcc..5e43e3e74 100644 --- a/macosx/HBVideoController.m +++ b/macosx/HBVideoController.m @@ -119,11 +119,11 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; // fFramerateVfrPfrCell if (self.video.frameRate == 0) // We are Same as Source { - [fFramerateVfrPfrCell setTitle:NSLocalizedString(@"Variable Framerate", nil)]; + [fFramerateVfrPfrCell setTitle:NSLocalizedString(@"Variable Framerate", @"Video -> Framerate")]; } else { - [fFramerateVfrPfrCell setTitle:NSLocalizedString(@"Peak Framerate (VFR)", nil)]; + [fFramerateVfrPfrCell setTitle:NSLocalizedString(@"Peak Framerate (VFR)", @"Video -> Framerate")]; } } else if ([keyPath isEqualToString:@"video.quality"]) @@ -264,13 +264,13 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; { fX264UseAdvancedOptionsCheck.hidden = NO; fDividerLine.hidden = YES; - fEncoderOptionsLabel.stringValue = NSLocalizedString(@"Encoder Options:", @""); + fEncoderOptionsLabel.stringValue = NSLocalizedString(@"Encoder Options:", @"Video -> Advanced panel checkbox"); } else { fX264UseAdvancedOptionsCheck.hidden =YES; fDividerLine.hidden = NO; - fEncoderOptionsLabel.stringValue = NSLocalizedString(@"Encoder Options", @""); + fEncoderOptionsLabel.stringValue = NSLocalizedString(@"Encoder Options", @"Video -> Encoder options title"); self.video.advancedOptions = NO; } } |