Changeset 83

Show
Ignore:
Timestamp:
04/25/07 21:05:11 (2 years ago)
Author:
cordney
Message:

[fix] localization: German (downloader)
[fix] downloader: show loading progress of list
[new] downloader: added Guest PCs from kju-app.org for download to the list

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/changelog.txt

    r82 r83  
     1Q-0.9.0d83 
     2[fix] localization: German (downloader) 
     3[fix] downloader: show loading progress of list 
     4[new] downloader: added Guest PCs from kju-app.org for download to the list 
     5 
    16Q-0.9.0d82 
    27[fix] enable log to console (cordney*) 

  • trunk/qcontrol/Resources/English.lproj/Localizable.strings

    r79 r83  
    191191/* cocoaDownloadController */ 
    192192 
     193"showAllDownloads:statusText" = "Loading List from Server.."; 
     194"showAllDownloads:statusText2" = "List loaded."; 
    193195"showAllDownloads:AlertSheet:standardAlert" = "Cannot show Guest PCs from free.oszoo.org."; 
    194196"showAllDownloads:AlertSheet:defaultButton" = "OK"; 

  • trunk/qcontrol/Resources/French.lproj/Localizable.strings

    r79 r83  
    190190/* cocoaDownloadController */ 
    191191 
     192"showAllDownloads:statusText" = "Loading List from Server.."; 
     193"showAllDownloads:statusText2" = "List loaded."; 
    192194"showAllDownloads:AlertSheet:standardAlert" = "Ne peut pas afficher les PC émulés depuis free.oszoo.org."; 
    193195"showAllDownloads:AlertSheet:defaultButton" = "OK"; 

  • trunk/qcontrol/Resources/German.lproj/Localizable.strings

    r79 r83  
    190190/* cocoaDownloadController */ 
    191191 
     192"showAllDownloads:statusText" = "Lade Liste vom Server.."; 
     193"showAllDownloads:statusText2" = "Liste geladen."; 
    192194"showAllDownloads:AlertSheet:standardAlert" = "Kann PCs von free.oszoo.org nicht anzeigen."; 
    193195"showAllDownloads:AlertSheet:defaultButton" = "OK"; 
    …… 
    199201"showDetails:MoreInfo" = "Mehr Informationen"; 
    200202"startDownload:downloadButton:Title" = "Stopp"; 
    201 "startDownload:statusText:Text" = "Download starten..."; 
     203"startDownload:statusText:Text" = "Download starten.."; 
    202204 
    203205"stopDownload:AlertSheet:standardAlert" = "Es sind Downloads aktiv"; 
    …… 
    211213"downloadDidReceiveData:remainingString4" = "ungefähr %d Sekunden verbleibend"; 
    212214"downloadDidReceiveData:connecting" = "Verbinden.."; 
    213 "downloadDidReceiveData:statusText1" = "%.0f %@ of %.1f %@ (%d kB/s), %@"; 
    214 "downloadDidReceiveData:statusText2" = "%.1f %@ of %.1f %@ (%d kB/s), %@"; 
     215"downloadDidReceiveData:statusText1" = "%.0f %@ von %.1f %@ (%d kB/s), %@"; 
     216"downloadDidReceiveData:statusText2" = "%.1f %@ von %.1f %@ (%d kB/s), %@"; 
    215217 
    216218"downloadDidFinish:statusText" = "Download beendet."; 
    …… 
    223225"finishDownload:statusText1" = "Importiere freies Betriebssystem.."; 
    224226"finishDownload:message1" = "Sie können jetzt ihr freies Betriebssystem nutzen."; 
    225 "finishDownload:message2" = "Die Festplatte konnte nicht gefunden werden. Bitte überprüfen Sie die Einstellungen bevor sie ihr freies Betriebssystem nutzen."; 
    226 "finishDownload:message3" = "Die Dateien konnten nicht entpackt werden. Das Archiv scheint beschädigt zu sein. Sie können versuchen Sie manuell zu entpacken oder diesen Fehler an free.oszoo.org melden.\n\nPath: %@"; 
     227"finishDownload:message2" = "Das Festplatten-Image konnte nicht gefunden werden. Bitte überprüfen Sie die Einstellungen bevor sie ihr freies Betriebssystem nutzen."; 
     228"finishDownload:message3" = "Die Dateien konnten nicht entpackt werden. Das Archiv scheint beschädigt zu sein. Sie können versuchen es manuell zu entpacken oder diesen Fehler an free.oszoo.org melden.\n\nPath: %@"; 
    227229"finishDownload:message4" = "Die Dateien konnten nicht entpackt werden. Die heruntergeladene Datei scheint kein Archiv zu sein.\n\nPath: %@"; 
    228230"finishDownload:AlertSheet:messageText" = "Importieren beendet."; 

  • trunk/qcontrol/Resources/pl.lproj/Localizable.strings

    r80 r83  
    191191/* cocoaDownloadController */ 
    192192 
     193"showAllDownloads:statusText" = "Loading List from Server.."; 
     194"showAllDownloads:statusText2" = "List loaded."; 
    193195"showAllDownloads:AlertSheet:standardAlert" = "Cannot show Guest PCs from free.oszoo.org."; 
    194196"showAllDownloads:AlertSheet:defaultButton" = "OK"; 

  • trunk/qcontrol/cocoaControlController.m

    r82 r83  
    771771- (BOOL) importFreeOSZooPC:(NSString *)name withPath:(NSString *)path 
    772772{ 
     773//  NSLog(@"cocoaControlController: importFreeOSZooPC"); 
     774    if([path isEqualTo: [userDefaults objectForKey: @"dataPath"]]) { 
     775        // Is considered to be a qvm which was extracted directly to the dataPath directory 
     776        [self loadConfigurations]; 
     777        return YES; 
     778    } 
     779         
    773780    NSMutableDictionary * thisPC = [[[NSDictionary alloc] initWithObjects:[NSArray arrayWithObjects: 
    774781        [[NSMutableDictionary alloc] initWithObjects:[NSArray arrayWithObjects:@"Q", @"none", [NSDate date], @"Q guest PC from FreeOSZoo", nil] forKeys:[NSArray arrayWithObjects: @"Author", @"Copyright", @"Date", @"Description", nil]], 

  • trunk/qcontrol/cocoaDownload.h

    r56 r83  
    3636    BOOL isHTTP; 
    3737    BOOL isBT; 
     38    BOOL isQVM; 
    3839     
    3940    float receivedContentLength; 
    …… 
    6061- (void) setURL:(NSString *)aURL; 
    6162- (void) setName:(NSString *)aName; 
     63- (void) setQVM:(BOOL)val; 
    6264- (NSString *) getName; 
    6365- (NSString *) getSavePath; 

  • trunk/qcontrol/cocoaDownload.m

    r53 r83  
    3333    isHTTP = YES; 
    3434    isBT = NO; 
     35    isQVM = NO; 
    3536     
    3637    // do initialization here... 
    …… 
    6768    [name release]; 
    6869    name = aName; 
     70} 
     71 
     72- (void) setQVM:(BOOL)val 
     73{ 
     74    isQVM = val; 
    6975} 
    7076 
    …… 
    104110- (NSString *) getSavePath 
    105111{ 
     112    NSLog(@"saveP: %@", savePath); 
    106113    return savePath; 
    107114} 
    …… 
    130137- (void) startBTDownload 
    131138{ 
     139    NSString * torrentPath; 
    132140    // download the torrent file 
    133     NSString * torrentPath = [[self createQVM] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.torrent", name]]; 
     141    if(isQVM) 
     142        torrentPath = [[preferences objectForKey:@"dataPath"] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.torrent", name]]; 
     143    else 
     144        torrentPath = [[self createQVM] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.torrent", name]]; 
     145 
    134146    // we need to temporarily save the qvm path here, cause we need it later 
    135147    savePath = torrentPath; 
    …… 
    189201- (void) checkDownloadStarted 
    190202{ 
     203#if kju_debug 
    191204    NSLog(@"check: receivedBytes %f", receivedContentLength); 
     205#endif 
    192206    if(receivedContentLength > 0.0) { 
    193207        // download started 
    194208    } else { 
     209#if kju_debug 
    195210        NSLog(@"download cancelled."); 
     211#endif 
    196212        // download did not start for 60 seconds, cancel and inform the user 
    197213        NSString * errorDescription = NSLocalizedStringFromTable(@"checkDownloadStarted:errorDescription", @"Localizable", @"cocoaDownload"); 
    …… 
    206222{ 
    207223    if(isHTTP) { 
    208         [theDownload cancel]; 
    209         [theDownload release]; 
     224        //[theDownload cancel]; 
     225        //[theDownload release]; 
    210226    } else if(isBT) { 
    211227        tr_torrentStop( tHandle ); 
    …… 
    240256 
    241257- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename 
    242 {     
    243     NSString * destinationFilename=[[self createQVM] stringByAppendingPathComponent:filename]; 
     258{ 
     259    NSString * destinationFilename; 
     260    if(isQVM) 
     261        destinationFilename = [[preferences objectForKey:@"dataPath"] stringByAppendingPathComponent:filename]; 
     262    else 
     263        destinationFilename=[[self createQVM] stringByAppendingPathComponent:filename]; 
     264 
    244265    savePath = destinationFilename; 
    245266    [savePath retain]; 
    …… 
    261282    // we should inform the controller about this 
    262283    [[NSNotificationCenter defaultCenter] postNotificationName:@"DownloadDidFinish" object:self]; 
    263     NSLog(@"Download did finish."); 
     284    //NSLog(@"Download did finish."); 
    264285} 
    265286 

  • trunk/qcontrol/cocoaDownloadController.m

    r53 r83  
    5757{ 
    5858    [table setDoubleAction:@selector(startDownload:)]; 
    59     //[self showWindow]; 
    60     [self showAllDownloads]; 
     59    [self showWindow]; 
     60     
     61    [NSThread detachNewThreadSelector:@selector(showAllDownloads) toTarget:self withObject:nil]; 
     62    //[self showAllDownloads]; 
    6163} 
    6264 
    …… 
    111113- (void) showAllDownloads 
    112114{ 
     115    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; 
    113116    // load downloadLists 
    114117    // save an original of the list so we dont have to load it again 
    …… 
    120123        } 
    121124         
     125        [statusText setStringValue: NSLocalizedStringFromTable(@"showAllDownloads:statusText", @"Localizable", @"cocoaDownloadController")]; 
     126        [statusBar setDoubleValue:0.0]; 
     127        [statusText setHidden:NO]; 
     128        [statusBar setHidden:NO]; 
     129        [statusBar setIndeterminate:YES]; 
     130        [statusBar startAnimation:self]; 
     131     
    122132        NSArray * dlList = [self getDownloadListFromServer]; 
     133         
     134        [statusText setStringValue: NSLocalizedStringFromTable(@"showAllDownloads:statusText2", @"Localizable", @"cocoaDownloadController")]; 
     135        [statusBar setDoubleValue:0.0]; 
     136        //[statusText setHidden:YES]; 
     137        //[statusBar setHidden:YES]; 
     138        [statusBar setIndeterminate:NO]; 
     139        [statusBar stopAnimation:self]; 
    123140     
    124141        // copy downloadList 
    …… 
    130147            // download list is nil, spawn error message 
    131148            //NSLog(@"Could not load list."); 
    132             NSBeginAlertSheet(NSLocalizedStringFromTable(@"showAllDownloads:AlertSheet:standardAlert", @"Localizable", @"cocoaDownloadController"),NSLocalizedStringFromTable(@"showAllDownloads:AlertSheet:defaultButton", @"Localizable", @"cocoaDownloadController"),nil,nil,[controller mainWindow],self,nil,nil,nil,NSLocalizedStringFromTable(@"showAllDownloads:AlertSheet:informativeText", @"Localizable", @"cocoaDownloadController")); 
     149            NSBeginAlertSheet(NSLocalizedStringFromTable(@"showAllDownloads:AlertSheet:standardAlert", @"Localizable", @"cocoaDownloadController"),NSLocalizedStringFromTable(@"showAllDownloads:AlertSheet:defaultButton", @"Localizable", @"cocoaDownloadController"),nil,nil,mainDlWindow,self,@selector(listDownloadFailedAlertSheetDidEnd:returnCode:contextInfo:),nil,nil,NSLocalizedStringFromTable(@"showAllDownloads:AlertSheet:informativeText", @"Localizable", @"cocoaDownloadController")); 
    133150        } 
    134151        [downloadOriginalList addObjectsFromArray:downloadList]; 
    …… 
    144161    // force showDetails update 
    145162    if([self returnShowsDetails]) [self showDetails:[table selectedRow]]; 
    146 } 
    147  
     163     
     164    [pool release];      
     165} 
     166 
     167- (void) listDownloadFailedAlertSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(id)contextInfo 
     168{ 
     169    // return code of no interest here, we just want to have the downloads window closed 
     170    [mainDlWindow orderOut:self]; 
     171} 
    148172- (void) prepareOSTypeSelector 
    149173{ 
    …… 
    275299            
    276300                return attrString; 
    277         } else { 
    278                 return @""; 
     301        } else if([[tableColumn identifier] isEqualToString:@"kju"]) { 
     302                if([thisDownload valueForKey:@"Kju"] == [NSNumber numberWithInt:1]) 
     303                  return [NSImage imageNamed:@"q_icon.icns"]; 
     304        return nil; 
     305    } else { 
     306        return @""; 
    279307        } 
    280308        return nil; 
    …… 
    317345    NSArray * downloadList = [NSPropertyListSerialization propertyListFromData:data mutabilityOption:NSPropertyListMutableContainersAndLeaves format:nil errorDescription:nil]; 
    318346    */ 
    319     NSArray * downloadList = [NSArray arrayWithContentsOfURL:[NSURL URLWithString:@"http://kju-app.org/data/freeoszoo.plist"]]; 
     347         
     348    NSArray * downloadList = [NSArray arrayWithContentsOfURL:[NSURL URLWithString:@"http://kju-app.org/data/freeoszoo_v2.plist"]]; 
    320349    return downloadList; 
    321350} 
    …… 
    392421        // 1. init download object, set values 
    393422        // TODO: distinguish between HTTP&BT, url pathExtension? 
    394         if([thisDownload valueForKey:@"Torrent"] == [NSNumber numberWithInt:1]) { 
     423        if([thisDownload valueForKey:@"Torrent"] == [NSNumber numberWithInt:1]) 
    395424            download = [[[cocoaDownload alloc] initWithBT] retain]; 
    396         } else { 
     425        else 
    397426            download = [[[cocoaDownload alloc] initWithHTTP] retain]; 
    398         } 
    399         if([[thisDownload objectForKey:@"Version"] isEqualToString:@""]) { 
     427             
     428        if([[thisDownload objectForKey:@"Version"] isEqualToString:@""]) 
    400429            [download setName:[thisDownload objectForKey:@"Name"]]; 
    401         } else { 
     430        else 
    402431            [download setName:[NSString stringWithFormat:@"%@ %@", [thisDownload objectForKey:@"Name"], [thisDownload objectForKey:@"Version"]]]; 
    403         } 
     432         
     433        if([thisDownload valueForKey:@"Kju"] == [NSNumber numberWithInt:1]) 
     434            [download setQVM: YES]; 
     435             
    404436        [download setURL:[thisDownload objectForKey:@"DownloadURL"]]; 
    405437        // - monitor the download object with NSNotifications 
    …… 
    536568- (void) downloadDidFinish:(NSNotification *)aNotification 
    537569{ 
     570    /* XXX FEHLERQUELLE !!! XXX */ 
     571     
    538572    [statusText setStringValue: NSLocalizedStringFromTable(@"downloadDidFinish:statusText", @"Localizable", @"cocoaDownloadController")]; 
    539573    [downloadButton setAction:nil]; 
    …… 
    548582- (void) downloadDidFail:(NSNotification *)aNotification 
    549583{ 
    550     NSLog(@"Download did fail: %@", [[aNotification userInfo] objectForKey:@"ERROR_DESCRIPTION"]); 
     584    //NSLog(@"Download did fail: %@", [[aNotification userInfo] objectForKey:@"ERROR_DESCRIPTION"]); 
    551585     
    552586    // delete qvm 
    …… 
    639673- (void) finishDownload:(int)sender withStatus:(int)status 
    640674{ 
     675//  NSLog(@"cocoaDownloadController: finishDownload"); 
    641676    NSString * message;         
    642677    NSString * path = [download getSavePath]; 
    …… 
    645680    // start import into Q 
    646681    [statusText setStringValue: NSLocalizedStringFromTable(@"finishDownload:statusText1", @"Localizable", @"cocoaDownloadController")]; 
    647     if([controller importFreeOSZooPC:name withPath:[path stringByDeletingLastPathComponent]]) { 
     682    if([controller importFreeOSZooPC:name withPath: [path stringByDeletingLastPathComponent]]) { 
    648683        message = NSLocalizedStringFromTable(@"finishDownload:message1", @"Localizable", @"cocoaDownloadController"); 
    649684    } else { 

  • trunk/qcontrol/freeoszoo.plist

    r53 r83  
    33<plist version="1.0"> 
    44<array> 
     5    <dict> 
     6                <key>Author</key> 
     7                <string>Mike Kronenberg for kju-app.org</string> 
     8                <key>Category</key> 
     9                <string>FreeDOS</string> 
     10                <key>Description</key> 
     11                <string>FreeDOS aims to be a complete, free, 100% MS-DOS compatible operating system (mostly achieved.) Today, FreeDOS is ideal for anyone who wants to bundle a version of DOS without having to pay a royalty for use of DOS. FreeDOS will also work on old hardware, in DOS emulators, and in embedded systems. FreeDOS is also an invaluable resource for people who would like to develop their own operating system. While there are many free operating systems out there, no other free DOS-compatible operating system exists.</string> 
     12                <key>DownloadSize</key> 
     13                <string>4</string> 
     14                <key>DownloadURL</key> 
     15                <string>http://www.kberg.ch/q/guests/FreeDOS100.qvm.zip</string> 
     16                <key>InfopageURL</key> 
     17                <string>http://www.kju-app.org/proj/wiki/FreeDOS1</string> 
     18                <key>InstallType</key> 
     19                <string>Preinstalled</string> 
     20                <key>Name</key> 
     21                <string>FreeDOS</string> 
     22                <key>Torrent</key> 
     23                <integer>0</integer> 
     24                <key>Version</key> 
     25                <string>1.0</string> 
     26                <key>Kju</key> 
     27                <integer>1</integer> 
     28        </dict> 
     29        <dict> 
     30                <key>Author</key> 
     31                <string>Mike Kronenberg for kju-app.org</string> 
     32                <key>Category</key> 
     33                <string>ReactOS</string> 
     34                <key>Description</key> 
     35                <string>The ReactOS project is dedicated to making Free Software available to everyone by providing a ground-up implementation of a Microsoft Windows XP compatible operating system. ReactOS aims to achieve complete binary compatibility with both applications and device drivers meant for NT and XP operating systems, by using a similar architecture and providing a complete and equivalent public interface.</string> 
     36                <key>DownloadSize</key> 
     37                <string>20</string> 
     38                <key>DownloadURL</key> 
     39                <string>http://www.kberg.ch/q/guests/ReactOS031.qvm.zip</string> 
     40                <key>InfopageURL</key> 
     41                <string>http://www.kju-app.org/proj/wiki/ReactOS031</string> 
     42                <key>InstallType</key> 
     43                <string>Preinstalled</string> 
     44                <key>Name</key> 
     45                <string>ReactOS</string> 
     46                <key>Torrent</key> 
     47                <integer>0</integer> 
     48                <key>Version</key> 
     49                <string>0.3.1</string> 
     50                <key>Kju</key> 
     51                <integer>1</integer> 
     52        </dict> 
     53        <dict> 
     54                <key>Author</key> 
     55                <string>Mike Kronenberg for kju-app.org</string> 
     56                <key>Category</key> 
     57                <string>Ubuntu</string> 
     58                <key>Description</key> 
     59                <string>"Ubuntu" is an ancient African word, meaning "humanity to others". Ubuntu also means "I am what I am because of who we all are". The Ubuntu Linux distribution brings the spirit of Ubuntu to the software world. Ubuntu is a complete Linux-based operating system, freely available with both community and professional support. It is developed by a large community and we invite you to participate too!</string> 
     60                <key>DownloadSize</key> 
     61                <string>175</string> 
     62                <key>DownloadURL</key> 
     63                <string>http://www.kberg.ch/q/guests/Ubuntu606Server.qvm.zip</string> 
     64                <key>InfopageURL</key> 
     65                <string>http://www.kju-app.org/proj/wiki/UbuntuDapperDrakeServer</string> 
     66                <key>InstallType</key> 
     67                <string>Preinstalled</string> 
     68                <key>Name</key> 
     69                <string>Ubuntu LTS Server</string> 
     70                <key>Torrent</key> 
     71                <integer>0</integer> 
     72                <key>Version</key> 
     73                <string>6.0.6 (Dapper Drake)</string> 
     74                <key>Kju</key> 
     75                <integer>1</integer> 
     76        </dict> 
     77        <dict> 
     78                <key>Author</key> 
     79                <string>Mike Kronenberg for kju-app.org</string> 
     80                <key>Category</key> 
     81                <string>Ubuntu</string> 
     82                <key>Description</key> 
     83                <string>"Ubuntu" is an ancient African word, meaning "humanity to others". Ubuntu also means "I am what I am because of who we all are". The Ubuntu Linux distribution brings the spirit of Ubuntu to the software world. Ubuntu is a complete Linux-based operating system, freely available with both community and professional support. It is developed by a large community and we invite you to participate too!</string> 
     84                <key>DownloadSize</key> 
     85                <string>713</string> 
     86                <key>DownloadURL</key> 
     87                <string>http://www.kberg.ch/q/guests/Ubuntu610.qvm.zip</string> 
     88                <key>InfopageURL</key> 
     89                <string>http://www.kju-app.org/proj/wiki/UbuntuEdgyEft</string> 
     90                <key>InstallType</key> 
     91                <string>Preinstalled</string> 
     92                <key>Name</key> 
     93                <string>Ubuntu Desktop</string> 
     94                <key>Torrent</key> 
     95                <integer>0</integer> 
     96                <key>Version</key> 
     97                <string>6.10 (Edgy Eft)</string> 
     98                <key>Kju</key> 
     99                <integer>1</integer> 
     100        </dict> 
    5101        <dict> 
    6102                <key>Author</key> 
    …… 
    17113                <string>http://www.oszoo.org/wiki/index.php/Darwin701-x86-20040626.tar.bz2</string> 
    18114                <key>InstallType</key> 
    19                 <string>Preconfigured</string> 
     115                <string>Preinstalled</string> 
    20116                <key>Name</key> 
    21117                <string>Darwin</string> 
    …… 
    39135                <string>http://www.oszoo.org/wiki/index.php/Freebsd_5.4_current.zip</string> 
    40136                <key>InstallType</key> 
    41                 <string>Preconfigured</string> 
     137                <string>Preinstalled</string> 
    42138                <key>Name</key> 
    43139                <string>FreeBSD</string> 
    …… 
    61157                <string>http://www.oszoo.org/wiki/index.php/Freebsd_6_0_x86.tar</string> 
    62158                <key>InstallType</key> 
    63                 <string>Preconfigured</string> 
     159                <string>Preinstalled</string> 
    64160                <key>Name</key> 
    65161                <string>FreeBSD</string> 
    …… 
    83179                <string>http://www.oszoo.org/wiki/index.php/Freebsd_6.1rel.qcow.img20060526.tar</string> 
    84180                <key>InstallType</key> 
    85                 <string>Preconfigured</string> 
     181                <string>Preinstalled</string> 
    86182                <key>Name</key> 
    87183                <string>FreeBSD</string> 
    …… 
    105201                <string>http://www.oszoo.org/wiki/index.php/Freedos-beta9rc5.tar.tar</string> 
    106202                <key>InstallType</key> 
    107                 <string>Preconfigured</string> 
     203                <string>Preinstalled</string> 
    108204                <key>Name</key> 
    109205                <string>FreeDOS</string> 
    …… 
    127223                <string>http://www.oszoo.org/wiki/index.php/Arch-linux.qcow.img.20060428.tar</string> 
    128224                <key>InstallType</key> 
    129                 <string>Preconfigured</string> 
     225                <string>Preinstalled</string> 
    130226                <key>Name</key> 
    131227                <string>ArchLinux</string> 
    …… 
    149245                <string>http://www.oszoo.org/wiki/index.php/Archlinux_0.7.2.zip</string> 
    150246                <key>InstallType</key> 
    151                 <string>Preconfigured</string> 
     247                <string>Preinstalled</string> 
    152248                <key>Name</key> 
    153249                <string>ArchLinux</string> 
    …… 
    171267                <string>http://www.oszoo.org/wiki/index.php/Arklinux2005.2_rc2_20051001.tar</string> 
    172268                <key>InstallType</key> 
    173                 <string>Preconfigured</string> 
     269                <string>Preinstalled</string> 
    174270                <key>Name</key> 
    175271                <string>ArkLinux</string> 
    …… 
    193289                <string>http://www.oszoo.org/wiki/index.php/CentOS4image.qcow</string> 
    194290                <key>InstallType</key> 
    195                 <string>Preconfigured</string> 
     291                <string>Preinstalled</string> 
    196292                <key>Name</key> 
    197293                <string>CentOS</string> 
    …… 
    215311                <string>http://www.oszoo.org/wiki/index.php/Sarge_2005_06_18.tar</string> 
    216312                <key>InstallType</key> 
    217                 <string>Preconfigured</string> 
     313                <string>Preinstalled</string> 
    218314                <key>Name</key> 
    219315                <string>Debian</string> 
    …… 
    237333                <string>http://www.oszoo.org/wiki/index.php/Debian-31r1a-i386-20060325.tar</string> 
    238334                <key>InstallType</key> 
    239                 <string>Preconfigured</string> 
     335                <string>Preinstalled</string> 
    240336                <key>Name</key> 
    241337                <string>Debian</string> 
    …… 
    259355                <string>http://www.oszoo.org/wiki/index.php/Eucaristos-0.0.3.img.tar.gz</string> 
    260356                <key>InstallType</key> 
    261                 <string>Preconfigured</string> 
     357                <string>Preinstalled</string> 
    262358                <key>Name</key> 
    263359                <string>EucaristOS</string> 
    …… 
    281377                <string>http://www.oszoo.org/wiki/index.php/Fedora-core2-x86.tar.bz2</string> 
    282378                <key>InstallType</key> 
    283                 <string>Preconfigured</string> 
     379                <string>Preinstalled</string> 
    284380                <key>Name</key> 
    285381                <string>Fedora</string> 
    …… 
    303399                <string>http://www.oszoo.org/wiki/index.php/Fedora_core_4_20051003.tar</string> 
    304400                <key>InstallType</key> 
    305                 <string>Preconfigured</string> 
     401                <string>Preinstalled</string> 
    306402                <key>Name</key> 
    307403                <string>Fedora</string> 
    …… 
    325421                <string>http://www.oszoo.org/wiki/index.php/Gentoo-2006.0.qcow.img20060504.tar</string> 
    326422                <key>InstallType</key> 
    327                 <string>Preconfigured</string> 
     423                <string>Preinstalled</string> 
    328424                <key>Name</key> 
    329425                <string>Gentoo</string> 
    …… 
    347443                <string>http://www.oszoo.org/wiki/index.php/Kubuntu_breezy_20051026.tar</string> 
    348444                <key>InstallType</key> 
    349                 <string>Preconfigured</string> 
     445                <string>Preinstalled</string> 
    350446                <key>Name</key> 
    351447                <string>Kubuntu</string> 
    …… 
    369465                <string>http://www.oszoo.org/wiki/index.php/Mandrake-10.0-x86.tar.bz2</string> 
    370466                <key>InstallType</key> 
    371                 <string>Preconfigured</string> 
     467                <string>Preinstalled</string> 
    372468                <key>Name</key> 
    373469                <string>Mandrake</string> 
    …… 
    391487                <string>http://www.oszoo.org/wiki/index.php/Slackware_10_2_20051106.tar</string> 
    392488                <key>InstallType</key> 
    393                 <string>Preconfigured</string> 
     489                <string>Preinstalled</string> 
    394490                <key>Name</key> 
    395491                <string>Slackware</string> 
    …… 
    413509                <string>http://www.oszoo.org/wiki/index.php/SUSE-9.1-personal-x86.tar.bz2</string> 
    414510                <key>InstallType</key> 
    415                 <string>Preconfigured</string> 
     511                <string>Preinstalled</string> 
    416512                <key>Name</key> 
    417513                <string>Suse</string> 
    …… 
    435531                <string>http://www.oszoo.org/wiki/index.php/Suse_10rc1_20051001.tar</string> 
    436532                <key>InstallType</key> 
    437                 <string>Preconfigured</string> 
     533                <string>Preinstalled</string> 
    438534                <key>Name</key> 
    439535                <string>Suse</string> 
    …… 
    457553                <string>http://www.oszoo.org/wiki/index.php/Trixbox_1.1_x86.zip</string> 
    458554                <key>InstallType</key> 
    459                 <string>Preconfigured</string> 
     555                <string>Preinstalled</string> 
    460556                <key>Name</key> 
    461557                <string>Trixbox</string> 
    …… 
    479575                <string>http://www.oszoo.org/wiki/index.php/Ubuntu-warty.zoo.tar.bz2</string> 
    480576                <key>InstallType</key> 
    481                 <string>Preconfigured</string> 
     577                <string>Preinstalled</string> 
    482578                <key>Name</key> 
    483579                <string>Ubuntu</string> 
    …… 
    501597                <string>http://www.oszoo.org/wiki/index.php/Ubuntu_5.10_amd64_20060314.tar</string> 
    502598                <key>InstallType</key> 
    503                 <string>Preconfigured</string> 
     599                <string>Preinstalled</string> 
    504600                <key>Name</key> 
    505601                <string>Ubuntu</string> 
    …… 
    523619                <string>http://www.oszoo.org/wiki/index.php/Ubuntu-6.06-desktop-x86.qcow.img.zip</string> 
    524620                <key>InstallType</key> 
    525                 <string>Preconfigured</string> 
     621                <string>Preinstalled</string> 
    526622                <key>Name</key> 
    527623                <string>Ubuntu</string> 
    …… 
    545641                <string>http://www.oszoo.org/wiki/index.php/Minix3_1_1_x86.tar</string> 
    546642                <key>InstallType</key> 
    547                 <string>Preconfigured</string> 
     643                <string>Preinstalled</string> 
    548644                <key>Name</key> 
    549645                <string>Minix</string> 
    …… 
    567663                <string>http://www.oszoo.org/wiki/index.php/Netbsd_1.6.2_20040525.tar</string> 
    568664                <key>InstallType</key> 
    569                 <string>Preconfigured</string> 
     665                <string>Preinstalled</string> 
    570666                <key>Name</key> 
    571667                <string>NetBSD</string> 
    …… 
    589685                <string>http://www.oszoo.org/wiki/index.php/Netbsd_2.0.2_20050512.tar</string> 
    590686                <key>InstallType</key> 
    591                 <string>Preconfigured</string> 
     687                <string>Preinstalled</string> 
    592688                <key>Name</key> 
    593689                <string>NetBSD</string> 
    …… 
    611707                <string>http://www.oszoo.org/wiki/index.php/Netbsd_2_1_x86.tar</string> 
    612708                <key>InstallType</key> 
    613                 <string>Preconfigured</string> 
     709                <string>Preinstalled</string> 
    614710                <key>Name</key> 
    615711                <string>NetBSD</string> 
    …… 
    633729                <string>http://www.oszoo.org/wiki/index.php/Openbsd_3.7_20050511.tar</string> 
    634730                <key>InstallType</key> 
    635                 <string>Preconfigured</string> 
     731                <string>Preinstalled</string> 
    636732                <key>Name</key> 
    637733                <string>OpenBSD</string> 
    …… 
    655751                <string>http://www.oszoo.org/wiki/index.php/Openbsd_3_8.tar</string> 
    656752                <key>InstallType</key> 
    657                 <string>Preconfigured</string> 
     753                <string>Preinstalled</string> 
    658754                <key>Name</key> 
    659755                <string>OpenBSD</string> 
    …… 
    677773                <string>http://www.oszoo.org/wiki/index.php/Openbsd3.9-full.zip</string> 
    678774                <key>InstallType</key> 
    679                 <string>Preconfigured</string> 
     775                <string>Preinstalled</string> 
    680776                <key>Name</key> 
    681777                <string>OpenBSD</string> 
    …… 
    699795                <string>http://www.oszoo.org/wiki/index.php/Opensolaris.tar</string> 
    700796                <key>InstallType</key> 
    701                 <string>Preconfigured</string> 
     797                <string>Preinstalled</string> 
    702798                <key>Name</key> 
    703799                <string>OpenSolaris</string> 
    …… 
    721817                <string>http://www.oszoo.org/wiki/index.php/Pcbsd_082_20051010.tar</string> 
    722818                <key>InstallType</key> 
    723                 <string>Preconfigured</string> 
     819                <string>Preinstalled</string> 
    724820                <key>Name</key> 
    725821                <string>PcBSD</string> 
    …… 
    743839                <string>http://www.oszoo.org/wiki/index.php/Plan9_060327.zip</string> 
    744840                <key>InstallType</key> 
    745                 <string>Preconfigured</string> 
     841                <string>Preinstalled</string> 
    746842                <key>Name</key> 
    747843                <string>Plan9</string> 
    …… 
    765861                <string>http://www.oszoo.org/wiki/index.php/Reactos0.2.6-REL-qemu.zip</string> 
    766862                <key>InstallType</key> 
    767                 <string>Preconfigured</string> 
     863                <string>Preinstalled</string> 
    768864                <key>Name</key> 
    769865                <string>ReactOS</string> 
    …… 
    787883                <string>http://www.oszoo.org/wiki/index.php/Reactos0.2.7-REL-qemu.zip</string> 
    788884                <key>InstallType</key> 
    789                 <string>Preconfigured</string> 
     885                <string>Preinstalled</string> 
    790886                <key>Name</key> 
    791887                <string>ReactOS</string>