diff --git a/mk/linux/mojosetup/.hg/branchheads.cache b/mk/linux/mojosetup/.hg/branchheads.cache
index c8db408c..8d56a365 100644
--- a/mk/linux/mojosetup/.hg/branchheads.cache
+++ b/mk/linux/mojosetup/.hg/branchheads.cache
@@ -1,2 +1,2 @@
-48f7a9461c372d6d6967f033bdb310c49bb4e848 767
-48f7a9461c372d6d6967f033bdb310c49bb4e848 default
+0f18b7ca6f289426f74de0977da55df9381b2aba 787
+0f18b7ca6f289426f74de0977da55df9381b2aba default
diff --git a/mk/linux/mojosetup/.hg/dirstate b/mk/linux/mojosetup/.hg/dirstate
index 9a4ea9b9..a5cb52ff 100644
Binary files a/mk/linux/mojosetup/.hg/dirstate and b/mk/linux/mojosetup/.hg/dirstate differ
diff --git a/mk/linux/mojosetup/.hg/store/00changelog.i b/mk/linux/mojosetup/.hg/store/00changelog.i
index ff32ea3c..27ae0d04 100644
Binary files a/mk/linux/mojosetup/.hg/store/00changelog.i and b/mk/linux/mojosetup/.hg/store/00changelog.i differ
diff --git a/mk/linux/mojosetup/.hg/store/00manifest.i b/mk/linux/mojosetup/.hg/store/00manifest.i
index 30c0265c..51420215 100644
Binary files a/mk/linux/mojosetup/.hg/store/00manifest.i and b/mk/linux/mojosetup/.hg/store/00manifest.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/_c_make_lists.txt.i b/mk/linux/mojosetup/.hg/store/data/_c_make_lists.txt.i
index 420b23b4..cea31ed3 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/_c_make_lists.txt.i and b/mk/linux/mojosetup/.hg/store/data/_c_make_lists.txt.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/archive__pck.c.i b/mk/linux/mojosetup/.hg/store/data/archive__pck.c.i
index 570a5c77..c180b2e0 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/archive__pck.c.i and b/mk/linux/mojosetup/.hg/store/data/archive__pck.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/archive__uz2.c.i b/mk/linux/mojosetup/.hg/store/data/archive__uz2.c.i
index eab5ac37..ccbf0ce6 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/archive__uz2.c.i and b/mk/linux/mojosetup/.hg/store/data/archive__uz2.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/archive__zip.c.i b/mk/linux/mojosetup/.hg/store/data/archive__zip.c.i
index be39d2ec..c128692d 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/archive__zip.c.i and b/mk/linux/mojosetup/.hg/store/data/archive__zip.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/docs.txt.i b/mk/linux/mojosetup/.hg/store/data/docs.txt.i
index 557a1cbf..2d38f74e 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/docs.txt.i and b/mk/linux/mojosetup/.hg/store/data/docs.txt.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/fileio.c.i b/mk/linux/mojosetup/.hg/store/data/fileio.c.i
index 8f829109..191c5865 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/fileio.c.i and b/mk/linux/mojosetup/.hg/store/data/fileio.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/fileio.h.i b/mk/linux/mojosetup/.hg/store/data/fileio.h.i
index b06087a0..2b6c82ff 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/fileio.h.i and b/mk/linux/mojosetup/.hg/store/data/fileio.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/gui__gtkplus2.c.i b/mk/linux/mojosetup/.hg/store/data/gui__gtkplus2.c.i
index 8563976d..3b47a8e7 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/gui__gtkplus2.c.i and b/mk/linux/mojosetup/.hg/store/data/gui__gtkplus2.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/lua__glue.c.i b/mk/linux/mojosetup/.hg/store/data/lua__glue.c.i
index 669f7b07..6860282c 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/lua__glue.c.i and b/mk/linux/mojosetup/.hg/store/data/lua__glue.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/misc/launchpad-import.sh.i b/mk/linux/mojosetup/.hg/store/data/misc/launchpad-import.sh.i
index cafc38bf..147af91d 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/misc/launchpad-import.sh.i and b/mk/linux/mojosetup/.hg/store/data/misc/launchpad-import.sh.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/platform.h.i b/mk/linux/mojosetup/.hg/store/data/platform.h.i
index 472f9cff..4d6fb32d 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/platform.h.i and b/mk/linux/mojosetup/.hg/store/data/platform.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/platform__unix.c.i b/mk/linux/mojosetup/.hg/store/data/platform__unix.c.i
index a5686f03..3992854f 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/platform__unix.c.i and b/mk/linux/mojosetup/.hg/store/data/platform__unix.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/platform__windows.c.i b/mk/linux/mojosetup/.hg/store/data/platform__windows.c.i
index f4e52cea..a5a9c43a 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/platform__windows.c.i and b/mk/linux/mojosetup/.hg/store/data/platform__windows.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/scripts/localization.lua.i b/mk/linux/mojosetup/.hg/store/data/scripts/localization.lua.i
index eb888406..f1271828 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/scripts/localization.lua.i and b/mk/linux/mojosetup/.hg/store/data/scripts/localization.lua.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__init.lua.i b/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__init.lua.i
index 1ec7ef05..75a05899 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__init.lua.i and b/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__init.lua.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__mainline.lua.i b/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__mainline.lua.i
index 502b64f6..5fbcd46d 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__mainline.lua.i and b/mk/linux/mojosetup/.hg/store/data/scripts/mojosetup__mainline.lua.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/crc32.c.i b/mk/linux/mojosetup/.hg/store/data/zlib/crc32.c.i
index 0d60a1c0..f4db35e9 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/crc32.c.i and b/mk/linux/mojosetup/.hg/store/data/zlib/crc32.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/deflate.c.i b/mk/linux/mojosetup/.hg/store/data/zlib/deflate.c.i
index 0dd1be16..085116a7 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/deflate.c.i and b/mk/linux/mojosetup/.hg/store/data/zlib/deflate.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/deflate.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/deflate.h.i
index 58cf36b9..768f4659 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/deflate.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/deflate.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/inffast.c.i b/mk/linux/mojosetup/.hg/store/data/zlib/inffast.c.i
index ce0dc62f..cd3faf74 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/inffast.c.i and b/mk/linux/mojosetup/.hg/store/data/zlib/inffast.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/inffast.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/inffast.h.i
index 980f90ac..d92b3ad8 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/inffast.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/inffast.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.c.i b/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.c.i
index 5e27d252..79ff22b0 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.c.i and b/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.h.i
index 5ab5572b..298f33c6 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/inftrees.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/trees.c.i b/mk/linux/mojosetup/.hg/store/data/zlib/trees.c.i
index fd049287..6171d08d 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/trees.c.i and b/mk/linux/mojosetup/.hg/store/data/zlib/trees.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/trees.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/trees.h.i
index 762125f4..733cb787 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/trees.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/trees.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/version.txt.i b/mk/linux/mojosetup/.hg/store/data/zlib/version.txt.i
index 51570b9e..084f23e4 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/version.txt.i and b/mk/linux/mojosetup/.hg/store/data/zlib/version.txt.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/zconf.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/zconf.h.i
index b4c76a91..71a76044 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/zconf.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/zconf.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/zlib.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/zlib.h.i
index ac0146d7..8789a5df 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/zlib.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/zlib.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/zutil.c.i b/mk/linux/mojosetup/.hg/store/data/zlib/zutil.c.i
index 4c83dd7b..08fd4db8 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/zutil.c.i and b/mk/linux/mojosetup/.hg/store/data/zlib/zutil.c.i differ
diff --git a/mk/linux/mojosetup/.hg/store/data/zlib/zutil.h.i b/mk/linux/mojosetup/.hg/store/data/zlib/zutil.h.i
index 8be5f8ee..836c9b92 100644
Binary files a/mk/linux/mojosetup/.hg/store/data/zlib/zutil.h.i and b/mk/linux/mojosetup/.hg/store/data/zlib/zutil.h.i differ
diff --git a/mk/linux/mojosetup/.hg/store/undo b/mk/linux/mojosetup/.hg/store/undo
index 68fa443f..e9e282e1 100644
Binary files a/mk/linux/mojosetup/.hg/store/undo and b/mk/linux/mojosetup/.hg/store/undo differ
diff --git a/mk/linux/mojosetup/.hg/undo.dirstate b/mk/linux/mojosetup/.hg/undo.dirstate
index e69de29b..192fd529 100644
Binary files a/mk/linux/mojosetup/.hg/undo.dirstate and b/mk/linux/mojosetup/.hg/undo.dirstate differ
diff --git a/mk/linux/mojosetup/CMakeLists.txt b/mk/linux/mojosetup/CMakeLists.txt
index 1b2f0f25..b9a6dfff 100644
--- a/mk/linux/mojosetup/CMakeLists.txt
+++ b/mk/linux/mojosetup/CMakeLists.txt
@@ -115,7 +115,7 @@ IF(UNIX)
 ENDIF(UNIX)
 
 IF(CMAKE_COMPILER_IS_GNUCC)
-    ADD_DEFINITIONS(-pipe -Wall -Werror -fsigned-char)
+    ADD_DEFINITIONS(-pipe -Wall -fsigned-char)
 
     # See if -fvisibility=hidden is available to us.
     CHECK_C_SOURCE_COMPILES("
diff --git a/mk/linux/mojosetup/archive_pck.c b/mk/linux/mojosetup/archive_pck.c
index 36e8e9de..a5b10d24 100644
--- a/mk/linux/mojosetup/archive_pck.c
+++ b/mk/linux/mojosetup/archive_pck.c
@@ -36,17 +36,6 @@ typedef struct
     MojoArchiveEntry *archiveEntries;
 } PCKinfo;
 
-
-static boolean readui32(MojoInput *io, uint32 *ui32)
-{
-    uint8 buf[sizeof (uint32)];
-    if (io->read(io, buf, sizeof (buf)) != sizeof (buf))
-        return false;
-
-    *ui32 = (buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24));
-    return true;
-} // readui32
-
 static boolean MojoInput_pck_ready(MojoInput *io)
 {
     return true;  // !!! FIXME?
@@ -129,7 +118,7 @@ static boolean MojoArchive_pck_enumerate(MojoArchive *ar)
         br = io->read(io, fileEntry.filename, sizeof (fileEntry.filename));
         if (br != sizeof (fileEntry.filename))
             return false;
-        else if (!readui32(io, &fileEntry.filesize))
+        else if (!MojoInput_readui32(io, &fileEntry.filesize))
             return false;
 
         dotdot = (strcmp(fileEntry.filename, "..") == 0);
@@ -254,9 +243,9 @@ MojoArchive *MojoArchive_createPCK(MojoInput *io)
     PCKinfo *pckInfo = NULL;
     PCKheader pckHeader;
 
-    if (!readui32(io, &pckHeader.Magic))
+    if (!MojoInput_readui32(io, &pckHeader.Magic))
         return NULL;
-    else if (!readui32(io, &pckHeader.StartOfBinaryData))
+    else if (!MojoInput_readui32(io, &pckHeader.StartOfBinaryData))
         return NULL;
 
     // Check if this is a *.pck file.
diff --git a/mk/linux/mojosetup/archive_uz2.c b/mk/linux/mojosetup/archive_uz2.c
index 1fa02a8e..768df9aa 100644
--- a/mk/linux/mojosetup/archive_uz2.c
+++ b/mk/linux/mojosetup/archive_uz2.c
@@ -50,17 +50,6 @@ typedef struct UZ2info
     boolean enumerated;
 } UZ2info;
 
-
-static boolean readui32(MojoInput *io, uint32 *ui32)
-{
-    uint8 buf[sizeof (uint32)];
-    if (io->read(io, buf, sizeof (buf)) != sizeof (buf))
-        return false;
-
-    *ui32 = (buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24));
-    return true;
-} // readui32
-
 static boolean unpack(UZ2input *inp)
 {
     MojoInput *io = inp->io;
@@ -104,9 +93,9 @@ static int64 MojoInput_uz2_read(MojoInput *io, void *_buf, uint32 bufsize)
         {
             if (input->position == input->fsize)
                 return 0;
-            else if (!readui32(input->io, &input->compsize))
+            else if (!MojoInput_readui32(input->io, &input->compsize))
                 return (retval == 0) ? -1 : retval;
-            else if (!readui32(input->io, &input->uncompsize))
+            else if (!MojoInput_readui32(input->io, &input->uncompsize))
                 return (retval == 0) ? -1 : retval;
             else if (!unpack(input))
                 return (retval == 0) ? -1 : retval;
@@ -136,9 +125,9 @@ static boolean MojoInput_uz2_seek(MojoInput *io, uint64 pos)
     {
         if (!input->io->seek(input->io, seekpos))
             return false;
-        else if (!readui32(io, &input->compsize))
+        else if (!MojoInput_readui32(io, &input->compsize))
             return false;
-        else if (!readui32(io, &input->uncompsize))
+        else if (!MojoInput_readui32(io, &input->uncompsize))
             return false;
 
         // we checked these formally elsewhere.
@@ -286,9 +275,9 @@ static int64 calculate_uz2_outsize(MojoInput *io)
     if (!io->seek(io, 0))
         return -1;
 
-    while (readui32(io, &compsize))
+    while (MojoInput_readui32(io, &compsize))
     {
-        if (!readui32(io, &uncompsize))
+        if (!MojoInput_readui32(io, &uncompsize))
             return -1;
         else if ((compsize > MAXCOMPSIZE) || (uncompsize > MAXUNCOMPSIZE))
             return -1;
diff --git a/mk/linux/mojosetup/archive_zip.c b/mk/linux/mojosetup/archive_zip.c
index 996f04a1..51fe629b 100644
--- a/mk/linux/mojosetup/archive_zip.c
+++ b/mk/linux/mojosetup/archive_zip.c
@@ -61,19 +61,8 @@ static PHYSFS_Allocator allocator = { 0, 0, mallocWrap, reallocWrap, freeWrap };
 #define fvoid void
 #define dvoid void
 
-#if PLATFORM_BIGENDIAN
-static PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 D)
-{
-    return((D<<24)|((D<<8)&0x00FF0000)|((D>>8)&0x0000FF00)|(D>>24));
-}
-static PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 D)
-{
-    return((D<<8)|(D>>8));
-}
-#else
-static PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 D) { return D; }
-static PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 D) { return D; }
-#endif
+#define readui16(io, ptr) MojoInput_readui16((MojoInput *) (io), ptr)
+#define readui32(io, ptr) MojoInput_readui32((MojoInput *) (io), ptr)
 
 static PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer,
                                     PHYSFS_uint32 size, PHYSFS_uint32 count)
