Getting rid of a duplicate localization function.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88054 e17a0e51-4ae3-4d35-97c3-1a29b211df97

6 files changed, 14 insertions, 6 deletions

diff --git a/macosx/CheatController.m b/macosx/CheatController.m
index 2c09cf2a..acae6fbd 100644
--- a/macosx/CheatController.m
+++ b/macosx/CheatController.m
@@ -342,7 +342,7 @@
 						  NSLocalizedString(@"Don't Save",@"Don't Save"),
 						  NSLocalizedString(@"Cancel", @"Cancel"), [self window], self,
 						  NULL, @selector(sheetDidDismiss:returnCode:contextInfo:), NULL,
-						  NSLocalizedString(@"The cheat codes have not been applied. Unapplied cheats will not run nor be saved. Do you wish to save?",nil));
+						  NSLocalizedString(@"The cheat codes have not been applied. Unapplied cheats will not run nor be saved. Do you wish to save?", nil));
 		
 		return NO;
 	}
diff --git a/macosx/English.lproj/en.lproj/Localizable.strings b/macosx/English.lproj/en.lproj/Localizable.strings
index b64b02e2..55b8934e 100644
--- a/macosx/English.lproj/en.lproj/Localizable.strings
+++ b/macosx/English.lproj/en.lproj/Localizable.strings
@@ -80,7 +80,6 @@
 "Format Card" = "Format Card";
 "Free Size" = "Free Size";
 "Format" = "Format";
-"No Free Space" = "No Free Space";
 "Formatting a memory card will remove all data on it.\n\nThis cannot be undone." = "Formatting a memory card will remove all data on it.\n\nThis cannot be undone.";
 "Delete Block" = "Delete Block";
 "Deleting a block will remove all saved data on that block.\n\nThis cannot be undone." = "Deleting a memory card object will set the blocks to not be readable by the emulator, and may result in the data being overwritten in the future.";
@@ -101,6 +100,9 @@
 "No" = "No";
 "Delete" = "Delete";
 
+//not-so-general buttons
+"Show Folder" = "Show Folder";
+
 //Mem card flags
 "MemCard_Deleted" = "Deleted";
 "MemCard_Free" = "Free";
diff --git a/macosx/English.lproj/fr.lproj/Localizable.strings b/macosx/English.lproj/fr.lproj/Localizable.strings
index 0b084a47..b77de4cc 100644
--- a/macosx/English.lproj/fr.lproj/Localizable.strings
+++ b/macosx/English.lproj/fr.lproj/Localizable.strings
@@ -82,7 +82,6 @@
 "Format Card" = "Formater cette carte mémoire ?";
 //"Free Size" = "Free Size";
 //"Format" = "Format";
-"No Free Space" = "Pas d'emplacement libre sur la carte mémoire";
 //"Formatting a memory card will remove all data on it.\n\nThis cannot be undone." = "Formatting a memory card will remove all data on it.\n\nThis cannot be undone.";
 //"Delete Block" = "Delete Block";
 //"Deleting a block will remove all saved data on that block.\n\nThis cannot be undone." = "Deleting a memory card object will set the blocks to not be readable by the emulator, and may result in the data being overwritten in the future.";
@@ -103,6 +102,9 @@
 "No" = "Non";
 //"Delete" = "Delete";
 
+//not-so-general buttons
+//"Show Folder" = "Show Folder";
+
 //Mem card flags
 "MemCard_Deleted" = "Supprimé";
 "MemCard_Free" = "Libre";
diff --git a/macosx/English.lproj/hu.lproj/Localizable.strings b/macosx/English.lproj/hu.lproj/Localizable.strings
index cb2e62e3..b5229483 100644
--- a/macosx/English.lproj/hu.lproj/Localizable.strings
+++ b/macosx/English.lproj/hu.lproj/Localizable.strings
@@ -82,7 +82,6 @@
 "Format Card" = "Kártya formázása";
 //"Free Size" = "Free Size";
 "Format" = "Formázod a memória kártyát?";
-//"No Free Space" = "No Free Space";
 "Formatting a memory card will remove all data on it.\n\nThis cannot be undone." = "Ha leformázod a memória kártyát, akkor a kártya üres lesz és minden meglévő adat el fog veszni.";
 //"Delete Block" = "Delete Block";
 //"Deleting a block will remove all saved data on that block.\n\nThis cannot be undone." = "Deleting a memory card object will set the blocks to not be readable by the emulator, and may result in the data being overwritten in the future.";
@@ -103,6 +102,9 @@
 "No" = "Nem";
 //"Delete" = "Delete";
 
+//not-so-general buttons
+//"Show Folder" = "Show Folder";
+
 //Mem card flags
 "MemCard_Deleted" = "Törölve";
 "MemCard_Free" = "Üres";
diff --git a/macosx/English.lproj/zh-Hans.lproj/Localizable.strings b/macosx/English.lproj/zh-Hans.lproj/Localizable.strings
index 1bc43cce..28bccab5 100644
--- a/macosx/English.lproj/zh-Hans.lproj/Localizable.strings
+++ b/macosx/English.lproj/zh-Hans.lproj/Localizable.strings
@@ -80,7 +80,6 @@
 "Format Card" = "格式化记忆卡";
 "Free Size" = "可用大小";
 "Format" = "格式";
-"No Free Space" = "No Free Space";
 "Formatting a memory card will remove all data on it.\n\nThis cannot be undone." = "格式化记忆卡将移除里面的数据.\n";
 "Delete Block" = "删除存档";
 "Deleting a block will remove all saved data on that block.\n\nThis cannot be undone." = "删除后在模拟器里将不能呢个读取这个存档.";
@@ -101,6 +100,9 @@
 "No" = "取消";
 "Delete" = "删除";
 
+//not-so-general buttons
+//"Show Folder" = "Show Folder";
+
 //Mem card flags
 "MemCard_Deleted" = "删除";
 "MemCard_Free" = "可用";
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index 2e260049..f44c0976 100755
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -466,7 +466,7 @@ otherblock();\
 		NSURL *biosURL = [[supportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"Bios"];
 		NSInteger retVal = NSRunInformationalAlertPanel(NSLocalizedString(@"Missing BIOS!", nil),
 				NSLocalizedString(@"Pcsxr wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\nIf you have a BIOS available, please copy it to\n%@", nil), 
-				NSLocalizedString(@"OK", @"OK"), NSLocalizedString(@"Show Folder", @"Show Folder"), nil, [[biosURL path] stringByAbbreviatingWithTildeInPath]);
+				NSLocalizedString(@"Okay", @"OK"), NSLocalizedString(@"Show Folder", @"Show Folder"), nil, [[biosURL path] stringByAbbreviatingWithTildeInPath]);
 		if (retVal == NSAlertAlternateReturn) {
 			[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[biosURL]];
 		}