Changeset 1027 for trunk


Ignore:
Timestamp:
Oct 24, 2006, 8:51:47 PM (15 years ago)
Author:
livings124
Message:

some cleanup from the previous commit

Location:
trunk/macosx
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r1026 r1027  
    202202    }
    203203
    204     [fActionButton setToolTip: NSLocalizedString(@"Shortcuts for changing global settings.", "Main window -> 1st bottom left button (action) tooltip")];
    205     [fSpeedLimitButton setToolTip: NSLocalizedString(@"Speed Limit overrides the total bandwidth limits with its own limits.", "Main window -> 2nd bottom left button (turtle) tooltip")];
     204    [fActionButton setToolTip: NSLocalizedString(@"Shortcuts for changing global settings.",
     205                                "Main window -> 1st bottom left button (action) tooltip")];
     206    [fSpeedLimitButton setToolTip: NSLocalizedString(@"Speed Limit overrides the total bandwidth limits with its own limits.",
     207                                "Main window -> 2nd bottom left button (turtle) tooltip")];
    206208
    207209    [fTableView setTorrents: fDisplayedTorrents];
     
    278280   
    279281    //set upload limit action button
    280     [fUploadLimitItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)", "Action context menu -> upload limit"),
    281                     [fDefaults integerForKey: @"UploadLimit"]]];
     282    [fUploadLimitItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
     283                    "Action context menu -> upload limit"), [fDefaults integerForKey: @"UploadLimit"]]];
    282284    if ([fDefaults boolForKey: @"CheckUpload"])
    283285        [fUploadLimitItem setState: NSOnState];
     
    286288
    287289        //set download limit action menu
    288     [fDownloadLimitItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)", "Action context menu -> download limit"),
    289                     [fDefaults integerForKey: @"DownloadLimit"]]];
     290    [fDownloadLimitItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
     291                    "Action context menu -> download limit"), [fDefaults integerForKey: @"DownloadLimit"]]];
    290292    if ([fDefaults boolForKey: @"CheckDownload"])
    291293        [fDownloadLimitItem setState: NSOnState];
     
    294296   
    295297    //set ratio action menu
    296     [fRatioSetItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)", "Action context menu -> ratio stop"),
    297                                 [fDefaults floatForKey: @"RatioLimit"]]];
     298    [fRatioSetItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
     299                                "Action context menu -> ratio stop"), [fDefaults floatForKey: @"RatioLimit"]]];
    298300    if ([fDefaults boolForKey: @"RatioCheck"])
    299301        [fRatioSetItem setState: NSOnState];
     
    395397        {
    396398            NSString * message = active == 1
    397                 ? NSLocalizedString(@"There is an active transfer. Do you really want to quit?", "Confirm Quit panel -> message")
    398                 : [NSString stringWithFormat:
    399                     NSLocalizedString(@"There are %d active transfers. Do you really want to quit?", "Confirm Quit panel -> message"), active];
    400 
    401             NSBeginAlertSheet(NSLocalizedString(@"Confirm Quit", "Confirm Quit panel -> title"), NSLocalizedString(@"Quit", "Confirm Quit panel -> button"), NSLocalizedString(@"Cancel", "Confirm Quit panel -> button"), nil, fWindow, self,
     399                ? NSLocalizedString(@"There is an active transfer. Do you really want to quit?",
     400                    "Confirm Quit panel -> message")
     401                : [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers. Do you really want to quit?",
     402                    "Confirm Quit panel -> message"), active];
     403
     404            NSBeginAlertSheet(NSLocalizedString(@"Confirm Quit", "Confirm Quit panel -> title"),
     405                                NSLocalizedString(@"Quit", "Confirm Quit panel -> button"),
     406                                NSLocalizedString(@"Cancel", "Confirm Quit panel -> button"), nil, fWindow, self,
    402407                                @selector(quitSheetDidEnd:returnCode:contextInfo:), nil, nil, message);
    403408            return NSTerminateLater;
     
    542547    [panel setCanChooseDirectories: YES];
    543548
    544     [panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"", "Open torrent -> select destination folder"), [torrent name]]];
     549    [panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"",
     550                        "Open torrent -> select destination folder"), [torrent name]]];
    545551   
    546552    NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys: torrent, @"Torrent", files, @"Files", nil];
     
    726732            if (selected == 1)
    727733            {
    728                 title = [NSString stringWithFormat: NSLocalizedString(@"Confirm Removal of \"%@\"", "Removal confirm panel -> title"),
     734                title = [NSString stringWithFormat: NSLocalizedString(@"Confirm Removal of \"%@\"",
     735                            "Removal confirm panel -> title"),
    729736                            [[fDisplayedTorrents objectAtIndex: [fTableView selectedRow]] name]];
    730737                message = NSLocalizedString(@"This transfer is active."
     
    734741            else
    735742            {
    736                 title = [NSString stringWithFormat: NSLocalizedString(@"Confirm Removal of %d Transfers", "Removal confirm panel -> title"), selected];
     743                title = [NSString stringWithFormat: NSLocalizedString(@"Confirm Removal of %d Transfers",
     744                            "Removal confirm panel -> title"), selected];
    737745                if (selected == active)
    738                     message = [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers.", "Removal confirm panel -> message part 1"), active];
     746                    message = [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers.",
     747                                "Removal confirm panel -> message part 1"), active];
    739748                else
    740                     message = [NSString stringWithFormat: NSLocalizedString(@"There are %d transfers (%d active).", "Removal confirm panel -> message part 1"), selected, active];
     749                    message = [NSString stringWithFormat: NSLocalizedString(@"There are %d transfers (%d active).",
     750                                "Removal confirm panel -> message part 1"), selected, active];
    741751                message = [message stringByAppendingString:
    742752                    NSLocalizedString(@" Once removed, continuing the transfers will require the torrent files."
     
    744754            }
    745755
    746             NSBeginAlertSheet(title, NSLocalizedString(@"Remove", "Removal confirm panel -> button"), NSLocalizedString(@"Cancel", "Removal confirm panel -> button"), nil, fWindow, self,
     756            NSBeginAlertSheet(title, NSLocalizedString(@"Remove", "Removal confirm panel -> button"),
     757                NSLocalizedString(@"Cancel", "Removal confirm panel -> button"), nil, fWindow, self,
    747758                nil, @selector(removeSheetDidEnd:returnCode:contextInfo:), dict, message);
    748759            return;
     
    866877        NSAlert * alert = [[NSAlert alloc] init];
    867878        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file copy alert -> button")];
    868         [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Copy of \"%@\" Cannot Be Created", "Torrent file copy alert -> title"), [torrent name]]];
     879        [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Copy of \"%@\" Cannot Be Created",
     880                                "Torrent file copy alert -> title"), [torrent name]]];
    869881        [alert setInformativeText: [NSString stringWithFormat:
    870                 NSLocalizedString(@"The torrent file (%@) cannot be found.", "Torrent file copy alert -> message"), [torrent torrentLocation]]];
     882                NSLocalizedString(@"The torrent file (%@) cannot be found.", "Torrent file copy alert -> message"),
     883                                    [torrent torrentLocation]]];
    871884        [alert setAlertStyle: NSWarningAlertStyle];
    872885       
     
    961974    if (![fStatusBar isHidden])
    962975    {
    963         [fTotalDLField setStringValue: [NSLocalizedString(@"Total DL: ", "Status bar -> total download") stringByAppendingString: [NSString stringForSpeed: downloadRate]]];
    964         [fTotalULField setStringValue: [NSLocalizedString(@"Total UL: ", "Status bar -> total upload") stringByAppendingString: [NSString stringForSpeed: uploadRate]]];
     976        [fTotalDLField setStringValue: [NSLocalizedString(@"Total DL: ", "Status bar -> total download")
     977                                        stringByAppendingString: [NSString stringForSpeed: downloadRate]]];
     978        [fTotalULField setStringValue: [NSLocalizedString(@"Total UL: ", "Status bar -> total upload")
     979                                        stringByAppendingString: [NSString stringForSpeed: uploadRate]]];
    965980    }
    966981
     
    9871002    }
    9881003
    989     [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Download Complete", "Growl notification title") description: [torrent name]
     1004    [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Download Complete", "Growl notification title")
     1005        description: [torrent name]
    9901006        notificationName: GROWL_DOWNLOAD_COMPLETE iconData: nil priority: 0 isSticky: NO clickContext: nil];
    9911007
     
    13771393    [noLimitItem setState: !enable ? NSOnState : NSOffState];
    13781394   
    1379     [limitItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)", "Action context menu -> upload/download limit"),
    1380                             [[dict objectForKey: @"Limit"] intValue]]];
     1395    [limitItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
     1396                            "Action context menu -> upload/download limit"), [[dict objectForKey: @"Limit"] intValue]]];
    13811397
    13821398    [dict release];
     
    14011417    [fRatioNotSetItem setState: !enable ? NSOnState : NSOffState];
    14021418   
    1403     [fRatioSetItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)", "Action context menu -> ratio stop"),
    1404                             [[dict objectForKey: @"Ratio"] floatValue]]];
     1419    [fRatioSetItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
     1420                                "Action context menu -> ratio stop"), [[dict objectForKey: @"Ratio"] floatValue]]];
    14051421
    14061422    [dict release];
     
    14921508    }
    14931509   
    1494     [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Seeding Complete", "Growl notification title") description: [[notification object] name]
     1510    [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Seeding Complete", "Growl notification title")
     1511        description: [[notification object] name]
    14951512        notificationName: GROWL_SEEDING_COMPLETE iconData: nil priority: 0 isSticky: NO clickContext: nil];
    14961513}
     
    16021619            //import only actually happened if the torrent array is larger
    16031620            if (oldCount < [fTorrents count])
    1604                 [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added", "Growl notification title") description: file
     1621                [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added",
     1622                    "Growl notification title") description: file
    16051623                    notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
    16061624        }
     
    21012119    if (action == @selector(showInfo:))
    21022120    {
    2103         NSString * title = [[fInfoController window] isVisible] ? NSLocalizedString(@"Hide Inspector", "View menu -> Inspector") : NSLocalizedString(@"Show Inspector", "View menu -> Inspector");
     2121        NSString * title = [[fInfoController window] isVisible] ? NSLocalizedString(@"Hide Inspector",
     2122                            "View menu -> Inspector") : NSLocalizedString(@"Show Inspector", "View menu -> Inspector");
    21042123        if (![[menuItem title] isEqualToString: title])
    21052124                [menuItem setTitle: title];
     
    21152134    if (action == @selector(toggleStatusBar:))
    21162135    {
    2117         NSString * title = [fStatusBar isHidden] ? NSLocalizedString(@"Show Status Bar", "View menu -> Status Bar") : NSLocalizedString(@"Hide Status Bar", "View menu -> Status Bar");
     2136        NSString * title = [fStatusBar isHidden] ? NSLocalizedString(@"Show Status Bar", "View menu -> Status Bar")
     2137                            : NSLocalizedString(@"Hide Status Bar", "View menu -> Status Bar");
    21182138        if (![[menuItem title] isEqualToString: title])
    21192139            [menuItem setTitle: title];
     
    21252145    if (action == @selector(toggleFilterBar:))
    21262146    {
    2127         NSString * title = [fFilterBar isHidden] ? NSLocalizedString(@"Show Filter Bar", "View menu -> Filter Bar") : NSLocalizedString(@"Hide Filter Bar", "View menu -> Filter Bar");
     2147        NSString * title = [fFilterBar isHidden] ? NSLocalizedString(@"Show Filter Bar", "View menu -> Filter Bar")
     2148                            : NSLocalizedString(@"Hide Filter Bar", "View menu -> Filter Bar");
    21282149        if (![[menuItem title] isEqualToString: title])
    21292150            [menuItem setTitle: title];
  • trunk/macosx/MessageWindowController.m

    r1026 r1027  
    175175    [panel setCanSelectHiddenExtension: YES];
    176176   
    177     [panel beginSheetForDirectory: nil file: NSLocalizedString(@"untitled", "Save log panel -> default file name") modalForWindow: [self window] modalDelegate: self
    178         didEndSelector: @selector(writeToFileSheetClosed:returnCode:contextInfo:) contextInfo: string];
     177    [panel beginSheetForDirectory: nil file: NSLocalizedString(@"untitled", "Save log panel -> default file name")
     178            modalForWindow: [self window] modalDelegate: self
     179            didEndSelector: @selector(writeToFileSheetClosed:returnCode:contextInfo:) contextInfo: string];
    179180}
    180181
     
    187188            NSAlert * alert = [[NSAlert alloc] init];
    188189            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Save log alert panel -> button")];
    189             [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Log Could Not Be Saved", "Save log alert panel -> title")]];
     190            [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Log Could Not Be Saved",
     191                                    "Save log alert panel -> title")]];
    190192            [alert setInformativeText: [NSString stringWithFormat:
    191                     NSLocalizedString(@"There was a problem creating the file \"%@\".", "Save log alert panel -> message"), [[panel filename] lastPathComponent]]];
     193                    NSLocalizedString(@"There was a problem creating the file \"%@\".",
     194                                        "Save log alert panel -> message"), [[panel filename] lastPathComponent]]];
    192195            [alert setAlertStyle: NSWarningAlertStyle];
    193196           
  • trunk/macosx/PiecesView.m

    r1026 r1027  
    136136       
    137137        [fImageView setToolTip: [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]
    138                             ? NSLocalizedString(@"Piece Availability", "Inspector -> Activity -> detailed pieces view tooltip")
    139                             : NSLocalizedString(@"Piece Progress", "Inspector -> Activity -> detailed pieces view tooltip")];
     138                        ? NSLocalizedString(@"Piece Availability", "Inspector -> Activity -> detailed pieces view tooltip")
     139                        : NSLocalizedString(@"Piece Progress", "Inspector -> Activity -> detailed pieces view tooltip")];
    140140       
    141141        //actually draw the box
     
    384384    [defaults setBool: showAvailability forKey: @"PiecesViewShowAvailability"];
    385385   
    386     [fImageView setToolTip: showAvailability ? NSLocalizedString(@"Piece Availability", "Inspector -> Activity -> detailed pieces view tooltip")
    387                                              : NSLocalizedString(@"Piece Progress", "Inspector -> Activity -> detailed pieces view tooltip")];
     386    [fImageView setToolTip: showAvailability
     387        ? NSLocalizedString(@"Piece Availability", "Inspector -> Activity -> detailed pieces view tooltip")
     388        : NSLocalizedString(@"Piece Progress", "Inspector -> Activity -> detailed pieces view tooltip")];
    388389   
    389390    [self updateView: YES];
  • trunk/macosx/PrefsController.m

    r1026 r1027  
    3838#define UPDATE_NEVER    2
    3939
    40 #define TOOLBAR_GENERAL     NSLocalizedString(@"General", "Preferences -> General toolbar item title")
    41 #define TOOLBAR_TRANSFERS   NSLocalizedString(@"Transfers", "Preferences -> Transfers toolbar item title")
    42 #define TOOLBAR_BANDWIDTH   NSLocalizedString(@"Bandwidth", "Preferences -> Bandwidth toolbar item title")
    43 #define TOOLBAR_NETWORK     NSLocalizedString(@"Network", "Preferences -> Network toolbar item title")
     40#define TOOLBAR_GENERAL     @"TOOLBAR_GENERAL"
     41#define TOOLBAR_TRANSFERS   @"TOOLBAR_TRANSFERS"
     42#define TOOLBAR_BANDWIDTH   @"TOOLBAR_BANDWIDTH"
     43#define TOOLBAR_NETWORK     @"TOOLBAR_NETWORK"
    4444
    4545@interface PrefsController (Private)
     
    294294    if ([ident isEqualToString: TOOLBAR_GENERAL])
    295295    {
    296         [item setLabel: TOOLBAR_GENERAL];
     296        [item setLabel: NSLocalizedString(@"General", "Preferences -> General toolbar item title")];
    297297        [item setImage: [NSImage imageNamed: @"Preferences.png"]];
    298298        [item setTarget: self];
     
    301301    else if ([ident isEqualToString: TOOLBAR_TRANSFERS])
    302302    {
    303         [item setLabel: TOOLBAR_TRANSFERS];
     303        [item setLabel: NSLocalizedString(@"Transfers", "Preferences -> Transfers toolbar item title")];
    304304        [item setImage: [NSImage imageNamed: @"Transfers.png"]];
    305305        [item setTarget: self];
     
    308308    else if ([ident isEqualToString: TOOLBAR_BANDWIDTH])
    309309    {
    310         [item setLabel: TOOLBAR_BANDWIDTH];
     310        [item setLabel: NSLocalizedString(@"Bandwidth", "Preferences -> Bandwidth toolbar item title")];
    311311        [item setImage: [NSImage imageNamed: @"Bandwidth.png"]];
    312312        [item setTarget: self];
     
    315315    else if ([ident isEqualToString: TOOLBAR_NETWORK])
    316316    {
    317         [item setLabel: TOOLBAR_NETWORK];
     317        [item setLabel: NSLocalizedString(@"Network", "Preferences -> Network toolbar item title")];
    318318        [item setImage: [NSImage imageNamed: @"Network.png"]];
    319319        [item setTarget: self];
     
    341341- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
    342342{
    343     return [NSArray arrayWithObjects:
    344             TOOLBAR_GENERAL, TOOLBAR_TRANSFERS,
    345             TOOLBAR_BANDWIDTH, TOOLBAR_NETWORK, nil];
     343    return [NSArray arrayWithObjects: TOOLBAR_GENERAL, TOOLBAR_TRANSFERS,
     344                                        TOOLBAR_BANDWIDTH, TOOLBAR_NETWORK, nil];
    346345}
    347346
     
    378377        PortChecker * checker = [[PortChecker alloc] initWithDelegate: self];
    379378
    380         [fPortStatusField setStringValue: [NSLocalizedString(@"Checking port status", "Preferences -> Network -> port status") stringByAppendingEllipsis]];
     379        [fPortStatusField setStringValue: [NSLocalizedString(@"Checking port status",
     380                                            "Preferences -> Network -> port status") stringByAppendingEllipsis]];
    381381        [fPortStatusProgress startAnimation: self];
    382382       
     
    403403            break;
    404404        case PORT_STATUS_ERROR:
    405             [fPortStatusField setStringValue: NSLocalizedString(@"Unable to check port status", "Preferences -> Network -> port status")];
     405            [fPortStatusField setStringValue: NSLocalizedString(@"Unable to check port status",
     406                                                "Preferences -> Network -> port status")];
    406407            [fPortStatusImage setImage: [NSImage imageNamed: @"YellowDot.tiff"]];
    407408            break;
     
    428429    if (status == 2)
    429430    {
    430         [fNatStatusField setStringValue: NSLocalizedString(@"Port successfully mapped", "Preferences -> Network -> port map status")];
     431        [fNatStatusField setStringValue: NSLocalizedString(@"Port successfully mapped",
     432                                            "Preferences -> Network -> port map status")];
    431433        [fNatStatusImage setImage: [NSImage imageNamed: @"GreenDot.tiff"]];
    432434    }
    433435    else if (status == 3 || status == 4)
    434436    {
    435         [fNatStatusField setStringValue: NSLocalizedString(@"Error mapping port", "Preferences -> Network -> port map status")];
     437        [fNatStatusField setStringValue: NSLocalizedString(@"Error mapping port",
     438                                            "Preferences -> Network -> port map status")];
    436439        [fNatStatusImage setImage: [NSImage imageNamed: @"RedDot.tiff"]];
    437440    }
  • trunk/macosx/Torrent.m

    r1026 r1027  
    194194    [fProgressString setString: @""];
    195195    if ([self progress] < 1.0)
    196         [fProgressString appendFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)", "Torrent -> progress string"), [NSString stringForFileSize:
    197                 [self downloadedValid]], [NSString stringForFileSize: [self size]], 100.0 * [self progress]];
     196        [fProgressString appendFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)", "Torrent -> progress string"),
     197                            [NSString stringForFileSize: [self downloadedValid]],
     198                            [NSString stringForFileSize: [self size]], 100.0 * [self progress]];
    198199    else
    199         [fProgressString appendFormat: NSLocalizedString(@"%@, uploaded %@ (Ratio: %@)", "Torrent -> progress string"), [NSString stringForFileSize:
    200                 [self size]], [NSString stringForFileSize: [self uploadedTotal]],
     200        [fProgressString appendFormat: NSLocalizedString(@"%@, uploaded %@ (Ratio: %@)", "Torrent -> progress string"),
     201                [NSString stringForFileSize: [self size]], [NSString stringForFileSize: [self uploadedTotal]],
    201202                [NSString stringForRatioWithDownload: [self downloadedTotal] upload: [self uploadedTotal]]];
    202203
     
    230231            [fStatusString setString: @""];
    231232            if ([self totalPeers] > 1)
    232                 [fStatusString appendFormat: NSLocalizedString(@"Downloading from %d of %d peers", "Torrent -> status string"), [self peersUploading], [self totalPeers]];
     233                [fStatusString appendFormat: NSLocalizedString(@"Downloading from %d of %d peers",
     234                                                "Torrent -> status string"), [self peersUploading], [self totalPeers]];
    233235            else
    234                 [fStatusString appendFormat: NSLocalizedString(@"Downloading from %d of %d peer", "Torrent -> status string"), [self peersUploading], [self totalPeers]];
     236                [fStatusString appendFormat: NSLocalizedString(@"Downloading from %d of %d peer",
     237                                                "Torrent -> status string"), [self peersUploading], [self totalPeers]];
    235238           
    236239            [fRemainingTimeString setString: @""];
     
    246249                    [fRemainingTimeString appendFormat: NSLocalizedString(@"%d sec", "Torrent -> remaining time"), eta];
    247250                else if (eta < 3600) //60 * 60
    248                     [fRemainingTimeString appendFormat: NSLocalizedString(@"%d min %02d sec", "Torrent -> remaining time"), eta / 60, eta % 60];
     251                    [fRemainingTimeString appendFormat: NSLocalizedString(@"%d min %02d sec", "Torrent -> remaining time"),
     252                                                            eta / 60, eta % 60];
    249253                else if (eta < 86400) //24 * 60 * 60
    250                     [fRemainingTimeString appendFormat: NSLocalizedString(@"%d hr %02d min", "Torrent -> remaining time"), eta / 3600, (eta / 60) % 60];
     254                    [fRemainingTimeString appendFormat: NSLocalizedString(@"%d hr %02d min", "Torrent -> remaining time"),
     255                                                            eta / 3600, (eta / 60) % 60];
    251256                else
    252257                {
    253258                    if (eta / 86400 > 1)
    254259                        [fRemainingTimeString appendFormat: NSLocalizedString(@"%d days %d hr", "Torrent -> remaining time"),
    255                                                 eta / 86400, (eta / 3600) % 24];
     260                                                                eta / 86400, (eta / 3600) % 24];
    256261                    else
    257262                        [fRemainingTimeString appendFormat: NSLocalizedString(@"%d day %d hr", "Torrent -> remaining time"),
    258                                                 eta / 86400, (eta / 3600) % 24];
     263                                                                eta / 86400, (eta / 3600) % 24];
    259264                }
    260265               
    261                 [fProgressString appendFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"), fRemainingTimeString];
     266                [fProgressString appendFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"),
     267                                                                    fRemainingTimeString];
    262268            }
    263269           
     
    267273            [fStatusString setString: @""];
    268274            if ([self totalPeers] > 1)
    269                 [fStatusString appendFormat: NSLocalizedString(@"Seeding to %d of %d peers", "Torrent -> status string"), [self peersDownloading], [self totalPeers]];
     275                [fStatusString appendFormat: NSLocalizedString(@"Seeding to %d of %d peers", "Torrent -> status string"),
     276                                                [self peersDownloading], [self totalPeers]];
    270277            else
    271                 [fStatusString appendFormat: NSLocalizedString(@"Seeding to %d of %d peer", "Torrent -> status string"), [self peersDownloading], [self totalPeers]];
     278                [fStatusString appendFormat: NSLocalizedString(@"Seeding to %d of %d peer", "Torrent -> status string"),
     279                                                [self peersDownloading], [self totalPeers]];
    272280           
    273281            break;
     
    284292    if (fStat->error & TR_ETRACKER)
    285293    {
    286         [fStatusString setString: [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString: [NSString stringWithUTF8String: fStat->trackerError]]];
     294        [fStatusString setString: [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString:
     295                                    [NSString stringWithUTF8String: fStat->trackerError]]];
    287296        if (!fError && [self isActive])
    288297        {
     
    303312        if ([self progress] < 1.0)
    304313        {
    305             stringToAppend = [NSString stringWithFormat: NSLocalizedString(@"DL: %@, ", "Torrent -> status string"), [NSString stringForSpeed: [self downloadRate]]];
     314            stringToAppend = [NSString stringWithFormat: NSLocalizedString(@"DL: %@, ", "Torrent -> status string"),
     315                                [NSString stringForSpeed: [self downloadRate]]];
    306316            [fShortStatusString setString: @""];
    307317        }
     
    311321                                                upload: [self uploadedTotal]];
    312322       
    313             [fShortStatusString setString: [NSString stringWithFormat: NSLocalizedString(@"Ratio: %@, ", "Torrent -> status string"), ratioString]];
    314             [fRemainingTimeString setString: [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString: ratioString]];
     323            [fShortStatusString setString: [NSString stringWithFormat: NSLocalizedString(@"Ratio: %@, ",
     324                                            "Torrent -> status string"), ratioString]];
     325            [fRemainingTimeString setString: [NSLocalizedString(@"Ratio: ", "Torrent -> status string")
     326                                                stringByAppendingString: ratioString]];
    315327        }
    316328       
    317         stringToAppend = [stringToAppend stringByAppendingString: [NSLocalizedString(@"UL: ", "Torrent -> status string") stringByAppendingString:
    318                                                 [NSString stringForSpeed: [self uploadRate]]]];
     329        stringToAppend = [stringToAppend stringByAppendingString: [NSLocalizedString(@"UL: ", "Torrent -> status string")
     330                                            stringByAppendingString: [NSString stringForSpeed: [self uploadRate]]]];
    319331
    320332        [fStatusString appendFormat: @" - %@", stringToAppend];
     
    476488    {
    477489        NSAlert * alert = [[NSAlert alloc] init];
    478         [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.", "Torrent file disk space alert -> title"),
    479                                     [self name]]];
     490        [alert setMessageText: [NSString stringWithFormat:
     491                                NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.",
     492                                    "Torrent file disk space alert -> title"), [self name]]];
    480493        [alert setInformativeText: [NSString stringWithFormat:
    481                         NSLocalizedString(@"The transfer will be paused. Clear up space on %@ to continue.", "Torrent file disk space alert -> message"), volume]];
     494                        NSLocalizedString(@"The transfer will be paused. Clear up space on %@ to continue.",
     495                                            "Torrent file disk space alert -> message"), volume]];
    482496        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file disk space alert -> button")];
    483497        [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent file disk space alert -> button")];
     
    556570- (NSString *) torrentLocationString
    557571{
    558     return fPrivateTorrent ? NSLocalizedString(@"Transmission Support Folder", "Torrent -> location") : [fPublicTorrentLocation stringByAbbreviatingWithTildeInPath];
     572    return fPrivateTorrent ? NSLocalizedString(@"Transmission Support Folder", "Torrent -> location")
     573                            : [fPublicTorrentLocation stringByAbbreviatingWithTildeInPath];
    559574}
    560575
Note: See TracChangeset for help on using the changeset viewer.