@@ -348,6 +337,7 @@ static int zlib_err(int rc)
 } /* zlib_err */
 
 
+#if !__MOJOSETUP__  /* we have our own readuiXX() functions. */
 /*
  * Read an unsigned 32-bit int and swap to native byte order.
  */
@@ -370,6 +360,7 @@ static int readui16(void *in, PHYSFS_uint16 *val)
     *val = PHYSFS_swapULE16(v);
     return(1);
 } /* readui16 */
+#endif
 
 
 static PHYSFS_sint64 ZIP_read(fvoid *opaque, void *buf,
@@ -605,8 +596,7 @@ static PHYSFS_sint64 zip_find_end_of_central_dir(void *in, PHYSFS_sint64 *len)
             totalread += maxread;
         } /* else */
 
-		PHYSFS_uint32 *pPhysBuf = (PHYSFS_uint32 *) (&buf[0]);
-        extra = *pPhysBuf;
+        extra = *((PHYSFS_uint32 *) (&buf[0]));
 
         for (i = maxread - 4; i > 0; i--)
         {
diff --git a/mk/linux/mojosetup/build/CMakeCache.txt b/mk/linux/mojosetup/build/CMakeCache.txt
index 9838b819..b1c9a9c2 100644
--- a/mk/linux/mojosetup/build/CMakeCache.txt
+++ b/mk/linux/mojosetup/build/CMakeCache.txt
@@ -1,5 +1,5 @@
 # This is the CMakeCache file.
-# For build in directory: /home/softcoder/Code/mojosetup/build
+# For build in directory: /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build
 # It was generated by CMake: /usr/bin/cmake
 # You can edit this file to change values found and used by cmake.
 # If you do not want to change any of the values, simply exit the editor.
@@ -23,7 +23,7 @@ CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
 
 //Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
 // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=
+CMAKE_BUILD_TYPE:STRING=MinSizeRel
 
 //Enable/Disable color output during build.
 CMAKE_COLOR_MAKEFILE:BOOL=ON
@@ -205,7 +205,7 @@ MOJOSETUP_CHECKSUM_SHA1:BOOL=ON
 MOJOSETUP_GUI_GTKPLUS2:BOOL=ON
 
 //Statically link GTK+ GUI
-MOJOSETUP_GUI_GTKPLUS2_STATIC:BOOL=OFF
+MOJOSETUP_GUI_GTKPLUS2_STATIC:BOOL=ON
 
 //Enable stdio GUI
 MOJOSETUP_GUI_STDIO:BOOL=ON
@@ -217,7 +217,7 @@ MOJOSETUP_GUI_STDIO_STATIC:BOOL=ON
 MOJOSETUP_GUI_WWW:BOOL=OFF
 
 //Enable BMP support
-MOJOSETUP_IMAGE_BMP:BOOL=OFF
+MOJOSETUP_IMAGE_BMP:BOOL=ON
 
 //Enable HDR support
 MOJOSETUP_IMAGE_HDR:BOOL=OFF
@@ -235,10 +235,10 @@ MOJOSETUP_IMAGE_PSD:BOOL=OFF
 MOJOSETUP_IMAGE_TGA:BOOL=OFF
 
 //Link own bzlib instead of system library
-MOJOSETUP_INTERNAL_BZLIB:BOOL=OFF
+MOJOSETUP_INTERNAL_BZLIB:BOOL=ON
 
 //Link own zlib instead of system library
-MOJOSETUP_INTERNAL_ZLIB:BOOL=OFF
+MOJOSETUP_INTERNAL_ZLIB:BOOL=ON
 
 //Add Lua 'db' library
 MOJOSETUP_LUALIB_DB:BOOL=ON
@@ -268,10 +268,10 @@ MOJOSETUP_URL_FTP:BOOL=ON
 MOJOSETUP_URL_HTTP:BOOL=ON
 
 //Value Computed by CMake
-MojoSetup_BINARY_DIR:STATIC=/home/softcoder/Code/mojosetup/build
+MojoSetup_BINARY_DIR:STATIC=/home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build
 
 //Value Computed by CMake
-MojoSetup_SOURCE_DIR:STATIC=/home/softcoder/Code/mojosetup
+MojoSetup_SOURCE_DIR:STATIC=/home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup
 
 //Dependencies for the target
 mojosetupgui_gtkplus2_LIB_DEPENDS:STATIC=general;-lgtk-x11-2.0;
@@ -287,8 +287,10 @@ CMAKE_AR-ADVANCED:INTERNAL=1
 CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
 //What is the target build tool cmake is generating for.
 CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
+//MODIFIED property for variable: CMAKE_BUILD_TYPE
+CMAKE_BUILD_TYPE-MODIFIED:INTERNAL=ON
 //This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/softcoder/Code/mojosetup/build
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
 //Minor version of cmake used to create the current loaded cache
@@ -318,6 +320,8 @@ CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
 CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //Result of TRY_COMPILE
 CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
+//Path to cache edit program executable.
+CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake
 //Executable file format
 CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
@@ -340,7 +344,7 @@ CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
 CMAKE_HAVE_PTHREAD_H:INTERNAL=1
 //Start directory with the top level CMakeLists.txt file for this
 // project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/softcoder/Code/mojosetup
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup
 //Install .so files without execute permission.
 CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
 //ADVANCED property for variable: CMAKE_LINKER
@@ -441,6 +445,14 @@ HAVE_UCRED_H:INTERNAL=
 HAVE_ZLIB_H:INTERNAL=1
 //Test MOJOSETUP_GCC_HAS_STACKPROT
 MOJOSETUP_GCC_HAS_STACKPROT:INTERNAL=1
+//MODIFIED property for variable: MOJOSETUP_GUI_GTKPLUS2_STATIC
+MOJOSETUP_GUI_GTKPLUS2_STATIC-MODIFIED:INTERNAL=ON
+//MODIFIED property for variable: MOJOSETUP_IMAGE_BMP
+MOJOSETUP_IMAGE_BMP-MODIFIED:INTERNAL=ON
+//MODIFIED property for variable: MOJOSETUP_INTERNAL_BZLIB
+MOJOSETUP_INTERNAL_BZLIB-MODIFIED:INTERNAL=ON
+//MODIFIED property for variable: MOJOSETUP_INTERNAL_ZLIB
+MOJOSETUP_INTERNAL_ZLIB-MODIFIED:INTERNAL=ON
 //Result of TEST_BIG_ENDIAN
 MOJOSETUP_IS_BIGENDIAN:INTERNAL=0
 //Test MOJOSETUP_IS_GCC4
diff --git a/mk/linux/mojosetup/build/Makefile b/mk/linux/mojosetup/build/Makefile
index adc9c139..922a0725 100644
--- a/mk/linux/mojosetup/build/Makefile
+++ b/mk/linux/mojosetup/build/Makefile
@@ -35,19 +35,22 @@ CMAKE_COMMAND = /usr/bin/cmake
 # The command to remove a file.
 RM = /usr/bin/cmake -E remove -f
 
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/bin/ccmake
+
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/softcoder/Code/mojosetup
+CMAKE_SOURCE_DIR = /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/softcoder/Code/mojosetup/build
+CMAKE_BINARY_DIR = /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
-	/usr/bin/cmake -i .
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -66,9 +69,9 @@ rebuild_cache/fast: rebuild_cache
 
 # The main all target
 all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/softcoder/Code/mojosetup/build/CMakeFiles /home/softcoder/Code/mojosetup/build/CMakeFiles/progress.marks
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build/CMakeFiles /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build/CMakeFiles/progress.marks
 	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/softcoder/Code/mojosetup/build/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
@@ -134,19 +137,6 @@ mojosetup/fast:
 	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/build
 .PHONY : mojosetup/fast
 
-#=============================================================================
-# Target rules for targets named mojosetupgui_gtkplus2
-
-# Build rule for target.
-mojosetupgui_gtkplus2: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 mojosetupgui_gtkplus2
-.PHONY : mojosetupgui_gtkplus2
-
-# fast build rule for target.
-mojosetupgui_gtkplus2/fast:
-	$(MAKE) -f CMakeFiles/mojosetupgui_gtkplus2.dir/build.make CMakeFiles/mojosetupgui_gtkplus2.dir/build
-.PHONY : mojosetupgui_gtkplus2/fast
-
 #=============================================================================
 # Target rules for targets named skeleton
 
@@ -235,6 +225,111 @@ buildver.s:
 	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/buildver.s
 .PHONY : buildver.s
 
+# target to build an object file
+bzip2/blocksort.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/blocksort.o
+.PHONY : bzip2/blocksort.o
+
+# target to preprocess a source file
+bzip2/blocksort.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/blocksort.i
+.PHONY : bzip2/blocksort.i
+
+# target to generate assembly for a file
+bzip2/blocksort.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/blocksort.s
+.PHONY : bzip2/blocksort.s
+
+# target to build an object file
+bzip2/bzlib.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/bzlib.o
+.PHONY : bzip2/bzlib.o
+
+# target to preprocess a source file
+bzip2/bzlib.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/bzlib.i
+.PHONY : bzip2/bzlib.i
+
+# target to generate assembly for a file
+bzip2/bzlib.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/bzlib.s
+.PHONY : bzip2/bzlib.s
+
+# target to build an object file
+bzip2/compress.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/compress.o
+.PHONY : bzip2/compress.o
+
+# target to preprocess a source file
+bzip2/compress.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/compress.i
+.PHONY : bzip2/compress.i
+
+# target to generate assembly for a file
+bzip2/compress.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/compress.s
+.PHONY : bzip2/compress.s
+
+# target to build an object file
+bzip2/crctable.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/crctable.o
+.PHONY : bzip2/crctable.o
+
+# target to preprocess a source file
+bzip2/crctable.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/crctable.i
+.PHONY : bzip2/crctable.i
+
+# target to generate assembly for a file
+bzip2/crctable.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/crctable.s
+.PHONY : bzip2/crctable.s
+
+# target to build an object file
+bzip2/decompress.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/decompress.o
+.PHONY : bzip2/decompress.o
+
+# target to preprocess a source file
+bzip2/decompress.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/decompress.i
+.PHONY : bzip2/decompress.i
+
+# target to generate assembly for a file
+bzip2/decompress.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/decompress.s
+.PHONY : bzip2/decompress.s
+
+# target to build an object file
+bzip2/huffman.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/huffman.o
+.PHONY : bzip2/huffman.o
+
+# target to preprocess a source file
+bzip2/huffman.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/huffman.i
+.PHONY : bzip2/huffman.i
+
+# target to generate assembly for a file
+bzip2/huffman.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/huffman.s
+.PHONY : bzip2/huffman.s
+
+# target to build an object file
+bzip2/randtable.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/randtable.o
+.PHONY : bzip2/randtable.o
+
+# target to preprocess a source file
+bzip2/randtable.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/randtable.i
+.PHONY : bzip2/randtable.i
+
+# target to generate assembly for a file
+bzip2/randtable.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/bzip2/randtable.s
+.PHONY : bzip2/randtable.s
+
 # target to build an object file
 checksum_crc32.o:
 	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/checksum_crc32.o
@@ -312,17 +407,17 @@ gui.s:
 
 # target to build an object file
 gui_gtkplus2.o:
-	$(MAKE) -f CMakeFiles/mojosetupgui_gtkplus2.dir/build.make CMakeFiles/mojosetupgui_gtkplus2.dir/gui_gtkplus2.o
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/gui_gtkplus2.o
 .PHONY : gui_gtkplus2.o
 
 # target to preprocess a source file
 gui_gtkplus2.i:
-	$(MAKE) -f CMakeFiles/mojosetupgui_gtkplus2.dir/build.make CMakeFiles/mojosetupgui_gtkplus2.dir/gui_gtkplus2.i
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/gui_gtkplus2.i
 .PHONY : gui_gtkplus2.i
 
 # target to generate assembly for a file
 gui_gtkplus2.s:
-	$(MAKE) -f CMakeFiles/mojosetupgui_gtkplus2.dir/build.make CMakeFiles/mojosetupgui_gtkplus2.dir/gui_gtkplus2.s
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/gui_gtkplus2.s
 .PHONY : gui_gtkplus2.s
 
 # target to build an object file
@@ -1024,6 +1119,171 @@ stb_image.s:
 	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/stb_image.s
 .PHONY : stb_image.s
 
+# target to build an object file
+zlib/adler32.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/adler32.o
+.PHONY : zlib/adler32.o
+
+# target to preprocess a source file
+zlib/adler32.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/adler32.i
+.PHONY : zlib/adler32.i
+
+# target to generate assembly for a file
+zlib/adler32.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/adler32.s
+.PHONY : zlib/adler32.s
+
+# target to build an object file
+zlib/compress.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/compress.o
+.PHONY : zlib/compress.o
+
+# target to preprocess a source file
+zlib/compress.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/compress.i
+.PHONY : zlib/compress.i
+
+# target to generate assembly for a file
+zlib/compress.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/compress.s
+.PHONY : zlib/compress.s
+
+# target to build an object file
+zlib/crc32.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/crc32.o
+.PHONY : zlib/crc32.o
+
+# target to preprocess a source file
+zlib/crc32.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/crc32.i
+.PHONY : zlib/crc32.i
+
+# target to generate assembly for a file
+zlib/crc32.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/crc32.s
+.PHONY : zlib/crc32.s
+
+# target to build an object file
+zlib/deflate.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/deflate.o
+.PHONY : zlib/deflate.o
+
+# target to preprocess a source file
+zlib/deflate.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/deflate.i
+.PHONY : zlib/deflate.i
+
+# target to generate assembly for a file
+zlib/deflate.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/deflate.s
+.PHONY : zlib/deflate.s
+
+# target to build an object file
+zlib/infback.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/infback.o
+.PHONY : zlib/infback.o
+
+# target to preprocess a source file
+zlib/infback.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/infback.i
+.PHONY : zlib/infback.i
+
+# target to generate assembly for a file
+zlib/infback.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/infback.s
+.PHONY : zlib/infback.s
+
+# target to build an object file
+zlib/inffast.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inffast.o
+.PHONY : zlib/inffast.o
+
+# target to preprocess a source file
+zlib/inffast.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inffast.i
+.PHONY : zlib/inffast.i
+
+# target to generate assembly for a file
+zlib/inffast.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inffast.s
+.PHONY : zlib/inffast.s
+
+# target to build an object file
+zlib/inflate.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inflate.o
+.PHONY : zlib/inflate.o
+
+# target to preprocess a source file
+zlib/inflate.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inflate.i
+.PHONY : zlib/inflate.i
+
+# target to generate assembly for a file
+zlib/inflate.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inflate.s
+.PHONY : zlib/inflate.s
+
+# target to build an object file
+zlib/inftrees.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inftrees.o
+.PHONY : zlib/inftrees.o
+
+# target to preprocess a source file
+zlib/inftrees.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inftrees.i
+.PHONY : zlib/inftrees.i
+
+# target to generate assembly for a file
+zlib/inftrees.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/inftrees.s
+.PHONY : zlib/inftrees.s
+
+# target to build an object file
+zlib/trees.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/trees.o
+.PHONY : zlib/trees.o
+
+# target to preprocess a source file
+zlib/trees.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/trees.i
+.PHONY : zlib/trees.i
+
+# target to generate assembly for a file
+zlib/trees.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/trees.s
+.PHONY : zlib/trees.s
+
+# target to build an object file
+zlib/uncompr.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/uncompr.o
+.PHONY : zlib/uncompr.o
+
+# target to preprocess a source file
+zlib/uncompr.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/uncompr.i
+.PHONY : zlib/uncompr.i
+
+# target to generate assembly for a file
+zlib/uncompr.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/uncompr.s
+.PHONY : zlib/uncompr.s
+
+# target to build an object file
+zlib/zutil.o:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/zutil.o
+.PHONY : zlib/zutil.o
+
+# target to preprocess a source file
+zlib/zutil.i:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/zutil.i
+.PHONY : zlib/zutil.i
+
+# target to generate assembly for a file
+zlib/zutil.s:
+	$(MAKE) -f CMakeFiles/mojosetup.dir/build.make CMakeFiles/mojosetup.dir/zlib/zutil.s
+.PHONY : zlib/zutil.s
+
 # Help Target
 help:
 	@echo "The following are some of the valid targets for this Makefile:"
@@ -1034,7 +1294,6 @@ help:
 	@echo "... lua"
 	@echo "... mojoluac"
 	@echo "... mojosetup"
-	@echo "... mojosetupgui_gtkplus2"
 	@echo "... rebuild_cache"
 	@echo "... skeleton"
 	@echo "... archive_pck.o"
@@ -1052,6 +1311,27 @@ help:
 	@echo "... buildver.o"
 	@echo "... buildver.i"
 	@echo "... buildver.s"
+	@echo "... bzip2/blocksort.o"
+	@echo "... bzip2/blocksort.i"
+	@echo "... bzip2/blocksort.s"
+	@echo "... bzip2/bzlib.o"
+	@echo "... bzip2/bzlib.i"
+	@echo "... bzip2/bzlib.s"
+	@echo "... bzip2/compress.o"
+	@echo "... bzip2/compress.i"
+	@echo "... bzip2/compress.s"
+	@echo "... bzip2/crctable.o"
+	@echo "... bzip2/crctable.i"
+	@echo "... bzip2/crctable.s"
+	@echo "... bzip2/decompress.o"
+	@echo "... bzip2/decompress.i"
+	@echo "... bzip2/decompress.s"
+	@echo "... bzip2/huffman.o"
+	@echo "... bzip2/huffman.i"
+	@echo "... bzip2/huffman.s"
+	@echo "... bzip2/randtable.o"
+	@echo "... bzip2/randtable.i"
+	@echo "... bzip2/randtable.s"
 	@echo "... checksum_crc32.o"
 	@echo "... checksum_crc32.i"
 	@echo "... checksum_crc32.s"
@@ -1193,6 +1473,39 @@ help:
 	@echo "... stb_image.o"
 	@echo "... stb_image.i"
 	@echo "... stb_image.s"
+	@echo "... zlib/adler32.o"
+	@echo "... zlib/adler32.i"
+	@echo "... zlib/adler32.s"
+	@echo "... zlib/compress.o"
+	@echo "... zlib/compress.i"
+	@echo "... zlib/compress.s"
+	@echo "... zlib/crc32.o"
+	@echo "... zlib/crc32.i"
+	@echo "... zlib/crc32.s"
+	@echo "... zlib/deflate.o"
+	@echo "... zlib/deflate.i"
+	@echo "... zlib/deflate.s"
+	@echo "... zlib/infback.o"
+	@echo "... zlib/infback.i"
+	@echo "... zlib/infback.s"
+	@echo "... zlib/inffast.o"
+	@echo "... zlib/inffast.i"
+	@echo "... zlib/inffast.s"
+	@echo "... zlib/inflate.o"
+	@echo "... zlib/inflate.i"
+	@echo "... zlib/inflate.s"
+	@echo "... zlib/inftrees.o"
+	@echo "... zlib/inftrees.i"
+	@echo "... zlib/inftrees.s"
+	@echo "... zlib/trees.o"
+	@echo "... zlib/trees.i"
+	@echo "... zlib/trees.s"
+	@echo "... zlib/uncompr.o"
+	@echo "... zlib/uncompr.i"
+	@echo "... zlib/uncompr.s"
+	@echo "... zlib/zutil.o"
+	@echo "... zlib/zutil.i"
+	@echo "... zlib/zutil.s"
 .PHONY : help
 
 
diff --git a/mk/linux/mojosetup/build/cmake_install.cmake b/mk/linux/mojosetup/build/cmake_install.cmake
index 3e0048dc..a1e396e7 100644
--- a/mk/linux/mojosetup/build/cmake_install.cmake
+++ b/mk/linux/mojosetup/build/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /home/softcoder/Code/mojosetup
+# Install script for directory: /home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup
 
 # Set the install prefix
 IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -12,7 +12,7 @@ IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
     STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
            CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
   ELSE(BUILD_TYPE)
-    SET(CMAKE_INSTALL_CONFIG_NAME "")
+    SET(CMAKE_INSTALL_CONFIG_NAME "MinSizeRel")
   ENDIF(BUILD_TYPE)
   MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
 ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
@@ -38,7 +38,7 @@ ELSE(CMAKE_INSTALL_COMPONENT)
   SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
 ENDIF(CMAKE_INSTALL_COMPONENT)
 
-FILE(WRITE "/home/softcoder/Code/mojosetup/build/${CMAKE_INSTALL_MANIFEST}" "")
+FILE(WRITE "/home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build/${CMAKE_INSTALL_MANIFEST}" "")
 FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES})
