]> git.saurik.com Git - cydia.git/blobdiff - Cydia.mm
This is getting nuts, I need an internal branch.
[cydia.git] / Cydia.mm
index 758a99e779bc02a2d3d3c74e72575470f4808713..827b02046fba5425efab4ca557a963c9681e38a2 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
 #include <Foundation/Foundation.h>
 
 #import <QuartzCore/CALayer.h>
 #include <Foundation/Foundation.h>
 
 #import <QuartzCore/CALayer.h>
-
 #import <UIKit/UIKit.h>
 
 #import <UIKit/UIKit.h>
 
-// XXX: remove
-#import <MessageUI/MailComposeController.h>
+#include <WebCore/WebCoreThread.h>
+#import <WebKit/WebDefaultUIKitDelegate.h>
 
 #include <iomanip>
 #include <sstream>
 
 #include <iomanip>
 #include <sstream>
@@ -78,6 +77,8 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 
+#include <apr-1/apr_pools.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
@@ -98,6 +99,8 @@ extern "C" {
 #include <errno.h>
 #include <pcre.h>
 
 #include <errno.h>
 #include <pcre.h>
 
+#include <ext/hash_map>
+
 #import "BrowserView.h"
 #import "ResetView.h"
 
 #import "BrowserView.h"
 #import "ResetView.h"
 
@@ -116,6 +119,7 @@ bool _itv;
         exit(0); \
 } while (false)
 
         exit(0); \
 } while (false)
 
+/* Profiler {{{ */
 #define _timestamp ({ \
     struct timeval tv; \
     gettimeofday(&tv, NULL); \
 #define _timestamp ({ \
     struct timeval tv; \
     gettimeofday(&tv, NULL); \
@@ -129,6 +133,7 @@ class ProfileTime {
   private:
     const char *name_;
     uint64_t total_;
   private:
     const char *name_;
     uint64_t total_;
+    uint64_t count_;
 
   public:
     ProfileTime(const char *name) :
 
   public:
     ProfileTime(const char *name) :
@@ -140,12 +145,14 @@ class ProfileTime {
 
     void AddTime(uint64_t time) {
         total_ += time;
 
     void AddTime(uint64_t time) {
         total_ += time;
+        ++count_;
     }
 
     void Print() {
         if (total_ != 0)
     }
 
     void Print() {
         if (total_ != 0)
-            std::cerr << std::setw(7) << total_ << " : " << name_ << std::endl;
+            std::cerr << std::setw(5) << count_ << ", " << std::setw(7) << total_ << " : " << name_ << std::endl;
         total_ = 0;
         total_ = 0;
+        count_ = 0;
     }
 };
 
     }
 };
 
@@ -177,7 +184,7 @@ void PrintTimes() {
     ProfileTimer _ ## name(name);
 
 #define _end }
     ProfileTimer _ ## name(name);
 
 #define _end }
-
+/* }}} */
 /* Objective-C Handle<> {{{ */
 template <typename Type_>
 class _H {
 /* Objective-C Handle<> {{{ */
 template <typename Type_>
 class _H {
@@ -229,7 +236,8 @@ void NSLogRect(const char *fix, const CGRect &rect) {
 }
 
 @interface NSObject (Cydia)
 }
 
 @interface NSObject (Cydia)
-- (void) yieldToSelector:(SEL)selector withObject:(id)object;
+- (id) yieldToSelector:(SEL)selector withObject:(id)object;
+- (id) yieldToSelector:(SEL)selector;
 @end
 
 @implementation NSObject (Cydia)
 @end
 
 @implementation NSObject (Cydia)
@@ -237,12 +245,17 @@ void NSLogRect(const char *fix, const CGRect &rect) {
 - (void) doNothing {
 }
 
 - (void) doNothing {
 }
 
-- (void) _yieldToContext:(NSArray *)context { _pooled
+- (void) _yieldToContext:(NSMutableArray *)context { _pooled
     SEL selector(reinterpret_cast<SEL>([[context objectAtIndex:0] pointerValue]));
     id object([[context objectAtIndex:1] nonretainedObjectValue]);
     volatile bool &stopped(*reinterpret_cast<bool *>([[context objectAtIndex:2] pointerValue]));
 
     SEL selector(reinterpret_cast<SEL>([[context objectAtIndex:0] pointerValue]));
     id object([[context objectAtIndex:1] nonretainedObjectValue]);
     volatile bool &stopped(*reinterpret_cast<bool *>([[context objectAtIndex:2] pointerValue]));
 
-    [self performSelector:selector withObject:object];
+    /* XXX: deal with exceptions */
+    id value([self performSelector:selector withObject:object]);
+
+    [context removeAllObjects];
+    if (value != nil)
+        [context addObject:value];
 
     stopped = true;
 
 
     stopped = true;
 
@@ -253,13 +266,12 @@ void NSLogRect(const char *fix, const CGRect &rect) {
     ];
 }
 
     ];
 }
 
-- (void) yieldToSelector:(SEL)selector withObject:(id)object {
-    [self performSelector:selector withObject:object];
-    return;
+- (id) yieldToSelector:(SEL)selector withObject:(id)object {
+    /*return [self performSelector:selector withObject:object];*/
 
     volatile bool stopped(false);
 
 
     volatile bool stopped(false);
 
-    NSArray *context([NSArray arrayWithObjects:
+    NSMutableArray *context([NSMutableArray arrayWithObjects:
         [NSValue valueWithPointer:selector],
         [NSValue valueWithNonretainedObject:object],
         [NSValue valueWithPointer:const_cast<bool *>(&stopped)],
         [NSValue valueWithPointer:selector],
         [NSValue valueWithNonretainedObject:object],
         [NSValue valueWithPointer:const_cast<bool *>(&stopped)],
@@ -277,6 +289,12 @@ void NSLogRect(const char *fix, const CGRect &rect) {
     NSDate *future([NSDate distantFuture]);
 
     while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
     NSDate *future([NSDate distantFuture]);
 
     while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
+
+    return [context count] == 0 ? nil : [context objectAtIndex:0];
+}
+
+- (id) yieldToSelector:(SEL)selector {
+    return [self yieldToSelector:selector withObject:nil];
 }
 
 @end
 }
 
 @end
@@ -368,7 +386,9 @@ extern NSString * const kCAFilterNearest;
 #define lprintf(args...) fprintf(stderr, args)
 
 #define ForRelease 0
 #define lprintf(args...) fprintf(stderr, args)
 
 #define ForRelease 0
-#define ForSaurik (1 && !ForRelease)
+#define ForSaurik (0 && !ForRelease)
+#define LogBrowser (1 && !ForRelease)
+#define ManualRefresh (1 && !ForRelease)
 #define ShowInternals (0 && !ForRelease)
 #define IgnoreInstall (0 && !ForRelease)
 #define RecycleWebViews 0
 #define ShowInternals (0 && !ForRelease)
 #define IgnoreInstall (0 && !ForRelease)
 #define RecycleWebViews 0
@@ -378,40 +398,25 @@ extern NSString * const kCAFilterNearest;
 #undef _trace
 #define _trace(args...)
 #undef _profile
 #undef _trace
 #define _trace(args...)
 #undef _profile
-#define _profile(name)
+#define _profile(name) {
 #undef _end
 #undef _end
-#define _end
+#define _end }
+#define PrintTimes() do {} while (false)
 #endif
 
 /* Radix Sort {{{ */
 @interface NSMutableArray (Radix)
 - (void) radixSortUsingSelector:(SEL)selector withObject:(id)object;
 #endif
 
 /* Radix Sort {{{ */
 @interface NSMutableArray (Radix)
 - (void) radixSortUsingSelector:(SEL)selector withObject:(id)object;
+- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument;
 @end
 
 @end
 
-@implementation NSMutableArray (Radix)
-
-- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object {
-    NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]);
-    [invocation setSelector:selector];
-    [invocation setArgument:&object atIndex:2];
-
-    size_t count([self count]);
-
-    struct RadixItem {
-        size_t index;
-        uint32_t key;
-    } *swap(new RadixItem[count * 2]), *lhs(swap), *rhs(swap + count);
-
-    for (size_t i(0); i != count; ++i) {
-        RadixItem &item(lhs[i]);
-        item.index = i;
-
-        id object([self objectAtIndex:i]);
-        [invocation setTarget:object];
+struct RadixItem_ {
+    size_t index;
+    uint32_t key;
+};
 
 
-        [invocation invoke];
-        [invocation getReturnValue:&item.key];
-    }
+static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *swap) {
+    struct RadixItem_ *lhs(swap), *rhs(swap + count);
 
     static const size_t width = 32;
     static const size_t bits = 11;
 
     static const size_t width = 32;
     static const size_t bits = 11;
@@ -444,7 +449,7 @@ extern NSString * const kCAFilterNearest;
             rhs[hist[key]++] = lhs[i];
         }
 
             rhs[hist[key]++] = lhs[i];
         }
 
-        RadixItem *tmp(lhs);
+        RadixItem_ *tmp(lhs);
         lhs = rhs;
         rhs = tmp;
     }
         lhs = rhs;
         rhs = tmp;
     }
@@ -459,6 +464,45 @@ extern NSString * const kCAFilterNearest;
     delete [] swap;
 }
 
     delete [] swap;
 }
 
+@implementation NSMutableArray (Radix)
+
+- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object {
+    NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]);
+    [invocation setSelector:selector];
+    [invocation setArgument:&object atIndex:2];
+
+    size_t count([self count]);
+    struct RadixItem_ *swap(new RadixItem_[count * 2]);
+
+    for (size_t i(0); i != count; ++i) {
+        RadixItem_ &item(swap[i]);
+        item.index = i;
+
+        id object([self objectAtIndex:i]);
+        [invocation setTarget:object];
+
+        [invocation invoke];
+        [invocation getReturnValue:&item.key];
+    }
+
+    RadixSort_(self, count, swap);
+}
+
+- (void) radixSortUsingFunction:(uint32_t (*)(id, void *))function withArgument:(void *)argument {
+    size_t count([self count]);
+    struct RadixItem_ *swap(new RadixItem_[count * 2]);
+
+    for (size_t i(0); i != count; ++i) {
+        RadixItem_ &item(swap[i]);
+        item.index = i;
+
+        id object([self objectAtIndex:i]);
+        item.key = function(object, argument);
+    }
+
+    RadixSort_(self, count, swap);
+}
+
 @end
 /* }}} */
 
 @end
 /* }}} */
 
@@ -519,8 +563,11 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s
 
 @interface NSString (Cydia)
 + (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length;
 
 @interface NSString (Cydia)
 + (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length;
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length withZone:(NSZone *)zone inPool:(apr_pool_t *)pool;
 + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
 - (NSComparisonResult) compareByPath:(NSString *)other;
 + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
 - (NSComparisonResult) compareByPath:(NSString *)other;
+- (NSString *) stringByCachingURLWithCurrentCDN;
+- (NSString *) stringByAddingPercentEscapesIncludingReserved;
 @end
 
 @implementation NSString (Cydia)
 @end
 
 @implementation NSString (Cydia)
@@ -529,6 +576,12 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s
     return [[[NSString alloc] initWithBytesNoCopy:const_cast<char *>(bytes) length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease];
 }
 
     return [[[NSString alloc] initWithBytesNoCopy:const_cast<char *>(bytes) length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease];
 }
 
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length withZone:(NSZone *)zone inPool:(apr_pool_t *)pool {
+    char *data(reinterpret_cast<char *>(apr_palloc(pool, length)));
+    memcpy(data, bytes, length);
+    return [[[NSString allocWithZone:zone] initWithBytesNoCopy:data length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease];
+}
+
 + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
     return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease];
 }
 + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
     return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease];
 }
@@ -563,8 +616,148 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s
     return result == NSOrderedSame ? value : result;
 }
 
     return result == NSOrderedSame ? value : result;
 }
 
+- (NSString *) stringByCachingURLWithCurrentCDN {
+    return [self
+        stringByReplacingOccurrencesOfString:@"://"
+        withString:@"://ne.edgecastcdn.net/8003A4/"
+        options:0
+        /* XXX: this is somewhat inaccurate */
+        range:NSMakeRange(0, 10)
+    ];
+}
+
+- (NSString *) stringByAddingPercentEscapesIncludingReserved {
+    return [(id)CFURLCreateStringByAddingPercentEscapes(
+        kCFAllocatorDefault, 
+        (CFStringRef) self,
+        NULL,
+        CFSTR(";/?:@&=+$,"),
+        kCFStringEncodingUTF8
+    ) autorelease];
+}
+
 @end
 
 @end
 
+static inline NSString *CYLocalizeEx(NSString *key, NSString *value = nil) {
+    return [[NSBundle mainBundle] localizedStringForKey:key value:value table:nil];
+}
+
+#define CYLocalize(key) CYLocalizeEx(@ key)
+
+class CYString {
+  private:
+    char *data_;
+    size_t size_;
+    CFStringRef cache_;
+
+    _finline void clear_() {
+        if (cache_ != nil)
+            CFRelease(cache_);
+    }
+
+  public:
+    _finline bool empty() const {
+        return size_ == 0;
+    }
+
+    _finline size_t size() const {
+        return size_;
+    }
+
+    _finline char *data() const {
+        return data_;
+    }
+
+    _finline void clear() {
+        size_ = 0;
+        clear_();
+    }
+
+    _finline CYString() :
+        data_(0),
+        size_(0),
+        cache_(nil)
+    {
+    }
+
+    _finline ~CYString() {
+        clear_();
+    }
+
+    void operator =(const CYString &rhs) {
+        data_ = rhs.data_;
+        size_ = rhs.size_;
+
+        if (rhs.cache_ == nil)
+            cache_ = NULL;
+        else
+            cache_ = reinterpret_cast<CFStringRef>(CFRetain(rhs.cache_));
+    }
+
+    void set(apr_pool_t *pool, const char *data, size_t size) {
+        if (size == 0)
+            clear();
+        else {
+            clear_();
+
+            char *temp(reinterpret_cast<char *>(apr_palloc(pool, size)));
+            memcpy(temp, data, size);
+            data_ = temp;
+            size_ = size;
+        }
+    }
+
+    _finline void set(apr_pool_t *pool, const char *data) {
+        set(pool, data, data == NULL ? 0 : strlen(data));
+    }
+
+    _finline void set(apr_pool_t *pool, const std::string &rhs) {
+        set(pool, rhs.data(), rhs.size());
+    }
+
+    bool operator ==(const CYString &rhs) const {
+        return size_ == rhs.size_ && memcmp(data_, rhs.data_, size_) == 0;
+    }
+
+    operator id() {
+        if (cache_ == NULL) {
+            if (size_ == 0)
+                return nil;
+            cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<uint8_t *>(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull);
+        } return (id) cache_;
+    }
+};
+
+extern "C" {
+    CF_EXPORT CFHashCode CFStringHashNSString(CFStringRef str);
+}
+
+struct NSStringMapHash :
+    std::unary_function<NSString *, size_t>
+{
+    _finline size_t operator ()(NSString *value) const {
+        return CFStringHashNSString((CFStringRef) value);
+    }
+};
+
+struct NSStringMapLess :
+    std::binary_function<NSString *, NSString *, bool>
+{
+    _finline bool operator ()(NSString *lhs, NSString *rhs) const {
+        return [lhs compare:rhs] == NSOrderedAscending;
+    }
+};
+
+struct NSStringMapEqual :
+    std::binary_function<NSString *, NSString *, bool>
+{
+    _finline bool operator ()(NSString *lhs, NSString *rhs) const {
+        return CFStringCompare((CFStringRef) lhs, (CFStringRef) rhs, 0) == kCFCompareEqualTo;
+        //CFEqual((CFTypeRef) lhs, (CFTypeRef) rhs);
+        //[lhs isEqualToString:rhs];
+    }
+};
+
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
   private:
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
   private:
