Changeset 5297


Ignore:
Timestamp:
Mar 18, 2008, 10:11:43 PM (14 years ago)
Author:
livings124
Message:

more string folding

Location:
trunk/macosx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/CreatorWindowController.m

    r4621 r5297  
    123123        int count = fInfo->fileCount;
    124124        if (count != 1)
    125             fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Create torrent -> info"), count];
     125            fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Create torrent -> info"), count];
    126126        else
    127             fileString = NSLocalizedString(@"1 File, ", "Create torrent -> info");
    128         statusString = [fileString stringByAppendingString: statusString];
     127            fileString = NSLocalizedString(@"1 File", "Create torrent -> info");
     128        statusString = [NSString stringWithFormat: @"%@, %@", fileString, statusString];
    129129    }
    130130    [fStatusField setStringValue: statusString];
  • trunk/macosx/DragOverlayWindow.m

    r4423 r5297  
    119119        NSString * fileString;
    120120        if (fileCount == 1)
    121             fileString = NSLocalizedString(@"1 File, ", "Drag overlay -> torrents");
     121            fileString = NSLocalizedString(@"1 File", "Drag overlay -> torrents");
    122122        else
    123             fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Drag overlay -> torrents"), fileCount];
    124         secondString = [fileString stringByAppendingString: secondString];
     123            fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Drag overlay -> torrents"), fileCount];
     124        secondString = [NSString stringWithFormat: @"%@, %@", fileString, secondString];
    125125    }
    126126   
  • trunk/macosx/English.lproj/Localizable.strings

    r5296 r5297  
    3232"%@ selected, uploaded %@ (Ratio: %@)" = "%1$@ selected, uploaded %2$@ (Ratio: %3$@)";
    3333
     34/* Inspector -> selected torrents */
     35"%@ Total" = "%@ Total";
     36
    3437/* Inspector -> Activity tab -> have */
    3538"%@ verified" = "%@ verified";
     
    5356"%d Downloading" = "%d Downloading";
    5457
    55 /* Add torrent -> info */
     58/* Inspector -> selected torrents
     59   Create torrent -> info
     60   Add torrent -> info
     61   Drag overlay -> torrents
     62   Inspector -> above tabs -> selected torrents */
    5663"%d Files" = "%d Files";
    57 
    58 /* Drag overlay -> torrents
    59    Create torrent -> info
    60    Inspector -> above tabs -> selected torrents */
    61 "%d Files, " = "%d Files, ";
    62 
    63 /* Inspector -> above tabs -> selected torrents */
    64 "%d Files, %@ Total" = "%1$d Files, %2$@ Total";
    6564
    6665/* Inspector -> Peers tab -> peers */
     
    124123"1 day" = "1 day";
    125124
    126 /* Add torrent -> info */
     125/* Create torrent -> info
     126   Add torrent -> info
     127   Drag overlay -> torrents
     128   Inspector -> above tabs -> selected torrents */
    127129"1 File" = "1 File";
    128 
    129 /* Drag overlay -> torrents
    130    Create torrent -> info
    131    Inspector -> above tabs -> selected torrents */
    132 "1 File, " = "1 File, ";
    133130
    134131/* Create torrent -> info */
     
    266263"Create a Torrent File" = "Create a Torrent File";
    267264
     265/* Create toolbar item -> tooltip */
     266"Create torrent file" = "Create torrent file";
     267
    268268/* Create torrent -> select file
    269269   Create toolbar item -> palette label */
    270270"Create Torrent File" = "Create Torrent File";
    271 
    272 /* Create toolbar item -> tooltip */
    273 "Create torrent file" = "Create torrent file";
    274271
    275272/* Create torrent -> failed -> title */
     
    494491"Open Torrent Address" = "Open Torrent Address";
    495492
     493/* Open toolbar item -> tooltip */
     494"Open torrent files" = "Open torrent files";
     495
    496496/* Open toolbar item -> palette label */
    497497"Open Torrent Files" = "Open Torrent Files";
    498 
    499 /* Open toolbar item -> tooltip */
    500 "Open torrent files" = "Open torrent files";
    501498
    502499/* Open address toolbar item -> tooltip */
  • trunk/macosx/InfoWindowController.m

    r5210 r5297  
    223223            }
    224224           
    225             [fBasicInfoField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d Files, %@ Total",
    226                                     "Inspector -> above tabs -> selected torrents"), fileCount, [NSString stringForFileSize: size]]];
     225            [fBasicInfoField setStringValue: [NSString stringWithFormat: @"%@, %@",
     226                [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Inspector -> selected torrents"), fileCount],
     227                [NSString stringWithFormat: NSLocalizedString(@"%@ Total", "Inspector -> selected torrents"),
     228                [NSString stringForFileSize: size]]]];
    227229            [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",
    228230                                            "Inspector -> above tabs -> selected torrents"), size]];
     
    363365            int fileCount = [torrent fileCount];
    364366            if (fileCount == 1)
    365                 fileString = NSLocalizedString(@"1 File, ", "Inspector -> above tabs -> selected torrents");
     367                fileString = NSLocalizedString(@"1 File", "Inspector -> above tabs -> selected torrents");
    366368            else
    367                 fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ",
     369                fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files",
    368370                                "Inspector -> above tabs -> selected torrents"), fileCount];
    369             basicString = [fileString stringByAppendingString: basicString];
     371            basicString = [NSString stringWithFormat: @"%@, %@", fileString, basicString];
    370372        }
    371373        [fBasicInfoField setStringValue: basicString];
Note: See TracChangeset for help on using the changeset viewer.