-  FILE(APPEND "/home/softcoder/Code/mojosetup/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n")
+  FILE(APPEND "/home/softcoder/Code/megaglest/branches/release-3.3.5.1/mk/linux/mojosetup/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n")
 ENDFOREACH(file)
diff --git a/mk/linux/mojosetup/build/mojoluac b/mk/linux/mojosetup/build/mojoluac
index fb32ee01..25c08e9f 100755
Binary files a/mk/linux/mojosetup/build/mojoluac and b/mk/linux/mojosetup/build/mojoluac differ
diff --git a/mk/linux/mojosetup/build/mojosetup b/mk/linux/mojosetup/build/mojosetup
index b738864c..8c433d98 100755
Binary files a/mk/linux/mojosetup/build/mojosetup and b/mk/linux/mojosetup/build/mojosetup differ
diff --git a/mk/linux/mojosetup/docs.txt b/mk/linux/mojosetup/docs.txt
index 7c86c5a8..3f39f437 100644
--- a/mk/linux/mojosetup/docs.txt
+++ b/mk/linux/mojosetup/docs.txt
@@ -243,6 +243,13 @@ Here are the elements, and the attributes they can possess.
     the installer will prompt the user, possibly recommmending locations
     to him.
 
+   dataprefix (default: "data/", mustBeString)
+
+    This attribute can be used to force the installer to pull data files
+    from a location other than data/.  The use of the default data/
+    is strongly recommended; use this option only with great care.
+
+
 
    recommended_destinations (no default, mustBeStringOrTableOfStrings)
 
@@ -316,6 +323,20 @@ Here are the elements, and the attributes they can possess.
     hook.
 
 
+   postexec (no default, mustBeString)
+
+    This attribute can be used to chain the installer to another process
+    on a successful installation.  The string can contain $DESTINATION which
+    will be replaced with the installation destination.
+
+
+   delete_error_is_fatal (default true, mustBeBool)
+
+    If we cannot exactly delete every file during uninstallation, we will
+    terminate at the very first failure if this is true.  Otherwise, we
+    will delete every file we can.
+
+
    updateurl (no default, mustBeUrl)
 
     This is written to the manifest files for the aid of external tools, but
@@ -433,6 +454,11 @@ Here are the elements, and the attributes they can possess.
     the license text. Currently this must be a text file in UTF-8 encoding.
 
 
+   accept_not_needed (false, mustBeBool)
+
+    If true, then the user does not have to explicitly accept the EULA.
+
+
  Setup.Readme:
 
   This element is a child of Setup.Package. It can be used to display a
@@ -1038,9 +1064,9 @@ Your config file is a Lua script, and as such, has access to all of Lua's
   MojoSetup.format(fmt, ...)
 
    Format a string, sort of (but not exactly!) like sprintf().
-    The only formatters accepted are %0 through %9 (and %%), which do not
-    have to appear in order in the string, but match the varargs in the
-    order they are passed to the function.
+   The only formatters accepted are %0 through %9 (and %%), which do not
+   have to appear in order in the string, but match the varargs in the
+   order they are passed to the function.
 
    format('%1 %0 %1 %%', 'X', 'Y', 'Z') will return the string: 'Y X Y %'
 
@@ -1066,6 +1092,16 @@ Your config file is a Lua script, and as such, has access to all of Lua's
    runtime, as require() won't respect the Base Archive.
 
 
+  MojoSetup.runScript(script, devnull, args...)
+
+   Run the given script in a shell. If devnull is true, all stdout
+   and stderr will be suppressed (literally sent to /dev/null on Unix
+   systems). Please note that lots of things can be done through Lua,
+   directly in your config file, so you don't have to worry about the
+   unique quirks of various shells on end user systems. Still, there are
+   times when this is useful.
+
+
   MojoSetup.translate(str)
 
    Find the proper translation for the end user's locale in the localization
diff --git a/mk/linux/mojosetup/fileio.c b/mk/linux/mojosetup/fileio.c
index 73312778..ae78866c 100644
--- a/mk/linux/mojosetup/fileio.c
+++ b/mk/linux/mojosetup/fileio.c
@@ -1060,6 +1060,26 @@ MojoArchive *MojoArchive_newFromDirectory(const char *dirname)
 } // MojoArchive_newFromDirectory
 
 
+boolean MojoInput_readui16(MojoInput *io, uint16 *ui16)
+{
+    uint8 buf[sizeof (uint16)];
+    if (io->read(io, buf, sizeof (buf)) != sizeof (buf))
+        return false;
+
+    *ui16 = (buf[0] | (buf[1] << 8));
+    return true;
+} // MojoInput_readui16
+
+
+boolean MojoInput_readui32(MojoInput *io, uint32 *ui32)
+{
+    uint8 buf[sizeof (uint32)];
+    if (io->read(io, buf, sizeof (buf)) != sizeof (buf))
+        return false;
+
+    *ui32 = (buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24));
+    return true;
+} // MojoInput_readui32
 
 
 MojoArchive *GBaseArchive = NULL;