@@ -620,6 +813,8 @@ class Pcre {
 - (NSString *) name;
 - (NSString *) address;
 
 - (NSString *) name;
 - (NSString *) address;
 
+- (void) setAddress:(NSString *)address;
+
 + (Address *) addressWithString:(NSString *)string;
 - (Address *) initWithString:(NSString *)string;
 @end
 + (Address *) addressWithString:(NSString *)string;
 - (Address *) initWithString:(NSString *)string;
 @end
@@ -641,6 +836,15 @@ class Pcre {
     return address_;
 }
 
     return address_;
 }
 
+- (void) setAddress:(NSString *)address {
+    if (address_ != nil)
+        [address_ autorelease];
+    if (address == nil)
+        address_ = nil;
+    else
+        address_ = [address retain];
+}
+
 + (Address *) addressWithString:(NSString *)string {
     return [[[Address alloc] initWithString:string] autorelease];
 }
 + (Address *) addressWithString:(NSString *)string {
     return [[[Address alloc] initWithString:string] autorelease];
 }
@@ -725,12 +929,20 @@ static const float KeyboardTime_ = 0.3f;
 #define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb"
 #define NotifyConfig_ "/etc/notify.conf"
 
 #define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb"
 #define NotifyConfig_ "/etc/notify.conf"
 
+static bool Queuing_;
+
 static CGColor Blue_;
 static CGColor Blueish_;
 static CGColor Black_;
 static CGColor Off_;
 static CGColor White_;
 static CGColor Gray_;
 static CGColor Blue_;
 static CGColor Blueish_;
 static CGColor Black_;
 static CGColor Off_;
 static CGColor White_;
 static CGColor Gray_;
+static CGColor Green_;
+static CGColor Purple_;
+static CGColor Purplish_;
+
+static UIColor *InstallingColor_;
+static UIColor *RemovingColor_;
 
 static NSString *App_;
 static NSString *Home_;
 
 static NSString *App_;
 static NSString *Home_;
@@ -749,6 +961,8 @@ static UIFont *Font22Bold_;
 static const char *Machine_ = NULL;
 static const NSString *UniqueID_ = nil;
 static const NSString *Build_ = nil;
 static const char *Machine_ = NULL;
 static const NSString *UniqueID_ = nil;
 static const NSString *Build_ = nil;
+static const NSString *Product_ = nil;
+static const NSString *Safari_ = nil;
 
 CFLocaleRef Locale_;
 CGColorSpaceRef space_;
 
 CFLocaleRef Locale_;
 CGColorSpaceRef space_;
@@ -774,7 +988,7 @@ NSString *GetLastUpdate() {
     NSDate *update = [Metadata_ objectForKey:@"LastUpdate"];
 
     if (update == nil)
     NSDate *update = [Metadata_ objectForKey:@"LastUpdate"];
 
     if (update == nil)
-        return @"Never or Unknown";
+        return CYLocalize("NEVER_OR_UNKNOWN");
 
     CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
@@ -789,6 +1003,7 @@ inline float Interpolate(float begin, float end, float fraction) {
     return (end - begin) * fraction + begin;
 }
 
     return (end - begin) * fraction + begin;
 }
 
+/* XXX: localize this! */
 NSString *SizeString(double size) {
     bool negative = size < 0;
     if (negative)
 NSString *SizeString(double size) {
     bool negative = size < 0;
     if (negative)
@@ -812,6 +1027,10 @@ NSString *StripVersion(NSString *version) {
     return version;
 }
 
     return version;
 }
 
+NSString *LocalizeSection(NSString *section) {
+    return section;
+}
+
 NSString *Simplify(NSString *title) {
     const char *data = [title UTF8String];
     size_t size = [title length];
 NSString *Simplify(NSString *title) {
     const char *data = [title UTF8String];
     size_t size = [title length];
@@ -870,7 +1089,11 @@ bool isSectionVisible(NSString *section) {
 - (void) setConfigurationData:(NSString *)data;
 @end
 
 - (void) setConfigurationData:(NSString *)data;
 @end
 
+@class PackageView;
+
 @protocol CydiaDelegate
 @protocol CydiaDelegate
+- (void) setPackageView:(PackageView *)view;
+- (void) clearPackage:(Package *)package;
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
 - (void) slideUp:(UIActionSheet *)alert;
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
 - (void) slideUp:(UIActionSheet *)alert;
@@ -884,6 +1107,7 @@ bool isSectionVisible(NSString *section) {
 - (RVPage *) pageForPackage:(NSString *)name;
 - (void) openMailToURL:(NSURL *)url;
 - (void) clearFirstResponder;
 - (RVPage *) pageForPackage:(NSString *)name;
 - (void) openMailToURL:(NSURL *)url;
 - (void) clearFirstResponder;
+- (PackageView *) packageView;
 @end
 /* }}} */
 
 @end
 /* }}} */
 
@@ -994,6 +1218,11 @@ class Progress :
 
 /* Database Interface {{{ */
 @interface Database : NSObject {
 
 /* Database Interface {{{ */
 @interface Database : NSObject {
+    NSZone *zone_;
+    apr_pool_t *pool_;
+
+    unsigned era_;
+
     pkgCacheFile cache_;
     pkgDepCache::Policy *policy_;
     pkgRecords *records_;
     pkgCacheFile cache_;
     pkgDepCache::Policy *policy_;
     pkgRecords *records_;
@@ -1016,6 +1245,7 @@ class Progress :
 }
 
 + (Database *) sharedInstance;
 }
 
 + (Database *) sharedInstance;
+- (unsigned) era;
 
 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 
 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
@@ -1053,6 +1283,7 @@ class Progress :
     NSString *description_;
     NSString *label_;
     NSString *origin_;
     NSString *description_;
     NSString *label_;
     NSString *origin_;
+    NSString *support_;
 
     NSString *uri_;
     NSString *distribution_;
 
     NSString *uri_;
     NSString *distribution_;
@@ -1069,6 +1300,8 @@ class Progress :
 
 - (NSComparisonResult) compareByNameAndType:(Source *)source;
 
 
 - (NSComparisonResult) compareByNameAndType:(Source *)source;
 
+- (NSString *) supportForPackage:(NSString *)package;
+
 - (NSDictionary *) record;
 - (BOOL) trusted;
 
 - (NSDictionary *) record;
 - (BOOL) trusted;
 
@@ -1103,6 +1336,7 @@ class Progress :
     _clear(description_)
     _clear(label_)
     _clear(origin_)
     _clear(description_)
     _clear(label_)
     _clear(origin_)
+    _clear(support_)
     _clear(version_)
     _clear(defaultIcon_)
     _clear(record_)
     _clear(version_)
     _clear(defaultIcon_)
     _clear(record_)
@@ -1156,6 +1390,8 @@ class Progress :
                 label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
             else if (name == "Origin")
                 origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
                 label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
             else if (name == "Origin")
                 origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+            else if (name == "Support")
+                support_ = [[NSString stringWithUTF8String:value.c_str()] retain];
             else if (name == "Version")
                 version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
         }
             else if (name == "Version")
                 version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
         }
@@ -1195,6 +1431,10 @@ class Progress :
     return [lhs compare:rhs options:LaxCompareOptions_];
 }
 
     return [lhs compare:rhs options:LaxCompareOptions_];
 }
 
+- (NSString *) supportForPackage:(NSString *)package {
+    return support_ == nil ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];
+}
+
 - (NSDictionary *) record {
     return record_;
 }
 - (NSDictionary *) record {
     return record_;
 }
@@ -1286,6 +1526,8 @@ class Progress :
 /* }}} */
 /* Package Class {{{ */
 @interface Package : NSObject {
 /* }}} */
 /* Package Class {{{ */
 @interface Package : NSObject {
+    unsigned era_;
+
     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
     pkgCache::VerIterator version_;
     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
     pkgCache::VerIterator version_;
@@ -1294,33 +1536,45 @@ class Progress :
     Source *source_;
     bool cached_;
 
     Source *source_;
     bool cached_;
 
-    NSString *section_;
+    CYString section_;
+    NSString *section$_;
+    bool essential_;
 
     NSString *latest_;
     NSString *installed_;
 
     NSString *id_;
 
     NSString *latest_;
     NSString *installed_;
 
     NSString *id_;
-    NSString *name_;
-    NSString *tagline_;
-    NSString *icon_;
-    NSString *depiction_;
-    NSString *homepage_;
-    Address *sponsor_;
-    Address *author_;
+    CYString name_;
+    CYString tagline_;
+    CYString icon_;
+    CYString depiction_;
+    CYString homepage_;
+
+    CYString sponsor_;
+    Address *sponsor$_;
+
+    CYString author_;
+    Address *author$_;
+
+    CYString support_;
     NSArray *tags_;
     NSString *role_;
 
     NSArray *relationships_;
     NSArray *tags_;
     NSString *role_;
 
     NSArray *relationships_;
+    NSMutableDictionary *metadata_;
 }
 
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
 
 - (pkgCache::PkgIterator) iterator;
 
 - (NSString *) section;
 - (NSString *) simpleSection;
 
 
 - (pkgCache::PkgIterator) iterator;
 
 - (NSString *) section;
 - (NSString *) simpleSection;
 
+- (NSString *) longSection;
+- (NSString *) shortSection;
+
 - (NSString *) uri;
 
 - (Address *) maintainer;
 - (NSString *) uri;
 
 - (Address *) maintainer;
@@ -1357,6 +1611,8 @@ class Progress :
 - (NSString *) depiction;
 - (Address *) author;
 
 - (NSString *) depiction;
 - (Address *) author;
 
+- (NSString *) support;
+
 - (NSArray *) files;
 - (NSArray *) relationships;
 - (NSArray *) warnings;
 - (NSArray *) files;
 - (NSArray *) relationships;
 - (NSArray *) warnings;
@@ -1371,9 +1627,11 @@ class Progress :
 - (BOOL) hasTag:(NSString *)tag;
 - (NSString *) primaryPurpose;
 - (NSArray *) purposes;
 - (BOOL) hasTag:(NSString *)tag;
 - (NSString *) primaryPurpose;
 - (NSArray *) purposes;
+- (bool) isCommercial;
 
 
+- (uint32_t) compareByPrefix;
 - (NSComparisonResult) compareByName:(Package *)package;
 - (NSComparisonResult) compareByName:(Package *)package;
-- (NSComparisonResult) compareBySection:(Package *)package;
+- (uint32_t) compareBySection:(NSArray *)sections;
 
 - (uint32_t) compareForChanges;
 
 
 - (uint32_t) compareForChanges;
 
@@ -1387,33 +1645,50 @@ class Progress :
 
 @end
 
 
 @end
 
+uint32_t PackageChangesRadix(Package *self, void *) {
+    union {
+        uint32_t key;
+
+        struct {
+            uint32_t timestamp : 30;
+            uint32_t ignored : 1;
+            uint32_t upgradable : 1;
+        } bits;
+    } value;
+
+    bool upgradable([self upgradableAndEssential:YES]);
+    value.bits.upgradable = upgradable ? 1 : 0;
+
+    if (upgradable) {
+        value.bits.timestamp = 0;
+        value.bits.ignored = [self ignored] ? 0 : 1;
+        value.bits.upgradable = 1;
+    } else {
+        value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
+        value.bits.ignored = 0;
+        value.bits.upgradable = 0;
+    }
+
+    return _not(uint32_t) - value.key;
+}
+
 @implementation Package
 
 - (void) dealloc {
     if (source_ != nil)
         [source_ release];
 @implementation Package
 
 - (void) dealloc {
     if (source_ != nil)
         [source_ release];
-
-    if (section_ != nil)
-        [section_ release];
+    if (section$_ != nil)
+        [section$_ release];
 
     [latest_ release];
     if (installed_ != nil)
         [installed_ release];
 
     [id_ release];
 
     [latest_ release];
     if (installed_ != nil)
         [installed_ release];
 
     [id_ release];
-    if (name_ != nil)
-        [name_ release];
-    [tagline_ release];
-    if (icon_ != nil)
-        [icon_ release];
-    if (depiction_ != nil)
-        [depiction_ release];
-    if (homepage_ != nil)
-        [homepage_ release];
-    if (sponsor_ != nil)
-        [sponsor_ release];
-    if (author_ != nil)
-        [author_ release];
+    if (sponsor$_ != nil)
+        [sponsor$_ release];
+    if (author$_ != nil)
+        [author$_ release];
     if (tags_ != nil)
         [tags_ release];
     if (role_ != nil)
     if (tags_ != nil)
         [tags_ release];
     if (role_ != nil)
@@ -1421,12 +1696,25 @@ class Progress :
 
     if (relationships_ != nil)
         [relationships_ release];
 
     if (relationships_ != nil)
         [relationships_ release];
+    if (metadata_ != nil)
+        [metadata_ release];
 
     [super dealloc];
 }
 
 
     [super dealloc];
 }
 
++ (NSString *) webScriptNameForSelector:(SEL)selector {
+    if (selector == @selector(hasTag:))
+        return @"hasTag";
+    else
+        return nil;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return [self webScriptNameForSelector:selector] == nil;
+}
+
 + (NSArray *) _attributeKeys {
 + (NSArray *) _attributeKeys {
-    return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"purposes", @"section", @"size", @"source", @"sponsor", @"tagline", @"warnings", nil];
+    return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"longSection", @"maintainer", @"mode", @"name", @"purposes", @"section", @"shortSection", @"simpleSection", @"size", @"source", @"sponsor", @"support", @"tagline", @"warnings", nil];
 }
 
 - (NSArray *) attributeKeys {
 }
 
 - (NSArray *) attributeKeys {
@@ -1437,8 +1725,12 @@ class Progress :
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
-    if ((self = [super init]) != nil) { _profile(Package$initWithIterator)
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
+    if ((self = [super init]) != nil) {
+    _profile(Package$initWithIterator)
+    @synchronized (database) {
+        era_ = [database era];
+
         iterator_ = iterator;
         database_ = database;
 
         iterator_ = iterator;
         database_ = database;
 
@@ -1491,22 +1783,21 @@ class Progress :
                 const char *begin, *end;
                 parser->GetRec(begin, end);
 
                 const char *begin, *end;
                 parser->GetRec(begin, end);
 
-                NSString *website(nil);
-                NSString *sponsor(nil);
-                NSString *author(nil);
-                NSString *tag(nil);
+                CYString website;
+                CYString tag;
 
                 struct {
                     const char *name_;
 
                 struct {
                     const char *name_;
-                    NSString **value_;
+                    CYString *value_;
                 } names[] = {
                     {"name", &name_},
                     {"icon", &icon_},
                     {"depiction", &depiction_},
                     {"homepage", &homepage_},
                     {"website", &website},
                 } names[] = {
                     {"name", &name_},
                     {"icon", &icon_},
                     {"depiction", &depiction_},
                     {"homepage", &homepage_},
                     {"website", &website},
-                    {"sponsor", &sponsor},
-                    {"author", &author},
+                    {"support", &support_},
+                    {"sponsor", &sponsor_},
+                    {"author", &author_},
                     {"tag", &tag},
                 };
 
                     {"tag", &tag},
                 };
 
@@ -1532,13 +1823,12 @@ class Progress :
 
                             for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i)
                                 if (strncasecmp(names[i].name_, name, size) == 0) {
 
                             for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i)
                                 if (strncasecmp(names[i].name_, name, size) == 0) {
-                                    NSString *value;
+                                    CYString &value(*names[i].value_);
 
                                     _profile(Package$initWithIterator$Parse$Value)
 
                                     _profile(Package$initWithIterator$Parse$Value)
-                                        value = [NSString stringWithUTF8Bytes:colon length:(stop - colon)];
+                                        value.set(pool, colon, stop - colon);
                                     _end
 
                                     _end
 
-                                    *names[i].value_ = value;
                                     break;
                                 }
                         }
                                     break;
                                 }
                         }
