diff --git a/Application/AppController.m b/Application/AppController.m index 79d56ca95..58a6201a4 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -296,7 +296,7 @@ void *kAppControllerContext = &kAppControllerContext; if([keyPath isEqualToString:@"playlistController.currentEntry"]) { PlaylistEntry *entry = playlistController.currentEntry; - NSString *appTitle = NSLocalizedString(@"CogTitle", @"Cog"); + NSString *appTitle = NSLocalizedString(@"CogTitle", @""); if(!entry) { miniWindow.title = appTitle; mainWindow.title = appTitle; diff --git a/Application/PlaybackEventController.m b/Application/PlaybackEventController.m index a205e5ce5..ce392f553 100644 --- a/Application/PlaybackEventController.m +++ b/Application/PlaybackEventController.m @@ -281,7 +281,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response } } - notif.actionButtonTitle = NSLocalizedString(@"SkipAction", @"Skip"); + notif.actionButtonTitle = NSLocalizedString(@"SkipAction", @""); [[NSUserNotificationCenter defaultUserNotificationCenter] scheduleNotification:notif]; diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 4f806d3ed..96b586963 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -913,7 +913,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc if([self shuffle] != ShuffleOff) [self resetShuffleList]; - [[self undoManager] setActionName:NSLocalizedString(@"PlaylistRandomizationAction", @"Playlist Randomization")]; + [[self undoManager] setActionName:NSLocalizedString(@"PlaylistRandomizationAction", @"")]; } - (void)unrandomizeList:(NSArray *)entries { diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m index 75bfb9a0d..fe2a60942 100644 --- a/Playlist/PlaylistLoader.m +++ b/Playlist/PlaylistLoader.m @@ -343,9 +343,9 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc return @[]; } - [self beginProgress:NSLocalizedString(@"ProgressActionLoader", @"playlist loader inserting files")]; + [self beginProgress:NSLocalizedString(@"ProgressActionLoader", @"")]; - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderListingFiles", @"collecting files") percentOfTotal:20.0]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderListingFiles", @"") percentOfTotal:20.0]; if(index < 0) index = 0; @@ -390,7 +390,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc sortedURLs = expandedURLs; } - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainerFiles", @"handling container file types") percentOfTotal:20.0]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainerFiles", @"") percentOfTotal:20.0]; progressstep = [sortedURLs count] ? 100.0 / (double)([sortedURLs count]) : 0; @@ -422,7 +422,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc [self completeProgressJob]; if([fileURLs count] > 0) { - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringFiles", @"eliminating unsupported file types") percentOfTotal:20.0]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringFiles", @"") percentOfTotal:20.0]; } else { [self setProgressStatus:60.0]; } @@ -461,7 +461,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc } if([containedURLs count] > 0) { - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainedFiles", @"eliminating unsupported file types from containers") percentOfTotal:20.0]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainedFiles", @"") percentOfTotal:20.0]; } else { [self setProgressStatus:80.0]; } @@ -500,7 +500,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc return @[]; } - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderAddingEntries", @"creating and adding playlist entries") percentOfTotal:20.0]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderAddingEntries", @"") percentOfTotal:20.0]; progressstep = 100.0 / (double)(count); @@ -568,8 +568,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc metadataLoadInProgress = YES; - [self beginProgress:NSLocalizedString(@"ProgressActionLoadingMetadata", @"loading metadata for tracks")]; - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoadingMetadata", @"processing files") percentOfTotal:50.0]; + [self beginProgress:NSLocalizedString(@"ProgressActionLoadingMetadata", @"")]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoadingMetadata", @"") percentOfTotal:50.0]; [self performSelectorOnMainThread:@selector(syncLoadInfoForEntries:) withObject:arrayFirst waitUntilDone:YES]; @@ -600,8 +600,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc progressstep = 100.0 / (double)([entries count] + 1); progress = progressstep; } else if([entries count]) { - [self beginProgress:NSLocalizedString(@"ProgressActionLoadingMetadata", @"loading metadata for tracks")]; - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoadingMetadata", @"processing files") percentOfTotal:50.0]; + [self beginProgress:NSLocalizedString(@"ProgressActionLoadingMetadata", @"")]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoadingMetadata", @"") percentOfTotal:50.0]; progressstep = 100.0 / (double)([entries count]); progress = 0.0; @@ -683,7 +683,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc progress = 0.0; [self completeProgressJob]; - [self beginProgressJob:NSLocalizedString(@"ProgressSubActionMetadataApply", @"applying info to playlist storage") percentOfTotal:50.0]; + [self beginProgressJob:NSLocalizedString(@"ProgressSubActionMetadataApply", @"") percentOfTotal:50.0]; progressstep = 200.0 / (double)([outArray count]); diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index b0cb1d13e..41a6a8e16 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -47,7 +47,7 @@ [self setVerticalMotionCanBeginDrag:YES]; // Set up header context menu - headerContextMenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"PlaylistHeaderContextMenuTitle", @"Playlist Header Context Menu")]; + headerContextMenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"PlaylistHeaderContextMenuTitle", @"")]; NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"identifier" ascending:YES]; @@ -58,9 +58,9 @@ for(NSTableColumn *col in [columns sortedArrayUsingDescriptors:sortDescriptors]) { NSString *title; if([[col identifier] isEqualToString:@"status"]) { - title = NSLocalizedString(@"PlaylistStatusColumn", @"Status"); + title = NSLocalizedString(@"PlaylistStatusColumn", @""); } else if([[col identifier] isEqualToString:@"index"]) { - title = NSLocalizedString(@"PlaylistIndexColumn", @"Index"); + title = NSLocalizedString(@"PlaylistIndexColumn", @""); } else { title = [[col headerCell] title]; } diff --git a/Preferences/PreferencesWindow.m b/Preferences/PreferencesWindow.m index 9c96668a4..4d407f325 100644 --- a/Preferences/PreferencesWindow.m +++ b/Preferences/PreferencesWindow.m @@ -42,7 +42,7 @@ } [self setReleasedWhenClosed:NO]; - [self setTitle:NSLocalizedString(@"PreferencesTitle", @"Preferences")]; + [self setTitle:NSLocalizedString(@"PreferencesTitle", @"")]; [self center]; if(@available(macOS 11, *)) { diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 2382bb88b..16f4c854f 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -46,13 +46,6 @@ "PreferencesTitle" = "Preferences"; -"ProgressActionUpdatingIndexes" = "updating playlist indexes"; -"ProgressActionMovingEntries" = "moving playlist entries"; -"ProgressActionInsertingEntries" = "inserting playlist entries"; -"ProgressActionUntrashingEntries" = "restoring playlist entries from the trash"; -"ProgressActionRemovingEntries" = "removing playlist entries"; -"ProgressActionTrashingEntries" = "moving playlist entries to the trash"; - "ProgressActionLoader" = "playlist loader inserting files"; "ProgressSubActionLoaderListingFiles" = "collecting files"; "ProgressSubActionLoaderFilteringContainerFiles" = "handling container file types"; diff --git a/es.lproj/Localizable.strings b/es.lproj/Localizable.strings index 2382bb88b..16f4c854f 100644 --- a/es.lproj/Localizable.strings +++ b/es.lproj/Localizable.strings @@ -46,13 +46,6 @@ "PreferencesTitle" = "Preferences"; -"ProgressActionUpdatingIndexes" = "updating playlist indexes"; -"ProgressActionMovingEntries" = "moving playlist entries"; -"ProgressActionInsertingEntries" = "inserting playlist entries"; -"ProgressActionUntrashingEntries" = "restoring playlist entries from the trash"; -"ProgressActionRemovingEntries" = "removing playlist entries"; -"ProgressActionTrashingEntries" = "moving playlist entries to the trash"; - "ProgressActionLoader" = "playlist loader inserting files"; "ProgressSubActionLoaderListingFiles" = "collecting files"; "ProgressSubActionLoaderFilteringContainerFiles" = "handling container file types";