diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings index cde8a03d1..06bf93cfc 100644 Binary files a/macosx/English.lproj/Localizable.strings and b/macosx/English.lproj/Localizable.strings differ diff --git a/macosx/Torrent.m b/macosx/Torrent.m index e40935de9..7a6bc59bf 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -357,7 +357,8 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 break; case TR_STATUS_CHECK: - tempString = [NSLocalizedString(@"Checking existing data", "Torrent -> status string") stringByAppendingEllipsis]; + tempString = [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)", + "Torrent -> status string"), 100.0 * fStat->recheckProgress]; [statusString setString: tempString]; [shortStatusString setString: tempString]; @@ -990,7 +991,12 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 break; case TR_STATUS_CHECK: - return [NSLocalizedString(@"Checking existing data", "Torrent -> status string") stringByAppendingEllipsis]; + return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)", + "Torrent -> status string"), 100.0 * fStat->recheckProgress]; + break; + + case TR_STATUS_CHECK_WAIT: + return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis]; break; case TR_STATUS_DOWNLOAD: diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index 821bb7db0..78e0f51b7 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -248,8 +248,12 @@ torrent = [fTorrents objectAtIndex: i]; rect = [self pauseRectForRow: i]; - if ([torrent isActive] && ![torrent isChecking]) - image = NSPointInRect(fClickPoint, rect) ? fPauseOnIcon : fPauseOffIcon; + image = nil; + if ([torrent isActive]) + { + if (![torrent isChecking]) + image = NSPointInRect(fClickPoint, rect) ? fPauseOnIcon : fPauseOffIcon; + } else if ([torrent isPaused]) { if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"]) @@ -259,8 +263,7 @@ else image = NSPointInRect(fClickPoint, rect) ? fResumeOnIcon : fResumeOffIcon; } - else - image = nil; + else; if (image) [image compositeToPoint: NSMakePoint(rect.origin.x, NSMaxY(rect)) operation: NSCompositeSourceOver];