@@ -1548,27 +1838,16 @@ class Progress :
                         ++begin;
                     } else goto next;
 
                         ++begin;
                     } else goto next;
 
+                _profile(Package$initWithIterator$Parse$Tagline)
+                    tagline_.set(pool, parser->ShortDesc());
+                _end
+
                 _profile(Package$initWithIterator$Parse$Retain)
                 _profile(Package$initWithIterator$Parse$Retain)
-                    if (name_ != nil)
-                        name_ = [name_ retain];
-                    _profile(Package$initWithIterator$Parse$Tagline)
-                        tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain];
-                    _end
-                    if (icon_ != nil)
-                        icon_ = [icon_ retain];
-                    if (depiction_ != nil)
-                        depiction_ = [depiction_ retain];
-                    if (homepage_ == nil)
+                    if (!homepage_.empty())
                         homepage_ = website;
                         homepage_ = website;
-                    if ([homepage_ isEqualToString:depiction_])
-                        homepage_ = nil;
-                    if (homepage_ != nil)
-                        homepage_ = [homepage_ retain];
-                    if (sponsor != nil)
-                        sponsor_ = [[Address addressWithString:sponsor] retain];
-                    if (author != nil)
-                        author_ = [[Address addressWithString:author] retain];
-                    if (tag != nil)
+                    if (homepage_ == depiction_)
+                        homepage_.clear();
+                    if (!tag.empty())
                         tags_ = [[tag componentsSeparatedByString:@", "] retain];
                 _end
             _end
                         tags_ = [[tag componentsSeparatedByString:@", "] retain];
                 _end
             _end
@@ -1588,49 +1867,59 @@ class Progress :
         NSString *key([id_ lowercaseString]);
 
         _profile(Package$initWithIterator$Metadata)
         NSString *key([id_ lowercaseString]);
 
         _profile(Package$initWithIterator$Metadata)
-            NSMutableDictionary *metadata = [Packages_ objectForKey:key];
-            if (metadata == nil) {
-                metadata = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
+            metadata_ = [Packages_ objectForKey:key];
+            if (metadata_ == nil) {
+                metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
                     now_, @"FirstSeen",
                 nil] mutableCopy];
 
                 if (solid != nil)
                     now_, @"FirstSeen",
                 nil] mutableCopy];
 
                 if (solid != nil)
-                    [metadata setObject:solid forKey:@"LastVersion"];
+                    [metadata_ setObject:solid forKey:@"LastVersion"];
                 changed = true;
             } else {
                 changed = true;
             } else {
-                NSDate *first([metadata objectForKey:@"FirstSeen"]);
-                NSDate *last([metadata objectForKey:@"LastSeen"]);
-                NSString *version([metadata objectForKey:@"LastVersion"]);
+                NSDate *first([metadata_ objectForKey:@"FirstSeen"]);
+                NSDate *last([metadata_ objectForKey:@"LastSeen"]);
+                NSString *version([metadata_ objectForKey:@"LastVersion"]);
 
                 if (first == nil) {
                     first = last == nil ? now_ : last;
 
                 if (first == nil) {
                     first = last == nil ? now_ : last;
-                    [metadata setObject:first forKey:@"FirstSeen"];
+                    [metadata_ setObject:first forKey:@"FirstSeen"];
                     changed = true;
                 }
 
                 if (solid != nil)
                     if (version == nil) {
                     changed = true;
                 }
 
                 if (solid != nil)
                     if (version == nil) {
-                        [metadata setObject:solid forKey:@"LastVersion"];
+                        [metadata_ setObject:solid forKey:@"LastVersion"];
                         changed = true;
                     } else if (![version isEqualToString:solid]) {
                         changed = true;
                     } else if (![version isEqualToString:solid]) {
-                        [metadata setObject:solid forKey:@"LastVersion"];
+                        [metadata_ setObject:solid forKey:@"LastVersion"];
                         last = now_;
                         last = now_;
-                        [metadata setObject:last forKey:@"LastSeen"];
+                        [metadata_ setObject:last forKey:@"LastSeen"];
                         changed = true;
                     }
             }
 
                         changed = true;
                     }
             }
 
+            metadata_ = [metadata_ retain];
+
             if (changed) {
             if (changed) {
-                [Packages_ setObject:metadata forKey:key];
+                [Packages_ setObject:metadata_ forKey:key];
                 Changed_ = true;
             }
         _end
                 Changed_ = true;
             }
         _end
-    _end } return self;
+
+        _profile(Package$initWithIterator$Section)
+            section_.set(pool, iterator_.Section());
+        _end
+
+        essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
+    } _end } return self;
 }
 
 }
 
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
     return [[[Package alloc]
     return [[[Package alloc]
-        initWithIterator:iterator 
+        initWithIterator:iterator
+        withZone:zone
+        inPool:pool
         database:database
     ] autorelease];
 }
         database:database
     ] autorelease];
 }
@@ -1640,24 +1929,22 @@ class Progress :
 }
 
 - (NSString *) section {
 }
 
 - (NSString *) section {
-    if (section_ != nil)
-        return section_;
-
-    const char *section = iterator_.Section();
-    if (section == NULL)
-        return nil;
+    if (section$_ == nil) {
+        if (section_.empty())
+            return nil;
 
 
-    NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
+        std::replace(section_.data(), section_.data() + section_.size(), ' ', '_');
+        NSString *name(section_);
 
 
-  lookup:
-    if (NSDictionary *value = [SectionMap_ objectForKey:name])
-        if (NSString *rename = [value objectForKey:@"Rename"]) {
-            name = rename;
-            goto lookup;
-        }
+      lookup:
+        if (NSDictionary *value = [SectionMap_ objectForKey:name])
+            if (NSString *rename = [value objectForKey:@"Rename"]) {
+                name = rename;
+                goto lookup;
+            }
 
 
-    section_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain];
-    return section_;
+        section$_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain];
+    } return section$_;
 }
 
 - (NSString *) simpleSection {
 }
 
 - (NSString *) simpleSection {
@@ -1667,6 +1954,14 @@ class Progress :
         return nil;
 }
 
         return nil;
 }
 
+- (NSString *) longSection {
+    return LocalizeSection(section_);
+}
+
+- (NSString *) shortSection {
+    return [[NSBundle mainBundle] localizedStringForKey:[self simpleSection] value:nil table:@"Sections"];
+}
+
 - (NSString *) uri {
     return nil;
 #if 0
 - (NSString *) uri {
     return nil;
 #if 0
@@ -1720,12 +2015,14 @@ class Progress :
         unichar character([name characterAtIndex:0]);
         if (!isalpha(character))
             return '#';
         unichar character([name characterAtIndex:0]);
         if (!isalpha(character))
             return '#';
-        return character;
+        return toupper(character);
     _end
 }
 
 - (NSMutableDictionary *) metadata {
     _end
 }
 
 - (NSMutableDictionary *) metadata {
-    return [Packages_ objectForKey:[id_ lowercaseString]];
+    if (metadata_ == nil)
+        metadata_ = [[Packages_ objectForKey:[id_ lowercaseString]] retain];
+    return metadata_;
 }
 
 - (NSDate *) seen {
 }
 
 - (NSDate *) seen {
@@ -1776,7 +2073,7 @@ class Progress :
 }
 
 - (BOOL) essential {
 }
 
 - (BOOL) essential {
-    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+    return essential_;
 }
 
 - (BOOL) broken {
 }
 
 - (BOOL) broken {
@@ -1816,26 +2113,28 @@ class Progress :
     switch (state.Mode) {
         case pkgDepCache::ModeDelete:
             if ((state.iFlags & pkgDepCache::Purge) != 0)
     switch (state.Mode) {
         case pkgDepCache::ModeDelete:
             if ((state.iFlags & pkgDepCache::Purge) != 0)
-                return @"Purge";
+                return @"PURGE";
             else
             else
-                return @"Remove";
+                return @"REMOVE";
         case pkgDepCache::ModeKeep:
         case pkgDepCache::ModeKeep:
-            if ((state.iFlags & pkgDepCache::AutoKept) != 0)
-                return nil;
+            if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+                return @"REINSTALL";
+            /*else if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+                return nil;*/
             else
                 return nil;
         case pkgDepCache::ModeInstall:
             else
                 return nil;
         case pkgDepCache::ModeInstall:
-            if ((state.iFlags & pkgDepCache::ReInstall) != 0)
-                return @"Reinstall";
-            else switch (state.Status) {
+            /*if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+                return @"REINSTALL";
+            else*/ switch (state.Status) {
                 case -1:
                 case -1:
-                    return @"Downgrade";
+                    return @"DOWNGRADE";
                 case 0:
                 case 0:
-                    return @"Install";
+                    return @"INSTALL";
                 case 1:
                 case 1:
-                    return @"Upgrade";
+                    return @"UPGRADE";
                 case 2:
                 case 2:
-                    return @"New Install";
+                    return @"NEW_INSTALL";
                 default:
                     _assert(false);
             }
                 default:
                     _assert(false);
             }
@@ -1882,11 +2181,23 @@ class Progress :
 }
 
 - (Address *) sponsor {
 }
 
 - (Address *) sponsor {
-    return sponsor_;
+    if (sponsor$_ == nil) {
+        if (sponsor_.empty())
+            return nil;
+        sponsor$_ = [[Address addressWithString:sponsor_] retain];
+    } return sponsor$_;
 }
 
 - (Address *) author {
 }
 
 - (Address *) author {
-    return author_;
+    if (author$_ == nil) {
+        if (author_.empty())
+            return nil;
+        author$_ = [[Address addressWithString:author_] retain];
+    } return author$_;
+}
+
+- (NSString *) support {
+    return support_ != nil ? support_ : [[self source] supportForPackage:id_];
 }
 
 - (NSArray *) files {
 }
 
 - (NSArray *) files {
@@ -1915,7 +2226,7 @@ class Progress :
 
     size_t length(strlen(name));
     if (length < 2) invalid:
 
     size_t length(strlen(name));
     if (length < 2) invalid:
-        [warnings addObject:@"illegal package identifier"];
+        [warnings addObject:CYLocalize("ILLEGAL_PACKAGE_IDENTIFIER")];
     else for (size_t i(0); i != length; ++i)
         if (
             /* XXX: technically this is not allowed */
     else for (size_t i(0); i != length; ++i)
         if (
             /* XXX: technically this is not allowed */
@@ -1943,11 +2254,11 @@ class Progress :
 
         /* XXX: this is not sensitive enough. only some folders are valid. */
         if (cydia && !repository)
 
         /* XXX: this is not sensitive enough. only some folders are valid. */
         if (cydia && !repository)
-            [warnings addObject:@"files installed into Cydia.app"];
+            [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"Cydia.app"]];
         if (_private)
         if (_private)
-            [warnings addObject:@"files installed with /private/*"];
+            [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/private"]];
         if (stash)
         if (stash)
-            [warnings addObject:@"files installed to /var/stash"];
+            [warnings addObject:[NSString stringWithFormat:CYLocalize("FILES_INSTALLED_TO"), @"/var/stash"]];
     }
 
     return [warnings count] == 0 ? nil : warnings;
     }
 
     return [warnings count] == 0 ? nil : warnings;
@@ -1990,8 +2301,17 @@ class Progress :
 
 - (Source *) source {
     if (!cached_) {
 
 - (Source *) source {
     if (!cached_) {
-        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
-        cached_ = true;
+        @synchronized (database_) {
+            if ([database_ era] != era_ || file_.end())
+                source_ = nil;
+            else {
+                source_ = [database_ getSource:file_.File()];
+                if (source_ != nil)
+                    [source_ retain];
+            }
+
+            cached_ = true;
+        }
     }
 
     return source_;
     }
 
     return source_;
@@ -2059,11 +2379,19 @@ class Progress :
     return [purposes count] == 0 ? nil : purposes;
 }
 
     return [purposes count] == 0 ? nil : purposes;
 }
 
+- (bool) isCommercial {
+    return [self hasTag:@"cydia::commercial"];
+}
+
+- (uint32_t) compareByPrefix {
+    return 0;
+}
+
 - (NSComparisonResult) compareByName:(Package *)package {
     NSString *lhs = [self name];
     NSString *rhs = [package name];
 
 - (NSComparisonResult) compareByName:(Package *)package {
     NSString *lhs = [self name];
     NSString *rhs = [package name];
 
-    if ([lhs length] != 0 && [rhs length] != 0) {
+    /*if ([lhs length] != 0 && [rhs length] != 0) {
         unichar lhc = [lhs characterAtIndex:0];
         unichar rhc = [rhs characterAtIndex:0];
 
         unichar lhc = [lhs characterAtIndex:0];
         unichar rhc = [rhs characterAtIndex:0];
 
@@ -2073,23 +2401,19 @@ class Progress :
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 
-    return [lhs compare:rhs options:LaxCompareOptions_];
-}
+    return [lhs compare:rhs options:LaxCompareOptions_];*/
 
 
-- (NSComparisonResult) compareBySection:(Package *)package {
-    NSString *lhs = [self section];
-    NSString *rhs = [package section];
+    return [lhs compare:rhs];
+}
 
 
-    if (lhs == NULL && rhs != NULL)
-        return NSOrderedAscending;
-    else if (lhs != NULL && rhs == NULL)
-        return NSOrderedDescending;
-    else if (lhs != NULL && rhs != NULL) {
-        NSComparisonResult result([lhs compare:rhs options:LaxCompareOptions_]);
-        return result != NSOrderedSame ? result : [lhs compare:rhs options:ForcedCompareOptions_];
+- (uint32_t) compareBySection:(NSArray *)sections {
+    NSString *section([self section]);
+    for (size_t i(0), e([sections count]); i != e; ++i) {
+        if ([section isEqualToString:[[sections objectAtIndex:i] name]])
+            return i;
     }
 
     }
 
-    return NSOrderedSame;
+    return _not(uint32_t);
 }
 
 - (uint32_t) compareForChanges {
 }
 
 - (uint32_t) compareForChanges {
@@ -2119,6 +2443,12 @@ class Progress :
     return _not(uint32_t) - value.key;
 }
 
     return _not(uint32_t) - value.key;
 }
 
+- (void) clear {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+}
+
 - (void) install {
     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
 - (void) install {
     pkgProblemResolver *resolver = [database_ resolver];
     resolver->Clear(iterator_);
@@ -2182,6 +2512,7 @@ class Progress :
     unichar index_;
     size_t row_;
     size_t count_;
     unichar index_;
     size_t row_;
     size_t count_;
+    NSString *localized_;
 }
 
 - (NSComparisonResult) compareByName:(Section *)section;
 }
 
 - (NSComparisonResult) compareByName:(Section *)section;
@@ -2190,16 +2521,23 @@ class Progress :
 - (Section *) initWithIndex:(unichar)index row:(size_t)row;
 - (NSString *) name;
 - (unichar) index;
 - (Section *) initWithIndex:(unichar)index row:(size_t)row;
 - (NSString *) name;
 - (unichar) index;
+
 - (size_t) row;
 - (size_t) count;
 - (size_t) row;
 - (size_t) count;
+
+- (void) addToRow;
 - (void) addToCount;
 
 - (void) addToCount;
 
+- (void) setCount:(size_t)count;
+
 @end
 
 @implementation Section
 
 - (void) dealloc {
     [name_ release];
 @end
 
 @implementation Section
 
 - (void) dealloc {
     [name_ release];
+    if (localized_ != nil)
+        [localized_ release];
     [super dealloc];
 }
 
     [super dealloc];
 }
 
@@ -2229,12 +2567,14 @@ class Progress :
         name_ = [name retain];
         index_ = '\0';
         row_ = row;
         name_ = [name retain];
         index_ = '\0';
         row_ = row;
+        localized_ = LocalizeSection(name_);
     } return self;
 }
 
     } return self;
 }
 
+/* XXX: localize the index thingees */
 - (Section *) initWithIndex:(unichar)index row:(size_t)row {
     if ((self = [super init]) != nil) {
 - (Section *) initWithIndex:(unichar)index row:(size_t)row {
     if ((self = [super init]) != nil) {
-        name_ = [[NSString stringWithCharacters:&index length:1] retain];
+        name_ = [(index == '#' ? @"123" : [NSString stringWithCharacters:&index length:1]) retain];
         index_ = index;
         row_ = row;
     } return self;
         index_ = index;
         row_ = row;
     } return self;
@@ -2256,10 +2596,22 @@ class Progress :
     return count_;
 }
 
     return count_;
 }
 
+- (void) addToRow {
+    ++row_;
+}
+
 - (void) addToCount {
     ++count_;
 }
 
 - (void) addToCount {
     ++count_;
 }
 
+- (void) setCount:(size_t)count {
+    count_ = count;
+}
+
+- (NSString *) localized {
+    return localized_;
+}
+
 @end
 /* }}} */
 
 @end
 /* }}} */
 
@@ -2276,8 +2628,15 @@ static NSArray *Finishes_;
     return instance;
 }
 
     return instance;
 }
 
