even more string folding!

diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index b8279a1afbfa375ca34c83cd187d5fc8d5175a9e..587ee18f53975d6f33f363e57e04bb809ac2d397 100644 (file)
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 54accb47eb9f906bdfe9aceb4e42c51ececff0a9..163ab0a51138241f1be662c619d01980e065ac04 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -974,15 +974,13 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     if (![self allDownloaded])
     {
         if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
-        {
-            string = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@ selected (%.2f%%)",
-                            "Torrent -> progress string"), [NSString stringForFileSize: [self haveTotal]],
-                            [NSString stringForFileSize: [self totalSizeSelected]], 100.0 * [self progressDone]];
-        }
+            string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@ selected", "Torrent -> progress string"),
+                        [NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self totalSizeSelected]]];
         else
-            string = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)", "Torrent -> progress string"),
-                            [NSString stringForFileSize: [self haveTotal]],
-                            [NSString stringForFileSize: [self size]], 100.0 * [self progress]];
+            string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@", "Torrent -> progress string"),
+                        [NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self size]]];
+        
+        string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", string, 100.0 * [self progress]];
     }
     else
     {
@@ -991,11 +989,14 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
         {
             if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
                 downloadString = [NSString stringWithFormat: NSLocalizedString(@"%@ selected", "Torrent -> progress string"),
-                                [NSString stringForFileSize: [self haveTotal]]];
+                                    [NSString stringForFileSize: [self haveTotal]]];
             else
-                downloadString = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)",
-                                    "Torrent -> progress string"), [NSString stringForFileSize: [self haveTotal]],
-                                    [NSString stringForFileSize: [self size]], 100.0 * [self progress]];
+            {
+                downloadString = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@", "Torrent -> progress string"),
+                                    [NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self size]]];
+                
+                downloadString = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", downloadString, 100.0 * [self progress]];
+            }
         }
         else
             downloadString = [NSString stringForFileSize: [self size]];