From 96ca338fa3a915a076308a1e712d3e91d3a8ecb3 Mon Sep 17 00:00:00 2001
From: vspader <unknown>
Date: Sun, 8 Jul 2007 00:13:03 +0000
Subject: [PATCH] Removed Preference window title. Fixed localizable string
 lookup calls in preference bundle.

---
 English.lproj/Localizable.strings            |   1 -
 German.lproj/Localizable.strings             |   2 --
 Greek.lproj/Localizable.strings              | Bin 1738 -> 1668 bytes
 Hebrew.lproj/Localizable.strings             | Bin 1406 -> 1332 bytes
 Preferences/General/AppcastArrayController.m |   6 +++---
 Preferences/General/FileDrawerPane.m         |   2 +-
 Preferences/General/HotKeyPane.m             |   2 +-
 Preferences/General/OutputPane.m             |   2 +-
 Preferences/General/PrefPaneController.m     |   7 ++++---
 Preferences/SS_PrefsController.m             |   2 +-
 Swedish.lproj/Localizable.strings            |   2 --
 11 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings
index c8fca7467..5f9b39da6 100644
--- a/English.lproj/Localizable.strings
+++ b/English.lproj/Localizable.strings
@@ -21,4 +21,3 @@
 "InvalidURLShort" = "Invalid URL";
 "InvalidURLLong" = "The URL is not valid.";
 
-"Preferences: " = "Preferences: ";
\ No newline at end of file
diff --git a/German.lproj/Localizable.strings b/German.lproj/Localizable.strings
index ff6212163..bed29c946 100644
--- a/German.lproj/Localizable.strings
+++ b/German.lproj/Localizable.strings
@@ -21,5 +21,3 @@
 "InvalidURLShort" = "Ungültige URL";
 "InvalidURLLong" = "Die URL ist nicht gültig.";
 
-"Preferences: " = "Preferences: ";
-
diff --git a/Greek.lproj/Localizable.strings b/Greek.lproj/Localizable.strings
index 4950adc5b09c0e466ab5b90fb50584e97a6d4c87..34b9a778c90c25c1a6325a8968eca0b1dc82d57e 100644
GIT binary patch
delta 7
OcmX@b+rqn{g$)1;!2+WI

delta 78
xcmZqSJ;l4Bh0RTgA%LNXA(bHwh(UB7Lo$#oX0T#VU{C^LTQH4JjWq)o0|0hx4a)!k

diff --git a/Hebrew.lproj/Localizable.strings b/Hebrew.lproj/Localizable.strings
index e3e09be0bba67e5e2f3032de221dce0f22d5edaf..1125bc0dc23e424ee638388a0c8e858e4ef7e1f0 100644
GIT binary patch
delta 7
OcmeyzwS{Yg2`c~%UIMTH

delta 82
zcmdnO^^a?V39A<ugAzjkLlHwNLmCi+=sbpGAX&^{#h?I`Q(&+K)A-a_GjIVR0HItB
A@Bjb+

diff --git a/Preferences/General/AppcastArrayController.m b/Preferences/General/AppcastArrayController.m
index da53cb173..0620ab860 100644
--- a/Preferences/General/AppcastArrayController.m
+++ b/Preferences/General/AppcastArrayController.m
@@ -17,15 +17,15 @@
 
 	[self addObject:
 		[NSDictionary dictionaryWithObjectsAndKeys:
-			NSLocalizedString(@"Stable", @""), @"name", @"http://cogx.org/appcast/stable.xml", @"url",nil]];
+			NSLocalizedStringFromTableInBundle(@"Stable", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"http://cogx.org/appcast/stable.xml", @"url",nil]];
 			
 	[self addObject:
 		[NSDictionary dictionaryWithObjectsAndKeys:
-			NSLocalizedString(@"Unstable", @""), @"name", @"http://cogx.org/appcast/unstable.xml", @"url",nil]];
+			NSLocalizedStringFromTableInBundle(@"Unstable", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"http://cogx.org/appcast/unstable.xml", @"url",nil]];
 			
 	[self addObject:
 		[NSDictionary dictionaryWithObjectsAndKeys:
-			NSLocalizedString(@"Nightly", @""), @"name", @"http://cogx.org/appcast/nightly.xml", @"url",nil]];
+			NSLocalizedStringFromTableInBundle(@"Nightly", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"http://cogx.org/appcast/nightly.xml", @"url",nil]];
 }
 
 