+- (unsigned) era {
+    return era_;
+}
+
 - (void) dealloc {
     _assert(false);
 - (void) dealloc {
     _assert(false);
+    NSRecycleZone(zone_);
+    // XXX: malloc_destroy_zone(zone_);
+    apr_pool_destroy(pool_);
     [super dealloc];
 }
 
     [super dealloc];
 }
 
@@ -2368,7 +2727,7 @@ static NSArray *Finishes_;
     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;
     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;
     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
-    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+    return iterator.end() ? nil : [Package packageWithIterator:iterator withZone:NULL inPool:pool_ database:self];
 }
 
 - (Database *) init {
 }
 
 - (Database *) init {
@@ -2379,6 +2738,9 @@ static NSArray *Finishes_;
         fetcher_ = NULL;
         lock_ = NULL;
 
         fetcher_ = NULL;
         lock_ = NULL;
 
+        zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO);
+        apr_pool_create(&pool_, NULL);
+
         sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
         sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
@@ -2520,6 +2882,10 @@ static NSArray *Finishes_;
 }
 
 - (void) reloadData { _pooled
 }
 
 - (void) reloadData { _pooled
+    @synchronized (self) {
+        ++era_;
+    }
+
     _error->Discard();
 
     delete list_;
     _error->Discard();
 
     delete list_;
@@ -2538,6 +2904,9 @@ static NSArray *Finishes_;
 
     cache_.Close();
 
 
     cache_.Close();
 
+    apr_pool_clear(pool_);
+    NSRecycleZone(zone_);
+
     _trace();
     if (!cache_.Open(progress_, true)) {
         std::string error;
     _trace();
     if (!cache_.Open(progress_, true)) {
         std::string error;
@@ -2592,7 +2961,7 @@ static NSArray *Finishes_;
     [packages_ removeAllObjects];
     _trace();
     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
     [packages_ removeAllObjects];
     _trace();
     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
-        if (Package *package = [Package packageWithIterator:iterator database:self])
+        if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self])
             [packages_ addObject:package];
     _trace();
     [packages_ sortUsingSelector:@selector(compareByName:)];
             [packages_ addObject:package];
     _trace();
     [packages_ sortUsingSelector:@selector(compareByName:)];
@@ -2820,6 +3189,7 @@ static NSArray *Finishes_;
 @end
 /* }}} */
 
 @end
 /* }}} */
 
+#if 0
 /* Mail Composition {{{ */
 @interface MailToView : PopUpView {
     MailComposeController *controller_;
 /* Mail Composition {{{ */
 @interface MailToView : PopUpView {
     MailComposeController *controller_;
@@ -2844,8 +3214,8 @@ static NSArray *Finishes_;
     NSLog(@"did:%@", delivery);
 // [UIApp setStatusBarShowsProgress:NO];
 if ([controller error]){
     NSLog(@"did:%@", delivery);
 // [UIApp setStatusBarShowsProgress:NO];
 if ([controller error]){
-NSArray *buttons = [NSArray arrayWithObjects:@"OK", nil];
-UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil];
+UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self];
 [mailAlertSheet setBodyText:[controller error]];
 [mailAlertSheet popupAlertAnimated:YES];
 }
 [mailAlertSheet setBodyText:[controller error]];
 [mailAlertSheet popupAlertAnimated:YES];
 }
@@ -2853,8 +3223,8 @@ UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" bu
 
 - (void) showError {
     NSLog(@"%@", [controller_ error]);
 
 - (void) showError {
     NSLog(@"%@", [controller_ error]);
-    NSArray *buttons = [NSArray arrayWithObjects:@"OK", nil];
-    UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+    NSArray *buttons = [NSArray arrayWithObjects:CYLocalize("OK"), nil];
+    UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:CYLocalize("ERROR") buttons:buttons defaultButtonIndex:0 delegate:self context:self];
     [mailAlertSheet setBodyText:[controller_ error]];
     [mailAlertSheet popupAlertAnimated:YES];
 }
     [mailAlertSheet setBodyText:[controller_ error]];
     [mailAlertSheet popupAlertAnimated:YES];
 }
@@ -2888,6 +3258,8 @@ UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" bu
 
 @end
 /* }}} */
 
 @end
 /* }}} */
+#endif
+
 /* Confirmation View {{{ */
 bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (!iterator.end())
 /* Confirmation View {{{ */
 bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (!iterator.end())
@@ -2907,6 +3279,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @protocol ConfirmationViewDelegate
 - (void) cancel;
 - (void) confirm;
 @protocol ConfirmationViewDelegate
 - (void) cancel;
 - (void) confirm;
+- (void) queue;
 @end
 
 @interface ConfirmationView : BrowserView {
 @end
 
 @interface ConfirmationView : BrowserView {
@@ -2965,10 +3338,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    [super webView:sender didClearWindowObject:window forFrame:frame];
     [window setValue:changes_ forKey:@"changes"];
     [window setValue:issues_ forKey:@"issues"];
     [window setValue:sizes_ forKey:@"sizes"];
     [window setValue:changes_ forKey:@"changes"];
     [window setValue:issues_ forKey:@"issues"];
     [window setValue:sizes_ forKey:@"sizes"];
-    [super webView:sender didClearWindowObject:window forFrame:frame];
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
@@ -3014,11 +3387,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {
+            NSString *parenthetical(CYLocalize("PARENTHETICAL"));
+
             essential_ = [[UIActionSheet alloc]
             essential_ = [[UIActionSheet alloc]
-                initWithTitle:@"Removing Essentials"
+                initWithTitle:CYLocalize("REMOVING_ESSENTIALS")
                 buttons:[NSArray arrayWithObjects:
                 buttons:[NSArray arrayWithObjects:
-                    @"Cancel Operation (Safe)",
-                    @"Force Removal (Unsafe)",
+                    [NSString stringWithFormat:parenthetical, CYLocalize("CANCEL_OPERATION"), CYLocalize("SAFE")],
+                    [NSString stringWithFormat:parenthetical, CYLocalize("FORCE_REMOVAL"), CYLocalize("UNSAFE")],
                 nil]
                 defaultButtonIndex:0
                 delegate:self
                 nil]
                 defaultButtonIndex:0
                 delegate:self
@@ -3028,17 +3403,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 #ifndef __OBJC2__
             [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
 #endif
 #ifndef __OBJC2__
             [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
 #endif
-            [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
+            [essential_ setBodyText:CYLocalize("REMOVING_ESSENTIALS_EX")];
         } else {
             essential_ = [[UIActionSheet alloc]
         } else {
             essential_ = [[UIActionSheet alloc]
-                initWithTitle:@"Unable to Comply"
-                buttons:[NSArray arrayWithObjects:@"Okay", nil]
+                initWithTitle:CYLocalize("UNABLE_TO_COMPLY")
+                buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil]
                 defaultButtonIndex:0
                 delegate:self
                 context:@"unable"
             ];
 
                 defaultButtonIndex:0
                 delegate:self
                 context:@"unable"
             ];
 
-            [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."];
+            [essential_ setBodyText:CYLocalize("UNABLE_TO_COMPLY_EX")];
         }
 
         changes_ = [[NSArray alloc] initWithObjects:
         }
 
         changes_ = [[NSArray alloc] initWithObjects:
@@ -3064,18 +3439,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {
-    return @"Confirm";
+    return CYLocalize("CONFIRM");
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {
-    return @"Cancel";
+    return [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("CANCEL"), CYLocalize("QUEUE")];
+}
+
+- (id) rightButtonTitle {
+    return issues_ != nil ? nil : [super rightButtonTitle];
 }
 
 - (id) _rightButtonTitle {
 #if AlwaysReload || IgnoreInstall
 }
 
 - (id) _rightButtonTitle {
 #if AlwaysReload || IgnoreInstall
-    return @"Reload";
+    return [super _rightButtonTitle];
 #else
 #else
-    return issues_ == nil ? @"Confirm" : nil;
+    return CYLocalize("CONFIRM");
 #endif
 }
 
 #endif
 }
 
@@ -3362,7 +3741,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) _retachThread {
     UINavigationItem *item = [navbar_ topItem];
 
 - (void) _retachThread {
     UINavigationItem *item = [navbar_ topItem];
-    [item setTitle:@"Complete"];
+    [item setTitle:CYLocalize("COMPLETE")];
 
     [overlay_ addSubview:close_];
     [progress_ removeFromSuperview];
 
     [overlay_ addSubview:close_];
     [progress_ removeFromSuperview];
@@ -3398,11 +3777,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 
     switch (Finish_) {
     }
 
     switch (Finish_) {
-        case 0: [close_ setTitle:@"Return to Cydia"]; break;
-        case 1: [close_ setTitle:@"Close Cydia (Restart)"]; break;
-        case 2: [close_ setTitle:@"Restart SpringBoard"]; break;
-        case 3: [close_ setTitle:@"Reload SpringBoard"]; break;
-        case 4: [close_ setTitle:@"Reboot Device"]; break;
+        case 0: [close_ setTitle:CYLocalize("RETURN_TO_CYDIA")]; break;
+        case 1: [close_ setTitle:CYLocalize("CLOSE_CYDIA")]; break;
+        case 2: [close_ setTitle:CYLocalize("RESTART_SPRINGBOARD")]; break;
+        case 3: [close_ setTitle:CYLocalize("RELOAD_SPRINGBOARD")]; break;
+        case 4: [close_ setTitle:CYLocalize("REBOOT_DEVICE")]; break;
     }
 
 #define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist"
     }
 
 #define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist"
@@ -3519,7 +3898,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil
-        title:@"Repairing"
+        title:CYLocalize("REPAIRING")
     ];
 }
 
     ];
 }
 
@@ -3536,7 +3915,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:(package == nil ? id : [package name])
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:(package == nil ? id : [package name])
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil]
         defaultButtonIndex:0
         delegate:self
         context:@"error"
         defaultButtonIndex:0
         delegate:self
         context:@"error"
@@ -3586,21 +3965,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     //NSString *nfile = conffile_r[2];
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
     //NSString *nfile = conffile_r[2];
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
-        initWithTitle:@"Configuration Upgrade"
+        initWithTitle:CYLocalize("CONFIGURATION_UPGRADE")
         buttons:[NSArray arrayWithObjects:
         buttons:[NSArray arrayWithObjects:
-            @"Keep My Old Copy",
-            @"Accept The New Copy",
-            // XXX: @"See What Changed",
+            CYLocalize("KEEP_OLD_COPY"),
+            CYLocalize("ACCEPT_NEW_COPY"),
+            // XXX: CYLocalize("SEE_WHAT_CHANGED"),
         nil]
         defaultButtonIndex:0
         delegate:self
         context:@"conffile"
     ] autorelease];
 
         nil]
         defaultButtonIndex:0
         delegate:self
         context:@"conffile"
     ] autorelease];
 
