From 5c82fa879807b96422ce3858a84a3b11029c0348 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Thu, 19 Jul 2007 03:49:24 +0000 Subject: [PATCH] small string change --- macosx/English.lproj/Localizable.strings | Bin 41200 -> 41184 bytes macosx/Torrent.m | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings index 6a5203d0a444a16dfe73f184ef7d86eec2a7fc04..a04964fc25e64e5e562a9d3394c2bafe86224074 100644 GIT binary patch delta 47 zcmexxkm113n-4YW$pZig Cxf4VH delta 67 zcmaEGkmreK7B>I@ diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 07901bce2..49efb531e 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -327,10 +327,9 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 [NSString stringForFileSize: [self size]], 100.0 * [self progress]]; else if (![self isComplete]) [progressString appendFormat: NSLocalizedString(@"%@ of %@ (%.2f%%), uploaded %@ (Ratio: %@)", - "Torrent -> progress string"), - [NSString stringForFileSize: [self downloadedValid]], [NSString stringForFileSize: [self size]], - 100.0 * [self progress], [NSString stringForFileSize: [self uploadedTotal]], - [NSString stringForRatio: [self ratio]]]; + "Torrent -> progress string"), [NSString stringForFileSize: [self downloadedValid]], + [NSString stringForFileSize: [self size]], 100.0 * [self progress], + [NSString stringForFileSize: [self uploadedTotal]], [NSString stringForRatio: [self ratio]]]; else [progressString appendFormat: NSLocalizedString(@"%@, uploaded %@ (Ratio: %@)", "Torrent -> progress string"), [NSString stringForFileSize: [self size]], [NSString stringForFileSize: [self uploadedTotal]], @@ -811,6 +810,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 NSDictionary * fsAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: [self downloadFolder]]; uint64_t remainingSpace = [[fsAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue]; + #warning add file size to remaining space and add total size if (remainingSpace <= fStat->left) { NSAlert * alert = [[NSAlert alloc] init]; @@ -818,7 +818,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.", "Torrent file disk space alert -> title"), [self name]]]; [alert setInformativeText: [NSString stringWithFormat: - NSLocalizedString(@"The transfer will be paused. Clear up space on \"%@\" to continue.", + NSLocalizedString(@"The transfer will be paused. Clear up space on %@ to continue.", "Torrent file disk space alert -> message"), volumeName]]; [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file disk space alert -> button")]; [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent file disk space alert -> button")];