Changeset 5669


Ignore:
Timestamp:
Apr 23, 2008, 3:33:04 AM (14 years ago)
Author:
livings124
Message:

clean up the quit/remove dialog text

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r5665 r5669  
    519519        {
    520520            NSString * message = active == 1
    521                 ? NSLocalizedString(@"There is an active transfer. Do you really want to quit?",
    522                     "Confirm Quit panel -> message")
    523                 : [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers. Do you really want to quit?",
    524                     "Confirm Quit panel -> message"), active];
    525 
    526             NSBeginAlertSheet(NSLocalizedString(@"Confirm Quit", "Confirm Quit panel -> title"),
     521                ? NSLocalizedString(@"There is an active transfer that will be paused on quit."
     522                    " The transfer will automatically resume on the next launch.", "Confirm Quit panel -> message")
     523                : [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers that will be paused on quit."
     524                    " The transfers will automatically resume on the next launch.", "Confirm Quit panel -> message"), active];
     525
     526            NSBeginAlertSheet(NSLocalizedString(@"Are you sure you want to quit?", "Confirm Quit panel -> title"),
    527527                                NSLocalizedString(@"Quit", "Confirm Quit panel -> button"),
    528528                                NSLocalizedString(@"Cancel", "Confirm Quit panel -> button"), nil, fWindow, self,
     
    10971097               
    10981098                if (!deleteData && !deleteTorrent)
    1099                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of \"%@\" from the transfer list.",
     1099                    title = [NSString stringWithFormat:
     1100                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list?",
    11001101                                "Removal confirm panel -> title"), torrentName];
    11011102                else if (deleteData && !deleteTorrent)
    1102                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of \"%@\" from the transfer list"
    1103                                 " and trash data file.", "Removal confirm panel -> title"), torrentName];
     1103                    title = [NSString stringWithFormat:
     1104                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list"
     1105                                " and trash the data file?", "Removal confirm panel -> title"), torrentName];
    11041106                else if (!deleteData && deleteTorrent)
    1105                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of \"%@\" from the transfer list"
    1106                                 " and trash torrent file.", "Removal confirm panel -> title"), torrentName];
     1107                    title = [NSString stringWithFormat:
     1108                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list"
     1109                                " and trash the torrent file?", "Removal confirm panel -> title"), torrentName];
    11071110                else
    1108                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of \"%@\" from the transfer list"
    1109                             " and trash both data and torrent files.", "Removal confirm panel -> title"), torrentName];
     1111                    title = [NSString stringWithFormat:
     1112                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list"
     1113                                " and trash both the data and torrent files?", "Removal confirm panel -> title"), torrentName];
    11101114               
    11111115                message = NSLocalizedString(@"This transfer is active."
     
    11161120            {
    11171121                if (!deleteData && !deleteTorrent)
    1118                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of %d transfers"
    1119                                 " from the transfer list.", "Removal confirm panel -> title"), selected];
     1122                    title = [NSString stringWithFormat:
     1123                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list?",
     1124                                "Removal confirm panel -> title"), selected];
    11201125                else if (deleteData && !deleteTorrent)
    1121                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of %d transfers"
    1122                                 " from the transfer list and trash data file.", "Removal confirm panel -> title"), selected];
     1126                    title = [NSString stringWithFormat:
     1127                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list"
     1128                                " and trash the data file?", "Removal confirm panel -> title"), selected];
    11231129                else if (!deleteData && deleteTorrent)
    1124                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of %d transfers"
    1125                                 " from the transfer list and trash torrent file.", "Removal confirm panel -> title"), selected];
     1130                    title = [NSString stringWithFormat:
     1131                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list"
     1132                                " and trash the torrent file?", "Removal confirm panel -> title"), selected];
    11261133                else
    1127                     title = [NSString stringWithFormat: NSLocalizedString(@"Confirm removal of %d transfers"
    1128                                 " from the transfer list and trash both data and torrent files.",
    1129                                 "Removal confirm panel -> title"), selected];
     1134                    title = [NSString stringWithFormat:
     1135                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list"
     1136                                " and trash both the data and torrent files?", "Removal confirm panel -> title"), selected];
    11301137               
    11311138                if (selected == active)
     
    11351142                    message = [NSString stringWithFormat: NSLocalizedString(@"There are %d transfers (%d active).",
    11361143                                "Removal confirm panel -> message part 1"), selected, active];
    1137                 message = [message stringByAppendingString:
    1138                     NSLocalizedString(@" Once removed, continuing the transfers will require the torrent files.",
     1144               
     1145                message = [message stringByAppendingFormat: @" %@",
     1146                                NSLocalizedString(@"Once removed, continuing the transfers will require the torrent files.",
    11391147                                "Removal confirm panel -> message part 2")];
    11401148            }
Note: See TracChangeset for help on using the changeset viewer.