-    [sheet setBodyText:[NSString stringWithFormat:
-        @"The following file has been changed by both the package maintainer and by you (or for you by a script).\n\n%@"
-    , ofile]];
-
+    [sheet setBodyText:[NSString stringWithFormat:@"%@\n\n%@", CYLocalize("CONFIGURATION_UPGRADE_EX"), ofile]];
     [sheet popupAlertAnimated:YES];
 }
 
     [sheet popupAlertAnimated:YES];
 }
 
@@ -3634,12 +4010,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* }}} */
 
 /* Package Cell {{{ */
 /* }}} */
 
 /* Package Cell {{{ */
-@interface PackageCell : UISimpleTableCell {
+@interface PackageCell : UITableCell {
     UIImage *icon_;
     NSString *name_;
     NSString *description_;
     UIImage *icon_;
     NSString *name_;
     NSString *description_;
+    bool commercial_;
     NSString *source_;
     UIImage *badge_;
     NSString *source_;
     UIImage *badge_;
+    bool cached_;
+    Package *package_;
 #ifdef USE_BADGES
     UITextLabel *status_;
 #endif
 #ifdef USE_BADGES
     UITextLabel *status_;
 #endif
@@ -3679,6 +4058,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [badge_ release];
         badge_ = nil;
     }
         [badge_ release];
         badge_ = nil;
     }
+
+    [package_ release];
+    package_ = nil;
 }
 
 - (void) dealloc {
 }
 
 - (void) dealloc {
@@ -3703,12 +4085,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self clearPackage];
 
     Source *source = [package source];
     [self clearPackage];
 
     Source *source = [package source];
-    NSString *section = [package simpleSection];
 
     icon_ = [[package icon] retain];
 
     icon_ = [[package icon] retain];
-
     name_ = [[package name] retain];
     description_ = [[package tagline] retain];
     name_ = [[package name] retain];
     description_ = [[package tagline] retain];
+    commercial_ = [package isCommercial];
+
+    package_ = [package retain];
 
     NSString *label = nil;
     bool trusted = false;
 
     NSString *label = nil;
     bool trusted = false;
@@ -3717,15 +4100,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         label = [source label];
         trusted = [source trusted];
     } else if ([[package id] isEqualToString:@"firmware"])
         label = [source label];
         trusted = [source trusted];
     } else if ([[package id] isEqualToString:@"firmware"])
-        label = @"Apple";
+        label = CYLocalize("APPLE");
     else
     else
-        label = @"Unknown/Local";
+        label = [NSString stringWithFormat:CYLocalize("SLASH_DELIMITED"), CYLocalize("UNKNOWN"), CYLocalize("LOCAL")];
 
 
-    NSString *from = [NSString stringWithFormat:@"from %@", label];
+    NSString *from(label);
 
 
-    if (section != nil && ![section isEqualToString:label])
-        from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
+    NSString *section = [package simpleSection];
+    if (section != nil && ![section isEqualToString:label]) {
+        section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"];
+        from = [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), from, section];
+    }
 
 
+    from = [NSString stringWithFormat:CYLocalize("FROM"), label];
     source_ = [from retain];
 
     if (NSString *purpose = [package primaryPurpose])
     source_ = [from retain];
 
     if (NSString *purpose = [package primaryPurpose])
@@ -3735,20 +4122,51 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 #ifdef USE_BADGES
     if (NSString *mode = [package mode]) {
         [badge_ setImage:[UIImage applicationImageNamed:
 #ifdef USE_BADGES
     if (NSString *mode = [package mode]) {
         [badge_ setImage:[UIImage applicationImageNamed:
-            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+            [mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"] ? @"removing.png" : @"installing.png"
         ]];
 
         ]];
 
-        [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
+        [status_ setText:[NSString stringWithFormat:CYLocalize("QUEUED_FOR"), CYLocalize(mode)]];
         [status_ setColor:[UIColor colorWithCGColor:Blueish_]];
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
         [status_ setColor:[UIColor colorWithCGColor:Blueish_]];
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
-        [status_ setText:@"Package Damaged"];
+        [status_ setText:CYLocalize("PACKAGE_DAMAGED")];
         [status_ setColor:[UIColor redColor]];
     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];
     }
 #endif
         [status_ setColor:[UIColor redColor]];
     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];
     }
 #endif
+
+    cached_ = false;
+}
+
+- (void) drawRect:(CGRect)rect {
+    if (!cached_) {
+        UIColor *color;
+
+        if (NSString *mode = [package_ mode]) {
+            bool remove([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]);
+            color = remove ? RemovingColor_ : InstallingColor_;
+        } else
+            color = [UIColor whiteColor];
+
+        [self setBackgroundColor:color];
+        cached_ = true;
+    }
+
+    [super drawRect:rect];
+}
+
+- (void) drawBackgroundInRect:(CGRect)rect withFade:(float)fade {
+    if (fade == 0) {
+        CGContextRef context(UIGraphicsGetCurrentContext());
+        [[self backgroundColor] set];
+        CGRect back(rect);
+        back.size.height -= 1;
+        CGContextFillRect(context, back);
+    }
+
+    [super drawBackgroundInRect:rect withFade:fade];
 }
 
 - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
 }
 
 - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
@@ -3778,17 +4196,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         UISetColor(White_);
 
     if (!selected)
         UISetColor(White_);
 
     if (!selected)
-        UISetColor(Black_);
+        UISetColor(commercial_ ? Purple_ : Black_);
     [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
     [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
     if (!selected)
     [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
     [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
     if (!selected)
-        UISetColor(Gray_);
+        UISetColor(commercial_ ? Purplish_ : Gray_);
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
     [super drawContentInRect:rect selected:selected];
 }
 
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
     [super drawContentInRect:rect selected:selected];
 }
 
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
+    cached_ = false;
+    [super setSelected:selected withFade:fade];
+}
+
 + (int) heightForPackage:(Package *)package {
     NSString *tagline([package tagline]);
     int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
 + (int) heightForPackage:(Package *)package {
     NSString *tagline([package tagline]);
     int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
@@ -3875,13 +4298,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self clearSection];
 
     if (section == nil) {
     [self clearSection];
 
     if (section == nil) {
-        name_ = [@"All Packages" retain];
+        name_ = [CYLocalize("ALL_PACKAGES") retain];
         count_ = nil;
     } else {
         section_ = [section name];
         if (section_ != nil)
             section_ = [section_ retain];
         count_ = nil;
     } else {
         section_ = [section name];
         if (section_ != nil)
             section_ = [section_ retain];
-        name_  = [(section_ == nil ? @"(No Section)" : section_) retain];
+        name_  = [(section_ == nil ? CYLocalize("NO_SECTION") : section_) retain];
         count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
 
         if (editing_)
         count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
 
         if (editing_)
@@ -3969,7 +4392,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [self addSubview:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
         [self addSubview:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
@@ -4037,11 +4460,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {
-    return @"Installed Files";
+    return CYLocalize("INSTALLED_FILES");
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {
-    return @"Files";
+    return CYLocalize("FILES");
 }
 
 @end
 }
 
 @end
@@ -4051,6 +4474,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     _transient Database *database_;
     Package *package_;
     NSString *name_;
     _transient Database *database_;
     Package *package_;
     NSString *name_;
+    bool commercial_;
     NSMutableArray *buttons_;
 }
 
     NSMutableArray *buttons_;
 }
 
@@ -4070,14 +4494,23 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 
+/*- (void) release {
+    if ([self retainCount] == 1)
+        [delegate_ setPackageView:self];
+    [super release];
+}*/
+
+/* XXX: this is not safe at all... localization of /fail/ */
 - (void) _clickButtonWithName:(NSString *)name {
 - (void) _clickButtonWithName:(NSString *)name {
-    if ([name isEqualToString:@"Install"])
+    if ([name isEqualToString:CYLocalize("CLEAR")])
+        [delegate_ clearPackage:package_];
+    else if ([name isEqualToString:CYLocalize("INSTALL")])
         [delegate_ installPackage:package_];
         [delegate_ installPackage:package_];
-    else if ([name isEqualToString:@"Reinstall"])
+    else if ([name isEqualToString:CYLocalize("REINSTALL")])
         [delegate_ installPackage:package_];
         [delegate_ installPackage:package_];
-    else if ([name isEqualToString:@"Remove"])
+    else if ([name isEqualToString:CYLocalize("REMOVE")])
         [delegate_ removePackage:package_];
         [delegate_ removePackage:package_];
-    else if ([name isEqualToString:@"Upgrade"])
+    else if ([name isEqualToString:CYLocalize("UPGRADE")])
         [delegate_ installPackage:package_];
     else _assert(false);
 }
         [delegate_ installPackage:package_];
     else _assert(false);
 }
@@ -4103,15 +4536,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
-    [window setValue:package_ forKey:@"package"];
     [super webView:sender didClearWindowObject:window forFrame:frame];
     [super webView:sender didClearWindowObject:window forFrame:frame];
+    [window setValue:package_ forKey:@"package"];
 }
 
 }
 
-#if !AlwaysReload
-- (void) _rightButtonClicked {
-    /*[super _rightButtonClicked];
-    return;*/
+- (bool) _allowJavaScriptPanel {
+    return commercial_;
+}
 
 
+#if !AlwaysReload
+- (void) __rightButtonClicked {
     int count = [buttons_ count];
     _assert(count != 0);
 
     int count = [buttons_ count];
     _assert(count != 0);
 
@@ -4120,22 +4554,29 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     else {
         NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
         [buttons addObjectsFromArray:buttons_];
     else {
         NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
         [buttons addObjectsFromArray:buttons_];
-        [buttons addObject:@"Cancel"];
+        [buttons addObject:CYLocalize("CANCEL")];
 
         [delegate_ slideUp:[[[UIActionSheet alloc]
             initWithTitle:nil
             buttons:buttons
 
         [delegate_ slideUp:[[[UIActionSheet alloc]
             initWithTitle:nil
             buttons:buttons
-            defaultButtonIndex:2
+            defaultButtonIndex:([buttons count] - 1)
             delegate:self
             context:@"modify"
         ] autorelease]];
     }
 }
             delegate:self
             context:@"modify"
         ] autorelease]];
     }
 }
+
+- (void) _rightButtonClicked {
+    if (commercial_)
+        [super _rightButtonClicked];
+    else
+        [self __rightButtonClicked];
+}
 #endif
 
 - (id) _rightButtonTitle {
     int count = [buttons_ count];
 #endif
 
 - (id) _rightButtonTitle {
     int count = [buttons_ count];
-    return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
+    return count == 0 ? nil : count != 1 ? CYLocalize("MODIFY") : [buttons_ objectAtIndex:0];
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {
@@ -4146,6 +4587,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if ((self = [super initWithBook:book]) != nil) {
         database_ = database;
         buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
     if ((self = [super initWithBook:book]) != nil) {
         database_ = database;
         buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
+        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
     } return self;
 }
 
     } return self;
 }
 
@@ -4165,28 +4607,50 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];
+        commercial_ = [package isCommercial];
 
 
-        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
-
+        if ([package_ mode] != nil)
+            [buttons_ addObject:CYLocalize("CLEAR")];
         if ([package_ source] == nil);
         else if ([package_ upgradableAndEssential:NO])
         if ([package_ source] == nil);
         else if ([package_ upgradableAndEssential:NO])
-            [buttons_ addObject:@"Upgrade"];
+            [buttons_ addObject:CYLocalize("UPGRADE")];
         else if ([package_ installed] == nil)
         else if ([package_ installed] == nil)
-            [buttons_ addObject:@"Install"];
+            [buttons_ addObject:CYLocalize("INSTALL")];
         else
         else
-            [buttons_ addObject:@"Reinstall"];
+            [buttons_ addObject:CYLocalize("REINSTALL")];
         if ([package_ installed] != nil)
         if ([package_ installed] != nil)
-            [buttons_ addObject:@"Remove"];
+            [buttons_ addObject:CYLocalize("REMOVE")];
+
+        if (special_ != NULL) {
+            CGRect frame([webview_ frame]);
+            frame.size.width = 320;
+            frame.size.height = 0;
+            [webview_ setFrame:frame];
+
+            [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
+
+            WebThreadLock();
+            [[[webview_ webView] windowScriptObject] setValue:package_ forKey:@"package"];
+
+            [self setButtonTitle:nil withStyle:nil toFunction:nil];
+
+            [self setFinishHook:nil];
+            [self setPopupHook:nil];
+            WebThreadUnlock();
+
+            [super callFunction:special_];
+        }
     }
     }
+
+    [self reloadButtons];
 }
 
 }
 
-- (bool) _loading {
-    return false;
+- (bool) isLoading {
+    return commercial_ ? [super isLoading] : false;
 }
 
 - (void) reloadData {
     [self setPackage:[database_ packageWithName:name_]];
 }
 
 - (void) reloadData {
     [self setPackage:[database_ packageWithName:name_]];
-    [self reloadButtons];
 }
 
 @end
 }
 
 @end
@@ -4263,7 +4727,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     Package *package = [packages_ objectAtIndex:row];
     package = [database_ packageWithName:[package id]];
 
     Package *package = [packages_ objectAtIndex:row];
     package = [database_ packageWithName:[package id]];
-    PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    PackageView *view([delegate_ packageView]);
     [view setPackage:package];
     [view setDelegate:delegate_];
     [book_ pushPage:view];
     [view setPackage:package];
     [view setDelegate:delegate_];
     [book_ pushPage:view];
