Changeset 10330 for branches


Ignore:
Timestamp:
Mar 8, 2010, 4:16:44 AM (12 years ago)
Author:
livings124
Message:

1.9x: revert string changes in r10272 and r10288

Location:
branches/1.9x/macosx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.9x/macosx/Controller.m

    r10272 r10330  
    13121312               
    13131313                message = NSLocalizedString(@"This transfer is active."
    1314                             " Once removed, continuing the transfer will require the torrent file or magnet link.",
     1314                            " Once removed, continuing the transfer will require the torrent file.",
    13151315                            "Removal confirm panel -> message");
    13161316            }
     
    13331333                                "Removal confirm panel -> message part 1"), selected, active];
    13341334                message = [message stringByAppendingFormat: @" %@",
    1335                             NSLocalizedString(@"Once removed, continuing the transfers will require the torrent files or magnet links.",
     1335                            NSLocalizedString(@"Once removed, continuing the transfers will require the torrent files.",
    13361336                            "Removal confirm panel -> message part 2")];
    13371337            }
  • branches/1.9x/macosx/TrackerNode.m

    r10288 r10330  
    183183   
    184184    NSString * baseString;
    185     if (fStat.hasScraped && fStat.lastScrapeTimedOut)
    186         baseString = [NSLocalizedString(@"Scrape timed out", "Tracker last scrape") stringByAppendingFormat: @": %@", dateString];
    187     else if (fStat.hasScraped && !fStat.lastScrapeSucceeded)
     185    if (fStat.hasScraped && (!fStat.lastScrapeSucceeded || fStat.lastScrapeTimedOut))
    188186    {
    189187        baseString = NSLocalizedString(@"Scrape error", "Tracker last scrape");
    190188       
    191         NSString * errorString = [NSString stringWithUTF8String: fStat.lastScrapeResult];
     189        NSString * errorString = fStat.lastScrapeTimedOut ? @"timed out" : [NSString stringWithUTF8String: fStat.lastScrapeResult];
    192190        if ([errorString isEqualToString: @""])
    193191            baseString = [baseString stringByAppendingFormat: @": %@", dateString];
Note: See TracChangeset for help on using the changeset viewer.