English.lproj/Localizable.strings @@ -346,7 +346,7 @@ NSString *serviceLabel = [[SyncedDocumentsController sharedInstance] serviceLabel]; NSString *messageText = [NSString stringWithFormat:BLocalizedString(@"%@ Conflicts", nil), serviceLabel]; NSString *informativeTextText = [NSString stringWithFormat:BLocalizedString(@"Some of your edits conflict with recent changes made on %@. Please go to the website to resolve these conflicts.", nil), serviceLabel]; - NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:BLocalizedString(@"Resolve", nil) alternateButton:BLocalizedString(@"Close", nil) otherButton:nil informativeTextWithFormat:informativeTextText]; + NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:BLocalizedString(@"Resolve", nil) alternateButton:BLocalizedString(@"Later", nil) otherButton:nil informativeTextWithFormat:informativeTextText]; if ([alert runModal] == NSOKButton) { [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[[[SyncedDocumentsController sharedInstance] serviceRootURLString] stringByAppendingString:@"/documents/#conflicts"]]]; } SyncedDocumentsControllerDelegate.m 4f32a2241be2c2a061952ef34eb6742fe0f9cc42 Jesse Grosjean jesse@hogbaysoftware.com http://github.com/jessegrosjean/bdocuments/commit/a1e40da80cac43d62574e5f65daa38bb3b917eb0 a1e40da80cac43d62574e5f65daa38bb3b917eb0 2009-06-01T10:12:03-07:00 2009-06-01T10:12:03-07:00 changed button b1342bbc5b87af769891b950a03fd27ab6e6be42 Jesse Grosjean jesse@hogbaysoftware.com