@@ -4281,7 +4745,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [list_ setDataSource:self];
 
         UITableColumn *column = [[[UITableColumn alloc]
         [list_ setDataSource:self];
 
         UITableColumn *column = [[[UITableColumn alloc]
-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
@@ -4375,6 +4839,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* Filtered Package Table {{{ */
 @interface FilteredPackageTable : PackageTable {
     SEL filter_;
 /* Filtered Package Table {{{ */
 @interface FilteredPackageTable : PackageTable {
     SEL filter_;
+    IMP imp_;
     id object_;
 }
 
     id object_;
 }
 
@@ -4402,7 +4867,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (bool) hasPackage:(Package *)package {
 }
 
 - (bool) hasPackage:(Package *)package {
-    return [package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(&objc_msgSend))(package, filter_, object_);
+    _profile(FilteredPackageTable$hasPackage)
+        return [package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(imp_))(package, filter_, object_);
+    _end
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
@@ -4410,6 +4877,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         filter_ = filter;
         object_ = object == nil ? nil : [object retain];
 
         filter_ = filter;
         object_ = object == nil ? nil : [object retain];
 
+        /* XXX: this is an unsafe optimization of doomy hell */
+        Method method = class_getInstanceMethod([Package class], filter);
+        imp_ = method_getImplementation(method);
+        _assert(imp_ != NULL);
+
         [self reloadData];
     } return self;
 }
         [self reloadData];
     } return self;
 }
@@ -4559,8 +5031,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
     switch (section + (offset_ == 0 ? 1 : 0)) {
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
     switch (section + (offset_ == 0 ? 1 : 0)) {
-        case 0: return @"Entered by User";
-        case 1: return @"Installed by Packages";
+        case 0: return CYLocalize("ENTERED_BY_USER");
+        case 1: return CYLocalize("INSTALLED_BY_PACKAGE");
 
         default:
             _assert(false);
 
         default:
             _assert(false);
@@ -4638,6 +5110,35 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [delegate_ syncData];
 }
 
     [delegate_ syncData];
 }
 
+- (void) complete {
+    [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+        @"deb", @"Type",
+        href_, @"URI",
+        @"./", @"Distribution",
+    nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
+
+    [delegate_ syncData];
+}
+
+- (NSString *) getWarning {
+    NSString *href(href_);
+    NSRange colon([href rangeOfString:@"://"]);
+    if (colon.location != NSNotFound)
+        href = [href substringFromIndex:(colon.location + 3)];
+    href = [href stringByAddingPercentEscapes];
+    href = [@"http://cydia.saurik.com/api/repotag/" stringByAppendingString:href];
+    href = [href stringByCachingURLWithCurrentCDN];
+
+    NSURL *url([NSURL URLWithString:href]);
+
+    NSStringEncoding encoding;
+    NSError *error(nil);
+
+    if (NSString *warning = [NSString stringWithContentsOfURL:url usedEncoding:&encoding error:&error])
+        return [warning length] == 0 ? nil : warning;
+    return nil;
+}
+
 - (void) _endConnection:(NSURLConnection *)connection {
     NSURLConnection **field = NULL;
     if (connection == trivial_bz2_)
 - (void) _endConnection:(NSURLConnection *)connection {
     NSURLConnection **field = NULL;
     if (connection == trivial_bz2_)
@@ -4652,24 +5153,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         trivial_bz2_ == nil &&
         trivial_gz_ == nil
     ) {
         trivial_bz2_ == nil &&
         trivial_gz_ == nil
     ) {
-        [delegate_ setStatusBarShowsProgress:NO];
-        [delegate_ removeProgressHUD:hud_];
-
-        [hud_ autorelease];
-        hud_ = nil;
+        bool defer(false);
 
         if (trivial_) {
 
         if (trivial_) {
-            [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                @"deb", @"Type",
-                href_, @"URI",
-                @"./", @"Distribution",
-            nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
-
-            [delegate_ syncData];
+            if (NSString *warning = [self yieldToSelector:@selector(getWarning)]) {
+                defer = true;
+
+                UIActionSheet *sheet = [[[UIActionSheet alloc]
+                    initWithTitle:CYLocalize("SOURCE_WARNING")
+                    buttons:[NSArray arrayWithObjects:CYLocalize("ADD_ANYWAY"), CYLocalize("CANCEL"), nil]
+                    defaultButtonIndex:0
+                    delegate:self
+                    context:@"warning"
+                ] autorelease];
+
+                [sheet setNumberOfRows:1];
+
+                [sheet setBodyText:warning];
+                [sheet popupAlertAnimated:YES];
+            } else
+                [self complete];
         } else if (error_ != nil) {
             UIActionSheet *sheet = [[[UIActionSheet alloc]
         } else if (error_ != nil) {
             UIActionSheet *sheet = [[[UIActionSheet alloc]
-                initWithTitle:@"Verification Error"
-                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                initWithTitle:CYLocalize("VERIFICATION_ERROR")
+                buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil]
                 defaultButtonIndex:0
                 delegate:self
                 context:@"urlerror"
                 defaultButtonIndex:0
                 delegate:self
                 context:@"urlerror"
@@ -4679,19 +5186,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             [sheet popupAlertAnimated:YES];
         } else {
             UIActionSheet *sheet = [[[UIActionSheet alloc]
             [sheet popupAlertAnimated:YES];
         } else {
             UIActionSheet *sheet = [[[UIActionSheet alloc]
-                initWithTitle:@"Did not Find Repository"
-                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                initWithTitle:CYLocalize("NOT_REPOSITORY")
+                buttons:[NSArray arrayWithObjects:CYLocalize("OK"), nil]
                 defaultButtonIndex:0
                 delegate:self
                 context:@"trivial"
             ] autorelease];
 
                 defaultButtonIndex:0
                 delegate:self
                 context:@"trivial"
             ] autorelease];
 
-            [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."];
+            [sheet setBodyText:CYLocalize("NOT_REPOSITORY_EX")];
             [sheet popupAlertAnimated:YES];
         }
 
             [sheet popupAlertAnimated:YES];
         }
 
-        [href_ release];
-        href_ = nil;
+        [delegate_ setStatusBarShowsProgress:NO];
+        [delegate_ removeProgressHUD:hud_];
+
+        [hud_ autorelease];
+        hud_ = nil;
+
+        if (!defer) {
+            [href_ release];
+            href_ = nil;
+        }
 
         if (error_ != nil) {
             [error_ release];
 
         if (error_ != nil) {
             [error_ release];
@@ -4727,6 +5242,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [request setHTTPMethod:method];
 
 
     [request setHTTPMethod:method];
 
+    if (Machine_ != NULL)
+        [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+    if (UniqueID_ != nil)
+        [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+
+    if (Role_ != nil)
+        [request setValue:Role_ forHTTPHeaderField:@"X-Role"];
+
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 
@@ -4753,7 +5276,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 trivial_ = false;
 
                 hud_ = [[delegate_ addProgressHUD] retain];
                 trivial_ = false;
 
                 hud_ = [[delegate_ addProgressHUD] retain];
-                [hud_ setText:@"Verifying URL"];
+                [hud_ setText:CYLocalize("VERIFYING_URL")];
             } break;
 
             case 2:
             } break;
 
             case 2:
@@ -4768,6 +5291,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [sheet dismiss];
     else if ([context isEqualToString:@"urlerror"])
         [sheet dismiss];
         [sheet dismiss];
     else if ([context isEqualToString:@"urlerror"])
         [sheet dismiss];
+    else if ([context isEqualToString:@"warning"]) {
+        switch (button) {
+            case 1:
+                [self complete];
+            break;
+
+            case 2:
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [href_ release];
+        href_ = nil;
+
+        [sheet dismiss];
+    }
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
@@ -4783,7 +5324,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [list_ setDataSource:self];
 
         UITableColumn *column = [[UITableColumn alloc]
         [list_ setDataSource:self];
 
         UITableColumn *column = [[UITableColumn alloc]
-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")
             identifier:@"name"
             width:[self frame].size.width
         ];
             identifier:@"name"
             width:[self frame].size.width
         ];
@@ -4831,8 +5372,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ] autorelease]];*/
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
     ] autorelease]];*/
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
-        initWithTitle:@"Enter Cydia/APT URL"
-        buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+        initWithTitle:CYLocalize("ENTER_APT_URL")
+        buttons:[NSArray arrayWithObjects:CYLocalize("ADD_SOURCE"), CYLocalize("CANCEL"), nil]
         defaultButtonIndex:0
         delegate:self
         context:@"source"
         defaultButtonIndex:0
         delegate:self
         context:@"source"
@@ -4860,15 +5401,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {
-    return @"Sources";
+    return CYLocalize("SOURCES");
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {
-    return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+    return [[list_ table] isRowDeletionEnabled] ? CYLocalize("ADD") : nil;
 }
 
 - (id) rightButtonTitle {
 }
 
 - (id) rightButtonTitle {
-    return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+    return [[list_ table] isRowDeletionEnabled] ? CYLocalize("DONE") : CYLocalize("EDIT");
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
@@ -4931,15 +5472,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {
-    return @"Installed";
+    return CYLocalize("INSTALLED");
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {
-    return @"Packages";
+    return CYLocalize("PACKAGES");
 }
 
 - (id) rightButtonTitle {
 }
 
 - (id) rightButtonTitle {
-    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? CYLocalize("EXPERT") : CYLocalize("SIMPLE");
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
@@ -4973,15 +5514,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) _leftButtonClicked {
     UIActionSheet *sheet = [[[UIActionSheet alloc]
 
 - (void) _leftButtonClicked {
     UIActionSheet *sheet = [[[UIActionSheet alloc]
-        initWithTitle:@"About Cydia Installer"
-        buttons:[NSArray arrayWithObjects:@"Close", nil]
+        initWithTitle:CYLocalize("ABOUT_CYDIA")
+        buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil]
         defaultButtonIndex:0
         delegate:self
         context:@"about"
     ] autorelease];
 
     [sheet setBodyText:
         defaultButtonIndex:0
         delegate:self
         context:@"about"
     ] autorelease];
 
     [sheet setBodyText:
-        @"Copyright (C) 2008\n"
+        @"Copyright (C) 2008-2009\n"
         "Jay Freeman (saurik)\n"
         "saurik@saurik.com\n"
         "http://www.saurik.com/\n"
         "Jay Freeman (saurik)\n"
         "saurik@saurik.com\n"
         "http://www.saurik.com/\n"
@@ -4999,7 +5540,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {
-    return @"About";
+    return CYLocalize("ABOUT");
 }
 
 @end
 }
 
 @end
@@ -5013,7 +5554,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @implementation ManageView
 
 - (NSString *) title {
 @implementation ManageView
 
 - (NSString *) title {
-    return @"Manage";
+    return CYLocalize("MANAGE");
 }
 
 - (void) _leftButtonClicked {
 }
 
 - (void) _leftButtonClicked {
@@ -5021,16 +5562,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {
-    return @"Settings";
+    return CYLocalize("SETTINGS");
 }
 
 #if !AlwaysReload
 - (id) _rightButtonTitle {
 }
 
 #if !AlwaysReload
 - (id) _rightButtonTitle {
-    return nil;
+    return Queuing_ ? CYLocalize("QUEUE") : nil;
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+    return Queuing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
+- (void) _rightButtonClicked {
+    [delegate_ queue];
 }
 #endif
 
 }
 #endif
 
-- (bool) _loading {
+- (bool) isLoading {
     return false;
 }
 
     return false;
 }
 
@@ -5071,7 +5620,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) getTitleForPage:(RVPage *)page {
 }
 
 - (NSString *) getTitleForPage:(RVPage *)page {
-    return Simplify([super getTitleForPage:page]);
+    return [super getTitleForPage:page];
 }
 
 - (BOOL) updating {
 }
 
 - (BOOL) updating {
@@ -5097,7 +5646,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [UIView endAnimations];
 
     [indicator_ startAnimation];
     [UIView endAnimations];
 
     [indicator_ startAnimation];
-    [prompt_ setText:@"Updating Database"];
+    [prompt_ setText:CYLocalize("UPDATING_DATABASE")];
     [progress_ setProgress:0];
 
     updating_ = true;
     [progress_ setProgress:0];
 
     updating_ = true;
@@ -5200,7 +5749,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [progress_ setStyle:0];
         [overlay_ addSubview:progress_];
 
         [progress_ setStyle:0];
         [overlay_ addSubview:progress_];
 
-        cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted];
+        cancel_ = [[UINavigationButton alloc] initWithTitle:CYLocalize("CANCEL") style:UINavigationButtonStyleHighlighted];
         [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
 
         CGRect frame = [cancel_ frame];
         [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
 
         CGRect frame = [cancel_ frame];
@@ -5232,7 +5781,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
 }
 
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
-    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
+    [prompt_ setText:[NSString stringWithFormat:CYLocalize("ERROR_MESSAGE"), error]];
 }
 
 - (void) setProgressTitle:(NSString *)title {
 }
 
 - (void) setProgressTitle:(NSString *)title {
@@ -5453,16 +6002,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (row == 0) {
         section = nil;
         name = nil;
     if (row == 0) {
         section = nil;
         name = nil;
-        title = @"All Packages";
+        title = CYLocalize("ALL_PACKAGES");
     } else {
         section = [filtered_ objectAtIndex:(row - 1)];
         name = [section name];
 
         if (name != nil)
     } else {
         section = [filtered_ objectAtIndex:(row - 1)];
         name = [section name];
 
         if (name != nil)
-            title = name;
+            title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"];
         else {
             name = @"";
         else {
             name = @"";
-            title = @"(No Section)";
+            title = CYLocalize("NO_SECTION");
         }
     }
 
         }
     }
 
@@ -5493,7 +6042,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
         [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
@@ -5517,47 +6066,82 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [sections_ removeAllObjects];
     [filtered_ removeAllObjects];
 
     [sections_ removeAllObjects];
     [filtered_ removeAllObjects];
 
-    NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
-    NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
+#if 0
+    typedef __gnu_cxx::hash_map<NSString *, Section *, NSStringMapHash, NSStringMapEqual> SectionMap;
+    SectionMap sections;
+    sections.resize(64);
+#else
+    NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
+#endif
 
     _trace();
     for (Package *package in packages) {
         NSString *name([package section]);
 
     _trace();
     for (Package *package in packages) {
         NSString *name([package section]);
+        NSString *key(name == nil ? @"" : name);
+
+#if 0
+        Section **section;
+
+        _profile(SectionsView$reloadData$Section)
+            section = &sections[key];
+            if (*section == nil) {
+                _profile(SectionsView$reloadData$Section$Allocate)
+                    *section = [[[Section alloc] initWithName:name] autorelease];
+                _end
+            }
+        _end
+
+        [*section addToCount];
 
 
-        if (name != nil) {
-            Section *section([sections objectForKey:name]);
+        _profile(SectionsView$reloadData$Filter)
+            if (![package valid] || [package installed] != nil || ![package visible])
+                continue;
+        _end
+
+        [*section addToRow];
+#else
+        Section *section;
+
+        _profile(SectionsView$reloadData$Section)
+            section = [sections objectForKey:key];
             if (section == nil) {
             if (section == nil) {
-                section = [[[Section alloc] initWithName:name] autorelease];
-                [sections setObject:section forKey:name];
+                _profile(SectionsView$reloadData$Section$Allocate)
+                    section = [[[Section alloc] initWithName:name] autorelease];
+                    [sections setObject:section forKey:key];
+                _end
             }
             }
-        }
+        _end
+
+        [section addToCount];
+
+        _profile(SectionsView$reloadData$Filter)
+            if (![package valid] || [package installed] != nil || ![package visible])
+                continue;
+        _end
 
 
-        if ([package valid] && [package installed] == nil && [package visible])
-            [filtered addObject:package];
+        [section addToRow];
+#endif
     }
     _trace();
 
     }
     _trace();
 
+#if 0
+    for (SectionMap::const_iterator i(sections.begin()), e(sections.end()); i != e; ++i)
+        [sections_ addObject:i->second];
+#else
     [sections_ addObjectsFromArray:[sections allValues]];
     [sections_ addObjectsFromArray:[sections allValues]];
-    [sections_ sortUsingSelector:@selector(compareByName:)];
+#endif
 
 
-    _trace();
-    [filtered sortUsingSelector:@selector(compareBySection:)];
-    _trace();
+    [sections_ sortUsingSelector:@selector(compareByName:)];
 
 
-    Section *section = nil;
-    for (Package *package in filtered) {
-        NSString *name = [package section];
-
-        if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
-            section = name == nil ?
-                [[[Section alloc] initWithName:nil] autorelease] :
-                [sections objectForKey:name];
-            [filtered_ addObject:section];
-        }
+    for (Section *section in sections_) {
+        size_t count([section row]);
+        if ([section row] == 0)
+            continue;
 
 
-        [section addToCount];
+        section = [[[Section alloc] initWithName:[section name]] autorelease];
+        [section setCount:count];
+        [filtered_ addObject:section];
     }
     }
-    _trace();
 
     [list_ reloadData];
     _trace();
 
     [list_ reloadData];
     _trace();
@@ -5582,15 +6166,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {
-    return editing_ ? @"Section Visibility" : @"Install by Section";
+    return editing_ ? CYLocalize("SECTION_VISIBILITY") : CYLocalize("INSTALL_BY_SECTION");
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {
-    return @"Sections";
+    return CYLocalize("SECTIONS");
 }
 
 - (id) rightButtonTitle {
 }
 
 - (id) rightButtonTitle {
-    return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
+    return [sections_ count] == 0 ? nil : editing_ ? CYLocalize("DONE") : CYLocalize("EDIT");
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
@@ -5634,6 +6218,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
 }
 
 - (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    NSLog(@"titleForSection:%u", section);
     return [[sections_ objectAtIndex:section] name];
 }
 
     return [[sections_ objectAtIndex:section] name];
 }
 
@@ -5665,7 +6250,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (row == INT_MAX)
         return;
     Package *package = [packages_ objectAtIndex:row];
     if (row == INT_MAX)
         return;
     Package *package = [packages_ objectAtIndex:row];
-    PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    PackageView *view([delegate_ packageView]);
     [view setDelegate:delegate_];
     [view setPackage:package];
     [book_ pushPage:view];
     [view setDelegate:delegate_];
     [view setPackage:package];
     [book_ pushPage:view];
@@ -5695,7 +6280,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         //[list_ setSectionListStyle:1];
 
         UITableColumn *column = [[[UITableColumn alloc]
         //[list_ setSectionListStyle:1];
 
         UITableColumn *column = [[[UITableColumn alloc]
-            initWithTitle:@"Name"
+            initWithTitle:CYLocalize("NAME")
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
             identifier:@"name"
             width:[self frame].size.width
         ] autorelease];
@@ -5728,11 +6313,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             [packages_ addObject:package];
 
     _trace();
             [packages_ addObject:package];
 
     _trace();
-    [packages_ radixSortUsingSelector:@selector(compareForChanges) withObject:nil];
+    [packages_ radixSortUsingFunction:reinterpret_cast<uint32_t (*)(id, void *)>(&PackageChangesRadix) withArgument:NULL];
     _trace();
 
     _trace();
 
-    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
-    Section *ignored = [[[Section alloc] initWithName:@"Ignored Upgrades"] autorelease];
+    Section *upgradable = [[[Section alloc] initWithName:CYLocalize("AVAILABLE_UPGRADES")] autorelease];
+    Section *ignored = [[[Section alloc] initWithName:CYLocalize("IGNORED_UPGRADES")] autorelease];
     Section *section = nil;
     NSDate *last = nil;
 
     Section *section = nil;
     NSDate *last = nil;
 
@@ -5745,17 +6330,43 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
 
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
 
-        if (![package upgradableAndEssential:YES]) {
+        BOOL uae;
+        _profile(ChangesView$reloadData$Upgrade)
+            uae = [package upgradableAndEssential:YES];
+        _end
+
+        if (!uae) {
             unseens = true;
             unseens = true;
-            NSDate *seen = [package seen];
+            NSDate *seen;
+
+            _profile(ChangesView$reloadData$Remember)
+                seen = [package seen];
+            _end
 
 
-            if (section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame)) {
+            bool different;
+            _profile(ChangesView$reloadData$Compare)
+                different = section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame);
+            _end
+
+            if (different) {
                 last = seen;
 
                 last = seen;
 
-                NSString *name(seen == nil ? [@"n/a ?" retain] : (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen));
-                section = [[[Section alloc] initWithName:name row:offset] autorelease];
-                [sections_ addObject:section];
-                [name release];
+                NSString *name;
+                if (seen == nil)
+                    name = CYLocalize("UNKNOWN");
+                else {
+                    _profile(ChangesView$reloadData$Format)
+                        name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+                    _end
+
+                    [name autorelease];
+                }
+
+                _profile(ChangesView$reloadData$Allocate)
+                    name = [NSString stringWithFormat:CYLocalize("NEW_AT"), name];
+                    section = [[[Section alloc] initWithName:name row:offset] autorelease];
+                    [sections_ addObject:section];
+                _end
             }
 
             [section addToCount];
             }
 
             [section addToCount];
@@ -5791,15 +6402,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) leftButtonTitle {
 }
 
 - (NSString *) leftButtonTitle {
-    return [(CYBook *)book_ updating] ? nil : @"Refresh";
+    return [(CYBook *)book_ updating] ? nil : CYLocalize("REFRESH");
 }
 
 - (id) rightButtonTitle {
 }
 
 - (id) rightButtonTitle {
-    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
+    return upgrades_ == 0 ? nil : [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]];
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {
-    return @"Changes";
+    return CYLocalize("CHANGES");
 }
 
 @end
 }
 
 @end
@@ -5845,7 +6456,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
     switch (group) {
 
 - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
     switch (group) {
-        case 0: return @"Advanced Search (Coming Soon!)";
+        case 0: return [NSString stringWithFormat:CYLocalize("PARENTHETICAL"), CYLocalize("ADVANCED_SEARCH"), CYLocalize("COMING_SOON")];
 
         default: _assert(false);
     }
 
         default: _assert(false);
     }
@@ -5978,7 +6589,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         UIFont *font = [UIFont systemFontOfSize:16];
         [field_ setFont:font];
 
         UIFont *font = [UIFont systemFontOfSize:16];
         [field_ setFont:font];
 
-        [field_ setPlaceholder:@"Package Names & Descriptions"];
+        [field_ setPlaceholder:CYLocalize("SEARCH_EX")];
         [field_ setDelegate:self];
 
         [field_ setPaddingTop:5];
         [field_ setDelegate:self];
 
         [field_ setPaddingTop:5];
@@ -6054,7 +6665,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) backButtonTitle {
 }
 
 - (NSString *) backButtonTitle {
-    return @"Search";
+    return CYLocalize("SEARCH");
 }
 
 - (void) setDelegate:(id)delegate {
 }
 
 - (void) setDelegate:(id)delegate {
@@ -6191,7 +6802,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             case 0: {
                 UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]);
                 [cell setShowSelection:NO];
             case 0: {
                 UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]);
                 [cell setShowSelection:NO];
-                [cell setTitle:@"Changes only shows upgrades to installed packages so as to minimize spam from packagers. Activate this to see upgrades to this package even when it is not installed."];
+                [cell setTitle:CYLocalize("SHOW_ALL_CHANGES_EX")];
                 return cell;
             }
 
                 return cell;
             }
 
@@ -6220,12 +6831,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         subscribedCell_ = [[UIPreferencesControlTableCell alloc] init];
         [subscribedCell_ setShowSelection:NO];
 
         subscribedCell_ = [[UIPreferencesControlTableCell alloc] init];
         [subscribedCell_ setShowSelection:NO];
-        [subscribedCell_ setTitle:@"Show All Changes"];
+        [subscribedCell_ setTitle:CYLocalize("SHOW_ALL_CHANGES")];
         [subscribedCell_ setControl:subscribedSwitch_];
 
         ignoredCell_ = [[UIPreferencesControlTableCell alloc] init];
         [ignoredCell_ setShowSelection:NO];
         [subscribedCell_ setControl:subscribedSwitch_];
 
         ignoredCell_ = [[UIPreferencesControlTableCell alloc] init];
         [ignoredCell_ setShowSelection:NO];
-        [ignoredCell_ setTitle:@"Ignore Upgrades"];
+        [ignoredCell_ setTitle:CYLocalize("IGNORE_UPGRADES")];
         [ignoredCell_ setControl:ignoredSwitch_];
 
         [table_ setDataSource:self];
         [ignoredCell_ setControl:ignoredSwitch_];
 
         [table_ setDataSource:self];
@@ -6251,7 +6862,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {
-    return @"Settings";
+    return CYLocalize("SETTINGS");
 }
 
 @end
 }
 
 @end
@@ -6326,6 +6937,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ChangesView *changes_;
     ManageView *manage_;
     SearchView *search_;
     ChangesView *changes_;
     ManageView *manage_;
     SearchView *search_;
+
+    PackageView *package_;
 }
 
 @end
 }
 
 @end
@@ -6337,34 +6950,34 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         int count = [broken_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]
         int count = [broken_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]
-            initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+            initWithTitle:(count == 1 ? CYLocalize("HALFINSTALLED_PACKAGE") : [NSString stringWithFormat:CYLocalize("HALFINSTALLED_PACKAGES"), count])
             buttons:[NSArray arrayWithObjects:
             buttons:[NSArray arrayWithObjects:
-                @"Forcibly Clear",
-                @"Ignore (Temporary)",
+                CYLocalize("FORCIBLY_CLEAR"),
+                CYLocalize("TEMPORARY_IGNORE"),
             nil]
             defaultButtonIndex:0
             delegate:self
             context:@"fixhalf"
         ] autorelease];
 
             nil]
             defaultButtonIndex:0
             delegate:self
             context:@"fixhalf"
         ] autorelease];
 
-        [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."];
+        [sheet setBodyText:CYLocalize("HALFINSTALLED_PACKAGE_EX")];
         [sheet popupAlertAnimated:YES];
     } else if (!Ignored_ && [essential_ count] != 0) {
         int count = [essential_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]
         [sheet popupAlertAnimated:YES];
     } else if (!Ignored_ && [essential_ count] != 0) {
         int count = [essential_ count];
 
         UIActionSheet *sheet = [[[UIActionSheet alloc]
-            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+            initWithTitle:(count == 1 ? CYLocalize("ESSENTIAL_UPGRADE") : [NSString stringWithFormat:CYLocalize("ESSENTIAL_UPGRADES"), count])
             buttons:[NSArray arrayWithObjects:
             buttons:[NSArray arrayWithObjects:
-                @"Upgrade Essential",
-                @"Complete Upgrade",
-                @"Ignore (Temporary)",
+                CYLocalize("UPGRADE_ESSENTIAL"),
+                CYLocalize("COMPLETE_UPGRADE"),
+                CYLocalize("TEMPORARY_IGNORE"),
             nil]
             defaultButtonIndex:0
             delegate:self
             context:@"upgrade"
         ] autorelease];
 
             nil]
             defaultButtonIndex:0
             delegate:self
             context:@"upgrade"
         ] autorelease];
 
-        [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."];
+        [sheet setBodyText:CYLocalize("ESSENTIAL_UPGRADE_EX")];
         [sheet popupAlertAnimated:YES];
     }
 }
         [sheet popupAlertAnimated:YES];
     }
 }
@@ -6372,8 +6985,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) _reloadData {
     UIView *block();
 
 - (void) _reloadData {
     UIView *block();
 
+    static bool loaded(false);
     UIProgressHUD *hud([self addProgressHUD]);
     UIProgressHUD *hud([self addProgressHUD]);
-    [hud setText:@"Reloading Data"];
+    [hud setText:(loaded ? CYLocalize("RELOADING_DATA") : CYLocalize("LOADING_DATA"))];
+    loaded = true;
 
     [database_ yieldToSelector:@selector(reloadData) withObject:nil];
     _trace();
 
     [database_ yieldToSelector:@selector(reloadData) withObject:nil];
     _trace();
@@ -6400,20 +7015,29 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
         [buttonbar_ setBadgeValue:badge forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
         NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
         [buttonbar_ setBadgeValue:badge forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
-            [buttonbar_ setBadgeAnimated:YES forButton:3];
-        [self setApplicationBadge:badge];
+            [buttonbar_ setBadgeAnimated:([essential_ count] != 0) forButton:3];
+        if ([self respondsToSelector:@selector(setApplicationBadge:)])
+            [self setApplicationBadge:badge];
+        else
+            [self setApplicationBadgeString:badge];
     } else {
         [buttonbar_ setBadgeValue:nil forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
             [buttonbar_ setBadgeAnimated:NO forButton:3];
     } else {
         [buttonbar_ setBadgeValue:nil forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
             [buttonbar_ setBadgeAnimated:NO forButton:3];
-        [self removeApplicationBadge];
+        if ([self respondsToSelector:@selector(removeApplicationBadge)])
+            [self removeApplicationBadge];
+        else // XXX: maybe use setApplicationBadgeString also?
+            [self setApplicationIconBadgeNumber:0];
     }
 
     }
 
+    Queuing_ = false;
+    [buttonbar_ setBadgeValue:nil forButton:4];
+
     [self updateData];
 
     // XXX: what is this line of code for?
     if ([packages count] == 0);
     [self updateData];
 
     // XXX: what is this line of code for?
     if ([packages count] == 0);
-    else if (Loaded_) loaded:
+    else if (Loaded_ || ManualRefresh) loaded:
         [self _loaded];
     else {
         Loaded_ = YES;
         [self _loaded];
     else {
         Loaded_ = YES;
@@ -6431,8 +7055,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) _saveConfig {
     if (Changed_) {
         _trace();
 - (void) _saveConfig {
     if (Changed_) {
         _trace();
-        _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
-        _trace();
+        NSString *error(nil);
+        if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) {
+            _trace();
+            NSError *error(nil);
+            if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error])
+                NSLog(@"failure to save metadata data: %@", error);
+            _trace();
+        } else {
+            NSLog(@"failure to serialize metadata: %@", error);
+            return;
+        }
+
         Changed_ = false;
     }
 }
         Changed_ = false;
     }
 }
@@ -6479,7 +7113,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         detachNewThreadSelector:@selector(update_)
         toTarget:self
         withObject:nil
         detachNewThreadSelector:@selector(update_)
         toTarget:self
         withObject:nil
-        title:@"Updating Sources"
+        title:CYLocalize("UPDATING_SOURCES")
     ];
 }
 
     ];
 }
 
