more string folding

This commit is contained in:
Mitchell Livingston 2008-03-18 22:11:43 +00:00
parent f741e74659
commit 32b41bb72e
4 changed files with 13 additions and 11 deletions

View File

@ -122,10 +122,10 @@
NSString * fileString; NSString * fileString;
int count = fInfo->fileCount; int count = fInfo->fileCount;
if (count != 1) if (count != 1)
fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Create torrent -> info"), count]; fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Create torrent -> info"), count];
else else
fileString = NSLocalizedString(@"1 File, ", "Create torrent -> info"); fileString = NSLocalizedString(@"1 File", "Create torrent -> info");
statusString = [fileString stringByAppendingString: statusString]; statusString = [NSString stringWithFormat: @"%@, %@", fileString, statusString];
} }
[fStatusField setStringValue: statusString]; [fStatusField setStringValue: statusString];

View File

@ -118,10 +118,10 @@
{ {
NSString * fileString; NSString * fileString;
if (fileCount == 1) if (fileCount == 1)
fileString = NSLocalizedString(@"1 File, ", "Drag overlay -> torrents"); fileString = NSLocalizedString(@"1 File", "Drag overlay -> torrents");
else else
fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Drag overlay -> torrents"), fileCount]; fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Drag overlay -> torrents"), fileCount];
secondString = [fileString stringByAppendingString: secondString]; secondString = [NSString stringWithFormat: @"%@, %@", fileString, secondString];
} }
NSImage * icon; NSImage * icon;

View File

@ -222,8 +222,10 @@ typedef enum
fileCount += [torrent fileCount]; fileCount += [torrent fileCount];
} }
[fBasicInfoField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d Files, %@ Total", [fBasicInfoField setStringValue: [NSString stringWithFormat: @"%@, %@",
"Inspector -> above tabs -> selected torrents"), fileCount, [NSString stringForFileSize: size]]]; [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Inspector -> selected torrents"), fileCount],
[NSString stringWithFormat: NSLocalizedString(@"%@ Total", "Inspector -> selected torrents"),
[NSString stringForFileSize: size]]]];
[fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes", [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",
"Inspector -> above tabs -> selected torrents"), size]]; "Inspector -> above tabs -> selected torrents"), size]];
} }
@ -362,11 +364,11 @@ typedef enum
NSString * fileString; NSString * fileString;
int fileCount = [torrent fileCount]; int fileCount = [torrent fileCount];
if (fileCount == 1) if (fileCount == 1)
fileString = NSLocalizedString(@"1 File, ", "Inspector -> above tabs -> selected torrents"); fileString = NSLocalizedString(@"1 File", "Inspector -> above tabs -> selected torrents");
else else
fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files",
"Inspector -> above tabs -> selected torrents"), fileCount]; "Inspector -> above tabs -> selected torrents"), fileCount];
basicString = [fileString stringByAppendingString: basicString]; basicString = [NSString stringWithFormat: @"%@, %@", fileString, basicString];
} }
[fBasicInfoField setStringValue: basicString]; [fBasicInfoField setStringValue: basicString];
[fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes", [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",