diff --git a/Preferences/General/FileDrawerPane.m b/Preferences/General/FileDrawerPane.m
index 2fbaa0313..fb0f4a461 100644
--- a/Preferences/General/FileDrawerPane.m
+++ b/Preferences/General/FileDrawerPane.m
@@ -13,7 +13,7 @@
 
 - (void)awakeFromNib
 {
-	[self setName:NSLocalizedString(@"File Drawer", @"")];
+	[self setName:NSLocalizedStringFromTableInBundle(@"File Drawer", nil, [NSBundle bundleForClass:[self class]], @"") ];
 	[self setIcon:@"file_drawer"];
 	
 	[rootPathTextView setStringValue:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileDrawerRootPath"]];
diff --git a/Preferences/General/HotKeyPane.m b/Preferences/General/HotKeyPane.m
index e07613f41..fade84dcf 100644
--- a/Preferences/General/HotKeyPane.m
+++ b/Preferences/General/HotKeyPane.m
@@ -13,7 +13,7 @@
 
 - (void)awakeFromNib
 {
-	[self setName:NSLocalizedString(@"Hot Keys", @"")];
+	[self setName:NSLocalizedStringFromTableInBundle(@"Hot Keys", nil, [NSBundle bundleForClass:[self class]], @"") ];
 	[self setIcon:@"hot_keys"];	
 
 //	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object: [view window]];
diff --git a/Preferences/General/OutputPane.m b/Preferences/General/OutputPane.m
index a67014cfc..fb04d0065 100644
--- a/Preferences/General/OutputPane.m
+++ b/Preferences/General/OutputPane.m
@@ -14,7 +14,7 @@
 - (void)awakeFromNib
 {
 	NSLog(@"AWOKEN!");
-	[self setName:NSLocalizedString(@"Output", @"")];
+	[self setName:NSLocalizedStringFromTableInBundle(@"Output", nil, [NSBundle bundleForClass:[self class]], @"") ];
 	[self setIcon:@"output"];
 }
 
diff --git a/Preferences/General/PrefPaneController.m b/Preferences/General/PrefPaneController.m
index 8fa00faf7..356df0c17 100644
--- a/Preferences/General/PrefPaneController.m
+++ b/Preferences/General/PrefPaneController.m
@@ -38,17 +38,18 @@
 
 - (PreferencePane *)remotePane
 {
-	return [PreferencePane preferencePaneWithView:remoteView name:NSLocalizedString(@"Remote", @"") icon:@"apple_remote"];
+	NSLog(@"Localizations; %@", [[NSBundle mainBundle] localizations]);
+	return [PreferencePane preferencePaneWithView:remoteView name:NSLocalizedStringFromTableInBundle(@"Remote", nil, [NSBundle bundleForClass:[self class]],  @"")  icon:@"apple_remote"];
 }
 
 - (PreferencePane *)updatesPane
 {
-	return [PreferencePane preferencePaneWithView:updatesView name:NSLocalizedString(@"Updates", @"") icon:@"updates"];
+	return [PreferencePane preferencePaneWithView:updatesView name:NSLocalizedStringFromTableInBundle(@"Updates", nil, [NSBundle bundleForClass:[self class]], @"")  icon:@"updates"];
 }
 
 - (PreferencePane *)scrobblerPane
 {
-	return [PreferencePane preferencePaneWithView:scrobblerView name:NSLocalizedString(@"Last.fm", @"") icon:@"lastfm"];
+	return [PreferencePane preferencePaneWithView:scrobblerView name:NSLocalizedStringFromTableInBundle(@"Last.fm", nil, [NSBundle bundleForClass:[self class]], @"")  icon:@"lastfm"];
 }
 
 @end
diff --git a/Preferences/SS_PrefsController.m b/Preferences/SS_PrefsController.m
index 4091b07ea..88a2c0993 100644
--- a/Preferences/SS_PrefsController.m
+++ b/Preferences/SS_PrefsController.m
@@ -339,7 +339,7 @@
     [prefsWindow setShowsResizeIndicator:canResize];
 
     if ((prefsToolbarItems && ([prefsToolbarItems count] > 1)) || alwaysShowsToolbar) {
-        [prefsWindow setTitle:[NSLocalizedString(@"Preferences: ", @"") stringByAppendingString:name]];
+        [prefsWindow setTitle:name];
     }
     
     // Update defaults
diff --git a/Swedish.lproj/Localizable.strings b/Swedish.lproj/Localizable.strings
index f18dee486..db7ac446b 100644
--- a/Swedish.lproj/Localizable.strings
+++ b/Swedish.lproj/Localizable.strings
@@ -20,5 +20,3 @@
 
 "InvalidURLShort" = "Ogiltig URL";
 "InvalidURLLong" = "URL ej giltig.";
-
-"Preferences: " = "Preferences: ";