@@ -6519,6 +7153,20 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self popUpBook:confirm_];
 }
 
     [self popUpBook:confirm_];
 }
 
+- (void) queue {
+    @synchronized (self) {
+        [self perform];
+    }
+}
+
+- (void) clearPackage:(Package *)package {
+    @synchronized (self) {
+        [package clear];
+        [self resolve];
+        [self perform];
+    }
+}
+
 - (void) installPackage:(Package *)package {
     @synchronized (self) {
         [package install];
 - (void) installPackage:(Package *)package {
     @synchronized (self) {
         [package install];
@@ -6543,8 +7191,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) cancel {
 }
 
 - (void) cancel {
+    [self slideUp:[[[UIActionSheet alloc]
+        initWithTitle:nil
+        buttons:[NSArray arrayWithObjects:CYLocalize("CONTINUE_QUEUING"), CYLocalize("CANCEL_CLEAR"), nil]
+        defaultButtonIndex:1
+        delegate:self
+        context:@"cancel"
+    ] autorelease]];
+}
+
+- (void) complete {
     @synchronized (self) {
         [self _reloadData];
     @synchronized (self) {
         [self _reloadData];
+
         if (confirm_ != nil) {
             [confirm_ release];
             confirm_ = nil;
         if (confirm_ != nil) {
             [confirm_ release];
             confirm_ = nil;
@@ -6560,7 +7219,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
-        title:@"Running"
+        title:CYLocalize("RUNNING")
     ];
 }
 
     ];
 }
 
@@ -6571,6 +7230,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [database_ perform];
 }
 
     [database_ perform];
 }
 
+/* XXX: replace and localize */
 - (void) bootstrap {
     [progress_
         detachNewThreadSelector:@selector(bootstrap_)
 - (void) bootstrap {
     [progress_
         detachNewThreadSelector:@selector(bootstrap_)
@@ -6586,7 +7246,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [confirm_ popFromSuperviewAnimated:NO];
     }
 
         [confirm_ popFromSuperviewAnimated:NO];
     }
 
-    [self cancel];
+    [self complete];
 }
 
 - (void) setPage:(RVPage *)page {
 }
 
 - (void) setPage:(RVPage *)page {
@@ -6605,18 +7265,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
 }
 
     [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
 }
 
+- (SectionsView *) sectionsView {
+    if (sections_ == nil)
+        sections_ = [[SectionsView alloc] initWithBook:book_ database:database_];
+    return sections_;
+}
+
 - (void) buttonBarItemTapped:(id)sender {
     unsigned tag = [sender tag];
     if (tag == tag_) {
         [book_ resetViewAnimated:YES];
         return;
     } else if (tag_ == 2 && tag != 2)
 - (void) buttonBarItemTapped:(id)sender {
     unsigned tag = [sender tag];
     if (tag == tag_) {
         [book_ resetViewAnimated:YES];
         return;
     } else if (tag_ == 2 && tag != 2)
-        [sections_ resetView];
+        [[self sectionsView] resetView];
 
     switch (tag) {
         case 1: [self _setHomePage]; break;
 
 
     switch (tag) {
         case 1: [self _setHomePage]; break;
 
-        case 2: [self setPage:sections_]; break;
+        case 2: [self setPage:[self sectionsView]]; break;
         case 3: [self setPage:changes_]; break;
         case 4: [self setPage:manage_]; break;
         case 5: [self setPage:search_]; break;
         case 3: [self setPage:changes_]; break;
         case 4: [self setPage:manage_]; break;
         case 5: [self setPage:search_]; break;
@@ -6633,22 +7299,44 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) askForSettings {
 }
 
 - (void) askForSettings {
+    NSString *parenthetical(CYLocalize("PARENTHETICAL"));
+
     UIActionSheet *role = [[[UIActionSheet alloc]
     UIActionSheet *role = [[[UIActionSheet alloc]
-        initWithTitle:@"Who Are You?"
+        initWithTitle:CYLocalize("WHO_ARE_YOU")
         buttons:[NSArray arrayWithObjects:
         buttons:[NSArray arrayWithObjects:
-            @"User (Graphical Only)",
-            @"Hacker (+ Command Line)",
-            @"Developer (No Filters)",
+            [NSString stringWithFormat:parenthetical, CYLocalize("USER"), CYLocalize("USER_EX")],
+            [NSString stringWithFormat:parenthetical, CYLocalize("HACKER"), CYLocalize("HACKER_EX")],
+            [NSString stringWithFormat:parenthetical, CYLocalize("DEVELOPER"), CYLocalize("DEVELOPER_EX")],
         nil]
         defaultButtonIndex:-1
         delegate:self
         context:@"role"
     ] autorelease];
 
         nil]
         defaultButtonIndex:-1
         delegate:self
         context:@"role"
     ] autorelease];
 
-    [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+    [role setBodyText:CYLocalize("ROLE_EX")];
     [role popupAlertAnimated:YES];
 }
 
     [role popupAlertAnimated:YES];
 }
 
+- (void) setPackageView:(PackageView *)view {
+    if (package_ == nil)
+        package_ = [view retain];
+    NSLog(@"packageView: %@", package_);
+}
+
+- (PackageView *) packageView {
+    PackageView *view;
+
+    if (package_ == nil)
+        view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    else {
+        return package_;
+        view = [package_ autorelease];
+        package_ = nil;
+    }
+
+    return view;
+}
+
 - (void) finish {
     if (hud_ != nil) {
         [self setStatusBarShowsProgress:NO];
 - (void) finish {
     if (hud_ != nil) {
         [self setStatusBarShowsProgress:NO];
@@ -6690,7 +7378,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"home-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"home-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Home", kUIButtonBarButtonTitle,
+            CYLocalize("HOME"), kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -6700,7 +7388,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Sections", kUIButtonBarButtonTitle,
+            CYLocalize("SECTIONS"), kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -6710,7 +7398,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"changes-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:3], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"changes-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:3], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Changes", kUIButtonBarButtonTitle,
+            CYLocalize("CHANGES"), kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -6720,7 +7408,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Manage", kUIButtonBarButtonTitle,
+            CYLocalize("MANAGE"), kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -6730,7 +7418,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             @"search-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:5], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"search-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:5], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Search", kUIButtonBarButtonTitle,
+            CYLocalize("SEARCH"), kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
     nil];
             @"0", kUIButtonBarButtonType,
         nil],
     nil];
@@ -6772,7 +7460,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [self reloadData];
 
 
     [self reloadData];
 
-    sections_ = [[SectionsView alloc] initWithBook:book_ database:database_];
+    [self sectionsView];
     changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
     search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 
     changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
     search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 
@@ -6781,6 +7469,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         withClass:[ManageView class]
     ] retain];
 
         withClass:[ManageView class]
     ] retain];
 
+    [self setPackageView:[self packageView]];
+
     PrintTimes();
 
     if (bootstrap_)
     PrintTimes();
 
     if (bootstrap_)
@@ -6794,7 +7484,39 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if ([context isEqualToString:@"missing"])
         [sheet dismiss];
 
     if ([context isEqualToString:@"missing"])
         [sheet dismiss];
-    else if ([context isEqualToString:@"fixhalf"]) {
+    else if ([context isEqualToString:@"cancel"]) {
+        bool clear;
+
+        switch (button) {
+            case 1:
+                clear = false;
+            break;
+
+            case 2:
+                clear = true;
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [sheet dismiss];
+
+        @synchronized (self) {
+            if (clear)
+                [self _reloadData];
+            else {
+                Queuing_ = true;
+                [buttonbar_ setBadgeValue:CYLocalize("Q_D") forButton:4];
+                [book_ reloadData];
+            }
+
+            if (confirm_ != nil) {
+                [confirm_ release];
+                confirm_ = nil;
+            }
+        }
+    } else if ([context isEqualToString:@"fixhalf"]) {
         switch (button) {
             case 1:
                 @synchronized (self) {
         switch (button) {
             case 1:
                 @synchronized (self) {
@@ -6928,21 +7650,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (RVPage *) pageForPackage:(NSString *)name {
     if (Package *package = [database_ packageWithName:name]) {
 
 - (RVPage *) pageForPackage:(NSString *)name {
     if (Package *package = [database_ packageWithName:name]) {
-        PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+        PackageView *view([self packageView]);
         [view setPackage:package];
         return view;
     } else {
         UIActionSheet *sheet = [[[UIActionSheet alloc]
         [view setPackage:package];
         return view;
     } else {
         UIActionSheet *sheet = [[[UIActionSheet alloc]
-            initWithTitle:@"Cannot Locate Package"
-            buttons:[NSArray arrayWithObjects:@"Close", nil]
+            initWithTitle:CYLocalize("CANNOT_LOCATE_PACKAGE")
+            buttons:[NSArray arrayWithObjects:CYLocalize("CLOSE"), nil]
             defaultButtonIndex:0
             delegate:self
             context:@"missing"
         ] autorelease];
 
             defaultButtonIndex:0
             delegate:self
             context:@"missing"
         ] autorelease];
 
-        [sheet setBodyText:[NSString stringWithFormat:
-            @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
-        , name]];
+        [sheet setBodyText:[NSString stringWithFormat:CYLocalize("PACKAGE_CANNOT_BE_FOUND"), name]];
 
         [sheet popupAlertAnimated:YES];
         return nil;
 
         [sheet popupAlertAnimated:YES];
         return nil;
@@ -7149,8 +7869,27 @@ id Dealloc_(id self, SEL selector) {
     return object;
 }*/
 
     return object;
 }*/
 
+Class $WebDefaultUIKitDelegate;
+
+void (*_UIWebDocumentView$_setUIKitDelegate$)(UIWebDocumentView *, SEL, id);
+
+void $UIWebDocumentView$_setUIKitDelegate$(UIWebDocumentView *self, SEL sel, id delegate) {
+    if (delegate == nil && $WebDefaultUIKitDelegate != nil)
+        delegate = [$WebDefaultUIKitDelegate sharedUIKitDelegate];
+    return _UIWebDocumentView$_setUIKitDelegate$(self, sel, delegate);
+}
+
 int main(int argc, char *argv[]) { _pooled
     _trace();
 int main(int argc, char *argv[]) { _pooled
     _trace();
+
+    Locale_ = CFLocaleCopyCurrent();
+
+    CFStringRef locale(CFLocaleGetIdentifier(Locale_));
+    setenv("LANG", [(NSString *) locale UTF8String], true);
+
+    // XXX: apr_app_initialize?
+    apr_initialize();
+
     class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16");
 
     bool substrate(false);
     class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16");
 
     bool substrate(false);
@@ -7179,7 +7918,6 @@ int main(int argc, char *argv[]) { _pooled
 
     App_ = [[NSBundle mainBundle] bundlePath];
     Home_ = NSHomeDirectory();
 
     App_ = [[NSBundle mainBundle] bundlePath];
     Home_ = NSHomeDirectory();
-    Locale_ = CFLocaleCopyCurrent();
 
     {
         NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];
 
     {
         NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];
@@ -7191,13 +7929,20 @@ int main(int argc, char *argv[]) { _pooled
     setuid(0);
     setgid(0);
 
     setuid(0);
     setgid(0);
 
-#if 0 /* XXX: this costs 1.4s of startup performance */
+#if 1 /* XXX: this costs 1.4s of startup performance */
     if (unlink("/var/cache/apt/pkgcache.bin") == -1)
         _assert(errno == ENOENT);
     if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
         _assert(errno == ENOENT);
 #endif
 
     if (unlink("/var/cache/apt/pkgcache.bin") == -1)
         _assert(errno == ENOENT);
     if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
         _assert(errno == ENOENT);
 #endif
 
+    $WebDefaultUIKitDelegate = objc_getClass("WebDefaultUIKitDelegate");
+    Method UIWebDocumentView$_setUIKitDelegate$(class_getInstanceMethod([WebView class], @selector(_setUIKitDelegate:)));
+    if (UIWebDocumentView$_setUIKitDelegate$ != NULL) {
+        _UIWebDocumentView$_setUIKitDelegate$ = reinterpret_cast<void (*)(UIWebDocumentView *, SEL, id)>(method_getImplementation(UIWebDocumentView$_setUIKitDelegate$));
+        method_setImplementation(UIWebDocumentView$_setUIKitDelegate$, reinterpret_cast<IMP>(&$UIWebDocumentView$_setUIKitDelegate$));
+    }
+
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;
     alloc->method_imp = (IMP) &Alloc_;*/
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;
     alloc->method_imp = (IMP) &Alloc_;*/
@@ -7229,16 +7974,22 @@ int main(int argc, char *argv[]) { _pooled
 
     if (NSDictionary *system = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"])
         Build_ = [system objectForKey:@"ProductBuildVersion"];
 
     if (NSDictionary *system = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"])
         Build_ = [system objectForKey:@"ProductBuildVersion"];
+    if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:@"/Applications/MobileSafari.app/Info.plist"]) {
+        Product_ = [info objectForKey:@"SafariProductVersion"];
+        Safari_ = [info objectForKey:@"CFBundleVersion"];
+    }
 
     /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
     AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/
 
     _trace();
 
     /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
     AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/
 
     _trace();
-    Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"];
+    Metadata_ = [[[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"] autorelease];
+    _trace();
+    SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
     _trace();
 
     if (Metadata_ == NULL)
     _trace();
 
     if (Metadata_ == NULL)
-        Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
+        Metadata_ = [NSMutableDictionary dictionaryWithCapacity:2];
     else {
         Settings_ = [Metadata_ objectForKey:@"Settings"];
 
     else {
         Settings_ = [Metadata_ objectForKey:@"Settings"];
 
@@ -7295,12 +8046,26 @@ int main(int argc, char *argv[]) { _pooled
     Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
     White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
     Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
     Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
     White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
     Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
+    Green_.Set(space_, 0.0, 0.5, 0.0, 1.0);
+    Purple_.Set(space_, 0.0, 0.0, 0.7, 1.0);
+    Purplish_.Set(space_, 0.4, 0.4, 0.8, 1.0);
+    /*Purple_.Set(space_, 1.0, 0.3, 0.0, 1.0);
+    Purplish_.Set(space_, 1.0, 0.6, 0.4, 1.0); ORANGE */
+    /*Purple_.Set(space_, 1.0, 0.5, 0.0, 1.0);
+    Purplish_.Set(space_, 1.0, 0.7, 0.2, 1.0); ORANGISH */
+    /*Purple_.Set(space_, 0.5, 0.0, 0.7, 1.0);
+    Purplish_.Set(space_, 0.7, 0.4, 0.8, 1.0); PURPLE */
+
+//.93
+    InstallingColor_ = [UIColor colorWithRed:0.88f green:1.00f blue:0.88f alpha:1.00f];
+    RemovingColor_ = [UIColor colorWithRed:1.00f green:0.88f blue:0.88f alpha:1.00f];
 
     Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
 
 
     Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
 
-    SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
+    void (*$GSFontSetUseLegacyFontMetrics)(BOOL)(reinterpret_cast<void (*)(BOOL)>(dlsym(RTLD_DEFAULT, "GSFontSetUseLegacyFontMetrics")));
+    if ($GSFontSetUseLegacyFontMetrics != NULL)
+        $GSFontSetUseLegacyFontMetrics(YES);
 
 
-    UIApplicationUseLegacyEvents(YES);
     UIKeyboardDisableAutomaticAppearance();
 
     _trace();
     UIKeyboardDisableAutomaticAppearance();
 
     _trace();