Changeset 5092


Ignore:
Timestamp:
Feb 22, 2008, 3:39:20 PM (14 years ago)
Author:
livings124
Message:

update strings file

Location:
trunk/macosx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/English.lproj/Localizable.strings

    r5078 r5092  
    5353"%d Connected" = "%d Connected";
    5454
    55 /* stats window -> running time */
     55/* time string */
    5656"%d days" = "%d days";
    57 
    58 /* Torrent -> remaining time */
    59 "%d days %02d hr" = "%1$d days %2$d hr";
    6057
    6158/* Dock item - Downloading */
     
    7168"%d Files, %@ Total" = "%1$d Files, %2$@ Total";
    7269
    73 /* stats window -> running time */
     70/* time string */
    7471"%d hr" = "%d hr";
    75 
    76 /* Torrent -> remaining time */
    77 "%d hr %02d min" = "%1$d hr %2$d min";
    7872
    7973/* Inspector -> Peers tab -> peers */
     
    8377"%d KB/s" = "%d KB/s";
    8478
    85 /* stats window -> running time */
     79/* time string */
    8680"%d min" = "%d min";
    87 
    88 /* Torrent -> remaining time */
    89 "%d min %02d sec" = "%1$d min %2$d sec";
    9081
    9182/* Status bar transfer count */
     
    9889"%d pieces" = "%d pieces";
    9990
    100 /* Torrent -> remaining time */
     91/* time string */
    10192"%d sec" = "%d sec";
    10293
     
    132123"(unreadable error)" = "(unreadable error)";
    133124
    134 /* stats window -> running time */
     125/* time string */
    135126"1 day" = "1 day";
    136 
    137 /* Torrent -> remaining time */
    138 "1 day %02d hr" = "1 day %02d hr";
    139127
    140128/* Create torrent -> info
     
    150138"1 time" = "1 time";
    151139
     140/* Status bar transfer count */
     141"1 transfer" = "1 transfer";
     142
    152143/* Filter Button -> tool tip */
    153144"1 Transfer" = "1 Transfer";
    154 
    155 /* Status bar transfer count */
    156 "1 transfer" = "1 transfer";
    157145
    158146/* Move folder cannot be used alert -> message */
     
    336324/* Torrent -> status string */
    337325"Error" = "Error";
    338 
    339 /* Torrent -> status string */
    340 "Error: " = "Error: ";
    341326
    342327/* Inspector -> title */
     
    796781"Total upload speed" = "Total upload speed";
    797782
     783/* Inspector -> title */
     784"Tracker" = "Tracker";
     785
    798786/* Preferences -> Transfers toolbar item title */
    799787"Transfers" = "Transfers";
  • trunk/macosx/NSStringAdditions.m

    r5091 r5092  
    105105+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds
    106106{
    107     return [NSString timeString: seconds showSeconds:showSeconds maxDigits: INT_MAX];
     107    return [NSString timeString: seconds showSeconds:showSeconds maxDigits: UINT_MAX];
    108108}
    109109
  • trunk/macosx/Torrent.m

    r5091 r5092  
    993993    if ([self isError])
    994994    {
     995        string = NSLocalizedString(@"Error", "Torrent -> status string");
    995996        NSString * errorString = [self errorMessage];
    996         if (!errorString || [errorString isEqualToString: @""])
    997             string = NSLocalizedString(@"Error", "Torrent -> status string");
    998         else
    999             string = [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString: errorString];
     997        if (errorString && ![errorString isEqualToString: @""])
     998            string = [NSString stringWithFormat: @"%@: %@", string, errorString];
    1000999    }
    10011000    else
Note: See TracChangeset for help on using the changeset viewer.