From a05a3d11cf14b328bf16a748c9aa5f3c8cbc88d0 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Wed, 1 Jan 2014 21:20:40 +0000 Subject: OS X: Fixing a copy-paste error. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88208 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/English.lproj/en.lproj/Localizable.strings | 1 + macosx/English.lproj/fr.lproj/Localizable.strings | 2 +- macosx/English.lproj/hu.lproj/Localizable.strings | 1 + macosx/English.lproj/zh-Hans.lproj/Localizable.strings | 1 + macosx/PcsxrController.m | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macosx/English.lproj/en.lproj/Localizable.strings b/macosx/English.lproj/en.lproj/Localizable.strings index 1ce0f602..e112f3a8 100644 --- a/macosx/English.lproj/en.lproj/Localizable.strings +++ b/macosx/English.lproj/en.lproj/Localizable.strings @@ -107,6 +107,7 @@ "BIOS_Move" = "Move"; "BIOS Already Exists" = "BIOS Already Exists"; "There already exists a BIOS file at \"%1$@\": not copying the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not copying the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; +"There already exists a BIOS file at \"%1$@\": not moving the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not moving the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; //not-so-general buttons "Show Folder" = "Show Folder"; diff --git a/macosx/English.lproj/fr.lproj/Localizable.strings b/macosx/English.lproj/fr.lproj/Localizable.strings index c44d817e..1d7fb5cb 100644 --- a/macosx/English.lproj/fr.lproj/Localizable.strings +++ b/macosx/English.lproj/fr.lproj/Localizable.strings @@ -112,7 +112,7 @@ //"BIOS_Move" = "Move"; //"BIOS Already Exists" = "BIOS Already Exists"; //"There already exists a BIOS file at \"%1$@\": not copying the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not copying the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; - +//"There already exists a BIOS file at \"%1$@\": not moving the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not moving the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; //Mem card flags "MemCard_Deleted" = "Supprimé"; diff --git a/macosx/English.lproj/hu.lproj/Localizable.strings b/macosx/English.lproj/hu.lproj/Localizable.strings index 827215c6..f9e5fb05 100644 --- a/macosx/English.lproj/hu.lproj/Localizable.strings +++ b/macosx/English.lproj/hu.lproj/Localizable.strings @@ -112,6 +112,7 @@ //"BIOS_Move" = "Move"; //"BIOS Already Exists" = "BIOS Already Exists"; //"There already exists a BIOS file at \"%1$@\": not copying the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not copying the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; +//"There already exists a BIOS file at \"%1$@\": not moving the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not moving the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; //Mem card flags "MemCard_Deleted" = "Törölve"; diff --git a/macosx/English.lproj/zh-Hans.lproj/Localizable.strings b/macosx/English.lproj/zh-Hans.lproj/Localizable.strings index 9d63853d..20a196d3 100644 --- a/macosx/English.lproj/zh-Hans.lproj/Localizable.strings +++ b/macosx/English.lproj/zh-Hans.lproj/Localizable.strings @@ -112,6 +112,7 @@ //"BIOS_Move" = "Move"; //"BIOS Already Exists" = "BIOS Already Exists"; //"There already exists a BIOS file at \"%1$@\": not copying the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not copying the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; +//"There already exists a BIOS file at \"%1$@\": not moving the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\"." = "There already exists a BIOS file at “%1$@”: not moving the file at “%2$@”.\n\nIf you do want to use the BIOS file at “%2$@”, delete the BIOS at “%1$@”."; //Mem card flags "MemCard_Deleted" = "删除"; diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index b798b8d1..5c526e52 100755 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -918,7 +918,7 @@ otherblock();\ NSURL *biosDirPath = [NSURL fileURLWithPath:[fm stringWithFileSystemRepresentation:Config.BiosDir length:strlen(Config.BiosDir)] isDirectory:YES]; NSURL *biosPath = [biosDirPath URLByAppendingPathComponent:[filename lastPathComponent]]; if ([biosPath checkResourceIsReachableAndReturnError:NULL]) { - NSAlert *alreadyThere = [NSAlert alertWithMessageText:NSLocalizedString(@"BIOS Already Exists", @"BIOS file already there.") defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:NSLocalizedString(@"There already exists a BIOS file at \"%1$@\": not copying the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\".", @"What to do"), [biosPath path], filename]; + NSAlert *alreadyThere = [NSAlert alertWithMessageText:NSLocalizedString(@"BIOS Already Exists", @"BIOS file already there.") defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:NSLocalizedString(@"There already exists a BIOS file at \"%1$@\": not moving the file at \"%2$@\".\n\nIf you do want to use the BIOS file at \"%2$@\", delete the BIOS at \"%1$@\".", @"What to do"), [biosPath path], filename]; alreadyThere.alertStyle = NSCriticalAlertStyle; [alreadyThere runModal]; return NO; -- cgit v1.2.3