diff --git a/mk/linux/mojosetup/fileio.h b/mk/linux/mojosetup/fileio.h
index 32b866c5..8152136b 100644
--- a/mk/linux/mojosetup/fileio.h
+++ b/mk/linux/mojosetup/fileio.h
@@ -105,6 +105,7 @@ MojoInput *MojoInput_newFromArchivePath(MojoArchive *ar, const char *fname);
 //  new MojoInput now owns it.
 MojoInput *MojoInput_newCompressedStream(MojoInput *origio);
 
+// !!! FIXME: fill in missing documentation here.
 extern MojoArchive *GBaseArchive;
 extern const char *GBaseArchivePath;
 MojoArchive *MojoArchive_initBaseArchive(void);
@@ -118,6 +119,22 @@ boolean MojoInput_toPhysicalFile(MojoInput *in, const char *fname, uint16 perms,
 
 MojoInput *MojoInput_newFromURL(const char *url);
 
+// Read a littleendian, unsigned 16-bit integer from (io), swapping it to
+//  the correct byteorder for the platform, and moving the file pointer
+//  ahead 2 bytes. Returns true on successful read and fills the swapped
+//  value into (*ui16), false on i/o error or EOF.
+boolean MojoInput_readui16(MojoInput *io, uint16 *ui16);
+
+// Read a littleendian, unsigned 32-bit integer from (io), swapping it to
+//  the correct byteorder for the platform, and moving the file pointer
+//  ahead 4 bytes. Returns true on successful read and fills the swapped
+//  value into (*ui32), false on i/o error or EOF.
+boolean MojoInput_readui32(MojoInput *io, uint32 *ui32);
+
+// (Please note that there are not bigendian versions of MojoInput_readuiXX()
+//  at the moment, as we don't need them for our current feature set. However,
+//  they could be added easily enough.)
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/mk/linux/mojosetup/gui_gtkplus2.c b/mk/linux/mojosetup/gui_gtkplus2.c
index fed2f133..307234db 100644
--- a/mk/linux/mojosetup/gui_gtkplus2.c
+++ b/mk/linux/mojosetup/gui_gtkplus2.c
@@ -592,6 +592,9 @@ static GtkWidget *create_gtkwindow(const char *title,
 
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_widget_show(window);
+
+    gtk_widget_grab_focus(next);
+
     return window;
 } // create_gtkwindow
 
diff --git a/mk/linux/mojosetup/lua_glue.c b/mk/linux/mojosetup/lua_glue.c
index 14adb8d3..5eecc74b 100644
--- a/mk/linux/mojosetup/lua_glue.c
+++ b/mk/linux/mojosetup/lua_glue.c
@@ -1102,6 +1102,35 @@ static int luahook_platform_uninstalldesktopmenuitem(lua_State *L)
 } // luahook_platform_uninstalldesktopmenuitem
 
 
+static int luahook_platform_exec(lua_State *L)
+{
+    const char *cmd = luaL_checkstring(L, 1);
+    logDebug("exec %0", cmd);
+    MojoPlatform_exec(cmd);
+    logError("exec %0 failed", cmd);
+    return retvalBoolean(L, 0);
+} // luahook_platform_exec
+
+
+static int luahook_platform_runscript(lua_State *L)
+{
+    const char *script = luaL_checkstring(L, 1);
+    const boolean devnull = lua_toboolean(L, 2);
+    const int argc = lua_gettop(L) - 2;
+    const char **argv = (const char **) xmalloc(sizeof (char *) * (argc + 1));
+    int retval = 0;
+    int i;
+
+    for (i = 0; i < argc; i++)
+        argv[i] = luaL_checkstring(L, i + 3);
+    argv[i] = NULL;
+
+    retval = retvalNumber(L, MojoPlatform_runScript(script, devnull, argv));
+    free(argv);
+    return retval;
+} // luahook_platform_runscript
+
+
 static int luahook_movefile(lua_State *L)
 {
     boolean retval = false;
@@ -1809,6 +1838,8 @@ boolean MojoLua_initLua(void)
             set_cfunc(luaState, luahook_platform_mkdir, "mkdir");
             set_cfunc(luaState, luahook_platform_installdesktopmenuitem, "installdesktopmenuitem");
             set_cfunc(luaState, luahook_platform_uninstalldesktopmenuitem, "uninstalldesktopmenuitem");
+            set_cfunc(luaState, luahook_platform_exec, "exec");
+            set_cfunc(luaState, luahook_platform_runscript, "runscript");
         lua_setfield(luaState, -2, "platform");
 
         // Set the GUI functions...
diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh
index 0348d673..ed2d8caa 100755
--- a/mk/linux/mojosetup/megaglest-installer/make.sh
+++ b/mk/linux/mojosetup/megaglest-installer/make.sh
@@ -5,8 +5,9 @@
 #  (make sure you don't build in features you don't need, etc).
 
 # below is the branch to build and installer from
-megaglest_release_folder="trunk"
-#megaglest_release_folder="release-3.3.4.1"
+
+#megaglest_release_folder="trunk"
+megaglest_release_folder="release-3.3.5.1"
 
 # below describe various folder paths relative to the installer root folder
 megaglest_project_root=../../../../../
diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
index e54b6ef7..e9bb3f54 100644
--- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
+++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
@@ -20,7 +20,7 @@ Setup.Package
     },
 
     postinstall = function(package)
-        MojoSetup.launchbrowser(MojoSetup.destination .. "http://glest.org/glest_board/index.php?topic=4930.0")
+        MojoSetup.launchbrowser(MojoSetup.destination .. "http://www.glest.org/glest_board/index.php?topic=4930.0")
     end,
 
     Setup.Eula
diff --git a/mk/linux/mojosetup/misc/launchpad-import.sh b/mk/linux/mojosetup/misc/launchpad-import.sh
index 00300d7a..4bd8c3ac 100755
--- a/mk/linux/mojosetup/misc/launchpad-import.sh
+++ b/mk/linux/mojosetup/misc/launchpad-import.sh
@@ -8,7 +8,7 @@ hg fetch  # will only work on a unmodified working directory.
 rm -rf launchpad
 mkdir $_
 cd $_
-tar -xzf ~/launchpad-export.tar.gz
+tar -xzf ~/Downloads/launchpad-export.tar.gz
 ../misc/po2localization.pl *.po mojosetup/mojosetup.pot >../scripts/localization.lua
 hg diff ../scripts/localization.lua |less
 set +x
@@ -17,5 +17,5 @@ read
 set -x
 hg commit -m "Latest translations from launchpad.net ..." ../scripts/localization.lua
 cd ..
-rm -rf launchpad ~/launchpad-export.tar.gz
+rm -rf launchpad ~/Downloads/launchpad-export.tar.gz
 exit 0
diff --git a/mk/linux/mojosetup/platform.h b/mk/linux/mojosetup/platform.h
index 1262147b..1b60923a 100644
--- a/mk/linux/mojosetup/platform.h
+++ b/mk/linux/mojosetup/platform.h
@@ -245,6 +245,12 @@ boolean MojoPlatform_installDesktopMenuItem(const char *data);
 // Returns (true) on success and (false) on failure.
 boolean MojoPlatform_uninstallDesktopMenuItem(const char *data);
 
+// Run a script from the archive in the OS
+int MojoPlatform_runScript(const char *script, boolean devnull, const char **argv);
+
+// Exec a given process name
+int MojoPlatform_exec(const char *cmd);
+
 #if !SUPPORT_MULTIARCH
 #define MojoPlatform_switchBin(img, len)
 #else
diff --git a/mk/linux/mojosetup/platform_unix.c b/mk/linux/mojosetup/platform_unix.c
index 5d6fe999..0f3ec0b3 100644
--- a/mk/linux/mojosetup/platform_unix.c
+++ b/mk/linux/mojosetup/platform_unix.c
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <sys/wait.h>
 #include <limits.h>
+#include <errno.h>
 
 #if MOJOSETUP_HAVE_SYS_UCRED_H
 #  ifdef MOJOSETUP_HAVE_MNTENT_H
@@ -993,7 +994,6 @@ void MojoPlatform_dlclose(void *lib)
 } // MojoPlatform_dlclose
 
 
-#if !PLATFORM_MACOSX && !PLATFORM_BEOS
 static int runScriptString(const char *str, boolean devnull, const char **_argv)
 {
     int retval = 127;
@@ -1057,7 +1057,7 @@ static int runScriptString(const char *str, boolean devnull, const char **_argv)
 } // runScriptString
 
 
-static int runScript(const char *script, boolean devnull, const char **argv)
+int MojoPlatform_runScript(const char *script, boolean devnull, const char **argv)
 {
     int retval = 127;
     char *str = NULL;
@@ -1084,10 +1084,12 @@ static int runScript(const char *script, boolean devnull, const char **argv)
         retval = runScriptString(str, devnull, argv);
 
     free(str);
+
     return retval;
 } // runScript
 
 
+#if !PLATFORM_MACOSX && !PLATFORM_BEOS
 static char *shellEscape(const char *str)
 {
     size_t len = 0;
@@ -1162,7 +1164,7 @@ static boolean unix_launchXdgUtil(const char *util, const char **argv)
     else  // try our fallback copy of xdg-utils in GBaseArchive?
     {
         char *script = format("meta/xdg-utils/%0", util);
-        rc = runScript(script, true, argv);
+        rc = MojoPlatform_runScript(script, true, argv);
         logDebug("internal script '%0' returned %1", script, numstr(rc));
         free(script);
     } // if
@@ -1255,6 +1257,13 @@ boolean MojoPlatform_uninstallDesktopMenuItem(const char *data)
 } // MojoPlatform_uninstallDesktopMenuItem
 
 
+int MojoPlatform_exec(const char *cmd)
+{
+    execl(cmd, cmd, NULL);
+    return errno;
+} // MojoPlatform_exec
+
+
 #if SUPPORT_MULTIARCH
 void MojoPlatform_switchBin(const uint8 *img, size_t len)
 {
diff --git a/mk/linux/mojosetup/platform_windows.c b/mk/linux/mojosetup/platform_windows.c
index 142838a4..7bd39ea9 100644
--- a/mk/linux/mojosetup/platform_windows.c
+++ b/mk/linux/mojosetup/platform_windows.c
@@ -517,6 +517,19 @@ boolean MojoPlatform_uninstallDesktopMenuItem(const char *data)
 } // MojoPlatform_uninstallDesktopMenuItem
 
 
