Added localizableness to some more stuff.

diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings
index c8ac213..ba3b981 100755 (executable)
--- a/English.lproj/Localizable.strings
+++ b/English.lproj/Localizable.strings
@@ -13,17 +13,19 @@ quit = "Quit MenuTunes";
 trackInfo = "Current Track Info";
 nowPlaying = "Now Playing";
 noSong = "No Song";
+time = "Time";
 track = "Track";
 separator = "<separator>";
 songRating = "Song Rating";
 upcomingSongs = "Upcoming Songs";
 playlists = "Playlists";
 eqPresets = "EQ Presets";
+refresh = "Refresh";
 open = "Open";
 noSongPlaying = "No song is playing.";
 noUpcomingSongs = "No upcoming songs.";
 autolaunch = "Auto-launch MenuTunes";
-autolaunch_msg = "Would you like MenuTunes to automatically launch at login?";
+autolaunch_msg = "Would you like MenuTunes to launch\nautomatically at startup?";
 duplicateCombo = "Duplicate Key Combo";
 duplicateCombo_msg = "The specified key combo is already in use...";
 replace = "Replace";
@@ -33,6 +35,17 @@ validated_title = "Registration Successful";
 validated_msg = "Your license key has been validated and stored.  Thank you for your support.";
 failed_title = "Registration Failed";
 failed_msg = "Your license key could not be validated.  Be sure that the name you entered matches the license key.";
+trialexpired_msg = "Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.";
+sharedplayeravailable_msg = "The selected shared player is available again.\nWould you like to reconnect to it?";
+sharedplayerunreachable_msg = "The remote MenuTunes server is unreachable.\nMenuTunes will revert back to the local player.";
+reconfigureprefs_msg = "The new features in this version of MenuTunes\nrequire you to reconfigure your preferences.";
+registernow = "Register Now";
+quitmenutunes = "Quit MenuTunes";
+reconnect = "Reconnect";
+ignore = "Ignore";
+showPreferences = "Show Preferences";
+launch_at_startup = "Launch At Startup";
+launch_manually = "Launch Manually";
 radio = "Radio";
 genericDevice = "Generic Device";
 iPod = "iPod";

diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index e8852a5..026313a 100755 (executable)
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/MainController.m b/MainController.m
index 73a8146..eb1aa3f 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -891,7 +891,7 @@ static MainController *sharedController;
         if ( [df boolForKey:@"showTime"] ) {
             NS_DURING
                 time = [NSString stringWithFormat:@"%@: %@ / %@",
-                @"Time",
+                NSLocalizedString(@"time", @"Time"),
                 [[self currentRemote] currentSongElapsed],
                 [[self currentRemote] currentSongLength]];
             NS_HANDLER

diff --git a/MenuController.m b/MenuController.m
index 6f7cb03..c448278 100755 (executable)
--- a/MenuController.m
+++ b/MenuController.m
@@ -682,7 +682,7 @@
     }
     [indices release];
     [playlistsMenu addItem:[NSMenuItem separatorItem]];
-    [[playlistsMenu addItemWithTitle:@"Refresh" action:@selector(rebuildSubmenus) keyEquivalent:@""] setTarget:self];
+    [[playlistsMenu addItemWithTitle:NSLocalizedString(@"refresh", @"Refresh") action:@selector(rebuildSubmenus) keyEquivalent:@""] setTarget:self];
     ITDebugLog(@"Done Building \"Playlists\" menu");
     return playlistsMenu;
 }

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 8eaba4f..b89d4e4 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -234,13 +234,13 @@ static StatusWindowController *sharedController;
 
 - (void)showSetupQueryWindow
 {
-    NSString *message = @"Would you like MenuTunes to launch\nautomatically at startup?";
+    NSString *message = NSLocalizedString(@"autolaunch_msg", @"Would you like MenuTunes to launch\nautomatically at startup?");
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Launch at Startup"
-                          alternateButton:@"Launch Manually"
+                            defaultButton:NSLocalizedString(@"launch_at_startup", @"Launch at Startup")
+                          alternateButton:NSLocalizedString(@"launch_manually", @"Launch Manually")
                                    target:[PreferencesController sharedPrefs]
                             defaultAction:@selector(autoLaunchOK)
                           alternateAction:@selector(autoLaunchCancel)];
@@ -252,13 +252,13 @@ static StatusWindowController *sharedController;
 
 - (void)showRegistrationQueryWindow
 {
-    NSString *message = @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.";
+    NSString *message = NSLocalizedString(@"trialexpired_msg", @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.");
 
     [_window setImage:[NSImage imageNamed:@"Register"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Register Now"
-                          alternateButton:@"Quit MenuTunes"
+                            defaultButton:NSLocalizedString(@"registernow", @"Register Now")
+                          alternateButton:NSLocalizedString(@"quitmenutunes", @"Quit MenuTunes")
                                    target:[MainController sharedController]
                             defaultAction:@selector(registerNowOK)
                           alternateAction:@selector(registerNowCancel)];
@@ -269,13 +269,13 @@ static StatusWindowController *sharedController;
 
 - (void)showReconnectQueryWindow
 {
-    NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?";
+    NSString *message = NSLocalizedString(@"sharedplayeravailable_msg", @"The selected shared player is available again.\nWould you like to reconnect to it?");
     [_window setLocked:NO];
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Reconnect"
-                          alternateButton:@"Ignore"
+                            defaultButton:NSLocalizedString(@"reconnect", @"Reconnect")
+                          alternateButton:NSLocalizedString(@"ignore", @"Ignore")
                                    target:[MainController sharedController]
                             defaultAction:@selector(reconnect)
                           alternateAction:@selector(cancelReconnect)];
@@ -286,7 +286,7 @@ static StatusWindowController *sharedController;
 
 - (void)showNetworkErrorQueryWindow
 {
-    NSString *message = @"The remote MenuTunes server is unreachable.\nMenuTunes will revert back to the local player.";
+    NSString *message = NSLocalizedString(@"sharedplayerunreachable_msg", @"The remote MenuTunes server is unreachable.\nMenuTunes will revert back to the local player.");
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
@@ -303,12 +303,12 @@ static StatusWindowController *sharedController;
 
 - (void)showPreferencesUpdateWindow
 {
-    NSString *message = @"The new features in this version of MenuTunes\nrequire you to reconfigure your preferences.";
+    NSString *message = NSLocalizedString(@"reconfigureprefs_msg", @"The new features in this version of MenuTunes\nrequire you to reconfigure your preferences.");
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Show Preferences"
+                            defaultButton:NSLocalizedString(@"showpreferences", @"Show Preferences")
                           alternateButton:@"OK"
                                    target:[MainController sharedController]
                             defaultAction:@selector(showPreferencesAndClose)