+int MojoPlatform_exec(const char *cmd)
+{
+    STUBBED("exec");
+    return 127;
+} // MojoPlatform_exec
+
+
+int MojoPlatform_runScript(const char *script, boolean devnull, const char **argv)
+{
+    STUBBED("runScript");
+    return 0;
+}
+
 boolean MojoPlatform_spawnTerminal(void)
 {
     assert(!MojoPlatform_istty());
diff --git a/mk/linux/mojosetup/scripts/localization.lua b/mk/linux/mojosetup/scripts/localization.lua
index c53f2745..b99cc548 100644
--- a/mk/linux/mojosetup/scripts/localization.lua
+++ b/mk/linux/mojosetup/scripts/localization.lua
@@ -3,8 +3,8 @@
 -- Please see the file LICENSE.txt in the source's root directory.
 --
 -- DO NOT EDIT BY HAND.
--- This file was generated with po2localization.pl, version hg-731:d431888dc3f3 ...
---  on 2009-12-14 03:16:00-0500
+-- This file was generated with po2localization.pl, version hg-772:f7a38b2e12df ...
+--  on 2010-04-24 17:09:16-0400
 --
 -- Your own installer's localizations go into app_localization.lua instead.
 -- If you want to add strings to be translated to this file, contact Ryan
@@ -15,7 +15,7 @@
 --
 -- ...and that work eventually ends up in this file.
 --
--- X-Launchpad-Export-Date: 2009-12-14 08:00+0000
+-- X-Launchpad-Export-Date: 2010-04-24 21:08+0000
 -- X-Generator: Launchpad (build Unknown)
 
 MojoSetup.languages = {
@@ -126,8 +126,9 @@ MojoSetup.localization = {
         nds = "HINWEIS: %0",
         nl = "OPMERKING: %0\n[Toets enter]",
         nn = "Notis: %0\n[trykk enter]",
+        pl = "UWAGA: %0",
         pt = "AVISO: %0\n[pressione enter]",
-        pt_BR = "AVISO: %0",
+        pt_BR = "AVISO: %0\n[pressione enter]",
         ro = "ATENŢIE: %0\n[apasă enter]",
         ru = "ВНИМАНИЕ: %0\n[нажмите enter]",
         sk = "Správa: %0",
@@ -170,6 +171,7 @@ MojoSetup.localization = {
         nds = "%0 [J/n] ",
         nl = "%0 [J/n]: ",
         nn = "%0 [J/n]: ",
+        pl = "%0 [T/n]: ",
         pt = "%0 [S/n] ",
         pt_BR = "%0 [S/n]: ",
         ro = "%0 [D/n]: ",
@@ -446,7 +448,7 @@ MojoSetup.localization = {
         ar = "(%0-%1 من %2 سطور، المزيد؟)",
         cs = "(%0-%1 z %2 řádků, zobrazit více?)",
         da = "(%0-%1 af %2 linie, vis flere?)",
-        de = "(%0-%1 von %2 Zeilen, weitere betrachten?)",
+        de = "(%0-%1 von %2 Zeilen, weitere anzeigen?)",
         el = "(%0-%1 από %2 γραμμές, θέλετε να δείτε περισσότερες?)",
         en_AU = "(%0-%1 of %2 lines, see more?)",
         en_CA = "(%0-%1 of %2 lines, see more?)",
@@ -540,7 +542,7 @@ MojoSetup.localization = {
         nds = "Zurück",
         nl = "terug",
         nn = "tilbake",
-        pl = "tył",
+        pl = "wstecz",
         pt = "voltar",
         pt_BR = "voltar",
         ro = "înapoi",
@@ -799,7 +801,7 @@ MojoSetup.localization = {
         nds = "Sind Sie sicher, dass Sie die Installation abbrechen wollen?",
         nl = "Weet u zeker dat u de installatie wilt afbreken?",
         nn = "Er du sikker på at du vil avbryta installasjonen?",
-        pl = "Czy na pewno chcesz anulować instalację?",
+        pl = "Czy napewno chcesz przerwać instalację?",
         pt = "Tem a certeza que quer cancelar a instalação?",
         pt_BR = "Você tem certeza que deseja cancelar a instalação?",
         ro = "Sunteţi sigur că doriţi anularea instalării?",
@@ -913,7 +915,7 @@ MojoSetup.localization = {
         nds = "FEHLER: Doppelte Medien-ID",
         nl = "BUG: dubbele media id",
         nn = "Programfeil: duplisert media-id",
-        pl = "BŁĄD: zduplikowany identyfikator media",
+        pl = "BŁĄD: zduplikowany identyfikator nośnika",
         pt = "BUG: id de mídia duplicado",
         pt_BR = "BUG: ID da mídia duplicado",
         ro = "EROARE: media id duplicat",
@@ -970,6 +972,7 @@ MojoSetup.localization = {
         af = "Kewer: support_uninstall vereis write_manifest",
         ar = "بقة: support_uninstall يحتاج write_manifest",
         cs = "CHYBA: support_uninstall vyžaduje write_manifest",
+        da = "Programfejl: support_uninstall krever write_manifest",
         de = "FEHLER: support_uninstall benötigt write_manifest",
         el = "ΣΦΑΛΜΑ: το \"support_uninstall\" απαιτεί το \"write_manifest\"",
         en_AU = "BUG: support_uninstall requires write_manifest",
@@ -1007,6 +1010,7 @@ MojoSetup.localization = {
         af = "Kewer: write_manifest vereis Lua omskakelaar ondersteuning",
         ar = "بقة: write_manifest يحتاج دعم معالج Lua",
         cs = "CHYBA: write_manifest vyžaduje podporu Lua parseru",
+        da = "Programfejl: write_manifest krever støtte for Lua-parser",
         de = "FEHLER: write_manifest benötigt Lua Parser Unterstützung",
         el = "ΣΦΑΛΜΑ: το \"write_manifest\" απαιτεί να υπάρχει υποστήριξη από \"Lua parser\"",
         en_AU = "BUG: write_manifest requires Lua parser support",
@@ -1023,7 +1027,7 @@ MojoSetup.localization = {
         nn = "Programfeil: write_manifest krevar støtte for Lua-parser",
         pl = "BŁĄD: write_manifest wymaga obsługi parsera Lua",
         pt = "BUG: write_manifest requer suporte do analisador da linguagem Lua",
-        pt_BR = "BUG: write_manifest necessita do suporte ao parser de Lua",
+        pt_BR = "BUG: write_manifest necessita do suporte ao interpretador de Lua",
         ro = "EROARE: write_manifest necesită suport Lua",
         ru = "Ошибка: write_manifest требует поддержки Lua parser",
         sk = "CHYBA: write_manifest potrebuje zapnutú podporu Lua parsera (Lua parser support)",
@@ -1041,6 +1045,7 @@ MojoSetup.localization = {
         af = "Kewer: Setup.DesktopMenuItem vereis support_uninstall",
         ar = "بقة: Setup.DesktopMenuItem يحتاج support_uninstall",
         cs = "CHYBA: Setup.DesktopMenuItem vyžaduje support_uninstall",
+        da = "Programfejl: Setup.DesktopMenuItem krever support_uninstall",
         de = "FEHLER: Setup.DesktopMenuItem benötigt support_uninstall",
         el = "ΣΦΑΛΜΑ: το Setup.DesktopMenuItem απαιτεί το \"support_uninstall\"",
         en_AU = "BUG: Setup.DesktopMenuItem requires support_uninstall",
@@ -1112,6 +1117,7 @@ MojoSetup.localization = {
         af = "Kewer: Ongeldige format() string",
         ar = "بقة: format() غير صحيحة",
         cs = "CHYBA: Neplatný řetězec pro format()",
+        da = "Programfejl: Ugyldig format()-streng",
         de = "FEHLER: Unzulässige format() Zeichenkette",
         el = "ΣΦΑΛΜΑ: Λάθος format() αλφαριθμητικό",
         en_AU = "BUG: Invalid format() string",
@@ -1148,6 +1154,7 @@ MojoSetup.localization = {
         af = "Kewer: stage het 'n verkeerde tipe terug gevoer",
         ar = "بقة: المرحلة انهت بنوع خاطئ",
         cs = "CHYBA: instalační krok vrátil chybný datový typ",
+        da = "Programfeij: nivå returnerte feil type",
         de = "FEHLER: Abschnitt gab falschen Typ zurück",
         el = "ΣΦΑΛΜΑ: η φάση εγκατάστασης επέστρεψε λάθος τύπο δεδομένων",
         en_AU = "BUG: stage returned wrong type",
@@ -1182,6 +1189,7 @@ MojoSetup.localization = {
         af = "Kewer: Fase het 'n verkeerde waarde terug gevoer",
         ar = "بقة: المرحلة انهت بقيمة خاطئة",
         cs = "CHYBA: instalační krok vrátil chybnou hodnotu",
+        da = "Programfejl: nivå returnerte feil verdi",
         de = "FEHLER: Abschnitt gab falschen Wert zurück",
         el = "ΣΦΑΛΜΑ: η φάση εγκατάστασης επέστρεψε λάθος τιμή",
         en_AU = "BUG: stage returned wrong value",
@@ -1216,6 +1224,7 @@ MojoSetup.localization = {
         af = "Kewer: terug gestap verby die begin van die fases",
         ar = "بقة: عودة للوراء في اول خطوة",
         cs = "CHYBA: pokus o krok zpět před začátek instalace",
+        da = "Programfejl: Gikk tilbake forbi startnivå",
         de = "FEHLER: Über den Startabschnitt hinaus zurückgegangen",
         el = "ΣΦΑΛΜΑ: ζητήθηκε η επιστροφή σε προηγούμενη φάση που δεν υπάρχει",
         en_AU = "BUG: stepped back over start of stages",
@@ -1232,7 +1241,7 @@ MojoSetup.localization = {
         nn = "Programfeil: Gjekk tilbake forbi startnivå",
         pl = "BŁĄD: Krok wstecz podczas początkowej fazy",
         pt = "BUG: Retrocedeu na primeira etapa",
-        pt_BR = "BUG: voltar na primeira etapa",
+        pt_BR = "BUG: voltou na primeira etapa",
         ro = "EROARE: s-a făcut întoarcere înainte de începerea stadiilor",
         ru = "БАГ: переход назад с начального этапа",
         sk = "CHYBA: vrátili ste sa pred začiatok počiatočnej fázy",
@@ -1248,6 +1257,7 @@ MojoSetup.localization = {
         af = "BUG: Ongehanteerde data tipe",
         ar = "بقة: نوع بيانات لا يمكن التعامل معه",
         cs = "CHYBA: Datový typ není obsluhován",
+        da = "Programfejl: Uhåndtert datatype",
         de = "FEHLER: Unbehandelter Datentyp",
         el = "ΣΦΑΛΜΑ: Άγνωστος τύπος δεδομένων",
         en_AU = "BUG: Unhandled data type",
@@ -1282,6 +1292,7 @@ MojoSetup.localization = {
         af = "Kewer: Kan nie tar toevoere dupliseer nie",
         ar = "بقة: لا يمكن تكرار مدخلات tar",
         cs = "CHYBA: Nemohu zduplikovat vstupy z taru",
+        da = "Programfejl: Kan ikke duplisere innfiler for tar",
         de = "FEHLER: Tar-Eingaben können nicht dupliziert werden",
         el = "ΣΦΑΛΜΑ: Δεν είναι δυναταή αντιγραφή των δεδομένων εισόδου του \"tar\"",
         en_AU = "BUG: Can't duplicate tar inputs",
@@ -1316,6 +1327,7 @@ MojoSetup.localization = {
         af = "Kewer: Onverwagte waarde",
         ar = "بقة: قيمة غير متوقعة",
         cs = "CHYBA: Neočekávaná hodnota",
+        da = "Programfejl: Uventet verdi",
         de = "FEHLER: Unerwarteter Wert",
         el = "ΣΦΑΛΜΑ: Μη αναμενόμενη τιμή",
         en_AU = "BUG: Unexpected value",
@@ -1371,7 +1383,7 @@ MojoSetup.localization = {
         nds = "FEHLER: Konfiguration %0 %1",
         nl = "BUG: configuratie %0 %1",
         nn = "Programfeil: Konfigurasjon %0 %1",
-        pl = "BŁĄD: Konfiguracja %0 $1",
+        pl = "BŁĄD: Konfiguracja %0 %1",
         pt = "BUG: Configuração %0 %1",
         pt_BR = "BUG: Configuração %0 %1",
         ro = "EROARE: Configuraţie %0 %1",
@@ -1388,14 +1400,19 @@ MojoSetup.localization = {
         cs = "není platným řetězcem",
         de = "ungültige Zeichenkette",
         en_AU = "invalid string",
+        en_CA = "invalid string",
         en_GB = "invalid string",
         es = "cadena de texto inválida",
         fr = "chaîne invalide",
         he = "מחרוזת לא תקינה",
+        hu = "helytelen karakterlánc",
         it = "Stringa non valida",
+        nb = "ugyldig streng",
         nds = "ungültige Zeichenkette",
         nl = "foute string",
+        pl = "Nieprawidłowy ciąg znaków",
         pt = "expressão inválida",
+        pt_BR = "texto inválido",
         ro = "şir de caractere invalid",
         sk = "neplatný reťazec",
         sv = "Felaktig sträng",
@@ -1594,7 +1611,7 @@ MojoSetup.localization = {
         nds = "URL hat keinen Host",
         nl = "URL heeft geen host",
         nn = "URL har ikke vert",
-        pl = "URL nie ma hosta",
+        pl = "Ten URL nie posiada hosta",
         pt = "O URL não contém o servidor",
         pt_BR = "Não existe host na URL",
         ro = "calea URL nu are gazdă",
@@ -1661,7 +1678,7 @@ MojoSetup.localization = {
         nds = "URL Protokoll wird nicht unterstützt",
         nl = "protocol van URL wordt niet ondersteund",
         nn = "URL-protokollen er ikkje støtta",
-        pl = "protokół URL nie obsługiwany",
+        pl = "protokół URL nie jest obsługiwany",
         pt = "O protocolo do URL não é suportado",
         pt_BR = "O protocolo da URL não é suportado",
         ro = "protocolul URL nu este suportat",
@@ -2048,7 +2065,7 @@ MojoSetup.localization = {
         nds = "Installation abbrechen",
         nl = "Installatie afbreken?",
         nn = "Avbryt installasjonen",
-        pl = "Anuluj Instalację",
+        pl = "Anuluj instalację",
         pt = "Cancelar instalação",
         pt_BR = "Cancelar instalação",
         ro = "Anulează instalarea",
@@ -2083,7 +2100,7 @@ MojoSetup.localization = {
         nds = "Konnte Archiv nicht enumerieren",
         nl = "Kan het archief niet weergeven",
         nn = "Kunne ikkje lista filer i arkivet",
-        pl = "nie można przetworzyć archiwum",
+        pl = "Nie można przetworzyć archiwum",
         pt = "Foi impossível enumerar o arquivo",
         pt_BR = "Não é possível enumerar o arquivo",
         ro = "Nu se poate citi arhiva",
@@ -2155,9 +2172,9 @@ MojoSetup.localization = {
         nds = "Wählen Sie das Installationsverzeichnis durch Drücken einer Nummer (enter für #1), oder geben Sie selber einen ein.",
         nl = "Kies installatiemap met het bijbehorende nummer, of voer u eigen keuze in.",
         nn = "Vel installasjonssti etter tal (trykk enter for #1), eller skriv inn din eigen.",
-        pl = "Wybierz miejsce instalacji wybierając numer (naciśnij enter dla #1), lub wpisz własną.",
+        pl = "Wybierz miejsce instalacji wybierając numer (naciśnij enter dla #1), lub wpisz własną ścieżkę.",
         pt = "Escolha o destino da instalação pelo seu número (pressione enter para o primeiro destino), ou introduza um outro destino.",
-        pt_BR = "Escolha um destino de instalação pelo número (pressione enter para 1), ou informe o seu própio.",
+        pt_BR = "Escolha um destino de instalação pelo número (pressione enter para 1), ou informe o seu próprio.",
         ro = "Alege destinaţia de instalare printr-un număr (apasă enter pentru 1), sau introdu-o pe cea dorită.",
         ru = "Выберите путь установки (нажмите Enter для номера 1), или введите свой.",
         sk = "Vyberte cieľ inštalácie pomocou čísla zo zoznamu (stlačte enter pre prvú možnosť), alebo zadajte svoju vlastnú možnosť.",
@@ -2264,9 +2281,9 @@ MojoSetup.localization = {
         nds = "Datei konnte für die Wiederherstellung nicht gesichert werden",
         nl = "Kon bestand niet backupen om de installatie terug te kunnen draaien",
         nn = "Kunne ikkje sikkerhetskopiera fil for tilbakerulling",
-        pl = "Nie można zaarchiwizować pliku do odtworzenia",
+        pl = "Nie można zarchiwizować pliku do odtworzenia",
         pt = "Foi impossível salvaguardar o ficheiro para refazer as acções",
-        pt_BR = "Não foi possível criar um backup ou restaurar o arquivo",
+        pt_BR = "Não foi possível criar um backup do arquivo para restauração",
         ro = "Nu s-a putut salva fişierul pentru opţiunea de revenire",
         ru = "Не могу сохранить копию файла для восстановления",
         sk = "Nemôžem zálohovať súbor pre obnovu",
@@ -2405,9 +2422,9 @@ MojoSetup.localization = {
         nds = "Ordner:",
         nl = "Map:",
         nn = "Mappe:",
-        pl = "Folder:",
+        pl = "Katalog:",
         pt = "Directorio",
-        pt_BR = "Diretório:",
+        pt_BR = "Pasta:",
         ro = "Dosar:",
         ru = "Папка:",
         sk = "Adresár:",
@@ -2440,7 +2457,7 @@ MojoSetup.localization = {
         nds = "Ziel",
         nl = "Bestemming",
         nn = "Mål",
-        pl = "Miejsce docelowe",
+        pl = "Cel",
         pt = "Destino",
         pt_BR = "Destino",
         ro = "Destinaţie",
@@ -2580,7 +2597,7 @@ MojoSetup.localization = {
         nds = "Fataler Fehler",
         nl = "Fatale fout",
         nn = "Kritisk feil",
-        pl = "Poważny błąd",
+        pl = "Błąd krytyczny",
         pt = "Erro fatal",
         pt_BR = "Erro fatal",
         ro = "Eroare terminală",
@@ -3178,7 +3195,7 @@ MojoSetup.localization = {
         nn = "Mediaendring",
         pl = "Zmiana nośnika",
         pt = "Mudança de media",
-        pt_BR = "Mídia alterada",
+        pt_BR = "Mudança de mídia",
         ro = "Schimbare mediu stocare",
         ru = "Смена диска",
         sk = "Výmena média",
@@ -3428,7 +3445,7 @@ MojoSetup.localization = {
         nn = "Ingenting å gjera!",
         pl = "Nic do zrobienia!",
         pt = "Nada por fazer!",
-        pt_BR = "Nada para fazer!",
+        pt_BR = "Nada a fazer!",
         ro = "Nu este nimic de făcut!",
         ru = "Нечего делать!",
         sk = "Nemám čo robiť",
@@ -3569,7 +3586,7 @@ MojoSetup.localization = {
         nds = "Enter drücken, um fortzufahren.",
         nl = "Toets enter om door te gaan.",
         nn = "Trykk Enter for å halda fram.",
-        pl = "Proszę nacisnąć enter, aby kontynuować.",
+        pl = "Naciśnij enter, aby kontynuować.",
         pt = "Pressione enter para continuar.",
         pt_BR = "Pressione enter para continuar.",
         ro = "Apăsaţi Enter pentru a continua.",
@@ -3676,7 +3693,7 @@ MojoSetup.localization = {
         nn = "Du kan stenga denne nettlesaren no.",
         pl = "Możesz zamknąć już przeglądarkę.",
         pt = "Já pode fechar este browser.",
-        pt_BR = "Você não pode fechar esse navegador agora.",
+        pt_BR = "Você pode fechar esse navegador agora.",
         ro = "Se poate închide navigatorul web acum.",
         ru = "Можете закрыть браузер.",
         sk = "Tento prehliadač môžete zavrieť.",
@@ -3928,7 +3945,7 @@ MojoSetup.localization = {
         nl = "Metadata",
         nn = "Metadata",
         pl = "Metadane",
-        pt = "Meta-Informação",
+        pt = "Metadados",
         pt_BR = "Metadado",
         ro = "Metadata",
         ru = "Метаданные",
@@ -3962,7 +3979,7 @@ MojoSetup.localization = {
         nl = "Ongeldige opdrachtregel",
         nn = "Ugyldig kommandolinje",
         pl = "Niepoprawny parametr",
-        pt = "Argumento da linha de comandos inválido",
+        pt = "Linha de comando inválida",
         pt_BR = "Linha de comando inválida",
         ro = "Linie de comandă invalidă",
         ru = "Неверная командная строка",
@@ -3997,7 +4014,7 @@ MojoSetup.localization = {
         nds = "Konnte Manifest für '%0' nicht laden.",
         nl = "Kan manifest bestand for '%0' niet laden",
         nn = "Kunne ikkje lasta manifestfil for '%0'",
-        pl = "Nie można załadować manifestu dla pliku '%0'",
+        pl = "Nie można załadować pliku manifest dla '%0'",
         pt = "Foi impossível carregar o ficheiro de manifesto para '%0'",
         pt_BR = "Não é possível carregar o arquivo manifest de '%0'",
         ro = "Nu s-a putut încărca lista de fişiere de instalat pentru '%0'",
@@ -4179,7 +4196,7 @@ MojoSetup.localization = {
         nn = "Avinstallasjonen er ferdig",
         pl = "Odinstalowanie zakończone",
         pt = "A desinstalação foi bem sucedida",
-        pt_BR = "Desinstalação completada",
+        pt_BR = "Desinstalação completa",
         ro = "Dezinstalare completă",
         ru = "Удаление завершено",
         sk = "Odinštalácia dokončená",
@@ -4350,6 +4367,7 @@ MojoSetup.localization = {
         cs = "Prosím, zadejte klíč produktu",
         de = "Bitte geben Sie Ihren Produktschlüssel ein",
         en_AU = "Please enter your product key",
+        en_CA = "Please enter your product key",
         en_GB = "Please enter your product key",
         es = "Por favor, introduzca su código de producto",
         fr = "Veuillez entrer la clé du produit",
@@ -4359,7 +4377,9 @@ MojoSetup.localization = {
         nb = "Skriv inn din produkt nøkkel",
         nds = "Bitte geben Sie den Produktschlüssel ein",
         nl = "Voer uw productsleutel in",
+        pl = "Wprowadź klucz produktu",
         pt = "Entre com a chave do produto",
+        pt_BR = "Entre a sua chave do produto",
         ro = "Introduceţi cheia produsului",
         sk = "Prosím vložte váš klúč produktu",
         sv = "Skriv in din produktnyckel",
@@ -4376,14 +4396,18 @@ MojoSetup.localization = {
         cs = "(stiskněte enter pro použití hodnoty '%0')",
         de = "(drücken Sie Enter, um '%0' zu verwenden)",
         en_AU = "just press enter to use '%0'",
+        en_CA = "(just press enter to use '%0')",
         en_GB = "(just press enter to use '%0')",
         es = "(simplemente presione enter para usar '%0')",
         fr = "(faites \"entrée\" pour effectuer les opérations suivantes: '%0')",
         he = "(רק הקש על Enter בכדי להשתמש ב־'%0')",
+        hu = "(üss entert a '%0' használatához)",
         it = "Premere invio per utilizzare '%0'",
         nb = "(trykk enter for å bruke '%0')",
         nl = "(druk op enter om '%0' te kiezen)",
+        pl = "(po prostu naciśnij ENTER aby użyć '%0')",
         pt = "(pressione enter para usar '%0')",
+        pt_BR = "(pressione enter para usar '%0')",
         ro = "(apăsaţi enter pentru a folosi '%0')",
         sk = "(stlačte enter pre '%0')",
         sv = "(tryck enter för att använda '%0')",
@@ -4398,6 +4422,7 @@ MojoSetup.localization = {
         cs = "Neplatný klíč produktu",
         de = "Ungültiger Produktschlüssel",
         en_AU = "Invalid product key",
+        en_CA = "Invalid product key",
         en_GB = "Invalid product key",
         es = "Código de producto inválido",
         fr = "La clé du produit est invalide",
@@ -4407,7 +4432,9 @@ MojoSetup.localization = {
         nb = "Ugyldig produkt nøkkel",
         nds = "Ungültiger Produktschlüssel",
         nl = "Foute productsleutel",
+        pl = "Klucz produktu jest błędny",
         pt = "Chave do produto inválida",
+        pt_BR = "Chave do produto inválida",
         ro = "Cheia produsului nu este valida",
         sk = "Neplatný kľúč produktu",
         sv = "Felaktig produktnyckel",
@@ -4422,15 +4449,19 @@ MojoSetup.localization = {
         cs = "Zadaný klíč nevypadá platně. Zkuste jej prosím zadat znovu.",
         de = "Dieser Produktschlüssel scheint ungültig zu sein. Versuchen Sie es bitte noch einmal.",
         en_AU = "That key appears to be invalid. Please try again.",
+        en_CA = "That key appears to be invalid. Please try again.",
         en_GB = "That key appears to be invalid. Please try again.",
         es = "El código parece inválido. Por favor, inténtelo de nuevo",
         fr = "La clé du produit est invalide, veuillez la ressaisir",
         he = "מפתח זה ככל הנראה שגוי, אנא נסה שוב.",
+        hu = "A megadott kulcs helytelen. Kérlek próbáld újra.",
         it = "La CD key non sembra valida. Sei pregato di riprovare.",
         nb = "Produkt nøkkelen ser ut til å være ugylidig. Prøv igjen.",
-        nds = "Dieser Schlüssel ist ungültig. Bitte versuchen Sie es nochmals.",
+        nds = "Dieser Schlüssel ist ungültig. Bitte versuchen Sie es erneut.",
         nl = "Deze produktsleutel lijkt niet te kloppen. Probeer a.u.b. opnieuw.",
+        pl = "Ten klucz produktu prawdopodobnie jest błędny. Spróbuj jeszcze raz.",
         pt = "Esta chave do produto parece ser inválida. Por favor tente novamente.",
+        pt_BR = "Esta chave parece inválida. Tente novamente.",
         ro = "Acea cheie nu este validă. Vă rugăm încercaţi iarăşi.",
         sk = "Kľúč produktu je neplatný, prosím zadajte nový.",
         sv = "Denna produktnyckel verkar felaktig. Försök gärna igen.",
@@ -4445,6 +4476,7 @@ MojoSetup.localization = {
         cs = "Okno",
         de = "Fenster",
         en_AU = "Window",
+        en_CA = "Window",
         en_GB = "Window",
         es = "Ventana",
         fr = "Fenêtre",
@@ -4452,8 +4484,11 @@ MojoSetup.localization = {
         hu = "Ablak",
         it = "Finestra",
         nb = "Vindu",
+        nds = "Fenster",
         nl = "Venster",
+        pl = "Okno",
         pt = "Janela",
+        pt_BR = "Janela",
         ro = "Fereastră",
         sv = "Fönster",
         tr = "Pencere",
@@ -4468,14 +4503,21 @@ MojoSetup.localization = {
         cs = "O %0",
         de = "Über %0",
         en_AU = "About %0",
+        en_CA = "About %0",
         en_GB = "About %0",
         es = "Acerca de %0",
         fr = "À propos de %0",
         he = "אודות %0",
+        hu = "%0 névjegye",
         it = "Informazioni su %0",
+        nb = "Om %0",
+        nds = "Über %0",
         nl = "Over %0",
+        pl = "Informacje o %0",
         pt = "Sobre o %0",
+        pt_BR = "Sobre %0",
         ro = "Despre %0",
+        ru = "О %0",
         sv = "Om %0",
         tr = "%0 Hakkında",
         zh_TW = "關於 %0"
@@ -4489,15 +4531,20 @@ MojoSetup.localization = {
         cs = "Skrýt %0",
         de = "Blende %0 aus",
         en_AU = "Hide %0",
+        en_CA = "Hide %0",
         en_GB = "Hide %0",
         es = "Ocultar %0",
         fr = "Masquer %0",
         he = "הסתרת %0",
+        hu = "%0 elrejtése",
         it = "Nascondi %0",
         nb = "Gjem %0",
         nl = "Verberg %0",
+        pl = "Ukryj %0",
         pt = "Esconder %0",
+        pt_BR = "Esconder %0",
         ro = "Ascunde %0",
+        ru = "Скрыть %0",
         sv = "Dölj %0",
         tr = "%0 Gizlensin",
         zh_TW = "隱藏 %0"
@@ -4510,14 +4557,18 @@ MojoSetup.localization = {
         cs = "Skrýt ostatní",
         de = "Andere ausblenden",
         en_AU = "Hide Others",
+        en_CA = "Hide Others",
         en_GB = "Hide Others",
         es = "Ocultar Otros",
         fr = "Masquer les autres",
         he = "הסתרת אחרים",
+        hu = "A többi elrejtése",
         it = "Nascondi le altre",
         nb = "Skjul andre",
         nl = "Verberg Anderen",
+        pl = "Ukryj inne okna",
         pt = "Ocultar os Outros",
+        pt_BR = "Esconder os outros",
         ro = "Ascunde-le pe celelalte",
         sv = "Dölj övriga",
         tr = "Diğerlerini Gizle",
@@ -4532,6 +4583,7 @@ MojoSetup.localization = {
         cs = "Ukončit %0",
         de = "Beende %0",
         en_AU = "Quit %0",
+        en_CA = "Quit %0",
         en_GB = "Quit %0",
         es = "Cerrar %0",
         fr = "Quitter %0",
@@ -4539,9 +4591,13 @@ MojoSetup.localization = {
         hu = "Kilépés %0",
         it = "Esci da %0",
         nb = "Avslutt %0",
+        nds = "Beende %0",
         nl = "Sluit %0",
+        pl = "Wyjdź z %0",
         pt = "Sair do %0",
+        pt_BR = "Sair do %0",
         ro = "Ieşire %0",
+        ru = "Выйти из %0",
         sv = "Avsluta %0",
         tr = "%0 Çıkış",
         zh_TW = "結束 %0"
@@ -4554,14 +4610,19 @@ MojoSetup.localization = {
         cs = "Zobrazit vše",
         de = "Alle einblenden",
         en_AU = "Show All",
+        en_CA = "Show All",
         en_GB = "Show All",
         es = "Mostrar Todos",
         fr = "Afficher tout",
         he = "הצג הכל",
+        hu = "Összes megjelenítése",
         it = "Mostra Tutto",
         nb = "Vis alle",
+        nds = "Zeige alle",
         nl = "Alles weergeven",
+        pl = "Pokaż ukryte okna",
         pt = "Mostrar Todos",
+        pt_BR = "Mostrar tudo",
         ro = "Arată tot",
         sv = "Visa alla",
         tr = "Hepsini Göster",
@@ -4577,6 +4638,7 @@ MojoSetup.localization = {
         cs = "Služby",
         de = "Dienste",
         en_AU = "Services",
+        en_CA = "Services",
         en_GB = "Services",
         es = "Servicios",
         fr = "Services",
@@ -4584,8 +4646,11 @@ MojoSetup.localization = {
         hu = "Szolgáltatások",
         it = "Servizi",
         nb = "Tjenester",
+        nds = "Dienste",
         nl = "Voorzieningen",
+        pl = "Usługi",
         pt = "Serviços",
+        pt_BR = "Serviços",
         ro = "Servicii",
         sv = "Tjänster",
         tr = "Hizmetler",
@@ -4599,6 +4664,7 @@ MojoSetup.localization = {
         cs = "Minimalizovat",
         de = "Minimieren",
         en_AU = "Minimize",
+        en_CA = "Minimize",
         en_GB = "Minimise",
         es = "Minimizar",
         fr = "Minimiser",
@@ -4606,8 +4672,11 @@ MojoSetup.localization = {
         hu = "Minimalizálás",
         it = "Riduci a icona",
         nb = "Minimer",
+        nds = "Minimieren",
         nl = "Minimaliseren",
+        pl = "Minimalizuj",
         pt = "Minimizar",
+        pt_BR = "Minimizar",
         ro = "Minimizează",
         sv = "Minimera",
         tr = "Küçült",
@@ -4621,6 +4690,7 @@ MojoSetup.localization = {
         cs = "Maximalizovat",
         de = "Vergrößern",
         en_AU = "Zoom",
+        en_CA = "Zoom",
         en_GB = "Zoom",
         es = "Zoom",
         fr = "Zoom",
@@ -4628,8 +4698,11 @@ MojoSetup.localization = {
         hu = "Nagyítás",
         it = "Massimizza",
         nb = "Forstørr",
+        nds = "Zoomen",
         nl = "Vergroten",
+        pl = "Maksymalizuj",
         pt = "Ampliar",
+        pt_BR = "Aumentar",
         ro = "Mărire",
         sv = "Maximera",
         tr = "Büyüt",
@@ -4643,15 +4716,21 @@ MojoSetup.localization = {
         cs = "Přenést vše do popředí",
         de = "Alle in den Vordergrund",
         en_AU = "Bring All to Front",
+        en_CA = "Bring All to Front",
         en_GB = "Bring All to Front",
         es = "Traer Todo al Frente",
         fr = "Tout ramener au premier plan",
         he = "קדם הכל לחזית",
+        hu = "Mindent felülre",
         it = "Porta tutto in primo piano",
         nb = "Flytt Alt Fram",
+        nds = "Alles nach vorne bringen",
         nl = "Alles op Voorgrond",
+        pl = "Przenieś okna na wierzch",
         pt = "Trazer Todos Para a Frente",
+        pt_BR = "Trazer tudo para a frente",
         ro = "Afişează toate în primplan",
+        sv = "Ta fram alla",
         tr = "Hepsini Öne Getir",
         zh_TW = "將所有視窗移至最上層"
     };
diff --git a/mk/linux/mojosetup/scripts/mojosetup_init.lua b/mk/linux/mojosetup/scripts/mojosetup_init.lua
index 4454a02c..94ec09b7 100644
--- a/mk/linux/mojosetup/scripts/mojosetup_init.lua
+++ b/mk/linux/mojosetup/scripts/mojosetup_init.lua
@@ -299,6 +299,7 @@ function Setup.Package(tab)
         { "description", nil, mustExist, mustBeString, cantBeEmpty },
         { "version", nil, mustExist, mustBeString, cantBeEmpty },
         { "destination", nil, mustBeString, cantBeEmpty },
+        { "dataprefix", "data/", mustBeString},
         { "recommended_destinations", nil, mustBeStringOrTableOfStrings },
         { "precheck", nil, mustBeFunction },
         { "preflight", nil, mustBeFunction },
@@ -316,7 +317,9 @@ function Setup.Package(tab)
         { "write_manifest", true, mustBeBool },
         { "support_uninstall", true, mustBeBool },
         { "preuninstall", nil, mustBeFunction },
-        { "postuninstall", nil, mustBeFunction }
+        { "postuninstall", nil, mustBeFunction },
+        { "postexec", nil, mustBeString},
+        { "delete_error_is_fatal", true, mustBeBool}
     })
 
     if MojoSetup.installs == nil then
@@ -378,6 +381,7 @@ function Setup.Eula(tab)
     {
         { "description", nil, mustExist, mustBeString, cantBeEmpty },
         { "source", nil, mustExist, mustBeString, cantBeEmpty },
+        { "accept_not_needed", nil, mustBeBool },
     })
 end
 
diff --git a/mk/linux/mojosetup/scripts/mojosetup_mainline.lua b/mk/linux/mojosetup/scripts/mojosetup_mainline.lua
index 28712180..6247b0a9 100644
--- a/mk/linux/mojosetup/scripts/mojosetup_mainline.lua
+++ b/mk/linux/mojosetup/scripts/mojosetup_mainline.lua
@@ -155,6 +155,8 @@ local function do_delete(fname)
             retval = true
         elseif not MojoSetup.platform.exists(fname) then
             retval = true
+        else
+            MojoSetup.logerror("Deleting '" .. fname .. "'" .. " failed!")
         end
     end
     return retval
@@ -602,7 +604,7 @@ local function install_archive_entry(archive, ent, file, option)
 end
 
 
-local function install_archive(archive, file, option)
+local function install_archive(archive, file, option, dataprefix)
     if not MojoSetup.archive.enumerate(archive) then
         MojoSetup.fatal(_("Couldn't enumerate archive"))
     end
@@ -635,9 +637,9 @@ local function install_archive(archive, file, option)
     while ent ~= nil do
         -- If inside GBaseArchive (no URL lead in string), then we
         --  want to clip to data/ directory...
-        if isbase then
+        if isbase and (string.len(dataprefix) > 0) then
             local count
-            ent.filename, count = string.gsub(ent.filename, "^data/", "", 1)
+            ent.filename, count = string.gsub(ent.filename, "^" .. dataprefix, "", 1)
             if count == 0 then
                 ent.filename = nil
             end
@@ -671,7 +673,7 @@ local function install_archive(archive, file, option)
 end
 
 
-local function install_basepath(basepath, file, option)
+local function install_basepath(basepath, file, option, dataprefix)
     -- Obviously, we don't want to enumerate the entire physical filesystem,
     --  so we'll dig through each path element with MojoPlatform_exists()
     --  until we find one that doesn't, then we'll back up and try to open
@@ -693,7 +695,7 @@ local function install_basepath(basepath, file, option)
     --  case, but it won't work for archives-in-archives.
     if MojoSetup.platform.exists(basepath) then
         local archive = create_basepath_archive(basepath)
-        install_archive(archive, file, option)
+        install_archive(archive, file, option, dataprefix)
         MojoSetup.archive.close(archive)
     else
         -- Check for archives-in-archives...
@@ -710,14 +712,14 @@ local function install_basepath(basepath, file, option)
                 local arclist = { archive }
                 path = rebuild_path(paths, i)
                 local arc = drill_for_archive(archive, path, arclist)
-                install_archive(arc, file, option)
+                install_archive(arc, file, option, dataprefix)
                 close_archive_list(arclist)
                 return  -- we're done here
             end
         end
 
         -- wait, the whole thing exists now? Did this just move in?
-        install_basepath(basepath, file, option)  -- try again, I guess...
+        install_basepath(basepath, file, option, dataprefix)  -- try again, I guess...
     end
 end
 
@@ -1324,14 +1326,17 @@ local function do_install(install)
     if (install.eulas ~= nil) and (not skipeulas) then
         for k,eula in pairs(install.eulas) do
             local desc = eula.description
-            local fname = "data/" .. eula.source
+            local fname = install.dataprefix .. eula.source
+            local accept_needed = not eula.accept_not_needed
 
             -- (desc) and (fname) become upvalues in this function.
             stages[#stages+1] = function (thisstage, maxstage)
                 local retval = MojoSetup.gui.readme(desc,fname,thisstage,maxstage)
                 if retval == 1 then
-                    if not MojoSetup.promptyn(desc, _("Accept this license?"), false) then
-                        MojoSetup.fatal(_("You must accept the license before you may install"))
+                    if accept_needed then
+                        if not MojoSetup.promptyn(desc, _("Accept this license?"), false) then
+                            MojoSetup.fatal(_("You must accept the license before you may install"))
+                        end
                     end
                 end
                 return retval
@@ -1359,7 +1364,7 @@ local function do_install(install)
         for k,readme in pairs(install.readmes) do
             local desc = readme.description
             -- !!! FIXME: pull from archive?
-            local fname = "data/" .. readme.source
+            local fname = install.dataprefix .. readme.source
             -- (desc) and (fname) become upvalues in this function.
             stages[#stages+1] = function(thisstage, maxstage)
                 return MojoSetup.gui.readme(desc, fname, thisstage, maxstage)
@@ -1460,15 +1465,18 @@ local function do_install(install)
 
             for k,eula in pairs(option_eulas) do
                 local desc = eula.description
-                local fname = "data/" .. eula.source
+                local fname = install.dataprefix .. eula.source
+                local accept_needed = not eula.accept_not_needed
                 local retval = MojoSetup.gui.readme(desc,fname,thisstage,maxstage)
                 if retval == 1 then
-                    if not MojoSetup.promptyn(desc, _("Accept this license?"), false) then
-                        -- can't go back? We have to die here instead.
-                        if thisstage == 1 then
-                            MojoSetup.fatal(_("You must accept the license before you may install"))
-                        else
-                            retval = -1  -- just step back a stage.
+                    if accept_needed then
+                        if not MojoSetup.promptyn(desc, _("Accept this license?"), false) then
+                            -- can't go back? We have to die here instead.
+                            if thisstage == 1 then
+                                MojoSetup.fatal(_("You must accept the license before you may install"))
+                            else
+                                retval = -1  -- just step back a stage.
+                            end
                         end
                     end
                 end
@@ -1720,7 +1728,7 @@ local function do_install(install)
                 local files = MojoSetup.files.media[mediaid]
                 for file,option in pairs(files) do
                     local prot,host,path = MojoSetup.spliturl(file.source)
-                    install_basepath(basepath .. "/" .. path, file, option)
+                    install_basepath(basepath .. "/" .. path, file, option, install.dataprefix)
                 end
             end
             medialist = nil   -- done with this.
@@ -1731,7 +1739,7 @@ local function do_install(install)
             for file,option in pairs(MojoSetup.files.downloads) do
                 local f = MojoSetup.downloaddir .. "/" .. id
                 id = id + 1
-                install_basepath(f, file, option)
+                install_basepath(f, file, option, install.dataprefix)
             end
         end
 
@@ -1739,12 +1747,12 @@ local function do_install(install)
             for file,option in pairs(MojoSetup.files.included) do
                 local arc = MojoSetup.archive.base
                 if file.source == nil then
-                    install_archive(arc, file, option)
+                    install_archive(arc, file, option, install.dataprefix)
                 else
                     local prot,host,path = MojoSetup.spliturl(file.source)
                     local arclist = {}
-                    arc = drill_for_archive(arc, "data/" .. path, arclist)
-                    install_archive(arc, file, option)
+                    arc = drill_for_archive(arc, install.dataprefix .. path, arclist)
+                    install_archive(arc, file, option, install.dataprefix)
                     close_archive_list(arclist)
                 end
             end
@@ -1830,7 +1838,6 @@ local function do_install(install)
     -- Done with these things. Make them eligible for garbage collection.
     stages = nil
     MojoSetup.manifest = nil
-    MojoSetup.destination = nil
     MojoSetup.manifestdir = nil
     MojoSetup.metadatadir = nil
     MojoSetup.controldir = nil
@@ -1871,6 +1878,7 @@ end
 
 
 local function installer()
+    local postexec = nil
     MojoSetup.loginfo("Installer starting")
 
     MojoSetup.revertinstall = real_revertinstall   -- replace the stub.
@@ -1884,6 +1892,11 @@ local function installer()
         if not install.disabled then
             saw_an_installer = true
             do_install(install)
+
+            if (install.postexec ~= nil) then
+                postexec = string.gsub(install.postexec, "$DESTINATION", MojoSetup.destination)
+            end
+
             MojoSetup.collectgarbage()  -- nuke all the tables we threw around...
         end
     end
@@ -1891,6 +1904,12 @@ local function installer()
     if not saw_an_installer then
         MojoSetup.fatal(_("Nothing to do!"))
     end
+
+    if postexec ~= nil then
+        MojoSetup.platform.exec(postexec)
+    end
+
+    MojoSetup.destination = nil
 end
 
 
@@ -2042,7 +2061,7 @@ local function uninstaller()
         end
 
         local filelist = flatten_manifest(package.manifest, prepend_dest_dir)
-        delete_files(filelist, callback, true)
+        delete_files(filelist, callback, package.delete_error_is_fatal)
         run_config_defined_hook(package.postuninstall, package)
         MojoSetup.gui.final(_("Uninstall complete"))
         stop_gui()
diff --git a/mk/linux/mojosetup/zlib/crc32.c b/mk/linux/mojosetup/zlib/crc32.c
index 1acc7ed8..91be372d 100644
--- a/mk/linux/mojosetup/zlib/crc32.c
+++ b/mk/linux/mojosetup/zlib/crc32.c
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006 Mark Adler
+ * Copyright (C) 1995-2006, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -221,7 +221,7 @@ const unsigned long FAR * ZEXPORT get_crc_table()
 unsigned long ZEXPORT crc32(crc, buf, len)
     unsigned long crc;
     const unsigned char FAR *buf;
-    unsigned len;
+    uInt len;
 {
     if (buf == Z_NULL) return 0UL;
 
diff --git a/mk/linux/mojosetup/zlib/deflate.c b/mk/linux/mojosetup/zlib/deflate.c
index fcd698cc..5c4022f3 100644
--- a/mk/linux/mojosetup/zlib/deflate.c
+++ b/mk/linux/mojosetup/zlib/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.4 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
diff --git a/mk/linux/mojosetup/zlib/deflate.h b/mk/linux/mojosetup/zlib/deflate.h
index f53deba8..cbf0d1ea 100644
--- a/mk/linux/mojosetup/zlib/deflate.h
+++ b/mk/linux/mojosetup/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2009 Jean-loup Gailly
+ * Copyright (C) 1995-2010 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -290,13 +290,13 @@ typedef struct internal_state {
    memory checker errors from longest match routines */
 
         /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int last));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int last));
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -309,11 +309,11 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
 #else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
 # define _tr_tally_lit(s, c, flush) \
diff --git a/mk/linux/mojosetup/zlib/inffast.c b/mk/linux/mojosetup/zlib/inffast.c
index 0a0761f3..2f1d60b4 100644
--- a/mk/linux/mojosetup/zlib/inffast.c
+++ b/mk/linux/mojosetup/zlib/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008 Mark Adler
+ * Copyright (C) 1995-2008, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -64,7 +64,7 @@
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
  */
-void inflate_fast(strm, start)
+void ZLIB_INTERNAL inflate_fast(strm, start)
 z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {
diff --git a/mk/linux/mojosetup/zlib/inffast.h b/mk/linux/mojosetup/zlib/inffast.h
index 1e88d2d9..e5c1aa4c 100644
--- a/mk/linux/mojosetup/zlib/inffast.h
+++ b/mk/linux/mojosetup/zlib/inffast.h
@@ -1,5 +1,5 @@
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2003, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,4 +8,4 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void inflate_fast OF((z_streamp strm, unsigned start));
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/mk/linux/mojosetup/zlib/inftrees.c b/mk/linux/mojosetup/zlib/inftrees.c
index ccf7fa96..11e9c52a 100644
--- a/mk/linux/mojosetup/zlib/inftrees.c
+++ b/mk/linux/mojosetup/zlib/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.4 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,7 +29,7 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int inflate_table(type, lens, codes, table, bits, work)
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
 codetype type;
 unsigned short FAR *lens;
 unsigned codes;
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 64, 195};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/mk/linux/mojosetup/zlib/inftrees.h b/mk/linux/mojosetup/zlib/inftrees.h
index 67461da0..baa53a0b 100644
--- a/mk/linux/mojosetup/zlib/inftrees.h
+++ b/mk/linux/mojosetup/zlib/inftrees.h
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2005, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -57,6 +57,6 @@ typedef enum {
     DISTS
 } codetype;
 
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
                              unsigned codes, code FAR * FAR *table,
                              unsigned FAR *bits, unsigned short FAR *work));
diff --git a/mk/linux/mojosetup/zlib/trees.c b/mk/linux/mojosetup/zlib/trees.c
index 1a6e997a..56e9bb1c 100644
--- a/mk/linux/mojosetup/zlib/trees.c
+++ b/mk/linux/mojosetup/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2009 Jean-loup Gailly
+ * Copyright (C) 1995-2010 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -351,13 +351,14 @@ void gen_trees_header()
                 static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
     }
 
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
     for (i = 0; i < DIST_CODE_LEN; i++) {
         fprintf(header, "%2u%s", _dist_code[i],
                 SEPARATOR(i, DIST_CODE_LEN-1, 20));
     }
 
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
     for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
         fprintf(header, "%2u%s", _length_code[i],
                 SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
@@ -382,7 +383,7 @@ void gen_trees_header()
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void _tr_init(s)
+void ZLIB_INTERNAL _tr_init(s)
     deflate_state *s;
 {
     tr_static_init();
@@ -867,7 +868,7 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
 /* ===========================================================================
  * Send a stored block
  */
-void _tr_stored_block(s, buf, stored_len, last)
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
@@ -892,7 +893,7 @@ void _tr_stored_block(s, buf, stored_len, last)
  * To simplify the code, we assume the worst case of last real code encoded
  * on one bit only.
  */
-void _tr_align(s)
+void ZLIB_INTERNAL _tr_align(s)
     deflate_state *s;
 {
     send_bits(s, STATIC_TREES<<1, 3);
@@ -921,7 +922,7 @@ void _tr_align(s)
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and output the encoded block to the zip file.
  */
-void _tr_flush_block(s, buf, stored_len, last)
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
@@ -1022,7 +1023,7 @@ void _tr_flush_block(s, buf, stored_len, last)
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int _tr_tally (s, dist, lc)
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
     deflate_state *s;
     unsigned dist;  /* distance of matched string */
     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
diff --git a/mk/linux/mojosetup/zlib/trees.h b/mk/linux/mojosetup/zlib/trees.h
index 72facf90..d35639d8 100644
--- a/mk/linux/mojosetup/zlib/trees.h
+++ b/mk/linux/mojosetup/zlib/trees.h
@@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = {
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
 
-const uch _dist_code[DIST_CODE_LEN] = {
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = {
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
  0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
diff --git a/mk/linux/mojosetup/zlib/version.txt b/mk/linux/mojosetup/zlib/version.txt
index 5c5d8f26..11df0a04 100644
--- a/mk/linux/mojosetup/zlib/version.txt
+++ b/mk/linux/mojosetup/zlib/version.txt
@@ -1 +1 @@
-zlib-1.2.4
+zlib-1.2.5
diff --git a/mk/linux/mojosetup/zlib/zconf.h b/mk/linux/mojosetup/zlib/zconf.h
index 58880245..02ce56c4 100644
--- a/mk/linux/mojosetup/zlib/zconf.h
+++ b/mk/linux/mojosetup/zlib/zconf.h
@@ -315,10 +315,6 @@
 #  endif
 #endif
 
-#ifdef HAVE_VISIBILITY_PRAGMA
-#  define ZEXTERN __attribute__((visibility ("default"))) extern
-#endif
-
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif
@@ -364,8 +360,21 @@ typedef uLong FAR uLongf;
 #  define Z_HAVE_UNISTD_H
 #endif
 
-#ifdef Z_HAVE_UNISTD_H
+#ifdef STDC
 #  include <sys/types.h>    /* for off_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
 #  include <unistd.h>       /* for SEEK_* and off_t */
 #  ifdef VMS
 #    include <unixio.h>     /* for off_t */
@@ -375,19 +384,22 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
-#ifdef _LARGEFILE64_SOURCE
-#  include <sys/types.h>
-#endif
-
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
+
 #ifndef z_off_t
 #  define z_off_t long
 #endif
 
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define z_off64_t off64_t
+#else
+#  define z_off64_t z_off_t
+#endif
+
 #if defined(__OS400__)
 #  define NO_vsnprintf
 #endif
diff --git a/mk/linux/mojosetup/zlib/zlib.h b/mk/linux/mojosetup/zlib/zlib.h
index f5785be7..bfbba83e 100644
--- a/mk/linux/mojosetup/zlib/zlib.h
+++ b/mk/linux/mojosetup/zlib/zlib.h
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.4, Mar 14th, 2010
+  version 1.2.5, April 19th, 2010
 
   Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
 
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.4"
-#define ZLIB_VERNUM 0x1240
+#define ZLIB_VERSION "1.2.5"
+#define ZLIB_VERNUM 0x1250
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 4
+#define ZLIB_VER_REVISION 5
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -1556,29 +1556,35 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
         inflateBackInit_((strm), (windowBits), (window), \
                                             ZLIB_VERSION, sizeof(z_stream))
 
-#ifdef _LARGEFILE64_SOURCE
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int));
-   ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS == 64
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
 #  define gzopen gzopen64
 #  define gzseek gzseek64
 #  define gztell gztell64
 #  define gzoffset gzoffset64
 #  define adler32_combine adler32_combine64
 #  define crc32_combine crc32_combine64
-#  ifndef _LARGEFILE64_SOURCE
+#  ifdef _LARGEFILE64_SOURCE
      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN off_t ZEXPORT gzseek64 OF((gzFile, off_t, int));
-     ZEXTERN off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off_t));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #  endif
 #else
    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
@@ -1589,10 +1595,12 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 #endif
 
+/* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
+    struct internal_state {int dummy;};
 #endif
 
+/* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
diff --git a/mk/linux/mojosetup/zlib/zutil.c b/mk/linux/mojosetup/zlib/zutil.c
index 98a55a88..898ed345 100644
--- a/mk/linux/mojosetup/zlib/zutil.c
+++ b/mk/linux/mojosetup/zlib/zutil.c
@@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -117,9 +117,9 @@ uLong ZEXPORT zlibCompileFlags()
 #  ifndef verbose
 #    define verbose 0
 #  endif
-int z_verbose = verbose;
+int ZLIB_INTERNAL z_verbose = verbose;
 
-void z_error (m)
+void ZLIB_INTERNAL z_error (m)
     char *m;
 {
     fprintf(stderr, "%s\n", m);
@@ -146,7 +146,7 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
-void zmemcpy(dest, source, len)
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
     Bytef* dest;
     const Bytef* source;
     uInt  len;
@@ -157,7 +157,7 @@ void zmemcpy(dest, source, len)
     } while (--len != 0);
 }
 
-int zmemcmp(s1, s2, len)
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     const Bytef* s1;
     const Bytef* s2;
     uInt  len;
@@ -170,7 +170,7 @@ int zmemcmp(s1, s2, len)
     return 0;
 }
 
-void zmemzero(dest, len)
+void ZLIB_INTERNAL zmemzero(dest, len)
     Bytef* dest;
     uInt  len;
 {
@@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
@@ -237,7 +237,7 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void  zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
@@ -272,13 +272,13 @@ void  zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void  zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
@@ -297,7 +297,7 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
-voidpf zcalloc (opaque, items, size)
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
     voidpf opaque;
     unsigned items;
     unsigned size;
@@ -307,7 +307,7 @@ voidpf zcalloc (opaque, items, size)
                               (voidpf)calloc(items, size);
 }
 
-void  zcfree (opaque, ptr)
+void ZLIB_INTERNAL zcfree (opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {
diff --git a/mk/linux/mojosetup/zlib/zutil.h b/mk/linux/mojosetup/zlib/zutil.h
index 025035db..258fa887 100644
--- a/mk/linux/mojosetup/zlib/zutil.h
+++ b/mk/linux/mojosetup/zlib/zutil.h
@@ -13,7 +13,12 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#define ZLIB_INTERNAL
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
 #include "zlib.h"
 
 #ifdef STDC
@@ -24,19 +29,6 @@
 #  include <stdlib.h>
 #endif
 
-#if defined(UNDER_CE) && defined(NO_ERRNO_H)
-#  define zseterrno(ERR) SetLastError((DWORD)(ERR))
-#  define zerrno() ((int)GetLastError())
-#else
-#  ifdef NO_ERRNO_H
-     extern int errno;
-#  else
-#    include <errno.h>
-#  endif
-#  define zseterrno(ERR) do { errno = (ERR); } while (0)
-#  define zerrno() errno
-#endif
-
 #ifndef local
 #  define local static
 #endif
@@ -167,10 +159,10 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
   #pragma warn -8066
 #endif
 
-#ifdef _LARGEFILE64_SOURCE
-#  define z_off64_t off64_t
-#else
-#  define z_off64_t z_off_t
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #endif
 
         /* common defaults */
@@ -181,12 +173,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #ifndef F_OPEN
 #  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-#ifdef _LARGEFILE64_SOURCE
-#  define F_OPEN64(name, mode) fopen64((name), (mode))
-#else
-#  define F_OPEN64(name, mode) fopen((name), (mode))
 #endif
 
          /* functions */
@@ -250,16 +236,16 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -276,8 +262,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                        unsigned size));
+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))