diff --git a/Makefile.in b/Makefile.in
index d7c4be5..31fff42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -261,6 +261,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/aclocal.m4 b/aclocal.m4
index d893624..d4a496c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -335,7 +335,7 @@
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
    
    GLIB_LC_MESSAGES
@@ -405,7 +405,8 @@
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
+  ],
+  [[$0: This macro is deprecated. You should use upstream gettext instead.]])
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
@@ -554,19 +555,19 @@
 ])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -586,32 +587,63 @@
   AC_SUBST([USE_NLS])
 ])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -633,18 +665,19 @@
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -654,8 +687,10 @@
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -667,10 +702,11 @@
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -678,19 +714,17 @@
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -744,16 +778,40 @@
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -764,16 +822,18 @@
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -784,13 +844,15 @@
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -799,7 +861,7 @@
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
 
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 4364b64..e53979e 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -210,6 +210,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/bin/sugar-activity b/bin/sugar-activity
old file mode 100644
new file mode 100755
index ccca503..bda6975 100755
--- a/bin/sugar-activity
+++ b/bin/sugar-activity
@@ -37,6 +37,12 @@
 from sugar3.bundle.activitybundle import ActivityBundle
 from sugar3 import logger
 
+from sugar3.bundle.bundle import MalformedBundleException
+
+from distutils.dir_util import mkpath
+import time
+import hashlib
+import random
 
 def create_activity_instance(constructor, handle):
     activity = constructor(handle)
@@ -69,7 +75,13 @@
 
 
 def main():
-    parser = OptionParser()
+    usage = 'usage: %prog [options] [activity dir] [python class]'
+    epilog = 'If you are running from a directory containing an Activity, ' \
+             'the argument may be ommitted. Otherwise please provide either '\
+             'a directory containing a Sugar Activity [activity dir], a '\
+             '[python_class], or both.'
+
+    parser = OptionParser(usage=usage, epilog=epilog)
     parser.add_option('-b', '--bundle-id', dest='bundle_id',
                       help='identifier of the activity bundle')
     parser.add_option('-a', '--activity-id', dest='activity_id',
@@ -89,18 +101,49 @@
 
     logger.start()
 
-    if 'SUGAR_BUNDLE_PATH' not in os.environ:
-        print 'SUGAR_BUNDLE_PATH is not defined in the environment.'
-        sys.exit(1)
-
-    if len(args) == 0:
-        print 'A python class must be specified as first argument.'
-        sys.exit(1)
+    activity_class = None
+    if len(args) == 2:
+        activity_class = args[1]
+        os.chdir(args[0])
+    elif len(args) == 1:
+        if os.path.isdir(args[0]):
+            os.chdir(args[0])
+        else:
+            activity_class = args[0]
+
+    os.environ['SUGAR_BUNDLE_PATH'] = os.path.abspath(os.curdir)
 
     bundle_path = os.environ['SUGAR_BUNDLE_PATH']
     sys.path.append(bundle_path)
 
-    bundle = ActivityBundle(bundle_path)
+    try:
+        bundle = ActivityBundle(bundle_path)
+    except MalformedBundleException:
+        parser.print_help()
+        exit(0)
+
+    if not activity_class:
+        if bundle.get_command().startswith('sugar-activity'):
+            print 'Guessing python class from activity.info!'
+            activity_class = bundle.get_command().split(" ")[1]
+
+    if 'SUGAR_VERSION' not in os.environ:
+        profile_id = os.environ.get('SUGAR_PROFILE', 'default')
+        home_dir = os.environ.get('SUGAR_HOME', os.path.expanduser('~/.sugar'))
+        base = os.path.join(home_dir, profile_id)
+        activity_root = os.path.join(base, bundle.get_bundle_id())
+
+        instance_dir = os.path.join(activity_root, 'instance')
+        mkpath(instance_dir)
+
+        data_dir = os.path.join(activity_root, 'data')
+        mkpath(data_dir)
+
+        tmp_dir = os.path.join(activity_root, 'tmp')
+        mkpath(tmp_dir)
+
+        os.environ['SUGAR_ACTIVITY_ROOT'] = activity_root
+        os.environ['SUGAR_BUNDLE_PATH'] = bundle.get_path()
 
     os.environ['SUGAR_BUNDLE_ID'] = bundle.get_bundle_id()
     os.environ['SUGAR_BUNDLE_NAME'] = bundle.get_name()
@@ -114,7 +157,7 @@
     gettext.bindtextdomain('sugar-toolkit-gtk3', config.locale_path)
     gettext.textdomain(bundle.get_bundle_id())
 
-    splitted_module = args[0].rsplit('.', 1)
+    splitted_module = activity_class.rsplit('.', 1)
     module_name = splitted_module[0]
     class_name = splitted_module[1]
 
@@ -123,6 +166,14 @@
         module = getattr(module, comp)
 
     activity_constructor = getattr(module, class_name)
+
+    if not options.activity_id:
+        # Generate random hash
+        data = '%s%s' % (time.time(), random.randint(10000, 100000))
+        random_hash = hashlib.sha1(data).hexdigest()
+        options.activity_id = random_hash
+        options.bundle_id = bundle.get_bundle_id()
+
     activity_handle = activityhandle.ActivityHandle(
         activity_id=options.activity_id,
         object_id=options.object_id, uri=options.uri,
diff --git a/configure b/configure
index d8358a1..be54bd1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sugar-toolkit-gtk3 0.106.1.
+# Generated by GNU Autoconf 2.69 for sugar-toolkit-gtk3 0.110.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='sugar-toolkit-gtk3'
 PACKAGE_TARNAME='sugar-toolkit-gtk3'
-PACKAGE_VERSION='0.106.1'
-PACKAGE_STRING='sugar-toolkit-gtk3 0.106.1'
+PACKAGE_VERSION='0.110.0'
+PACKAGE_STRING='sugar-toolkit-gtk3 0.110.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -651,11 +651,11 @@
 INTLLIBS
 INSTOBJEXT
 GMOFILES
+DATADIRNAME
 CATOBJEXT
 CATALOGS
 MSGFMT_OPTS
 GETTEXT_PACKAGE
-DATADIRNAME
 ALL_LINGUAS
 INTLTOOL_PERL
 GMSGFMT
@@ -709,6 +709,7 @@
 GLIB_GENMARSHAL
 WARN_CFLAGS
 CPP
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -832,6 +833,7 @@
 enable_shared
 with_pic
 enable_fast_install
+with_aix_soname
 enable_dependency_tracking
 with_gnu_ld
 with_sysroot
@@ -848,6 +850,7 @@
 LDFLAGS
 LIBS
 CPPFLAGS
+LT_SYS_LIBRARY_PATH
 CPP
 PYTHON
 PKG_CONFIG
@@ -1395,7 +1398,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sugar-toolkit-gtk3 0.106.1 to adapt to many kinds of systems.
+\`configure' configures sugar-toolkit-gtk3 0.110.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1466,7 +1469,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sugar-toolkit-gtk3 0.106.1:";;
+     short | recursive ) echo "Configuration of sugar-toolkit-gtk3 0.110.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1498,9 +1501,12 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
 
 Some influential environment variables:
   CC          C compiler command
@@ -1510,6 +1516,8 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   CPP         C preprocessor
   PYTHON      the Python interpreter
   PKG_CONFIG  path to pkg-config utility
@@ -1586,7 +1594,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sugar-toolkit-gtk3 configure 0.106.1
+sugar-toolkit-gtk3 configure 0.110.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1951,7 +1959,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sugar-toolkit-gtk3 $as_me 0.106.1, which was
+It was created by sugar-toolkit-gtk3 $as_me 0.110.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2820,7 +2828,7 @@
 
 # Define the identity of the package.
  PACKAGE='sugar-toolkit-gtk3'
- VERSION='0.106.1'
+ VERSION='0.110.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2904,14 +2912,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -2934,22 +2942,22 @@
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3069,7 +3077,7 @@
     $ECHO ""
 }
 
-case "$ECHO" in
+case $ECHO in
   printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 $as_echo "printf" >&6; } ;;
   print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -4372,19 +4380,19 @@
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -4398,7 +4406,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -4409,7 +4417,7 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -4420,32 +4428,32 @@
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -4488,33 +4496,38 @@
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -4525,15 +4538,15 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
   if test -n "$DUMPBIN"; then :
@@ -4639,9 +4652,9 @@
   fi
 fi
 
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
     *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
+      DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
     *)
       DUMPBIN=:
@@ -4649,8 +4662,8 @@
     esac
   fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -4701,7 +4714,7 @@
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -4741,7 +4754,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -4791,22 +4804,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -4824,7 +4838,7 @@
 
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
@@ -4841,30 +4855,6 @@
 : ${CP="cp -f"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
 
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
@@ -4988,13 +4978,13 @@
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       reload_cmds=false
     fi
     ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5122,13 +5112,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix[4-9]*)
@@ -5155,8 +5145,7 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
@@ -5190,10 +5179,6 @@
   else
     lt_cv_deplibs_check_method=pass_all
   fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
   ;;
 
 haiku*)
@@ -5234,7 +5219,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5256,8 +5241,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -5310,6 +5295,9 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
@@ -5467,8 +5455,8 @@
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
   *--identify-strict*)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -5480,7 +5468,7 @@
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 
@@ -5635,7 +5623,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
+      if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -5643,7 +5631,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
+	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
@@ -5656,7 +5644,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 $as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
@@ -5873,7 +5861,7 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
+  bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
@@ -5963,7 +5951,7 @@
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[ABCDEGRST]'
   fi
   ;;
@@ -5996,14 +5984,44 @@
   symcode='[ABCDGIRSTW]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6021,21 +6039,24 @@
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -6083,11 +6104,11 @@
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
@@ -6113,7 +6134,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -6133,13 +6154,13 @@
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
@@ -6160,7 +6181,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -6213,6 +6234,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
@@ -6225,9 +6256,9 @@
 
 
 lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
  yes)
-   if test "$GCC" = yes; then
+   if test yes = "$GCC"; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
@@ -6237,8 +6268,8 @@
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
@@ -6250,18 +6281,99 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6270,24 +6382,25 @@
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -6316,9 +6429,50 @@
   rm -rf conftest*
   ;;
 
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6332,7 +6486,14 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
@@ -6377,7 +6538,7 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -6417,13 +6578,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
 *-*solaris*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6435,7 +6597,7 @@
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*)
+        i?86-*-solaris*|x86_64-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
@@ -6444,7 +6606,7 @@
         esac
         # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
         if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
+          LD=${LD-ld}_sol2
         fi
         ;;
       *)
@@ -6460,7 +6622,7 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -6571,7 +6733,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 $as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 
@@ -7074,7 +7236,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
@@ -7092,7 +7254,7 @@
 	  cat conftest.err >&5
 	# Otherwise, if the output was created with a 0 exit code from
 	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7131,7 +7293,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -7160,7 +7322,7 @@
       _lt_result=$?
       if test -s conftest.err && $GREP force_load conftest.err; then
 	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7173,38 +7335,73 @@
 $as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[012][,.]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
       _lt_dar_single_mod='$single_module'
     fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
     else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
     fi
     ;;
   esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7509,14 +7706,14 @@
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -7541,22 +7738,20 @@
     *)
       pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
   pic_mode=default
 fi
 
-
-test -z "$pic_mode" && pic_mode=default
 
 
 
@@ -7573,14 +7768,14 @@
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -7594,11 +7789,63 @@
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
 
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7647,7 +7894,7 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
@@ -7686,7 +7933,7 @@
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
@@ -7697,14 +7944,14 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -7713,15 +7960,8 @@
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -7736,22 +7976,22 @@
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -7774,13 +8014,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -7802,22 +8042,22 @@
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -7840,13 +8080,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -7867,7 +8107,7 @@
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7929,7 +8169,7 @@
 
 lt_prog_compiler_no_builtin_flag=
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -7945,7 +8185,7 @@
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -7975,7 +8215,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
     :
@@ -7993,17 +8233,18 @@
 lt_prog_compiler_static=
 
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     lt_prog_compiler_wl='-Wl,'
     lt_prog_compiler_static='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
+      lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
@@ -8014,8 +8255,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -8031,6 +8272,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -8101,7 +8347,7 @@
     case $host_os in
     aix*)
       lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
@@ -8109,10 +8355,29 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -8128,7 +8393,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      lt_prog_compiler_static='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -8137,9 +8402,9 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -8163,6 +8428,12 @@
 	lt_prog_compiler_wl='-Wl,-Wl,,'
 	lt_prog_compiler_pic='-PIC'
 	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
 	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
@@ -8261,7 +8532,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
       fi
@@ -8290,7 +8561,7 @@
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
@@ -8322,7 +8593,7 @@
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -8352,7 +8623,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8384,7 +8655,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -8403,13 +8674,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
@@ -8529,8 +8800,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -8542,9 +8813,9 @@
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -8587,9 +8858,9 @@
   # included in the symbol list
   include_expsyms=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
   exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -8604,7 +8875,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -8612,7 +8883,7 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
@@ -8622,7 +8893,7 @@
   # On some targets, GNU ld is compatible enough with the native linker
   # that we're better off using the native interface for both.
   lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     case $host_os in
       aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
@@ -8644,24 +8915,24 @@
     esac
   fi
 
-  if test "$lt_use_gnu_ld_interface" = yes; then
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -8674,7 +8945,7 @@
     case $host_os in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
@@ -8693,7 +8964,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -8709,7 +8980,7 @@
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -8719,7 +8990,7 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
@@ -8727,61 +8998,89 @@
       exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
     haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
 	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* | pgf95* | pgfortran*)
 					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -8792,42 +9091,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
 	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
 	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -8841,8 +9145,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -8860,8 +9164,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -8873,7 +9177,7 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -8888,9 +9192,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -8907,15 +9211,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs" = no; then
+    if test no = "$ld_shlibs"; then
       runpath_var=
       hardcode_libdir_flag_spec=
       export_dynamic_flag_spec=
@@ -8931,7 +9235,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -8939,34 +9243,57 @@
       ;;
 
     aix[4-9]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -8985,13 +9312,21 @@
       hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -9010,35 +9345,42 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec='${wl}-bexpall'
+      export_dynamic_flag_spec='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
+        if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
@@ -9073,7 +9415,7 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
@@ -9081,17 +9423,17 @@
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
+	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
@@ -9126,7 +9468,7 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
@@ -9134,21 +9476,33 @@
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
 	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 	  else
 	    # Exported symbols can be pulled into shared objects from archives
 	    whole_archive_flag_spec='$convenience'
 	  fi
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -9157,7 +9511,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -9187,16 +9541,17 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
@@ -9205,18 +9560,18 @@
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
 	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
 	;;
       *)
 	# Assume MSVC wrapper
@@ -9225,7 +9580,7 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
@@ -9244,24 +9599,24 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
   else
     whole_archive_flag_spec=''
   fi
   link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
+  allow_undefined_flag=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
+  if test yes = "$_lt_dar_can_shared"; then
     output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
@@ -9303,33 +9658,33 @@
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
+      export_dynamic_flag_spec='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
+	export_dynamic_flag_spec='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -9337,25 +9692,25 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 
@@ -9367,7 +9722,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9386,14 +9741,14 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 $as_echo "$lt_cv_prog_compiler__b" >&6; }
 
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 else
     archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 fi
@@ -9401,8 +9756,8 @@
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
@@ -9413,7 +9768,7 @@
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+	  export_dynamic_flag_spec='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -9424,8 +9779,8 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
@@ -9435,8 +9790,8 @@
 if ${lt_cv_irix_exported_symbol+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (void) { return 0; }
@@ -9448,22 +9803,32 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 $as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
       ;;
 
     netbsd*)
@@ -9480,7 +9845,7 @@
     newsos6)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
@@ -9488,27 +9853,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs=no
@@ -9519,33 +9876,53 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -9556,24 +9933,24 @@
 
     solaris*)
       no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -9583,11 +9960,11 @@
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 	fi
@@ -9597,10 +9974,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -9649,43 +10026,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
+      no_undefined_flag='$wl-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
+      export_dynamic_flag_spec='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -9700,10 +10077,10 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -9711,7 +10088,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
@@ -9737,7 +10114,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -9952,14 +10329,14 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
   esac
   case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
   case $lt_search_path_spec in
@@ -9975,28 +10352,35 @@
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
   lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -10010,7 +10394,7 @@
   # for these hosts.
   case $host_os in
     mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
   esac
   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
@@ -10019,7 +10403,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -10036,14 +10420,16 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
@@ -10051,41 +10437,91 @@
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -10095,18 +10531,18 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
@@ -10114,8 +10550,8 @@
 bsdi[45]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -10127,7 +10563,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
@@ -10136,8 +10572,8 @@
     # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -10153,17 +10589,17 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
@@ -10172,8 +10608,8 @@
   *,cl*)
     # Native MSVC
     libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
 
     case $build_os in
     mingw*)
@@ -10200,7 +10636,7 @@
       sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       ;;
     *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -10213,8 +10649,8 @@
     esac
 
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname'
@@ -10227,7 +10663,7 @@
 
   *)
     # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
   esac
@@ -10240,8 +10676,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -10254,8 +10690,8 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -10273,12 +10709,13 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -10303,26 +10740,15 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
@@ -10340,14 +10766,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -10355,8 +10782,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -10365,8 +10792,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
   # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -10379,8 +10806,8 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -10391,7 +10818,7 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
@@ -10399,8 +10826,8 @@
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -10419,8 +10846,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -10429,13 +10856,33 @@
   dynamic_linker=no
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -10482,11 +10929,15 @@
   # Add ABI-specific directories to the system library path.
   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10503,12 +10954,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -10518,7 +10969,7 @@
 
 newsos6)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -10527,58 +10978,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -10589,8 +11050,8 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -10600,11 +11061,11 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
@@ -10612,8 +11073,8 @@
 
 sysv4 | sysv4.3*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -10634,24 +11095,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
+  if test -d /usr/nec; then
     version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -10669,7 +11130,7 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
@@ -10677,8 +11138,8 @@
 
 uts4*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -10688,19 +11149,34 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
 
 
 
@@ -10798,15 +11274,15 @@
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
+   test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
+  if test no != "$hardcode_direct" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
@@ -10821,12 +11297,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -10836,7 +11312,7 @@
 
 
 
-  if test "x$enable_dlopen" != xyes; then
+  if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -10846,23 +11322,23 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -10900,21 +11376,29 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
 fi
 
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
     ;;
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
+  lt_cv_dlopen=shl_load
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -10953,11 +11437,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
+  lt_cv_dlopen=dlopen
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -10996,7 +11480,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -11035,7 +11519,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -11074,7 +11558,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
@@ -11095,21 +11579,21 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
     enable_dlopen=yes
-  else
-    enable_dlopen=no
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11117,7 +11601,7 @@
 if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11164,9 +11648,9 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -11196,7 +11680,7 @@
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -11216,14 +11700,14 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11270,9 +11754,9 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -11302,7 +11786,7 @@
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -11323,9 +11807,9 @@
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -11369,7 +11853,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -11397,7 +11881,7 @@
 
 
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -11405,13 +11889,13 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
-    test "$enable_shared" = yes && enable_static=no
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -11419,8 +11903,12 @@
     ;;
 
   aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -11430,7 +11918,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
@@ -11444,7 +11932,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC="$lt_save_CC"
+CC=$lt_save_CC
 
 
 
@@ -12586,44 +13074,6 @@
 fi
 
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
 
 
 
@@ -14009,7 +14459,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sugar-toolkit-gtk3 $as_me 0.106.1, which was
+This file was extended by sugar-toolkit-gtk3 $as_me 0.110.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14066,7 +14516,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sugar-toolkit-gtk3 config.status 0.106.1
+sugar-toolkit-gtk3 config.status 0.110.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -14190,6 +14640,7 @@
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
 PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -14239,10 +14690,13 @@
 GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -14307,7 +14761,8 @@
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -14358,9 +14813,12 @@
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
 nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
@@ -14395,7 +14853,7 @@
 striplib; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -14422,10 +14880,11 @@
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -14434,19 +14893,16 @@
 done
 
 ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
+
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'
 
@@ -15004,55 +15460,53 @@
  ;;
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags=""
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -15071,6 +15525,9 @@
 
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
 
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
@@ -15189,17 +15646,26 @@
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
 # Specify filename containing input files for \$NM.
 nm_file_list_spec=$lt_nm_file_list_spec
 
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -15291,8 +15757,11 @@
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -15385,13 +15854,13 @@
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -15440,6 +15909,65 @@
 hardcode_action=$hardcode_action
 
 # ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
 
 _LT_EOF
 
@@ -15449,7 +15977,7 @@
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -15458,7 +15986,7 @@
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
@@ -15467,165 +15995,6 @@
   # is reportedly fixed, but why not run on old versions too?
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
 
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
diff --git a/configure.ac b/configure.ac
index 3f1aa92..3f58d36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-toolkit-gtk3],[0.106.1],[],[sugar-toolkit-gtk3])
+AC_INIT([sugar-toolkit-gtk3],[0.110.0],[],[sugar-toolkit-gtk3])
 
 AC_PREREQ([2.59])
 
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69d..0f0a2da 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,12 @@
-
-# libtool (GNU libtool) 2.4.2
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
+
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -23,166 +26,670 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+VERSION=2.4.6
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
 # the _XPG environment variable is not equal to 1 (one), the special
 # positional parameter $0, within a function call, is the name of the
 # function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
 # Compute the dirname of FILE.  If nonempty, add APPEND to the result,
 # otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
 # call:
 #   dirname:  Compute the dirname of FILE.  If nonempty,
 #             add APPEND to the result, otherwise set result
@@ -190,263 +697,327 @@
 #             value returned in "$func_dirname_result"
 #   basename: Compute filename of FILE.
 #             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
     else
-      func_dirname_result="$func_dirname_result${2}"
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
     fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+
+    $ECHO "$_G_tmpdir"
+}
+
 
 # func_normal_abspath PATH
+# ------------------------
 # Remove doubled-up and trailing slashes, "." path components,
 # and cancel out any ".." path components in PATH after making
 # it an absolute path.
-#             value returned in "$func_normal_abspath_result"
 func_normal_abspath ()
 {
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
     func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
         fi
         break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
 
     # A bug in bash halts the script if the last line of a function
     # fails when set -e is in force, so we need another command to
@@ -454,450 +1025,1113 @@
     :
 }
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
     :
 }
 
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
       esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
       fi
 
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
 # Aesthetically quote ARG to be evaled later; same as above,
 # but do not quote variable references.
 func_quote_for_expand ()
 {
+    $debug_cmd
+
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-        my_arg="$1" ;;
+        _G_arg=$1 ;;
     esac
 
-    case $my_arg in
+    case $_G_arg in
       # Double-quote args containing shell metacharacters to delay
       # word splitting and command substitution for a subsequent eval.
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, so we specify it separately.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
+        _G_arg=\"$_G_arg\"
         ;;
     esac
 
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+    func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.
 func_show_eval ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
     }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.  Use the saved locale for evaluation.
 func_show_eval_locale ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
       eval "func_echo $func_quote_for_expand_result"
     }
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
-}
+    }
+}
+
 
 # func_tr_sh
+# ----------
 # Turn $1 into a string suitable for a shell variable name.
 # Result is stored in $func_tr_sh_result.  All characters
 # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
 # if $1 begins with a digit, a '_' is prepended as well.
 func_tr_sh ()
 {
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
 func_help ()
 {
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
-    $opt_debug
-
-    func_error "missing argument for $1."
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
     exit_cmd=exit
 }
 
 
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
 # Set func_split_short_opt_name and func_split_short_opt_arg shell
 # variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
@@ -915,17 +2149,19 @@
     exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
     echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       echo "enable shared libraries"
     else
       echo "disable shared libraries"
     fi
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       echo "enable static libraries"
     else
       echo "disable static libraries"
@@ -934,289 +2170,297 @@
     exit $?
 }
 
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
 # Verify that TAGNAME is valid, and either flag an error and exit, or
 # enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 # variable here.
 func_enable_tag ()
 {
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
     *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
 
 # func_check_version_match
+# ------------------------
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
 func_check_version_match ()
 {
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from an older release.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      else
-        cat >&2 <<_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 $progname: but the definition of this LT_INIT comes from revision $macro_revision.
 $progname: You should recreate aclocal.m4 with macros from revision $package_revision
 $progname: of $PACKAGE $VERSION and run autoconf again.
 _LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
     fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
     esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
+
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
     fi
 
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
 
 
 
@@ -1224,24 +2468,52 @@
 ##    Main.    ##
 ## ----------- ##
 
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
 # func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function implements the same check as func_lalib_p without
 # resorting to external programs.  To this end, it redirects stdin and
 # closes it afterwards, without saving the original file descriptor.
 # As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
+# fatal anyway.  Works if 'file' does not exist.
 func_lalib_unsafe_p ()
 {
     lalib_p=no
@@ -1249,13 +2521,13 @@
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
-	    case "$lalib_p_line" in
+	    case $lalib_p_line in
 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 	    esac
 	done
 	exec 0<&5 5<&-
     fi
-    test "$lalib_p" = yes
+    test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@
 {
     func_dirname_and_basename "$1" "" "."
     func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 }
 
 # func_ltwrapper_p file
@@ -1308,11 +2581,13 @@
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
-    $opt_debug
+    $debug_cmd
+
     save_ifs=$IFS; IFS='~'
     for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
       IFS=$save_ifs
-      eval cmd=\"$cmd\"
       func_show_eval "$cmd" "${2-:}"
     done
     IFS=$save_ifs
@@ -1324,10 +2599,11 @@
 # Note that it is not necessary on cygwin/mingw to append a dot to
 # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
 func_source ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $1 in
     */* | *\\*)	. "$1" ;;
     *)		. "./$1" ;;
@@ -1354,10 +2630,10 @@
 # store the result into func_replace_sysroot_result.
 func_replace_sysroot ()
 {
-  case "$lt_sysroot:$1" in
+  case $lt_sysroot:$1 in
   ?*:"$lt_sysroot"*)
     func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
+    func_replace_sysroot_result='='$func_stripname_result
     ;;
   *)
     # Including no sysroot.
@@ -1374,7 +2650,8 @@
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    $opt_debug
+    $debug_cmd
+
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -1393,7 +2670,7 @@
 	for z in $available_tags; do
 	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@
 	# line option must be used.
 	if test -z "$tagname"; then
 	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
+	  func_fatal_error "specify a tag with '--tag'"
 #	else
 #	  func_verbose "using $tagname tagged configuration"
 	fi
@@ -1434,15 +2711,15 @@
 # but don't create it if we're doing a dry run.
 func_write_libtool_object ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
     else
       write_lobj=none
     fi
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
     else
       write_oldobj=none
     fi
@@ -1450,7 +2727,7 @@
     $opt_dry_run || {
       cat >${write_libobj}T <<EOF
 # $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -1462,7 +2739,7 @@
 non_pic_object=$write_oldobj
 
 EOF
-      $MV "${write_libobj}T" "${write_libobj}"
+      $MV "${write_libobj}T" "$write_libobj"
     }
 }
 
@@ -1482,8 +2759,9 @@
 # be empty on error (or when ARG is empty)
 func_convert_core_file_wine_to_w32 ()
 {
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
   if test -n "$1"; then
     # Unfortunately, winepath does not exit with a non-zero error code, so we
     # are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@
     # *an error message* to stdout. So we must check for both error code of
     # zero AND non-empty stdout, which explains the odd construction:
     func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
       func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
+        $SED -e "$sed_naive_backslashify"`
     else
       func_convert_core_file_wine_to_w32_result=
     fi
@@ -1514,18 +2792,19 @@
 # are convertible, then the result may be empty.
 func_convert_core_path_wine_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
+  func_convert_core_path_wine_to_w32_result=
   if test -n "$1"; then
     oldIFS=$IFS
     IFS=:
     for func_convert_core_path_wine_to_w32_f in $1; do
       IFS=$oldIFS
       func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
         if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
         else
           func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
         fi
@@ -1554,7 +2833,8 @@
 # environment variable; do not put it in $PATH.
 func_cygpath ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
     func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
     if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@
     fi
   else
     func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
   fi
 }
 #end: func_cygpath
@@ -1574,10 +2854,11 @@
 # result in func_convert_core_msys_to_w32_result.
 func_convert_core_msys_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # awkward: cmd appends spaces to result
   func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
 }
 #end: func_convert_core_msys_to_w32
 
@@ -1588,13 +2869,14 @@
 # func_to_host_file_result to ARG1).
 func_convert_file_check ()
 {
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
     func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
+    func_error "  '$1'"
     func_error "Continuing, but uninstalled executables may not work."
     # Fallback:
-    func_to_host_file_result="$1"
+    func_to_host_file_result=$1
   fi
 }
 # end func_convert_file_check
@@ -1606,10 +2888,11 @@
 # func_to_host_file_result to a simplistic fallback value (see below).
 func_convert_path_check ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -z "$4" && test -n "$3"; then
     func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
+    func_error "  '$3'"
     func_error "Continuing, but uninstalled executables may not work."
     # Fallback.  This is a deliberately simplistic "conversion" and
     # should not be "improved".  See libtool.info.
@@ -1618,7 +2901,7 @@
       func_to_host_path_result=`echo "$3" |
         $SED -e "$lt_replace_pathsep_chars"`
     else
-      func_to_host_path_result="$3"
+      func_to_host_path_result=$3
     fi
   fi
 }
@@ -1630,9 +2913,10 @@
 # and appending REPL if ORIG matches BACKPAT.
 func_convert_path_front_back_pathsep ()
 {
-  $opt_debug
+  $debug_cmd
+
   case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
     ;;
   esac
   case $4 in
@@ -1646,7 +2930,7 @@
 ##################################################
 # $build to $host FILE NAME CONVERSION FUNCTIONS #
 ##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@
 # in func_to_host_file_result.
 func_to_host_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   $to_host_file_cmd "$1"
 }
 # end func_to_host_file
@@ -1669,7 +2954,8 @@
 # in (the comma separated) LAZY, no conversion takes place.
 func_to_tool_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   case ,$2, in
     *,"$to_tool_file_cmd",*)
       func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@
 # Copy ARG to func_to_host_file_result.
 func_convert_file_noop ()
 {
-  func_to_host_file_result="$1"
+  func_to_host_file_result=$1
 }
 # end func_convert_file_noop
 
@@ -1698,11 +2984,12 @@
 # func_to_host_file_result.
 func_convert_file_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1714,8 +3001,9 @@
 # func_to_host_file_result.
 func_convert_file_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
     # LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@
 # and a working winepath. Returns result in func_to_host_file_result.
 func_convert_file_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1747,12 +3036,13 @@
 # Returns result in func_to_host_file_result.
 func_convert_file_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_msys_to_w32 "$1"
     func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
+    func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1765,13 +3055,14 @@
 # in func_to_host_file_result.
 func_convert_file_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
     func_convert_core_file_wine_to_w32 "$1"
     func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
+    func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1781,7 +3072,7 @@
 #############################################
 # $build to $host PATH CONVERSION FUNCTIONS #
 #############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@
 to_host_path_cmd=
 func_init_to_host_path_cmd ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -z "$to_host_path_cmd"; then
     func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
   fi
 }
 
@@ -1818,7 +3110,8 @@
 # in func_to_host_path_result.
 func_to_host_path ()
 {
-  $opt_debug
+  $debug_cmd
+
   func_init_to_host_path_cmd
   $to_host_path_cmd "$1"
 }
@@ -1829,7 +3122,7 @@
 # Copy ARG to func_to_host_path_result.
 func_convert_path_noop ()
 {
-  func_to_host_path_result="$1"
+  func_to_host_path_result=$1
 }
 # end func_convert_path_noop
 
@@ -1840,8 +3133,9 @@
 # func_to_host_path_result.
 func_convert_path_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from ARG.  MSYS
     # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@
 # func_to_host_file_result.
 func_convert_path_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
@@ -1883,14 +3178,15 @@
 # a working winepath.  Returns result in func_to_host_file_result.
 func_convert_path_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@
 # Returns result in func_to_host_file_result.
 func_convert_path_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@
 # func_to_host_file_result.
 func_convert_path_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from
     # ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@
 # end func_convert_path_nix_to_cygwin
 
 
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
-    $opt_debug
+    $debug_cmd
+
     # Get the compilation command and the source file.
     base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
     suppress_opt=yes
     suppress_output=
     arg_mode=normal
@@ -1965,12 +3281,12 @@
       case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
+	lastarg=$arg
 	arg_mode=normal
 	;;
 
       target )
-	libobj="$arg"
+	libobj=$arg
 	arg_mode=normal
 	continue
 	;;
@@ -1980,7 +3296,7 @@
 	case $arg in
 	-o)
 	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
+	    func_fatal_error "you cannot specify '-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
@@ -2009,12 +3325,12 @@
 	  func_stripname '-Wc,' '' "$arg"
 	  args=$func_stripname_result
 	  lastarg=
-	  save_ifs="$IFS"; IFS=','
+	  save_ifs=$IFS; IFS=,
 	  for arg in $args; do
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 	    func_append_quoted lastarg "$arg"
 	  done
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
@@ -2027,8 +3343,8 @@
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
+	  lastarg=$srcfile
+	  srcfile=$arg
 	  ;;
 	esac  #  case $arg
 	;;
@@ -2043,13 +3359,13 @@
       func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      func_fatal_error "you must specify a target with \`-o'"
+      func_fatal_error "you must specify a target with '-o'"
       ;;
     *)
       # Get the name of the library object.
       test -z "$libobj" && {
 	func_basename "$srcfile"
-	libobj="$func_basename_result"
+	libobj=$func_basename_result
       }
       ;;
     esac
@@ -2069,7 +3385,7 @@
     case $libobj in
     *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      func_fatal_error "cannot determine name of library object from '$libobj'"
       ;;
     esac
 
@@ -2078,8 +3394,8 @@
     for arg in $later; do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	continue
 	;;
@@ -2105,17 +3421,17 @@
     func_quote_for_eval "$libobj"
     test "X$libobj" != "X$func_quote_for_eval_result" \
       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
 
     test -z "$base_compile" && \
       func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       removelist="$obj $lobj $libobj ${libobj}T"
     else
       removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@
       pic_mode=default
       ;;
     esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
 
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
     else
       output_obj=
       need_locks=no
@@ -2145,12 +3461,12 @@
 
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
+    if test yes = "$need_locks"; then
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
-    elif test "$need_locks" = warn; then
+    elif test warn = "$need_locks"; then
       if test -f "$lockfile"; then
 	$ECHO "\
 *** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2180,11 +3496,11 @@
     qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      if test "$pic_mode" != no; then
+      if test no != "$pic_mode"; then
 	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
@@ -2201,7 +3517,7 @@
       func_show_eval_locale "$command"	\
           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2228,20 +3544,20 @@
       fi
 
       # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
+      if test yes = "$suppress_opt"; then
 	suppress_output=' >/dev/null 2>&1'
       fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
 	# Don't build PIC code
 	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
-      if test "$compiler_c_o" = yes; then
+      if test yes = "$compiler_c_o"; then
 	func_append command " -o $obj"
       fi
 
@@ -2250,7 +3566,7 @@
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2281,7 +3597,7 @@
       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
       # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
+      if test no != "$need_locks"; then
 	removelist=$lockfile
         $RM "$lockfile"
       fi
@@ -2291,7 +3607,7 @@
 }
 
 $opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
@@ -2311,7 +3627,7 @@
 Remove files from the build directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@
   -no-suppress      do not suppress compiler output for multiple passes
   -prefer-pic       try to build PIC objects only
   -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
   -Wc,FLAG          pass FLAG directly to the compiler
 
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
         ;;
 
       execute)
@@ -2352,7 +3668,7 @@
 
   -dlopen FILE      add the directory containing FILE to the library path
 
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
 flags.
 
 If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
         ;;
 
       install)
@@ -2381,7 +3697,7 @@
 Install executables or libraries.
 
 INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
@@ -2407,7 +3723,7 @@
   -avoid-version    do not add a version suffix if possible
   -bindir BINDIR    specify path to binaries directory (for systems where
                     libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
@@ -2421,7 +3737,8 @@
   -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
@@ -2441,20 +3758,20 @@
   -Xlinker FLAG     pass linker-specific FLAG directly to the linker
   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
 treated as uninstalled libtool libraries, other files are standard or library
 object files.
 
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
 required, except when creating a convenience library.
 
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 is created, otherwise an executable program is created."
         ;;
 
@@ -2465,7 +3782,7 @@
 Remove libraries from an installation directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
+        func_fatal_help "invalid operation mode '$opt_mode'"
         ;;
     esac
 
     echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
+    $ECHO "Try '$progname --help' for more information about other modes."
 }
 
 # Now that we've collected a possible --mode arg, show help if necessary
 if $opt_help; then
-  if test "$opt_help" = :; then
+  if test : = "$opt_help"; then
     func_mode_help
   else
     {
@@ -2491,7 +3808,7 @@
       for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
       for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@
 	func_mode_help
       done
     } |
-    sed '1d
+    $SED '1d
       /^When reporting/,/^Report/{
 	H
 	d
@@ -2516,16 +3833,17 @@
 # func_mode_execute arg...
 func_mode_execute ()
 {
-    $opt_debug
+    $debug_cmd
+
     # The first argument is the command name.
-    cmd="$nonopt"
+    cmd=$nonopt
     test -z "$cmd" && \
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
     for file in $opt_dlopen; do
       test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+	|| func_fatal_help "'$file' is not a file"
 
       dir=
       case $file in
@@ -2535,7 +3853,7 @@
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
 
 	# Read the libtool library.
 	dlname=
@@ -2546,18 +3864,18 @@
 	if test -z "$dlname"; then
 	  # Warn if it was a shared library.
 	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	    func_warning "'$file' was not linked with '-export-dynamic'"
 	  continue
 	fi
 
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 
 	if test -f "$dir/$objdir/$dlname"; then
 	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -2565,18 +3883,18 @@
       *.lo)
 	# Just add the directory containing the .lo file.
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	;;
 
       *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 	continue
 	;;
       esac
 
       # Get the absolute pathname.
       absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+      test -n "$absdir" && dir=$absdir
 
       # Now add the directory to shlibpath_var.
       if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@
 
     # This variable tells wrapper scripts just to set shlibpath_var
     # rather than running their programs.
-    libtool_execute_magic="$magic"
+    libtool_execute_magic=$magic
 
     # Check if any of the arguments is a wrapper script.
     args=
@@ -2601,12 +3919,12 @@
 	if func_ltwrapper_script_p "$file"; then
 	  func_source "$file"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	elif func_ltwrapper_executable_p "$file"; then
 	  func_ltwrapper_scriptname "$file"
 	  func_source "$func_ltwrapper_scriptname_result"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	fi
 	;;
       esac
@@ -2614,7 +3932,15 @@
       func_append_quoted args "$file"
     done
 
-    if test "X$opt_dry_run" = Xfalse; then
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
       if test -n "$shlibpath_var"; then
 	# Export the shlibpath_var.
 	eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@
       done
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
+      exec_cmd=\$cmd$args
     fi
 }
 
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
-    $opt_debug
+    $debug_cmd
+
     libs=
     libdirs=
     admincmds=
@@ -2663,11 +3982,11 @@
 	if func_lalib_unsafe_p "$opt"; then
 	  func_append libs " $opt"
 	else
-	  func_warning "\`$opt' is not a valid libtool archive"
+	  func_warning "'$opt' is not a valid libtool archive"
 	fi
 
       else
-	func_fatal_error "invalid argument \`$opt'"
+	func_fatal_error "invalid argument '$opt'"
       fi
     done
 
@@ -2682,12 +4001,12 @@
       # Remove sysroot references
       if $opt_dry_run; then
         for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
         done
       else
         tmpdir=`func_mktempdir`
         for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 	    > $tmpdir/tmp-la
 	  mv -f $tmpdir/tmp-la $lib
 	done
@@ -2712,7 +4031,7 @@
     fi
 
     # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+    $opt_quiet && exit $EXIT_SUCCESS
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@
       echo
       echo "If you ever happen to want to link against installed libraries"
       echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
       echo "flag during linking and do at least one of the following:"
       if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
 	echo "     during execution"
       fi
       if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
 	echo "     during linking"
       fi
       if test -n "$hardcode_libdir_flag_spec"; then
 	libdir=LIBDIR
 	eval flag=\"$hardcode_libdir_flag_spec\"
 
-	$ECHO "   - use the \`$flag' linker flag"
+	$ECHO "   - use the '$flag' linker flag"
       fi
       if test -n "$admincmds"; then
 	$ECHO "   - have your system administrator run these commands:$admincmds"
       fi
       if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
       fi
       echo
 
@@ -2762,18 +4081,20 @@
     exit $EXIT_SUCCESS
 }
 
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
-    $opt_debug
+    $debug_cmd
+
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
        # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@
     opts=
     prev=
     install_type=
-    isdir=no
+    isdir=false
     stripme=
     no_mode=:
     for arg
@@ -2813,7 +4134,7 @@
       fi
 
       case $arg in
-      -d) isdir=yes ;;
+      -d) isdir=: ;;
       -f)
 	if $install_cp; then :; else
 	  prev=$arg
@@ -2831,7 +4152,7 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
 	    arg2=$install_override_mode
 	    no_mode=false
 	  fi
@@ -2856,7 +4177,7 @@
       func_fatal_help "you must specify an install program"
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
+      func_fatal_help "the '$prev' option requires an argument"
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
@@ -2878,19 +4199,19 @@
     dest=$func_stripname_result
 
     # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
       destname=
     else
       func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
+      destdir=$func_dirname_result
+      destname=$func_basename_result
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files; shift
       test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
+	func_fatal_help "'$dest' is not a directory"
     fi
     case $destdir in
     [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@
 	case $file in
 	*.lo) ;;
 	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  func_fatal_help "'$destdir' must be an absolute directory name"
 	  ;;
 	esac
       done
@@ -2908,7 +4229,7 @@
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     staticlibs=
     future_libdirs=
@@ -2928,7 +4249,7 @@
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+	  || func_fatal_help "'$file' is not a valid libtool archive"
 
 	library_names=
 	old_library=
@@ -2950,7 +4271,7 @@
 	fi
 
 	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@
 	  # are installed into $libdir/../bin (currently, that works fine)
 	  # but it's something to keep an eye on.
 	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@
 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
-	  func_warning "relinking \`$file'"
+	  func_warning "relinking '$file'"
 	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 	fi
 
 	# See the names of the shared library.
 	set dummy $library_names; shift
 	if test -n "$1"; then
-	  realname="$1"
+	  realname=$1
 	  shift
 
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
 
 	  # Install the shared library and build the symlinks.
 	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
-	  tstripme="$stripme"
+	  tstripme=$stripme
 	  case $host_os in
 	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
-	      tstripme=""
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
 	      ;;
 	    esac
 	    ;;
@@ -3006,7 +4334,7 @@
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
 	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
@@ -3017,14 +4345,14 @@
 	  fi
 
 	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
+	  lib=$destdir/$realname
 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 	fi
 
 	# Install the pseudo-library for information purposes.
 	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
+	name=$func_basename_result
+	instname=$dir/${name}i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@
 
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@
 	  staticdest=$func_lo2o_result
 	  ;;
 	*.$objext)
-	  staticdest="$destfile"
+	  staticdest=$destfile
 	  destfile=
 	  ;;
 	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
 	  ;;
 	esac
 
@@ -3063,7 +4391,7 @@
 	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 
 	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
+	if test yes = "$build_old_libs"; then
 	  # Deduce the name of the old-style object file.
 	  func_lo2o "$file"
 	  staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@
       *)
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# If the file is missing, and there is a .exe on the end, strip it
 	# because it is most likely a libtool script we actually want to
 	# install
-	stripped_ext=""
+	stripped_ext=
 	case $file in
 	  *.exe)
 	    if test ! -f "$file"; then
 	      func_stripname '' '.exe' "$file"
 	      file=$func_stripname_result
-	      stripped_ext=".exe"
+	      stripped_ext=.exe
 	    fi
 	    ;;
 	esac
@@ -3119,19 +4447,19 @@
 
 	  # Check the variables that should have been set.
 	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  finalize=:
 	  for lib in $notinst_deplibs; do
 	    # Check to see that each library is installed.
 	    libdir=
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
 	    fi
 	  done
 
@@ -3139,29 +4467,29 @@
 	  func_source "$wrapper"
 
 	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
+	  if test no = "$fast_install" && test -n "$relink_command"; then
 	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
+	      if $finalize; then
 	        tmpdir=`func_mktempdir`
 		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
 	        # Replace the output file specification.
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
-	        $opt_silent || {
+	        $opt_quiet || {
 	          func_quote_for_expand "$relink_command"
 		  eval "func_echo $func_quote_for_expand_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
+		  func_error "error: relink '$file' with the above command before installing it"
 		  $opt_dry_run || ${RM}r "$tmpdir"
 		  continue
 	        fi
-	        file="$outputname"
+	        file=$outputname
 	      else
-	        func_warning "cannot relink \`$file'"
+	        func_warning "cannot relink '$file'"
 	      fi
 	    }
 	  else
@@ -3198,10 +4526,10 @@
 
     for file in $staticlibs; do
       func_basename "$file"
-      name="$func_basename_result"
+      name=$func_basename_result
 
       # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
+      oldlib=$destdir/$name
       func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
       tool_oldlib=$func_to_tool_file_result
 
@@ -3216,18 +4544,18 @@
     done
 
     test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+      func_warning "remember to run '$progname --finish$future_libdirs'"
 
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
     else
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
     my_dlsyms=
 
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
+	my_dlsyms=${my_outputname}S.c
       else
 	func_error "not configured to extract global symbols from dlpreopened files"
       fi
@@ -3255,7 +4584,7 @@
       "") ;;
       *.c)
 	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
+	nlist=$output_objdir/$my_outputname.nm
 
 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 
@@ -3263,34 +4592,36 @@
 	func_verbose "creating $output_objdir/$my_dlsyms"
 
 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
 #endif
 
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 #endif
 
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
 # define LT_DLSYM_CONST const
 #endif
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* External symbol declarations for the compiler. */\
 "
 
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
 
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
@@ -3298,7 +4629,7 @@
 	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
 	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
 	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
@@ -3318,10 +4649,10 @@
 
 	  # Prepare the list of exported symbols
 	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
+	    export_symbols=$output_objdir/$outputname.exp
 	    $opt_dry_run || {
 	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
 	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
@@ -3345,22 +4676,22 @@
 	fi
 
 	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_verbose "extracting global C symbols from '$dlprefile'"
 	  func_basename "$dlprefile"
-	  name="$func_basename_result"
+	  name=$func_basename_result
           case $host in
 	    *cygwin* | *mingw* | *cegcc* )
 	      # if an import library, we need to obtain dlname
 	      if func_win32_import_lib_p "$dlprefile"; then
 	        func_tr_sh "$dlprefile"
 	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
+	        dlprefile_dlbasename=
 	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
 	          # Use subshell, to avoid clobbering current variable values
 	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
+	          if test -n "$dlprefile_dlname"; then
 	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
+	            dlprefile_dlbasename=$func_basename_result
 	          else
 	            # no lafile. user explicitly requested -dlpreopen <import library>.
 	            $sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@
 	          fi
 	        fi
 	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
+	          if test -n "$dlprefile_dlbasename"; then
 	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
 	          else
 	            func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@
 	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
 	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
@@ -3432,11 +4768,30 @@
   void *address;
 } lt_dlsymlist;
 extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
 LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
 
 	  case $need_lib_prefix in
 	  no)
@@ -3478,9 +4833,7 @@
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
 	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 	    ;;
 	  esac
 	  ;;
@@ -3497,10 +4850,10 @@
 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
 	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
 	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	symfileobj=$output_objdir/${my_outputname}S.$objext
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@
 	esac
 	;;
       *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
 	;;
       esac
     else
@@ -3530,6 +4883,32 @@
       compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
       finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
 }
 
 # func_win32_libid arg
@@ -3541,8 +4920,9 @@
 # Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
-  $opt_debug
-  win32_libid_type="unknown"
+  $debug_cmd
+
+  win32_libid_type=unknown
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   *ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@
     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
 	    1,100{
 		/ I /{
-		    s,.*,import,
+		    s|.*|import|
 		    p
 		    q
 		}
 	    }'`
+	;;
+      esac
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib ()
 {
-  $opt_debug
+  $debug_cmd
+
   sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 }
 
@@ -3610,7 +5004,8 @@
 # specified import library.
 func_cygming_dll_for_implib_fallback_core ()
 {
-  $opt_debug
+  $debug_cmd
+
   match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
   $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
     $SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@
       /./p' |
     # we now have a list, one entry per line, of the stringified
     # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
     # a '.' (that is, objdump's representation of an unprintable
     # character.) This should work for all archives with less than
     # 0x302f exports -- but will fail for DLLs whose name actually
@@ -3656,30 +5051,6 @@
     #
     # Of those that remain, print the first one.
     $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
 }
 
 # func_cygming_dll_for_implib_fallback ARG
@@ -3695,16 +5066,17 @@
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib_fallback ()
 {
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
     # binutils import library
     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
+  elif func_cygming_ms_implib_p "$1"; then
     # ms-generated import library
     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
   else
     # unknown
-    sharedlib_from_linklib_result=""
+    sharedlib_from_linklib_result=
   fi
 }
 
@@ -3712,10 +5084,11 @@
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
       lockfile=$f_ex_an_ar_oldlib.lock
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@
     fi
     func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
 		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
+    if test yes = "$lock_old_archive_extraction"; then
       $opt_dry_run || rm -f "$lockfile"
     fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
-    $opt_debug
-    my_gentop="$1"; shift
+    $debug_cmd
+
+    my_gentop=$1; shift
     my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
 
     for my_xlib in $my_oldlibs; do
       # Extract the objects.
       case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
+      my_xlib=$func_basename_result
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
@@ -3765,7 +5139,7 @@
 	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
 
       func_mkdir_p "$my_xdir"
 
@@ -3778,22 +5152,23 @@
 	  cd $my_xdir || exit $?
 	  darwin_archive=$my_xabs
 	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
 	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 	  if test -n "$darwin_arches"; then
 	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 	    darwin_arch=
 	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
 	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@
       my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
-    func_extract_archives_result="$my_oldobjs"
+    func_extract_archives_result=$my_oldobjs
 }
 
 
@@ -3830,7 +5205,7 @@
 #
 # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
 # variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
 # the $objdir directory.  This is a cygwin/mingw-specific
 # behavior.
 func_emit_wrapper ()
@@ -3841,7 +5216,7 @@
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@
 
 # Very basic option parsing. These options are (a) specific to
 # the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
 # windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
 # this pattern).
 #
 # There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@
 
   # Print the debug banner immediately:
   if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
   fi
 }
 
@@ -3944,7 +5319,7 @@
   lt_dump_args_N=1;
   for lt_arg
   do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
     lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
   done
 }
@@ -3958,7 +5333,7 @@
   *-*-mingw | *-*-os2* | *-cegcc*)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@
   *)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-	if test "$fast_install" = yes; then
+	if test yes = "$fast_install"; then
 	  $ECHO "\
   program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
 
   if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@
     if test -n \"\$relink_command\"; then
       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
       fi
@@ -4101,7 +5476,7 @@
 	fi
 
 	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@
     fi
   else
     # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
     \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
@@ -4140,7 +5515,7 @@
 	cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
 # ifdef __STRICT_ANSI__
 int _putenv (const char *);
 # endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # ifdef __STRICT_ANSI__
 char *realpath (const char *, char *);
 int putenv (char *);
 int setenv (const char *, const char *, int);
 # endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
 #endif
 
 /* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
 # define setmode _setmode
 # define stat    _stat
 # define chmod   _chmod
 # define getcwd  _getcwd
 # define putenv  _putenv
 # define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
 # define setmode _setmode
 # define stat    _stat
 # define chmod   _chmod
 # define getcwd  _getcwd
 # define putenv  _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # define HAVE_SETENV
 # define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
 #endif
 
-#if defined(PATH_MAX)
+#if defined PATH_MAX
 # define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
 # define LT_PATHMAX MAXPATHLEN
 #else
 # define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@
 # define PATH_SEPARATOR ':'
 #endif
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
 # define HAVE_DOS_BASED_FILE_SYSTEM
 # define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@
 
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
+  if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
 static int lt_debug = 1;
 #else
 static int lt_debug = 0;
@@ -4300,11 +5673,16 @@
 EOF
 
 	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
               func_to_host_path "$temp_rpath"
 	      cat <<EOF
 const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@
 EOF
 	    fi
 
-	    if test "$fast_install" = yes; then
+	    if test yes = "$fast_install"; then
 	      cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
@@ -4357,12 +5735,12 @@
   char *actual_cwrapper_name;
   char *target_name;
   char *lt_argv_zero;
-  intptr_t rval = 127;
+  int rval = 127;
 
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
+  newargz = XMALLOC (char *, (size_t) argc + 1);
 
   /* very simple arg parsing; don't want to rely on getopt
    * also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@
   newargc=0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
+      if (STREQ (argv[i], dumpscript_opt))
 	{
 EOF
-	    case "$host" in
+	    case $host in
 	      *mingw* | *cygwin* )
 		# make stdout use "unix" line endings
 		echo "          setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@
 	  lt_dump_script (stdout);
 	  return 0;
 	}
-      if (strcmp (argv[i], debug_opt) == 0)
+      if (STREQ (argv[i], debug_opt))
 	{
           lt_debug = 1;
           continue;
 	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+      if (STREQ (argv[i], ltwrapper_option_prefix))
         {
           /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
              namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@
 EOF
 	    cat <<EOF
   /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
 EOF
 	    cat <<"EOF"
   lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
   newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
@@ -4569,7 +5947,7 @@
 {
   const char *base;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   /* Skip over the disk name in MSDOS pathnames. */
   if (isalpha ((unsigned char) name[0]) && name[1] == ':')
     name += 2;
@@ -4628,7 +6006,7 @@
   const char *p_next;
   /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
-  int tmp_len;
+  size_t tmp_len;
   char *concat_name;
 
   lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@
     return NULL;
 
   /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
     {
       concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@
 	    return concat_name;
 	  XFREE (concat_name);
 	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
     }
 #endif
 
@@ -4679,7 +6057,7 @@
 	      for (q = p; *q; q++)
 		if (IS_PATH_SEPARATOR (*q))
 		  break;
-	      p_len = q - p;
+	      p_len = (size_t) (q - p);
 	      p_next = (*q == '\0' ? q : q + 1);
 	      if (p_len == 0)
 		{
@@ -4798,7 +6176,7 @@
   if (patlen <= len)
     {
       str += len - patlen;
-      if (strcmp (str, pat) == 0)
+      if (STREQ (str, pat))
 	*str = '\0';
     }
   return str;
@@ -4863,7 +6241,7 @@
     char *str = xstrdup (value);
     setenv (name, str, 1);
 #else
-    int len = strlen (name) + 1 + strlen (value) + 1;
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
     char *str = XMALLOC (char, len);
     sprintf (str, "%s=%s", name, value);
     if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@
   char *new_value;
   if (orig_value && *orig_value)
     {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
       new_value = XMALLOC (char, add_len + orig_value_len + 1);
       if (to_end)
         {
@@ -4912,10 +6290,10 @@
     {
       char *new_value = lt_extend_str (getenv (name), value, 0);
       /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
         {
-          new_value[len-1] = '\0';
+          new_value[--len] = '\0';
         }
       lt_setenv (name, new_value);
       XFREE (new_value);
@@ -5082,27 +6460,47 @@
 # True if ARG is an import lib, as indicated by $file_magic_cmd
 func_win32_import_lib_p ()
 {
-    $opt_debug
+    $debug_cmd
+
     case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
     *import*) : ;;
     *) false ;;
     esac
 }
 
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $host in
     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
+      # what system we are compiling for in order to pass an extra
       # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
+      # to make a dll that has undefined symbols, in which case not
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
-    preload=no
+    preload=false
     prev=
     prevarg=
     release=
@@ -5161,7 +6560,7 @@
     vinfo=
     vinfo_number=no
     weak_libs=
-    single_module="${wl}-single_module"
+    single_module=$wl-single_module
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@
     do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	break
 	;;
       -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@
 
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
-      arg="$1"
+      arg=$1
       shift
       func_quote_for_eval "$arg"
       qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@
 
 	case $prev in
 	bindir)
-	  bindir="$arg"
+	  bindir=$arg
 	  prev=
 	  continue
 	  ;;
 	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
+	  $preload || {
 	    # Add the symbol object into the linking commands.
 	    func_append compile_command " @SYMFILE@"
 	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
+	    preload=:
+	  }
 	  case $arg in
 	  *.la | *.lo) ;;  # We handle these cases below.
 	  force)
-	    if test "$dlself" = no; then
+	    if test no = "$dlself"; then
 	      dlself=needless
 	      export_dynamic=yes
 	    fi
@@ -5249,9 +6648,9 @@
 	    continue
 	    ;;
 	  self)
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 	      dlself=yes
 	    else
 	      dlself=needless
@@ -5261,7 +6660,7 @@
 	    continue
 	    ;;
 	  *)
-	    if test "$prev" = dlfiles; then
+	    if test dlfiles = "$prev"; then
 	      func_append dlfiles " $arg"
 	    else
 	      func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@
 	  esac
 	  ;;
 	expsyms)
-	  export_symbols="$arg"
+	  export_symbols=$arg
 	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
+	    || func_fatal_error "symbol file '$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
 	expsyms_regex)
-	  export_symbols_regex="$arg"
+	  export_symbols_regex=$arg
 	  prev=
 	  continue
 	  ;;
@@ -5297,7 +6696,13 @@
 	  continue
 	  ;;
 	inst_prefix)
-	  inst_prefix_dir="$arg"
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
 	  prev=
 	  continue
 	  ;;
@@ -5321,21 +6726,21 @@
 
 		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
 		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
+		xdir=$func_dirname_result
+
+		if test none != "$pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
@@ -5346,7 +6751,7 @@
 		  fi
 
 		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
+		  if test dlprefiles = "$prev"; then
 		    # Preload the old-style object.
 		    func_append dlprefiles " $pic_object"
 		    prev=
@@ -5354,23 +6759,23 @@
 
 		  # A PIC object.
 		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
+		  arg=$pic_object
 		fi
 
 		# Non-PIC object.
-		if test "$non_pic_object" != none; then
+		if test none != "$non_pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
+		  non_pic_object=$xdir$non_pic_object
 
 		  # A standard non-PIC object
 		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
 		  fi
 		else
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
+		  non_pic_object=$pic_object
 		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
@@ -5378,7 +6783,7 @@
 		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
 		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
+		  xdir=$func_dirname_result
 
 		  func_lo2o "$arg"
 		  pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@
 		  func_append libobjs " $pic_object"
 		  func_append non_pic_objects " $non_pic_object"
 	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
+		  func_fatal_error "'$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
+	    func_fatal_error "link input file '$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
 	precious_regex)
-	  precious_files_regex="$arg"
+	  precious_files_regex=$arg
 	  prev=
 	  continue
 	  ;;
 	release)
-	  release="-$arg"
+	  release=-$arg
 	  prev=
 	  continue
 	  ;;
@@ -5415,7 +6825,7 @@
 	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
-	  if test "$prev" = rpath; then
+	  if test rpath = "$prev"; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
 	    *) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@
 	  continue
 	  ;;
 	shrext)
-	  shrext_cmds="$arg"
+	  shrext_cmds=$arg
 	  prev=
 	  continue
 	  ;;
@@ -5470,7 +6880,7 @@
 	esac
       fi # test -n "$prev"
 
-      prevarg="$arg"
+      prevarg=$arg
 
       case $arg in
       -all-static)
@@ -5484,7 +6894,7 @@
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -5516,7 +6926,7 @@
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
+	if test X-export-symbols = "X$arg"; then
 	  prev=expsyms
 	else
 	  prev=expsyms_regex
@@ -5550,9 +6960,9 @@
 	func_stripname "-L" '' "$arg"
 	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
+	    func_fatal_error "require no space between '-L' and '$1'"
 	  else
-	    func_fatal_error "need path for \`-L' option"
+	    func_fatal_error "need path for '-L' option"
 	  fi
 	fi
 	func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@
 	*)
 	  absdir=`cd "$dir" && pwd`
 	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
 	  ;;
 	esac
 	case "$deplibs " in
@@ -5599,7 +7009,7 @@
 	;;
 
       -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 	  case $host in
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@
 	    ;;
 	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
@@ -5620,22 +7030,27 @@
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
 	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  esac
-	elif test "X$arg" = "X-lc_r"; then
+	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
 	 esac
 	fi
 	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
 	continue
 	;;
 
@@ -5668,7 +7083,7 @@
 	;;
 
       -multi_module)
-	single_module="${wl}-multi_module"
+	single_module=$wl-multi_module
 	continue
 	;;
 
@@ -5682,8 +7097,8 @@
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -5698,6 +7113,11 @@
 
       -objectlist)
 	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
 	continue
 	;;
 
@@ -5788,14 +7208,14 @@
 	func_stripname '-Wc,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
 	  func_append arg " $func_quote_for_eval_result"
 	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5804,15 +7224,15 @@
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
 	  func_append arg " $wl$func_quote_for_eval_result"
 	  func_append compiler_flags " $wl$func_quote_for_eval_result"
 	  func_append linker_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5835,7 +7255,7 @@
       # -msg_* for osf cc
       -msg_*)
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,46 @@
       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
       # -F/path              path to uninstalled frameworks, gcc on darwin
       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
         continue
         ;;
 
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
       # Some other compiler flag.
       -* | +*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       *.$objext)
@@ -5886,21 +7327,21 @@
 
 	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
 	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
+	  xdir=$func_dirname_result
+
+	  test none = "$pic_object" || {
 	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		func_append dlfiles " $pic_object"
 		prev=
 		continue
@@ -5911,7 +7352,7 @@
 	    fi
 
 	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      # Preload the old-style object.
 	      func_append dlprefiles " $pic_object"
 	      prev=
@@ -5919,23 +7360,23 @@
 
 	    # A PIC object.
 	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
+	    arg=$pic_object
+	  }
 
 	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
+	  if test none != "$non_pic_object"; then
 	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
+	    non_pic_object=$xdir$non_pic_object
 
 	    # A standard non-PIC object
 	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
 	    fi
 	  else
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
+	    non_pic_object=$pic_object
 	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
@@ -5943,7 +7384,7 @@
 	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
 	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
+	    xdir=$func_dirname_result
 
 	    func_lo2o "$arg"
 	    pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7392,7 @@
 	    func_append libobjs " $pic_object"
 	    func_append non_pic_objects " $non_pic_object"
 	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
+	    func_fatal_error "'$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
@@ -5967,11 +7408,11 @@
 	# A libtool-controlled library.
 
 	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
+	if test dlfiles = "$prev"; then
 	  # This library was specified with -dlopen.
 	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
-	elif test "$prev" = dlprefiles; then
+	elif test dlprefiles = "$prev"; then
 	  # The library was specified with -dlpreopen.
 	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
@@ -5986,7 +7427,7 @@
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
       esac # arg
 
@@ -5998,9 +7439,9 @@
     done # argument parsing loop
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
       func_append compile_command " $arg"
       func_append finalize_command " $arg"
@@ -6009,20 +7450,23 @@
     oldlibs=
     # calculate the name of the file, without its directory
     func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
+    output_objdir=$func_dirname_result$objdir
     func_to_tool_file "$output_objdir/"
     tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
@@ -6045,7 +7489,7 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
+      if $opt_preserve_dup_deps; then
 	case "$libs " in
 	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
@@ -6053,7 +7497,7 @@
       func_append libs " $deplib"
     done
 
-    if test "$linkmode" = lib; then
+    if test lib = "$linkmode"; then
       libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
       # Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7529,7 @@
 	  case $file in
 	  *.la) ;;
 	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -6093,7 +7537,7 @@
     prog)
 	compile_deplibs=
 	finalize_deplibs=
-	alldeplibs=no
+	alldeplibs=false
 	newdlfiles=
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7549,29 @@
     for pass in $passes; do
       # The preopen pass in lib mode reverses $deplibs; put it back here
       # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
+      if test lib,link = "$linkmode,$pass"; then
 	## FIXME: Find the place where the list is rebuilt in the wrong
 	##        order, and fix it there properly
         tmp_deplibs=
 	for deplib in $deplibs; do
 	  tmp_deplibs="$deplib $tmp_deplibs"
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
       fi
 
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
 	deplibs=
       fi
-      if test "$linkmode" = prog; then
+      if test prog = "$linkmode"; then
 	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+      if test lib,dlpreopen = "$linkmode,$pass"; then
 	# Collect and forward deplibs of preopened libtool libs
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
@@ -6148,26 +7592,26 @@
 	    esac
 	  done
 	done
-	libs="$dlprefiles"
+	libs=$dlprefiles
       fi
-      if test "$pass" = dlopen; then
+      if test dlopen = "$pass"; then
 	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
+	save_deplibs=$deplibs
 	deplibs=
       fi
 
       for deplib in $libs; do
 	lib=
-	found=no
+	found=false
 	case $deplib in
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7621,13 @@
 	  continue
 	  ;;
 	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
 	    continue
 	  fi
 	  func_stripname '-l' '' "$deplib"
 	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	  else
 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7635,22 @@
 	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
+	      lib=$searchdir/lib$name$search_ext
 	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
+		if test .la = "$search_ext"; then
+		  found=:
 		else
-		  found=no
+		  found=false
 		fi
 		break 2
 	      fi
 	    done
 	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
+	  if $found; then
+	    # deplib is a libtool library
 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
 		if func_lalib_p "$lib"; then
@@ -6223,19 +7658,19 @@
 		  old_library=
 		  func_source "$lib"
 		  for l in $old_library $library_names; do
-		    ll="$l"
+		    ll=$l
 		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
 		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
+		    ladir=$func_dirname_result
 		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
+		    if test prog,link = "$linkmode,$pass"; then
 		      compile_deplibs="$deplib $compile_deplibs"
 		      finalize_deplibs="$deplib $finalize_deplibs"
 		    else
 		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 		    fi
 		    continue
 		  fi
@@ -6244,15 +7679,25 @@
 	      *) ;;
 	      esac
 	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
 	  fi
 	  ;; # -l
 	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7710,18 @@
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
+	    test conv = "$pass" && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
 	    func_resolve_sysroot "$func_stripname_result"
 	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
-	    if test "$pass" = conv; then
+	    if test conv = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test "$pass" = scan; then
+	    if test scan = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7732,13 @@
 	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
+	    func_warning "'-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
-	  if test "$pass" = link; then
+	  if test link = "$pass"; then
 	    func_stripname '-R' '' "$deplib"
 	    func_resolve_sysroot "$func_stripname_result"
 	    dir=$func_resolve_sysroot_result
@@ -6311,7 +7756,7 @@
 	  lib=$func_resolve_sysroot_result
 	  ;;
 	*.$libext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -6322,21 +7767,26 @@
 	    case " $dlpreconveniencelibs " in
 	    *" $deplib "*) ;;
 	    *)
-	      valid_a_lib=no
+	      valid_a_lib=false
 	      case $deplibs_check_method in
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
+		    valid_a_lib=:
 		  fi
 		;;
 		pass_all)
-		  valid_a_lib=yes
+		  valid_a_lib=:
 		;;
 	      esac
-	      if test "$valid_a_lib" != yes; then
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
 		echo
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
 		echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7794,13 @@
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because the file extensions .$libext of this argument makes me believe"
 		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
 	      fi
 	      ;;
 	    esac
 	    continue
 	    ;;
 	  prog)
-	    if test "$pass" != link; then
+	    if test link != "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7811,10 @@
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
 	      func_append newdlprefiles " $deplib"
@@ -6382,22 +7827,20 @@
 	  continue
 	  ;;
 	%DEPLIBS%)
-	  alldeplibs=yes
+	  alldeplibs=:
 	  continue
 	  ;;
 	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
 
 	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	ladir=$func_dirname_result
 
 	dlname=
 	dlopen=
@@ -6427,30 +7870,30 @@
 	  done
 	fi
 	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
 	  test -n "$dlopen" && func_append dlfiles " $dlopen"
 	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
-	if test "$pass" = conv; then
+	if test conv = "$pass"; then
 	  # Only check for convenience libraries
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
+	      func_fatal_error "cannot find name of link library for '$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
 	  fi
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
@@ -6464,26 +7907,26 @@
 	# Get the name of the library we link against.
 	linklib=
 	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
 	  linklib=$old_library
 	else
 	  for l in $old_library $library_names; do
-	    linklib="$l"
+	    linklib=$l
 	  done
 	fi
 	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
+	  func_fatal_error "cannot find name of link library for '$lib'"
 	fi
 
 	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -6497,40 +7940,40 @@
 
 	# We need an absolute path.
 	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "cannot determine absolute directory name of '$ladir'"
 	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
+	    abs_ladir=$ladir
 	  fi
 	  ;;
 	esac
 	func_basename "$lib"
-	laname="$func_basename_result"
+	laname=$func_basename_result
 
 	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
+	if test yes = "$installed"; then
 	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
 	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
 	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
+	    dir=$ladir
+	    absdir=$abs_ladir
 	    # Remove this search path later
 	    func_append notinst_path " $abs_ladir"
 	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
 	    # Remove this search path later
 	    func_append notinst_path " $abs_ladir"
 	  fi
@@ -6539,11 +7982,11 @@
 	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 	  fi
-	  case "$host" in
+	  case $host in
 	    # special handling for platforms with PE-DLLs.
 	    *cygwin* | *mingw* | *cegcc* )
 	      # Linker will automatically link against shared library if both
@@ -6587,9 +8030,9 @@
 
 	if test -z "$libdir"; then
 	  # Link the convenience library
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
+	  elif test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	  else
@@ -6599,14 +8042,14 @@
 	fi
 
 
-	if test "$linkmode" = prog && test "$pass" != link; then
+	if test prog = "$linkmode" && test link != "$pass"; then
 	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
 	  fi
 
 	  tmp_libs=
@@ -6618,14 +8061,14 @@
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
+	    if $linkalldeplibs; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
@@ -6635,15 +8078,15 @@
 	  continue
 	fi # $linkmode = prog...
 
-	if test "$linkmode,$pass" = "prog,link"; then
+	if test prog,link = "$linkmode,$pass"; then
 	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
 	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
+	      case $temp_rpath: in
 	      *"$absdir:"*) ;;
 	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
@@ -6672,9 +8115,9 @@
 	    esac
 	  fi # $linkmode,$pass = prog,link...
 
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
 		 test -n "$library_names"; }; }; then
 	    # We only need to search for static libraries
 	    continue
@@ -6683,19 +8126,19 @@
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
+	if test built = "$use_static_libs" && test yes = "$installed"; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
 	      # No point in relinking DLLs because paths are not encoded
 	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
-	    if test "$installed" = no; then
+	    if test no = "$installed"; then
 	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
@@ -6705,24 +8148,24 @@
 
 	  # Warn about portability, can't link against -module's on some
 	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
+	  dlopenmodule=
 	  for dlpremoduletest in $dlprefiles; do
 	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
+	      dlopenmodule=$dlpremoduletest
 	      break
 	    fi
 	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
 	    echo
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
 	    $ECHO "*** $linklib is not portable!"
 	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -6750,43 +8193,43 @@
 	    # figure out the soname
 	    set dummy $library_names
 	    shift
-	    realname="$1"
+	    realname=$1
 	    shift
 	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
-	      soname="$dlname"
+	      soname=$dlname
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
+	      *cygwin* | mingw* | *cegcc* | *os2*)
 	        func_arith $current - $age
 		major=$func_arith_result
-		versuffix="-$major"
+		versuffix=-$major
 		;;
 	      esac
 	      eval soname=\"$soname_spec\"
 	    else
-	      soname="$realname"
+	      soname=$realname
 	    fi
 
 	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
+	    soroot=$soname
 	    func_basename "$soroot"
-	    soname="$func_basename_result"
+	    soname=$func_basename_result
 	    func_stripname 'lib' '.dll' "$soname"
 	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_verbose "extracting exported symbol list from '$soname'"
 	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
+	      func_verbose "generating import library for '$soname'"
 	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
@@ -6794,58 +8237,58 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    lib_linked=yes
 	    case $hardcode_action in
 	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
 		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
+		    *-*-unixware7*) add_dir=-L$dir ;;
 		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
+		    # if the lib is a (non-dlopened) module then we cannot
 		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
+			 $GREP ": [^:]* bundle" >/dev/null; then
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
+			if test -z "$old_library"; then
 			  echo
 			  echo "*** And there doesn't seem to be a static archive available"
 			  echo "*** The link will probably fail, sorry"
 			else
-			  add="$dir/$old_library"
+			  add=$dir/$old_library
 			fi
 		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
+			add=$dir/$old_library
 		      fi
 		    fi
 		esac
-	      elif test "$hardcode_minus_L" = no; then
+	      elif test no = "$hardcode_minus_L"; then
 		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
+		*-*-sunos*) add_shlibpath=$dir ;;
 		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -6854,10 +8297,10 @@
 		      ;;
 		  esac
 		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
@@ -6865,7 +8308,7 @@
 	    *) lib_linked=no ;;
 	    esac
 
-	    if test "$lib_linked" != yes; then
+	    if test yes != "$lib_linked"; then
 	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
@@ -6875,15 +8318,15 @@
 	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
 		*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8335,33 @@
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
 	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
 	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
 	      else
-		add="$libdir/$linklib"
+		add=$libdir/$linklib
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+	      add_dir=-L$libdir
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
@@ -6927,10 +8370,10 @@
 		    ;;
 		esac
 	      fi
-	      add="-l$name"
+	      add=-l$name
 	    fi
 
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -6938,43 +8381,43 @@
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test "$linkmode" = prog; then
+	elif test prog = "$linkmode"; then
 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 	  # is not unsupported.  This is valid on all known static and
 	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
 	    compile_deplibs="$dir/$linklib $compile_deplibs"
 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 	  else
 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 	  fi
-	elif test "$build_libtool_libs" = yes; then
+	elif test yes = "$build_libtool_libs"; then
 	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
+	  if test pass_all != "$deplibs_check_method"; then
 	    # We're trying link a shared library against a static one
 	    # but the system doesn't support it.
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
 	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
 	    echo "*** I have the capability to make that library automatically link in when"
 	    echo "*** you link to this library.  But I can only do this if you have a"
 	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
+	    if test yes = "$module"; then
 	      echo "*** But as you try to build a module library, libtool will still create "
 	      echo "*** a static module, that should work as long as the dlopening application"
 	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
 		echo
 		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	      fi
-	      if test "$build_old_libs" = no; then
+	      if test no = "$build_old_libs"; then
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -6987,11 +8430,11 @@
 	  fi
 	fi # link shared/static library?
 
-	if test "$linkmode" = lib; then
+	if test lib = "$linkmode"; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
@@ -7005,12 +8448,12 @@
 	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
-	    dependency_libs="$temp_deplibs"
+	    dependency_libs=$temp_deplibs
 	  fi
 
 	  func_append newlib_search_path " $absdir"
 	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
@@ -7020,7 +8463,7 @@
                    func_resolve_sysroot "$func_stripname_result";;
               *) func_resolve_sysroot "$deplib" ;;
             esac
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $func_resolve_sysroot_result "*)
                 func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8472,12 @@
 	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
-	  if test "$link_all_deplibs" != no; then
+	  if test no != "$link_all_deplibs"; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
 	      path=
 	      case $deplib in
-	      -L*) path="$deplib" ;;
+	      -L*) path=$deplib ;;
 	      *.la)
 	        func_resolve_sysroot "$deplib"
 	        deplib=$func_resolve_sysroot_result
@@ -7042,12 +8485,12 @@
 		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
 		  fi
 		  ;;
 		esac
@@ -7055,35 +8498,35 @@
 		case $host in
 		*-*-darwin*)
 		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
                       if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 		      path=
 		    fi
 		  fi
 		  ;;
 		*)
-		  path="-L$absdir/$objdir"
+		  path=-L$absdir/$objdir
 		  ;;
 		esac
 		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
 		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
 		fi
 		;;
 	      esac
@@ -7095,23 +8538,23 @@
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
 	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
@@ -7121,12 +8564,12 @@
 	    esac
 	  done
 	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
+	}
+
+	if test prog,link = "$linkmode,$pass"; then
+	  vars="compile_deplibs finalize_deplibs"
 	else
-	  vars="compile_deplibs finalize_deplibs"
+	  vars=deplibs
 	fi
 	for var in $vars dependency_libs; do
 	  # Add libraries to $var in reverse order
@@ -7184,62 +8627,93 @@
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
-      for i in $dependency_libs ; do
+      for i in $dependency_libs; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
 	*" $i "*)
-	  i=""
+	  i=
 	  ;;
 	esac
-	if test -n "$i" ; then
+	if test -n "$i"; then
 	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
     done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
     fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+	func_warning "'-l' and '-L' are ignored for archives" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
+	func_warning "'-rpath' is ignored for archives"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
+	func_warning "'-R' is ignored for archives"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
+	func_warning "'-version-info/-version-number' is ignored for archives"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
+	func_warning "'-release' is ignored for archives"
 
       test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
+	func_warning "'-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
-      oldlibs="$output"
+      oldlibs=$output
       func_append objs "$old_deplibs"
       ;;
 
     lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
+      # Make sure we only generate libraries of the form 'libNAME.la'.
       case $outputname in
       lib*)
 	func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8722,10 @@
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
 	  # Add the "lib" prefix for modules if required
 	  func_stripname '' '.la' "$outputname"
 	  name=$func_stripname_result
@@ -7265,8 +8739,8 @@
       esac
 
       if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 	else
 	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8749,21 @@
 	fi
       fi
 
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
       shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
 
       oldlibs=
       if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
+	if test yes = "$build_libtool_libs"; then
 	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
+	  # Some compilers have problems with a '.al' extension so
 	  # convenience libraries should have the same extension an
 	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8772,20 @@
 	fi
 
 	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 
 	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
+	  func_warning "'-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
+	save_ifs=$IFS; IFS=:
 	set dummy $vinfo 0 0 0
 	shift
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
+	  func_fatal_help "too many parameters to '-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -7319,42 +8793,42 @@
 
 	case $vinfo_number in
 	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
 	  # and those that subtract age and use age as
 	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
+	  # that has an extra 1 added just for fun
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
+	    age=$number_minor
+	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
 	    ;;
 	  irix|nonstopux)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
+	    age=$number_minor
+	    revision=$number_minor
 	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
 	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
+	  current=$1
+	  revision=$2
+	  age=$3
 	  ;;
 	esac
 
@@ -7362,30 +8836,30 @@
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -7400,26 +8874,36 @@
 	  # verstring for coding it into the library header
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
 	  ;;
 
 	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
+	  if test no = "$lt_irix_increment"; then
 	    func_arith $current - $age
 	  else
 	    func_arith $current - $age + 1
@@ -7430,69 +8914,74 @@
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
 	  esac
-	  verstring="$verstring_prefix$major.$revision"
+	  verstring=$verstring_prefix$major.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $revision - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
+	    verstring=$verstring_prefix$major.$iface:$verstring
 	  done
 
-	  # Before this point, $major must not contain `.'.
+	  # Before this point, $major must not contain '.'.
 	  major=.$major
-	  versuffix="$major.$revision"
+	  versuffix=$major.$revision
 	  ;;
 
 	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	osf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $current - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
+	    verstring=$verstring:$iface.0
 	  done
 
 	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
+	  func_append verstring ":$current.0"
 	  ;;
 
 	qnx)
-	  major=".$current"
-	  versuffix=".$current"
+	  major=.$current
+	  versuffix=.$current
 	  ;;
 
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
 	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	windows)
 	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
+	  # extension on DOS 8.3 file systems.
 	  func_arith $current - $age
 	  major=$func_arith_result
-	  versuffix="-$major"
+	  versuffix=-$major
 	  ;;
 
 	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  func_fatal_configuration "unknown library version type '$version_type'"
 	  ;;
 	esac
 
@@ -7506,42 +8995,45 @@
 	    verstring=
 	    ;;
 	  *)
-	    verstring="0.0"
+	    verstring=0.0
 	    ;;
 	  esac
-	  if test "$need_version" = no; then
+	  if test no = "$need_version"; then
 	    versuffix=
 	  else
-	    versuffix=".0.0"
+	    versuffix=.0.0
 	  fi
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test yes,no = "$avoid_version,$need_version"; then
 	  major=
 	  versuffix=
-	  verstring=""
+	  verstring=
 	fi
 
 	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
 	  fi
 	else
 	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
+	  allow_undefined_flag=$no_undefined_flag
 	fi
 
       fi
 
-      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_generate_dlsyms "$libname" "$libname" :
       func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -7550,8 +9042,8 @@
 	  case $p in
 	    *.$objext | *.gcno)
 	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 		 then
 		   continue
@@ -7567,11 +9059,11 @@
       fi
 
       # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
 	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
@@ -7592,13 +9084,13 @@
 	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
 
       # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
+      old_dlfiles=$dlfiles
       dlfiles=
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
@@ -7608,7 +9100,7 @@
       done
 
       # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
+      old_dlprefiles=$dlprefiles
       dlprefiles=
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
@@ -7617,7 +9109,7 @@
 	esac
       done
 
-      if test "$build_libtool_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	  case $host in
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9133,7 @@
 	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
+	    if test yes = "$build_libtool_need_lc"; then
 	      func_append deplibs " -lc"
 	    fi
 	    ;;
@@ -7657,9 +9149,9 @@
 	# I'm not sure if I'm treating the release correctly.  I think
 	# release should show up in the -l (ie -lgmp5) so we don't want to
 	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
+	release=
+	versuffix=
+	major=
 	newdeplibs=
 	droppeddeps=no
 	case $deplibs_check_method in
@@ -7688,20 +9180,20 @@
 	      -l*)
 		func_stripname -l '' "$i"
 		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
 		    func_append newdeplibs " $i"
-		    i=""
+		    i=
 		    ;;
 		  esac
 		fi
-		if test -n "$i" ; then
+		if test -n "$i"; then
 		  libname=`eval "\\$ECHO \"$libname_spec\""`
 		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
@@ -7731,20 +9223,20 @@
 		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
 		      func_append newdeplibs " $i"
-		      i=""
+		      i=
 		      ;;
 		    esac
 		  fi
-		  if test -n "$i" ; then
+		  if test -n "$i"; then
 		    libname=`eval "\\$ECHO \"$libname_spec\""`
 		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
@@ -7781,24 +9273,24 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		if test -n "$file_magic_glob"; then
 		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
 		else
 		  libnameglob=$libname
 		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
+		  if test yes = "$want_nocaseglob"; then
 		    shopt -s nocaseglob
 		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
 		    $nocaseglob
@@ -7816,25 +9308,25 @@
 		      # We might still enter an endless loop, since a link
 		      # loop can be closed while we follow links,
 		      # but so what?
-		      potlib="$potent_lib"
+		      potlib=$potent_lib
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
 			func_append newdeplibs " $a_deplib"
-			a_deplib=""
+			a_deplib=
 			break 2
 		      fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9334,7 @@
 		echo "*** you link to this library.  But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9357,30 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    potlib=$potent_lib # see symlink-check above in file_magic test
 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
 		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
+		      a_deplib=
 		      break 2
 		    fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9388,7 @@
 		echo "*** you link to this library.  But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9404,18 @@
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
-	  newdeplibs=""
+	  newdeplibs=
 	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 	    done
 	  fi
 	  case $tmp_deplibs in
 	  *[!\	\ ]*)
 	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
+	    if test none = "$deplibs_check_method"; then
 	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
 	      echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9439,8 @@
 	  ;;
 	esac
 
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
 	    echo
 	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
@@ -7957,12 +9449,12 @@
 	    if test -z "$global_symbol_pipe"; then
 	      echo
 	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
 	      build_libtool_libs=module
 	      build_old_libs=yes
 	    else
@@ -7973,14 +9465,14 @@
 	    echo "*** automatically added whenever a program is linked with this library"
 	    echo "*** or is declared to -dlopen it."
 
-	    if test "$allow_undefined" = no; then
+	    if test no = "$allow_undefined"; then
 	      echo
 	      echo "*** Since this library must not contain undefined symbols,"
 	      echo "*** because either the platform does not support them or"
 	      echo "*** it was explicitly requested with -no-undefined,"
 	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -8026,7 +9518,7 @@
 	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      deplibs="$new_libs"
+      deplibs=$new_libs
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -8034,25 +9526,25 @@
       dlname=
 
       # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
 	# FIXME: should test the right _cmds variable.
 	case $archive_cmds in
 	  *\$LD\ *) wl= ;;
         esac
-	if test "$hardcode_into_libs" = yes; then
+	if test yes = "$hardcode_into_libs"; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
 		func_replace_sysroot "$libdir"
 		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
+		  hardcode_libdirs=$libdir
 		else
 		  # Just accumulate the unique libdirs.
 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9569,7 @@
 	  # Substitute the hardcoded libdirs into the rpath.
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
+	    libdir=$hardcode_libdirs
 	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9583,8 @@
 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 	fi
 
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -8102,19 +9594,19 @@
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	shift
-	realname="$1"
+	realname=$1
 	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
 	else
-	  soname="$realname"
+	  soname=$realname
 	fi
 	if test -z "$dlname"; then
 	  dlname=$soname
 	fi
 
-	lib="$output_objdir/$realname"
+	lib=$output_objdir/$realname
 	linknames=
 	for link
 	do
@@ -8128,7 +9620,7 @@
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
 	  func_append delfiles " $export_symbols"
 	fi
 
@@ -8137,31 +9629,31 @@
 	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	    func_dll_def_p "$export_symbols" || {
 	      # and it's NOT already a .def file. Must figure out
 	      # which of the given symbols are data symbols and tag
 	      # them as such. So, trigger use of export_symbols_cmds.
 	      # export_symbols gets reassigned inside the "prepare
 	      # the list of exported symbols" if statement, so the
 	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
+	      orig_export_symbols=$export_symbols
 	      export_symbols=
 	      always_export_symbols=yes
-	    fi
+	    }
 	  fi
 	  ;;
 	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
+	      IFS=$save_ifs
 	      # Take the normal branch if the nm_file_list_spec branch
 	      # doesn't work or if tool conversion is not needed.
 	      case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9667,7 @@
 		  try_normal_branch=no
 		  ;;
 	      esac
-	      if test "$try_normal_branch" = yes \
+	      if test yes = "$try_normal_branch" \
 		 && { test "$len" -lt "$max_cmd_len" \
 		      || test "$max_cmd_len" -le -1; }
 	      then
@@ -8186,7 +9678,7 @@
 		output_la=$func_basename_result
 		save_libobjs=$libobjs
 		save_output=$output
-		output=${output_objdir}/${output_la}.nm
+		output=$output_objdir/$output_la.nm
 		func_to_tool_file "$output"
 		libobjs=$nm_file_list_spec$func_to_tool_file_result
 		func_append delfiles " $output"
@@ -8209,8 +9701,8 @@
 		break
 	      fi
 	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
@@ -8218,16 +9710,16 @@
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
 	  # though. Also, the filter scales superlinearly with the number of
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
@@ -8246,11 +9738,11 @@
 	    ;;
 	  esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
+	    test yes = "$compiler_needs_object" &&
 	    test -z "$libobjs"; then
 	    # extract the archives, so we have objects to list.
 	    # TODO: could optimize this to just extract one archive.
@@ -8261,7 +9753,7 @@
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	    test "X$libobjs" = "X " && libobjs=
 	  else
-	    gentop="$output_objdir/${outputname}x"
+	    gentop=$output_objdir/${outputname}x
 	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
@@ -8270,18 +9762,18 @@
 	  fi
 	fi
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
+	if test yes = "$module" && test -n "$module_cmds"; then
 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	    eval test_cmds=\"$module_expsym_cmds\"
 	    cmds=$module_expsym_cmds
@@ -8299,7 +9791,7 @@
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" &&
+	if test : != "$skipped_export" &&
 	   func_len " $test_cmds" &&
 	   len=$func_len_result &&
 	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9824,8 @@
 	  last_robj=
 	  k=1
 
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
 	    func_verbose "creating GNU ld script: $output"
 	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
@@ -8345,14 +9837,14 @@
 	    func_append delfiles " $output"
 	    func_to_tool_file "$output"
 	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
 	    func_verbose "creating linker input file list: $output"
 	    : > $output
 	    set x $save_libobjs
 	    shift
 	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
+	    if test yes = "$compiler_needs_object"; then
 	      firstobj="$1 "
 	      shift
 	    fi
@@ -8367,7 +9859,7 @@
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
+	      output=$output_objdir/$output_la-$k.$objext
 	      eval test_cmds=\"$reload_cmds\"
 	      func_len " $test_cmds"
 	      len0=$func_len_result
@@ -8379,13 +9871,13 @@
 		func_len " $obj"
 		func_arith $len + $func_len_result
 		len=$func_arith_result
-		if test "X$objlist" = X ||
+		if test -z "$objlist" ||
 		   test "$len" -lt "$max_cmd_len"; then
 		  func_append objlist " $obj"
 		else
 		  # The command $test_cmds is almost too long, add a
 		  # command to the queue.
-		  if test "$k" -eq 1 ; then
+		  if test 1 -eq "$k"; then
 		    # The first file doesn't have a previous command to add.
 		    reload_objs=$objlist
 		    eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9887,10 @@
 		    reload_objs="$objlist $last_robj"
 		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  last_robj=$output_objdir/$output_la-$k.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
+		  output=$output_objdir/$output_la-$k.$objext
 		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
@@ -8410,9 +9902,9 @@
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
 	      func_append delfiles " $output"
 
@@ -8420,9 +9912,9 @@
 	      output=
 	    fi
 
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
 	      $opt_dry_run || $RM $export_symbols
 	      libobjs=$output
 	      # Append the command to create the export file.
@@ -8431,16 +9923,16 @@
 	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	    fi
+	    }
 
 	    test -n "$save_libobjs" &&
 	      func_verbose "creating a temporary reloadable object file: $output"
 
 	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
+	      IFS=$save_ifs
+	      $opt_quiet || {
 		  func_quote_for_expand "$cmd"
 		  eval "func_echo $func_quote_for_expand_result"
 	      }
@@ -8448,7 +9940,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
+		if test relink = "$opt_mode"; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -8457,7 +9949,7 @@
 		exit $lt_exit
 	      }
 	    done
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 
 	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +9957,18 @@
 	    fi
 	  fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
 	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
 	      # though. Also, the filter scales superlinearly with the number of
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
@@ -8485,7 +9977,7 @@
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
-	  fi
+	  }
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -8499,7 +9991,7 @@
 	  # value of $libobjs for piecewise linking.
 
 	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test yes = "$module" && test -n "$module_cmds"; then
 	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	      cmds=$module_expsym_cmds
 	    else
@@ -8521,7 +10013,7 @@
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10021,12 @@
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
-	save_ifs="$IFS"; IFS='~'
+	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
-	  IFS="$save_ifs"
+	  IFS=$sp$nl
 	  eval cmd=\"$cmd\"
-	  $opt_silent || {
+	  IFS=$save_ifs
+	  $opt_quiet || {
 	    func_quote_for_expand "$cmd"
 	    eval "func_echo $func_quote_for_expand_result"
 	  }
@@ -8541,7 +10034,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
+	    if test relink = "$opt_mode"; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -8550,10 +10043,10 @@
 	    exit $lt_exit
 	  }
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -8573,39 +10066,39 @@
 	done
 
 	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
+	if test yes = "$module" || test yes = "$export_dynamic"; then
 	  # On all known operating systems, these are identical.
-	  dlname="$soname"
+	  dlname=$soname
 	fi
       fi
       ;;
 
     obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+	func_warning "'-l' and '-L' are ignored for objects" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
+	func_warning "'-rpath' is ignored for objects"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
+	func_warning "'-R' is ignored for objects"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
+	func_warning "'-version-info' is ignored for objects"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
+	func_warning "'-release' is ignored for objects"
 
       case $output in
       *.lo)
 	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
 
 	libobj=$output
 	func_lo2o "$libobj"
@@ -8613,7 +10106,7 @@
 	;;
       *)
 	libobj=
-	obj="$output"
+	obj=$output
 	;;
       esac
 
@@ -8626,17 +10119,19 @@
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
-	  gentop="$output_objdir/${obj}x"
+	  gentop=$output_objdir/${obj}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
@@ -8645,12 +10140,12 @@
       fi
 
       # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
       func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
@@ -8662,7 +10157,7 @@
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$build_libtool_libs" != yes; then
+      test yes = "$build_libtool_libs" || {
 	if test -n "$gentop"; then
 	  func_show_eval '${RM}r "$gentop"'
 	fi
@@ -8672,12 +10167,12 @@
 	# $show "echo timestamp > $libobj"
 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
+	output=$libobj
 	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
@@ -8694,16 +10189,14 @@
 	          output=$func_stripname_result.exe;;
       esac
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+	func_warning "'-version-info' is ignored for programs"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+	func_warning "'-release' is ignored for programs"
+
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10210,11 @@
       *-*-darwin*)
 	# Don't allow lazy linking, it breaks C++ global constructors
 	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
+	if test CXX = "$tagname"; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
 	    ;;
 	  esac
 	fi
@@ -8757,7 +10250,7 @@
 	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      compile_deplibs="$new_libs"
+      compile_deplibs=$new_libs
 
 
       func_append compile_command " $compile_deplibs"
@@ -8781,7 +10274,7 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10297,7 @@
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
@@ -8821,10 +10314,10 @@
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      compile_rpath="$rpath"
+      compile_rpath=$rpath
 
       rpath=
       hardcode_libdirs=
@@ -8832,7 +10325,7 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10350,43 @@
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
 	# Transform all the library objects into standard objects.
 	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
       # template prelinking step
       if test -n "$prelink_cmds"; then
 	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      wrappers_required=yes
+      wrappers_required=:
       case $host in
       *cegcc* | *mingw32ce*)
         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
+        wrappers_required=false
         ;;
       *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
+        test yes = "$build_libtool_libs" || wrappers_required=false
         ;;
       *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
         fi
         ;;
       esac
-      if test "$wrappers_required" = no; then
+      $wrappers_required || {
 	# Replace the output file specification.
 	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	link_command=$compile_command$compile_rpath
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
@@ -8908,12 +10399,12 @@
 	fi
 
 	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 	fi
 
 	exit $exit_status
-      fi
+      }
 
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10434,9 @@
 	fi
       fi
 
-      if test "$no_install" = yes; then
+      if test yes = "$no_install"; then
 	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
+	link_command=$compile_var$compile_command$compile_rpath
 	# Replace the output file specification.
 	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
@@ -8962,27 +10453,28 @@
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
 
       # Replace the output file specification.
       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10531,8 @@
 	    func_dirname_and_basename "$output" "" "."
 	    output_name=$func_basename_result
 	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
 	    $RM $cwrappersource $cwrapper
 	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
@@ -9061,7 +10553,7 @@
 	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 	    $opt_dry_run || {
 	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
+	      if test "x$build" = "x$host"; then
 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 	      else
 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10576,27 @@
     # See if we need to build an old-fashioned archive.
     for oldlib in $oldlibs; do
 
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
 	  build_libtool_libs=no
-	else
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
 	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
 
       if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
+	gentop=$output_objdir/${outputname}x
 	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
@@ -9110,13 +10604,13 @@
       fi
 
       # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 	cmds=$old_archive_from_new_cmds
       else
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10631,7 @@
 	  :
 	else
 	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
@@ -9146,7 +10640,7 @@
 	  for obj in $save_oldobjs
 	  do
 	    func_basename "$obj"
-	    objbase="$func_basename_result"
+	    objbase=$func_basename_result
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -9215,18 +10709,18 @@
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
+	      if test "$obj" = "$last_oldobj"; then
 		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 	      objlist=
 	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
 	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
+	  if test -z "$oldobjs"; then
 	    eval cmds=\"\$concat_cmds\"
 	  else
 	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10737,7 @@
     case $output in
     *.la)
       old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      test yes = "$build_old_libs" && old_library=$libname.$libext
       func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
@@ -9258,31 +10752,31 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
+      if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
 
       # Only create the output if not a dry run.
       $opt_dry_run || {
 	for installed in no yes; do
-	  if test "$installed" = yes; then
+	  if test yes = "$installed"; then
 	    if test -z "$install_libdir"; then
 	      break
 	    fi
-	    output="$output_objdir/$outputname"i
+	    output=$output_objdir/${outputname}i
 	    # Replace all uninstalled libtool libraries with the installed ones
 	    newdependency_libs=
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
 		func_basename "$deplib"
-		name="$func_basename_result"
+		name=$func_basename_result
 		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      -L*)
@@ -9298,23 +10792,23 @@
 	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
-	    dependency_libs="$newdependency_libs"
+	    dependency_libs=$newdependency_libs
 	    newdlfiles=
 
 	    for lib in $dlfiles; do
 	      case $lib in
 	      *.la)
 	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
@@ -9324,34 +10818,34 @@
 		# didn't already link the preopened objects directly into
 		# the library:
 		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
 	      func_append newdlfiles " $abs"
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
 	      func_append newdlprefiles " $abs"
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
@@ -9367,10 +10861,9 @@
 	  case $host,$output,$installed,$module,$dlname in
 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
 	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
+	      if test -n "$bindir"; then
 		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
+		tdlname=$func_relative_path_result/$dlname
 	      else
 		# Otherwise fall back on heuristic.
 		tdlname=../bin/$dlname
@@ -9379,7 +10872,7 @@
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -9393,7 +10886,7 @@
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
@@ -9419,7 +10912,7 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
+	  if test no,yes = "$installed,$need_relink"; then
 	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
@@ -9434,27 +10927,29 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
-    $opt_debug
-    RM="$nonopt"
+    $debug_cmd
+
+    RM=$nonopt
     files=
-    rmforce=
+    rmforce=false
     exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     for arg
     do
       case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
+      -f) func_append RM " $arg"; rmforce=: ;;
       -*) func_append RM " $arg" ;;
       *) func_append files " $arg" ;;
       esac
@@ -9467,18 +10962,18 @@
 
     for file in $files; do
       func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
       else
-	odir="$dir/$objdir"
+	odir=$dir/$objdir
       fi
       func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
 
       # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
+      if test clean = "$opt_mode"; then
 	case " $rmdirs " in
 	  *" $odir "*) ;;
 	  *) func_append rmdirs " $odir" ;;
@@ -9493,11 +10988,11 @@
       elif test -d "$file"; then
 	exit_status=1
 	continue
-      elif test "$rmforce" = yes; then
+      elif $rmforce; then
 	continue
       fi
 
-      rmfiles="$file"
+      rmfiles=$file
 
       case $name in
       *.la)
@@ -9511,7 +11006,7 @@
 	  done
 	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$opt_mode" in
+	  case $opt_mode in
 	  clean)
 	    case " $library_names " in
 	    *" $dlname "*) ;;
@@ -9522,12 +11017,12 @@
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -9543,21 +11038,19 @@
 	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
+	  if test -n "$pic_object" && test none != "$pic_object"; then
 	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
 	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$opt_mode" = clean ; then
+	if test clean = "$opt_mode"; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -9584,12 +11077,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
 	      func_append rmfiles " $odir/lt-$name"
 	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
 	    fi
 	  fi
 	fi
@@ -9598,7 +11091,7 @@
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
 
-    # Try to remove the ${objdir}s in the directories where we deleted files
+    # Try to remove the $objdir's in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
 	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11101,17 @@
     exit $exit_status
 }
 
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
 
 test -z "$opt_mode" && {
-  help="$generic_help"
+  help=$generic_help
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
+  func_fatal_help "invalid operation mode '$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
@@ -9628,7 +11122,7 @@
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
+# where we disable both kinds of libraries.  Given conflicting
 # choices, we go for a static library, that is the most portable,
 # since we can't tell whether shared libraries were disabled because
 # the user asked for that or because the platform doesn't support
@@ -9651,5 +11145,3 @@
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-
diff --git a/m4/intltool.m4 b/m4/intltool.m4
index 33353ed..c25b7b1 100644
--- a/m4/intltool.m4
+++ b/m4/intltool.m4
@@ -154,31 +154,6 @@
 
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
 
 IT_PO_SUBDIR([po])
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f12cfdf..a644432 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-#   This file is part of GNU Libtool.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
-# serial 57 LT_INIT
+# serial 58 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@
 # LT_INIT([OPTIONS])
 # ------------------
 AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@
 _LT_SET_OPTIONS([$0], [$1])
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@
 dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
 ])
 
 
 # _LT_FILEUTILS_DEFAULTS
 # ----------------------
 # It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
 m4_defun([_LT_FILEUTILS_DEFAULTS],
 [: ${CP="cp -f"}
 : ${MV="mv -f"}
@@ -177,15 +186,16 @@
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 ])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
@@ -198,7 +208,7 @@
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
@@ -209,14 +219,14 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@
 
 # _LT_PROG_LTMAIN
 # ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
 # now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
 # so we pass a copy along to make sure it has a sensible value anyway.
 m4_defun([_LT_PROG_LTMAIN],
 [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
 _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 ])# _LT_PROG_LTMAIN
 
 
@@ -286,7 +296,7 @@
 
 # So that we can recreate a full libtool script including additional
 # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
 # label.
 
 
@@ -421,8 +431,8 @@
 
 # _LT_CONFIG_STATUS_DECLARE([VARNAME])
 # ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
 [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -446,7 +456,7 @@
 # Output comment and list of tags supported by the script
 m4_defun([_LT_LIBTOOL_TAGS],
 [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
 ])
 
 
@@ -474,7 +484,7 @@
 # _LT_LIBTOOL_CONFIG_VARS
 # -----------------------
 # Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
 # script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 # section) are produced by _LT_LIBTOOL_TAG_VARS.
 m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -500,8 +510,8 @@
 # Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 # variables for single and double quote escaping we saved from calls
 # to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
 # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 m4_defun([_LT_CONFIG_COMMANDS],
 [AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -547,7 +557,7 @@
 ]], lt_decl_quote_varnames); do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@
 ]], lt_decl_dquote_varnames); do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@
 # Generate a child script FILE with all initialization necessary to
 # reuse the environment learned by the parent script, and make the
 # file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
+# '#!' sequence but before initialization text begins.  After this
 # macro, additional text can be appended to FILE to form the body of
 # the child script.  The macro ends with non-zero status if the
 # file could not be fully written (such as if the disk is full).
@@ -598,7 +608,7 @@
 _AS_PREPARE
 exec AS_MESSAGE_FD>&1
 _ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
 m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
@@ -621,7 +631,7 @@
 } >&AS_MESSAGE_LOG_FD
 
 lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
 for use in further configure time tests before the real libtool is
 generated.
 
@@ -643,7 +653,7 @@
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
-while test $[#] != 0
+while test 0 != $[#]
 do
   case $[1] in
     --version | --v* | -V )
@@ -656,10 +666,10 @@
       lt_cl_silent=: ;;
 
     -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
 
     *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
   esac
   shift
 done
@@ -685,7 +695,7 @@
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
 lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
   lt_config_lt_args="$lt_config_lt_args --quiet"
 exec AS_MESSAGE_LOG_FD>/dev/null
 $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -705,31 +715,46 @@
 _LT_CONFIG_SAVE_COMMANDS([
   m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
   m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
 _LT_COPYING
 _LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
 # ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
 
 _LT_EOF
 
@@ -739,7 +764,7 @@
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -755,8 +780,6 @@
   # is reportedly fixed, but why not run on old versions too?
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
 
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
@@ -775,7 +798,6 @@
 [m4_if([$1], [], [
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'], [])
 ])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +996,7 @@
 
     AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
       [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
@@ -992,7 +1014,7 @@
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
 	# Otherwise, if the output was created with a 0 exit code from
 	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1032,7 @@
       AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 	[lt_cv_ld_exported_symbols_list=yes],
 	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
     ])
 
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1054,7 @@
       _lt_result=$?
       if test -s conftest.err && $GREP force_load conftest.err; then
 	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1064,32 @@
     ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
       _lt_dar_single_mod='$single_module'
     fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
     else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -1087,29 +1109,29 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
     m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
                   [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
+  if test yes = "$_lt_dar_can_shared"; then
     output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ],[])
   else
@@ -1129,7 +1151,7 @@
 # Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
+if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1169,7 @@
     _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi],[])
   if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
   fi
   ])
   aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1189,8 @@
 # -----------------------
 # Find how we can fake an echo command that does not interpret backslash.
 # In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
 [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1218,10 @@
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
-    $ECHO "$*" 
+    $ECHO "$*"
 }
 
-case "$ECHO" in
+case $ECHO in
   printf*) AC_MSG_RESULT([printf]) ;;
   print*) AC_MSG_RESULT([print -r]) ;;
   *) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1247,17 @@
 AC_DEFUN([_LT_WITH_SYSROOT],
 [AC_MSG_CHECKING([for sysroot])
 AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
 [], [with_sysroot=no])
 
 dnl lt_sysroot will always be passed unquoted.  We quote it here
 dnl in case the user passed a directory name.
 lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
  yes)
-   if test "$GCC" = yes; then
+   if test yes = "$GCC"; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
@@ -1244,14 +1267,14 @@
  no|'')
    ;; #(
  *)
-   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_RESULT([$with_sysroot])
    AC_MSG_ERROR([The sysroot must be an absolute path.])
    ;;
 esac
 
  AC_MSG_RESULT([${lt_sysroot:-no}])
 _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
 
 # _LT_ENABLE_LOCK
 # ---------------
@@ -1259,31 +1282,33 @@
 [AC_ARG_ENABLE([libtool-lock],
   [AS_HELP_STRING([--disable-libtool-lock],
     [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1337,46 @@
   rm -rf conftest*
   ;;
 
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
@@ -1324,7 +1386,14 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
@@ -1369,19 +1438,20 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
     [AC_LANG_PUSH(C)
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
      AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
 *-*solaris*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
@@ -1389,7 +1459,7 @@
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*)
+        i?86-*-solaris*|x86_64-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
@@ -1398,7 +1468,7 @@
         esac
         # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
         if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
+          LD=${LD-ld}_sol2
         fi
         ;;
       *)
@@ -1414,7 +1484,7 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 ])# _LT_ENABLE_LOCK
 
 
@@ -1433,11 +1503,11 @@
      [echo conftest.$ac_objext > conftest.lst
       lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
       AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
+      if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
+	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
@@ -1445,7 +1515,7 @@
      ])
   ])
 
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
@@ -1476,7 +1546,7 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
+  bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
@@ -1512,7 +1582,7 @@
   [$2=no
    m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
@@ -1539,7 +1609,7 @@
    $RM conftest*
 ])
 
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
     m4_if([$5], , :, [$5])
 else
     m4_if([$6], , :, [$6])
@@ -1561,7 +1631,7 @@
 m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $3"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1580,10 +1650,10 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 ])
 
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
     m4_if([$4], , :, [$4])
 else
     m4_if([$5], , :, [$5])
@@ -1604,7 +1674,7 @@
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -1644,7 +1714,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1694,22 +1764,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -1725,7 +1796,7 @@
     ;;
   esac
 ])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 else
   AC_MSG_RESULT(none)
@@ -1753,7 +1824,7 @@
 # ----------------------------------------------------------------
 m4_defun([_LT_TRY_DLOPEN_SELF],
 [m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
   [$4]
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1800,9 +1871,9 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -1828,7 +1899,7 @@
   return status;
 }]
 _LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -1849,7 +1920,7 @@
 # ------------------
 AC_DEFUN([LT_SYS_DLOPEN_SELF],
 [m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -1859,44 +1930,52 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ])
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
+	  [lt_cv_dlopen=shl_load],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
 	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
+	      [lt_cv_dlopen=dlopen],
 	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
 	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
 	      ])
 	    ])
 	  ])
@@ -1905,21 +1984,21 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
     enable_dlopen=yes
-  else
-    enable_dlopen=no
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1929,7 +2008,7 @@
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     ])
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
 	  lt_cv_dlopen_self_static, [dnl
@@ -1939,9 +2018,9 @@
       ])
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -2033,8 +2112,8 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 _LT_COMPILER_C_O([$1])
 
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING([if we can lock with hard links])
   hard_links=yes
@@ -2044,8 +2123,8 @@
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
     need_locks=warn
   fi
 else
@@ -2072,8 +2151,8 @@
 _LT_DECL([], [objdir], [0],
          [The name of the directory that contains temporary libtool files])dnl
 m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
 ])# _LT_CHECK_OBJDIR
 
 
@@ -2085,15 +2164,15 @@
 _LT_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
    test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
 
   # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
     # Linking always hardcodes the temporary library directory.
     _LT_TAGVAR(hardcode_action, $1)=relink
   else
@@ -2107,12 +2186,12 @@
 fi
 AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
 
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -2136,7 +2215,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT([yes])
@@ -2154,6 +2233,47 @@
 ])# _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
@@ -2164,17 +2284,18 @@
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
   esac
   case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
   case $lt_search_path_spec in
@@ -2190,28 +2311,35 @@
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
   lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -2225,7 +2353,7 @@
   # for these hosts.
   case $host_os in
     mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
   esac
   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
@@ -2234,7 +2362,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -2251,14 +2379,17 @@
 # flags to be left without arguments
 need_version=unknown
 
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[[4-9]]*)
@@ -2266,41 +2397,91 @@
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[[01]] | aix4.[[01]].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -2310,18 +2491,18 @@
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
@@ -2329,8 +2510,8 @@
 bsdi[[45]]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2342,7 +2523,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
@@ -2351,8 +2532,8 @@
     # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
@@ -2368,17 +2549,17 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 m4_if([$1], [],[
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
@@ -2387,8 +2568,8 @@
   *,cl*)
     # Native MSVC
     libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
 
     case $build_os in
     mingw*)
@@ -2415,7 +2596,7 @@
       sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       ;;
     *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
         # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2428,8 +2609,8 @@
     esac
 
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname'
@@ -2442,7 +2623,7 @@
 
   *)
     # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
   esac
@@ -2455,8 +2636,8 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2469,8 +2650,8 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -2488,12 +2669,13 @@
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -2518,26 +2700,15 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
@@ -2555,14 +2726,15 @@
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -2570,8 +2742,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
@@ -2580,8 +2752,8 @@
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
   # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2594,8 +2766,8 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -2606,7 +2778,7 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
@@ -2614,8 +2786,8 @@
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
@@ -2634,8 +2806,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
@@ -2644,13 +2816,33 @@
   dynamic_linker=no
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
@@ -2678,11 +2870,15 @@
   # Add ABI-specific directories to the system library path.
   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2699,12 +2895,12 @@
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -2714,7 +2910,7 @@
 
 newsos6)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
@@ -2723,58 +2919,68 @@
   version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -2785,8 +2991,8 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -2796,11 +3002,11 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
@@ -2808,8 +3014,8 @@
 
 sysv4 | sysv4.3*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
@@ -2830,24 +3036,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
+  if test -d /usr/nec; then
     version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2865,7 +3071,7 @@
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
@@ -2873,8 +3079,8 @@
 
 uts4*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -2883,19 +3089,29 @@
   ;;
 esac
 AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
 
 _LT_DECL([], [variables_saved_for_relink], [1],
     [Variables whose values should be saved in libtool wrapper scripts and
@@ -2929,39 +3145,41 @@
     [Whether we should hardcode library paths into libraries])
 _LT_DECL([], [sys_lib_search_path_spec], [2],
     [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 ])# _LT_SYS_DYNAMIC_LINKER
 
 
 # _LT_PATH_TOOL_PREFIX(TOOL)
 # --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
 AC_DEFUN([_LT_PATH_TOOL_PREFIX],
 [m4_require([_LT_DECL_EGREP])dnl
 AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 [case $MAGIC_CMD in
 [[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
   ac_dummy="m4_if([$2], , $PATH, [$2])"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
@@ -2984,11 +3202,11 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   AC_MSG_RESULT($MAGIC_CMD)
 else
@@ -3006,7 +3224,7 @@
 
 # _LT_PATH_MAGIC
 # --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
 m4_defun([_LT_PATH_MAGIC],
 [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3033,16 +3251,16 @@
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
+    [test no = "$withval" || with_gnu_ld=yes],
     [with_gnu_ld=no])dnl
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
+    # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3056,7 +3274,7 @@
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      test -z "$LD" && LD="$ac_prog"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -3067,37 +3285,37 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   AC_MSG_CHECKING([for GNU ld])
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -3151,13 +3369,13 @@
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       reload_cmds=false
     fi
     ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -3166,6 +3384,43 @@
 _LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 _LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
 
 
 # _LT_CHECK_MAGIC_METHOD
@@ -3183,13 +3438,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix[[4-9]]*)
@@ -3216,8 +3471,7 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
@@ -3251,10 +3505,6 @@
   else
     lt_cv_deplibs_check_method=pass_all
   fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
   ;;
 
 haiku*)
@@ -3295,7 +3545,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3317,8 +3567,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3371,6 +3621,9 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 ])
 
@@ -3411,33 +3664,38 @@
 AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3448,21 +3706,21 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
   if test -n "$DUMPBIN"; then :
     # Let the user override the test.
   else
     AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
     *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
+      DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
     *)
       DUMPBIN=:
@@ -3470,8 +3728,8 @@
     esac
   fi
   AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -3517,8 +3775,8 @@
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
   *--identify-strict*)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -3530,7 +3788,7 @@
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 ])
@@ -3557,11 +3815,26 @@
     lt_cv_path_mainfest_tool=yes
   fi
   rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 ])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
 
 
 # LT_LIB_M
@@ -3575,11 +3848,11 @@
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
   AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
   ;;
 esac
 AC_SUBST([LIBM])
@@ -3598,7 +3871,7 @@
 
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3650,7 +3923,7 @@
   symcode='[[ABCDGISTW]]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[[ABCDEGRST]]'
   fi
   ;;
@@ -3683,14 +3956,44 @@
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3708,21 +4011,24 @@
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx]"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3762,11 +4068,11 @@
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT@&t@_DLSYM_CONST
 #else
@@ -3792,7 +4098,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -3812,9 +4118,9 @@
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
@@ -3835,7 +4141,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -3862,12 +4168,16 @@
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
     [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
 _LT_DECL([global_symbol_to_c_name_address],
     [lt_cv_sys_global_symbol_to_c_name_address], [1],
     [Transform the output of nm in a C name address pair])
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
 _LT_DECL([], [nm_file_list_spec], [1],
     [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3883,17 +4193,18 @@
 
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
+  if test yes = "$GXX"; then
     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
     aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -3904,8 +4215,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -3921,6 +4232,11 @@
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -3970,7 +4286,7 @@
     case $host_os in
       aix[[4-9]]*)
 	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	  # AIX 5 now supports IA64 processor
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
@@ -4011,14 +4327,14 @@
 	case $cc_basename in
 	  CC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -4047,7 +4363,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4055,7 +4371,7 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    # old Intel C++ for x86_64, which still supported -KPIC.
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4200,17 +4516,18 @@
   fi
 ],
 [
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -4221,8 +4538,8 @@
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -4239,6 +4556,11 @@
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4309,7 +4631,7 @@
     case $host_os in
     aix*)
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
@@ -4317,11 +4639,30 @@
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -4337,7 +4678,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -4346,9 +4687,9 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4372,6 +4713,12 @@
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
@@ -4470,7 +4817,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
@@ -4499,7 +4846,7 @@
   fi
 ])
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_TAGVAR(lt_prog_compiler_pic, $1)=
     ;;
@@ -4565,17 +4912,21 @@
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
@@ -4621,9 +4972,9 @@
   # included in the symbol list
   _LT_TAGVAR(include_expsyms, $1)=
   # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
   _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4639,7 +4990,7 @@
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -4647,7 +4998,7 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
@@ -4657,7 +5008,7 @@
   # On some targets, GNU ld is compatible enough with the native linker
   # that we're better off using the native interface for both.
   lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     case $host_os in
       aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
@@ -4679,24 +5030,24 @@
     esac
   fi
 
-  if test "$lt_use_gnu_ld_interface" = yes; then
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4709,7 +5060,7 @@
     case $host_os in
     aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -4728,7 +5079,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -4744,7 +5095,7 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4754,7 +5105,7 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4762,61 +5113,89 @@
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
     haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
 	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* | pgf95* | pgfortran*)
 					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4827,42 +5206,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
 	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
 	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  if test yes = "$supports_anon_versioning"; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4876,8 +5260,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4895,8 +5279,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4908,7 +5292,7 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
@@ -4923,9 +5307,9 @@
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
@@ -4942,15 +5326,15 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
       runpath_var=
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
       _LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4966,7 +5350,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4974,34 +5358,57 @@
       ;;
 
     aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -5020,13 +5427,21 @@
       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
 	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -5045,61 +5460,80 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
         _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
 	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
 	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 	  else
 	    # Exported symbols can be pulled into shared objects from archives
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -5108,7 +5542,7 @@
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -5138,16 +5572,17 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5156,18 +5591,18 @@
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
 	;;
       *)
 	# Assume MSVC wrapper
@@ -5176,7 +5611,7 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
@@ -5226,33 +5661,33 @@
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_direct, $1)=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5260,25 +5695,25 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 	m4_if($1, [], [
@@ -5286,14 +5721,14 @@
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
 	  _LT_LINKER_OPTION([if $CC understands -b],
 	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
 	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	case $host_cpu in
@@ -5304,7 +5739,7 @@
 	*)
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -5315,16 +5750,16 @@
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
 	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
 	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   AC_LINK_IFELSE(
 	     [AC_LANG_SOURCE(
 	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5337,19 +5772,29 @@
       end]])])],
 	      [lt_cv_irix_exported_symbol=yes],
 	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(inherit_rpath, $1)=yes
       _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
       ;;
 
     netbsd*)
@@ -5366,7 +5811,7 @@
     newsos6)
       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
@@ -5374,27 +5819,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 	fi
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5405,33 +5842,53 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5442,24 +5899,24 @@
 
     solaris*)
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -5469,11 +5926,11 @@
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	fi
@@ -5483,10 +5940,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -5535,43 +5992,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
+      # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -5586,17 +6043,17 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
 	;;
       esac
     fi
   fi
 ])
 AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
 _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 
@@ -5613,7 +6070,7 @@
   # Assume -lc should be added
   _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $_LT_TAGVAR(archive_cmds, $1) in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -5693,12 +6150,12 @@
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
     DIR into the resulting binary])
 _LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
     DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
     library is relocated])
 _LT_TAGDECL([], [hardcode_minus_L], [0],
     [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5739,10 +6196,10 @@
 # ------------------------
 # Ensure that the configuration variables for a C compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_C_CONFIG],
 [m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
 AC_LANG_PUSH(C)
 
 # Source file extension for C test sources.
@@ -5782,18 +6239,18 @@
   LT_SYS_DLOPEN_SELF
   _LT_CMD_STRIPLIB
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   AC_MSG_CHECKING([if libtool supports shared libraries])
   AC_MSG_RESULT([$can_build_shared])
 
   AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
-    test "$enable_shared" = yes && enable_static=no
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -5801,8 +6258,12 @@
     ;;
 
   aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -5810,13 +6271,13 @@
 
   AC_MSG_CHECKING([whether to build static libraries])
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   AC_MSG_RESULT([$enable_static])
 
   _LT_CONFIG($1)
 fi
 AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
 ])# _LT_LANG_C_CONFIG
 
 
@@ -5824,14 +6285,14 @@
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_CXX_CONFIG],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
   AC_PROG_CXXCPP
 else
   _lt_caught_CXX_error=yes
@@ -5873,7 +6334,7 @@
 # the CXX compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="int some_variable = 0;"
 
@@ -5915,35 +6376,35 @@
   if test -n "$compiler"; then
     # We don't want -fno-exception when compiling C++ code, so set the
     # no_builtin_flag separately
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
     else
       _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
     fi
 
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; then
       # Set up default GNU C++ configuration
 
       LT_PATH_LD
 
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 
         # If archive_cmds runs LD, not CC, wlarc should be empty
         # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
         #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
+        wlarc='$wl'
 
         # ancient GNU ld didn't support --whole-archive et. al.
         if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
         else
           _LT_TAGVAR(whole_archive_flag_spec, $1)=
         fi
@@ -5979,18 +6440,30 @@
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
       aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
+        if test ia64 = "$host_cpu"; then
           # On IA64, the linker does run time linking by default, so we don't
           # have to do anything special.
           aix_use_runtimelinking=no
           exp_sym_flag='-Bexport'
-          no_entry_flag=""
+          no_entry_flag=
         else
           aix_use_runtimelinking=no
 
           # Test if we are trying to use run time linking or normal
           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
           case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	    for ld_flag in $LDFLAGS; do
 	      case $ld_flag in
@@ -6000,6 +6473,13 @@
 	        ;;
 	      esac
 	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
 	    ;;
           esac
 
@@ -6018,13 +6498,21 @@
         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
         _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
           case $host_os in aix4.[[012]]|aix4.[[012]].*)
           # We only want to do this on AIX 4.2 and lower, the check
           # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -6042,64 +6530,84 @@
 	  fi
           esac
           shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
 	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
         else
           # not using gcc
-          if test "$host_cpu" = ia64; then
+          if test ia64 = "$host_cpu"; then
 	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	  # chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
           else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
 	    else
-	      shared_flag='${wl}-bM:SRE'
+	      shared_flag='$wl-bM:SRE'
 	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
           fi
         fi
 
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
         # It seems that -bexpall does not export symbols beginning with
         # underscore (_), so it is better to generate a list of symbols to
 	# export.
         _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
           # Warning - without using the other runtime loading flags (-brtl),
           # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
           _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
         else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
 	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
 	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 	    else
 	      # Exported symbols can be pulled into shared objects from archives
 	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -6109,7 +6617,7 @@
 	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6137,57 +6645,58 @@
 	  # Tell ltmain to make .lib files, not .a files.
 	  libext=lib
 	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
+	  shrext_cmds=.dll
 	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
 	  # The linker will not automatically build a static lib if we build a DLL.
 	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	  # Don't use ranlib
 	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
 	  ;;
 	*)
 	  # g++
 	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 	  # as there is no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
 	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	  _LT_TAGVAR(always_export_symbols, $1)=no
 	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
 	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	  else
 	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
@@ -6196,6 +6705,34 @@
 	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	;;
 
       dgux*)
@@ -6232,18 +6769,15 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
       hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
         _LT_TAGVAR(hardcode_direct, $1)=yes
         _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 				             # but as the default
@@ -6255,7 +6789,7 @@
             _LT_TAGVAR(ld_shlibs, $1)=no
             ;;
           aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             # Commands to make compiler produce verbose output that lists
             # what "hidden" libraries, object files and flags are used when
             # linking a shared library.
@@ -6264,11 +6798,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6278,15 +6812,15 @@
         ;;
 
       hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
           case $host_cpu in
             hppa*64*|ia64*)
               ;;
             *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
               ;;
           esac
         fi
@@ -6312,13 +6846,13 @@
           aCC*)
 	    case $host_cpu in
 	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	        ;;
 	    esac
 	    # Commands to make compiler produce verbose output that lists
@@ -6329,20 +6863,20 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
 	        case $host_cpu in
 	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -6357,22 +6891,22 @@
       interix[[3-9]]*)
 	_LT_TAGVAR(hardcode_direct, $1)=no
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 	# Instead, shared libraries are loaded at an image base (0x10000000 by
 	# default) and relocated if they conflict, which is a slow very memory
 	# consuming and fragmenting process.  To avoid this, we pick a random,
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -6381,22 +6915,22 @@
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 	    ;;
           *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 	    ;;
         esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6404,8 +6938,8 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
 	    # linking a shared library.
@@ -6414,10 +6948,10 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6431,59 +6965,59 @@
 	    # earlier do not add the objects themselves.
 	    case `$CC -V 2>&1` in
 	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	      *)  # Version 8.0 or newer
 	        tmp_idyn=
 	        case $host_cpu in
 		  ia64*) tmp_idyn=' -i_dynamic';;
 		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	    esac
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 	    ;;
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
 	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
 	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	      ;;
 	    esac
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 
 	    runpath_var=LD_RUN_PATH
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6497,18 +7031,18 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
 	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
@@ -6516,10 +7050,10 @@
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
@@ -6577,22 +7111,17 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
 	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
+      openbsd* | bitrig*)
 	if test -f /usr/libexec/ld.so; then
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 	  fi
 	  output_verbose_link_cmd=func_echo_all
 	else
@@ -6608,9 +7137,9 @@
 	    # KCC will only create a shared library if the output file
 	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	    # Archives containing C++ object files must be created using
@@ -6628,17 +7157,17 @@
           cxx*)
 	    case $host in
 	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
 	    esac
@@ -6653,21 +7182,21 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	      esac
 
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	      # Commands to make compiler produce verbose output that lists
@@ -6713,9 +7242,9 @@
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6723,7 +7252,7 @@
 	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	      *)
 		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
+		# but understands '-z linker_flag'.
 	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	        ;;
@@ -6740,30 +7269,30 @@
 	    ;;
           gcx*)
 	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 
 	    # The C++ compiler must be used to create the archive.
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 	    ;;
           *)
 	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
 	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
@@ -6771,11 +7300,11 @@
 	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
 	      case $host_os in
 		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		  ;;
 	      esac
 	    fi
@@ -6784,52 +7313,52 @@
         ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
       case $cc_basename in
         CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
       esac
       ;;
 
       sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
+	# Note: We CANNOT use -z defs as we might desire, because we do not
 	# link with -lc, and that would cause any symbols used from libc to
 	# always be unresolved, which means just about no library would
 	# ever link correctly.  If we're not using GNU ld we use -z text
 	# though, which does catch some bad symbols but isn't as heavy-handed
 	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 	runpath_var='LD_RUN_PATH'
 
 	case $cc_basename in
           CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
 	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
+              '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    ;;
 	esac
       ;;
@@ -6860,10 +7389,10 @@
     esac
 
     AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -6890,7 +7419,7 @@
   lt_cv_path_LD=$lt_save_path_LD
   lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
 
 AC_LANG_POP
 ])# _LT_LANG_CXX_CONFIG
@@ -6912,12 +7441,13 @@
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
 func_stripname_cnf ()
 {
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
   esac
 } # func_stripname_cnf
 ])# _LT_FUNC_STRIPNAME_CNF
+
 
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
@@ -7002,13 +7532,13 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
+    case $prev$p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
        # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
 	 prev=$p
 	 continue
        fi
@@ -7024,16 +7554,16 @@
        case $p in
        =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
        esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
 	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
 	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
 	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
 	   fi
 	   ;;
 	 # The "-l" case would never come before the object being
@@ -7041,9 +7571,9 @@
 	 esac
        else
 	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
 	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
 	 fi
        fi
        prev=
@@ -7058,15 +7588,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
+	   _LT_TAGVAR(predep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
 	 fi
        else
 	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	   _LT_TAGVAR(postdep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
 	 fi
@@ -7097,51 +7627,6 @@
   _LT_TAGVAR(postdep_objects,$1)=
   _LT_TAGVAR(postdeps,$1)=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 ])
 
@@ -7150,7 +7635,7 @@
 esac
  _LT_TAGVAR(compiler_lib_search_dirs, $1)=
 if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 _LT_TAGDECL([], [compiler_lib_search_dirs], [1],
     [The directories searched by this compiler when creating a shared library])
@@ -7170,10 +7655,10 @@
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
 [AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
   _lt_disable_F77=yes
 fi
 
@@ -7210,7 +7695,7 @@
 # the F77 compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -7232,7 +7717,7 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
   lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
@@ -7246,21 +7731,25 @@
     AC_MSG_RESULT([$can_build_shared])
 
     AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7268,11 +7757,11 @@
 
     AC_MSG_CHECKING([whether to build static libraries])
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -7289,9 +7778,9 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
@@ -7301,11 +7790,11 @@
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
 [AC_LANG_PUSH(Fortran)
 
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
   _lt_disable_FC=yes
 fi
 
@@ -7342,7 +7831,7 @@
 # the FC compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -7364,7 +7853,7 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
   lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
@@ -7380,21 +7869,25 @@
     AC_MSG_RESULT([$can_build_shared])
 
     AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && enable_shared=no
 
     # On AIX, shared libraries and static libraries use the same namespace, and
     # are all built from PIC.
     case $host_os in
       aix3*)
-        test "$enable_shared" = yes && enable_static=no
+        test yes = "$enable_shared" && enable_static=no
         if test -n "$RANLIB"; then
           archive_cmds="$archive_cmds~\$RANLIB \$lib"
           postinstall_cmds='$RANLIB $lib'
         fi
         ;;
       aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7402,11 +7895,11 @@
 
     AC_MSG_CHECKING([whether to build static libraries])
     # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -7426,7 +7919,7 @@
   GCC=$lt_save_GCC
   CC=$lt_save_CC
   CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
 
 AC_LANG_POP
 ])# _LT_LANG_FC_CONFIG
@@ -7436,7 +7929,7 @@
 # --------------------------
 # Ensure that the configuration variables for the GNU Java Compiler compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_GCJ_CONFIG],
 [AC_REQUIRE([LT_PROG_GCJ])dnl
 AC_LANG_SAVE
@@ -7470,7 +7963,7 @@
 CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
 _LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7507,7 +8000,7 @@
 # --------------------------
 # Ensure that the configuration variables for the GNU Go compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_GO_CONFIG],
 [AC_REQUIRE([LT_PROG_GO])dnl
 AC_LANG_SAVE
@@ -7541,7 +8034,7 @@
 CFLAGS=$GOFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
 _LT_CC_BASENAME([$compiler])
 
 # Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7578,7 +8071,7 @@
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_RC_CONFIG],
 [AC_REQUIRE([LT_PROG_RC])dnl
 AC_LANG_SAVE
@@ -7594,7 +8087,7 @@
 lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_TAG_COMPILER
@@ -7604,7 +8097,7 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
 lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
@@ -7633,7 +8126,7 @@
 [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
   [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
     [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
       AC_SUBST(GCJFLAGS)])])[]dnl
 ])
 
@@ -7744,7 +8237,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f "$lt_ac_sed" && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7761,9 +8254,9 @@
     $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
     cmp -s conftest.out conftest.nl || break
     # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
+    test 10 -lt "$lt_ac_count" && break
     lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
       lt_ac_max=$lt_ac_count
       lt_cv_path_SED=$lt_ac_sed
     fi
@@ -7787,27 +8280,7 @@
 # Find out whether the shell is Bourne or XSI compatible,
 # or has some other useful features.
 m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
@@ -7831,102 +8304,9 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
 # _LT_PATH_CONVERSION_FUNCTIONS
 # -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
 # func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
 # for certain cross-compile configurations and native mingw.
 m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 5d9acd8..94b0829 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 7 ltoptions.m4
+# serial 8 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@
 [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
         _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
 ])
 
 
@@ -75,13 +75,15 @@
   dnl
   dnl If no reference was made to various pairs of opposing options, then
   dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
   dnl archives by default:
   _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
   _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
   _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
   _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
   ])
 ])# _LT_SET_OPTIONS
 
@@ -112,7 +114,7 @@
 [_LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@
 _LT_SET_OPTION([LT_INIT], [win32-dll])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@
 
 # _LT_ENABLE_SHARED([DEFAULT])
 # ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_SHARED],
 [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@
 
 # _LT_ENABLE_STATIC([DEFAULT])
 # ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_STATIC],
 [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@
 
 # _LT_ENABLE_FAST_INSTALL([DEFAULT])
 # ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_FAST_INSTALL],
 [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
 ])
 
 AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 
 
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
 # _LT_WITH_PIC([MODE])
 # --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 # LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
     [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@
     *)
       pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+    [pic_mode=m4_default([$1], [default])])
 
 _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 ])# _LT_WITH_PIC
@@ -359,7 +412,7 @@
 [_LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a05..48bc934 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602..fa04b52 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..c6b26f8 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
@@ -25,7 +26,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 06a8cfe..fcd2c3b 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -33,8 +33,7 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a4693c..cb4db75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
 src/sugar3/graphics/alert.py
 src/sugar3/graphics/colorbutton.py
 src/sugar3/graphics/objectchooser.py
+src/sugar3/graphics/popwindow.py
 src/sugar3/util.py
 src/sugar3/mime.py
 src/sugar3/speech.py
diff --git a/po/af.po b/po/af.po
index c41b251..35d27e4 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-08-29 21:23+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 04:56+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474779410.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktiwiteit"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Hou fout"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Hou die fout: alle veranderinge sal verdwyn"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Moenie stop nie"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Stop in elkgeval"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 #, fuzzy
 msgid "Undo"
 msgstr "Ontdoen"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Herdoen"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopieër"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Plak"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privaat"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "My woonbuurt"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Beskrywing"
 
@@ -168,7 +169,8 @@
 msgstr "Leeg"
 
 #: ../src/sugar3/util.py:348
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "%d B"
 msgstr "%d B"
 
@@ -187,22 +189,305 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Teks"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Beeld"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Klank"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Skakel"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonees"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnies"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalaans"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tsjeggies"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Wallies"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Deens"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Duits"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grieks"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Verstek"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Engels (VK)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Engels"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Engels"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Engels_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Engels_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Engels (VSA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Engels"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spaans"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Spaans"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estnies"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persies"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persies-Engels"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Fins"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Frans (België)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Frans"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Iers"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grieks, Antiek"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroaties"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armeens"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Armeens"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesies"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Yslands"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiaans"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgies"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Koerdies"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latyn"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Litaus"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letties"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Masedonies"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malabaars"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Maleis"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalees"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Noors"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Pandjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Pools"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugees (Brasilië)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugees (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Roemeens"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Russies"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slowaaks"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanees"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serwies"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turks"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Viëtnamees"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Viëtnamees_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Viëtnamees_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "Sjinees"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "Sjinees"
diff --git a/po/ak.po b/po/ak.po
index 05259ea..140894c 100644
--- a/po/ak.po
+++ b/po/ak.po
@@ -6,108 +6,111 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-08-20 15:33+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-13 03:31+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ak\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
-#, python-format, fuzzy
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1473737491.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
+#, python-format, python-format
 msgid "%s Activity"
-msgstr "%s Hyewbɔ"
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "%s Dwuma a wodi"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 #, fuzzy
 msgid "Stop"
 msgstr "Gyae"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 #, fuzzy
 msgid "Undo"
 msgstr "Nnyɛ"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
+#, fuzzy
 msgid "Redo"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:114
+msgstr "Sanyɔ"
+
+#: ../src/sugar3/activity/widgets.py:113
+#, fuzzy
 msgid "Copy"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:122
+msgstr "Kɔpe"
+
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Fa to ha"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Nkyerɛkyerɛmu"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Gyae"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
 msgid "Ok"
-msgstr ""
+msgstr "Yoo"
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr ""
+msgstr "Toa so"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
-msgstr ""
+msgstr "Paw kɔla a wopɛ"
 
 #: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
+msgstr "Kɔkɔɔ"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Ahabanmono"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Bruu"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
-msgstr ""
+msgstr " ne "
 
 #: ../src/sugar3/util.py:218
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
@@ -188,22 +191,307 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragones kasa"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bɔlgeria kasa"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnia kasa"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Kyɛk kasa"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Gyaaman"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Greek kasa"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Difɔlt"
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "Borɔfo"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Borɔfo"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Borɔfo"
+
+#: ../src/sugar3/speech.py:62
+#, fuzzy
+msgid "English_rp"
+msgstr "Borɔfo"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Borɔfo_wmids"
+
+#: ../src/sugar3/speech.py:64
+#, fuzzy
+msgid "English USA"
+msgstr "Borɔfo"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Borɔfo"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Ɛspɛranto kasa"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spain kasa"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Ɛstonia kasa"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Pɛɛhyia kasa"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finland kasa"
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "Frɛnkye"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Frɛnkye"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroehyia kasa"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hangri kasa"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Aamɛnia kasa"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonihyia kasa"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Aesland kasa"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italy kasa"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Gyɔgyea kasa"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kɛɛdihyefo kasa"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituwenia kasa"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Latvia kasa"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Masedonia kasa"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malay kasa"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nɛpal kasa"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Dɛɛkye"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Nɔɔwefo kasa"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Pungyabi kasa"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Pɔland kasa"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Pɔɔtugal kasa (Brazil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Pɔɔtugal kasa (Pɔɔtugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romenia kasa"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rahyia kasa"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovakia kasa"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albenia kasa"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Sɛɛbia kasa"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Sweden kasa"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil kasa"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Tɛrki kasa"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "Kyaena kasa"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "Kyaena kasa"
diff --git a/po/am.po b/po/am.po
index 02d7fec..f70562e 100644
--- a/po/am.po
+++ b/po/am.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 08:07+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 05:00+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474952440.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s ድርጊት"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "ቁም ቁሚ አቁም አቁሚ"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "ወደ ነበረበት መልስ"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "እንደገና አድርግ"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "ቅጂ"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -88,17 +89,16 @@
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "እንደገና አድርግ"
+msgstr "ቀይ"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "አረንጓዴ"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "ሰማያዊ"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -170,39 +170,327 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "ጽሑፍ"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "ምስል"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "ድምፅ"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "ፈልግ"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "አያያዝ"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "አፍሪካንኛ"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "አራጎንስ"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "ቡልጋሪኛ"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "ቦስኒያንኛ"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "ካታላንኛ"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ቼክኛ"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ወልሽ"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ዴኒሽ"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ጀርመን"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ግሪክኛ"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "እንግሊዘኛ (የአሜሪካ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "ኤስፐራንቶ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ስፓንሽኛ"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "ስፓንሽኛ"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "ኢስቶኒያንኛ"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "ፐርሺያኛ"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "ፐርሺያኛ-እንግሊዝኛ"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ፊኒሽ"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ፈረንሳይኛ (የቤልጄም)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ፈረንሳይኛ"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "አይሪሽ"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "ግሪክኛ"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ሒንዱኛ"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ክሮሽያንኛ"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ሀንጋሪኛ"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "አርመናዊ"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "አርመናዊ"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ኢንዶኔዥኛ"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "አይስላንድኛ"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ጣሊያንኛ"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ጆርጂያን"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "ካናዳኛ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "ኩርድሽኛ"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ላቲንኛ"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ሉቴንያንኛ"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ላትቪያን"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "ማሴዶንኛ"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "ማላያላምኛ"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "ማላይኛ"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "ኔፓሊኛ"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ደች"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ኖርዌጂያን"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "ፑንጃብኛ"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "ፖሊሽኛ"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "የብራዚል ፖርቹጋልኛ"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "የአውሮፓ ፖርቹጋልኛ"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "ሮማኒያን"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ራሽያኛ"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "ስሎቫክኛ"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "ልቤኒኛ"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "ሰርቢኛ"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ስዊድንኛ"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "ስዋሂሊኛ"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ቱርክኛ"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "ቪትናምኛ"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "ቪትናምኛ"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "ቪትናምኛ"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "ቻይንኛ"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "ቻይንኛ"
diff --git a/po/ar.po b/po/ar.po
index ddf6c95..9a18288 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,70 +10,71 @@
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 00:51+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 20:59+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474837152.000000\n"
 "Nplurals=6; Plural=N==0 ? 0: n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 "
 ": n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "نشاط %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "خطأ في الحفظ"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "خطأ في الحفظ: ستُفقد كل التغييرات"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "لا تُوقف"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "أوقف على أي حال"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "أوقف"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "تراجع"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "أعِد"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "انسخ"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "الصق"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "خاص"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "جِوارِي"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "الوصف"
 
@@ -221,22 +222,306 @@
 msgid "%d GB"
 msgstr "%d ج.بايت"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "نص"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "صورة"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "صوت"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "فيديو"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "وصلة"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+#, fuzzy
+msgid "Afrikaans"
+msgstr "الأفريكانية"
+
+#: ../src/sugar3/speech.py:49
+#, fuzzy
+msgid "Aragonese"
+msgstr "الأراجونية"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "البلغارية"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "البوسنية"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "الكتالانية"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "التشيكية"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "الولزية"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "الدانماركية"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "الألمانية"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "اليونانية"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "الإنجليزية البريطانية"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "الإنجليزية"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "الإنجليزية"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "الإنجليزية"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "الإنجليزية"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "الإنجليزية الأمريكية"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+#, fuzzy
+msgid "Spanish"
+msgstr "اﻷسبانيه"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "الفنلندية"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "الفرنسية (بلجيكا)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "الفرنسية"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "الأيرلندية"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "اليونانية، القديمة"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "الهندية"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "الكرواتية"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "الهنغارية"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "الأرمينية"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "الإيسلندية"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "الكانادا"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "الكردية"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "اللاتينية"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "اللتوانية"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "اللاتفية"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "المقدونية"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "ملايلام"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "لغة الملايو"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "النيبالية"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "البرتغالية (البرازيل)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "البرتغالية (البرتغال)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "الصربية"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "السويدية"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "السواحليه"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "التاميلية"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "التركية"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "الفيتنامية"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "الفيتنامية"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "الفيتنامية"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "ماندرين"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "كانتوني"
diff --git a/po/ayc.po b/po/ayc.po
index 00a1362..57b64bf 100644
--- a/po/ayc.po
+++ b/po/ayc.po
@@ -7,7 +7,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-22 12:40+0000\n"
-"PO-Revision-Date: 2015-06-29 14:23+0000\n"
+"PO-Revision-Date: 2016-03-06 13:22+0000\n"
 "Last-Translator: EdgarQuispeChambi <equispe7@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ayc\n"
@@ -16,7 +16,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.1.1\n"
-"X-POOTLE-MTIME: 1435587822.000000\n"
+"X-POOTLE-MTIME: 1457270543.000000\n"
 
 #  "Actividad %s"
 #: ../src/sugar3/activity/activity.py:416
@@ -52,7 +52,7 @@
 #  "Deshacer"
 #: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr "Kutiña"
+msgstr "Kutjaña"
 
 #  "Rehacer"
 #: ../src/sugar3/activity/widgets.py:106
@@ -93,7 +93,7 @@
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
 msgid "Ok"
-msgstr "Ukhamawa"
+msgstr "Waliki"
 
 #  "Continuar"
 #: ../src/sugar3/graphics/alert.py:434
@@ -507,7 +507,7 @@
 
 #: ../src/sugar3/speech.py:111
 msgid "Vietnam"
-msgstr "Vietnamita"
+msgstr "Vietnamita jaqi"
 
 #: ../src/sugar3/speech.py:112
 msgid "Vietnam_hue"
diff --git a/po/be.po b/po/be.po
index 7950f9e..6942db7 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-20 04:46+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-29 01:57+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475114220.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Спыніць"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -90,15 +91,15 @@
 
 #: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
+msgstr "Чырвоны"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Зялёны"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Сіні"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -193,22 +194,307 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "афрыкаанс"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "арагонская"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "балгарская"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "баснійская"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "каталанская"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "чэшская"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "валійская"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "дацкая"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "нямецкая"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "грэчаская"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Англійская (брытанская)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "англійская"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "англійская"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "англійская"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "англійская"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "aнглійская (ЗША)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "англійская"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "эсперанта"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "іспанская"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "эстонская"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "фарсі"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "фарсі-англійская"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "фінская"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Французкая (Бельгія)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "французская"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ірландская"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Старажытнагрэчаская"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "хіндзі"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "харвацкая"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "венгерская"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "армянская"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "армянская"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "інданезійская"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ісландская"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "італьянская"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "грузінская"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "канада"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "курдская"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "лацінская"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "літоўская"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "латышская"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "македонская"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "малаялам"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "малайская"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "непальская"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "галандская"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "нарвежская"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "панджабі"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "польская"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Партугальская (Бразылія)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Партугальская (Партугалія)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "румынская"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "руская"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "славацкая"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "албанская"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "сербская"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "шведская"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "суахілі"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "тамільская"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "турэцкая"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "в’етнамская"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "в’етнамская"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "в’етнамская"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "кітайская"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "кітайская"
diff --git a/po/be@latin.po b/po/be@latin.po
index 73c4a38..dd28686 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: 2013-06-20 04:47+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,60 +14,60 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) ;\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) ;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Prypyni"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -193,22 +193,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 92245da..e3fd560 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 07:07+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 02:21+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474942917.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Занятие \"%s\""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Грешка при запазване"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Грешка при запазване: всички промени ще бъдат загубени"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Отмяна на спирането"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Спиране въпреки това"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Спиране"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Отмяна"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Възстановяване"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Копиране"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Поставяне"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "лично"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "моите съседи"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -88,17 +89,16 @@
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "Възстановяване"
+msgstr "Червена"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Зелено"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Синя"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -192,22 +192,303 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Изображение"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Звук"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Видео"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Връзка"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "африкаанс"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "арагонски"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "български"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "босненски"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "каталонски"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "чешки"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "уелски"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "датски"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "немски"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "гръцки"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "английски (Великобритания)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "английски"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "английски"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "английски"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "английски"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Английски (САЩ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "английски"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "есперанто"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "испански"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "испанска — латиноамериканска"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "естонски"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "персийски"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "персийски-английски"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "фински"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Френски (Белгия)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "френски"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ирландски"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Древногръцки"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "хинди"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "хърватски"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "унгарски"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "арменски"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "арменска — западна"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "индонезийски"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "исландски"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "италиански"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "лоджбан"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "грузински"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "каннада"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "кюрдски"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "латински"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "литовски"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "латвийски"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "македонски"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "малаялам"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "малайски"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "непалски"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "нидерландски"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "норвежки"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "пенджабски"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "полски"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "португалска — бразилска"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "португалски (Португалия)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "румънски"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "руски"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "словашки"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "албански"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "сръбски"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "шведски"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "суахили"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "тамилски"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "турски"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "виетнамски"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "виетнамски"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "виетнамски"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Кантонийски"
diff --git a/po/bi.po b/po/bi.po
index d69df72..47a0b69 100644
--- a/po/bi.po
+++ b/po/bi.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: 2013-09-05 16:35+0200\n"
 "Last-Translator: Gwen <woods.gwen@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,59 +17,59 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktiviti"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Trabol blong sevem"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Trabol blong sevem: ol samting we yu jenisim, mbae yu lusum"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "No stopem"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Stopem nomo"
 
 # intransitive "stop"
 # transitive "stopem"
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stopem"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Lusumaot"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Mekem bakegen"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopiem"
 
 # Literally, "put it" -- I don't think people really use a word for paste.
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Putum"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Praevet"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Smol vilij blong mi"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Deskripsen"
 
@@ -183,22 +183,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Ol wod"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Pikja"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Saon"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vidio"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Link"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/bn.po b/po/bn.po
index d9cf4f0..9749c69 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2012-06-20 06:41+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s সক্রিয়তা"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "সমস্যা রাখো"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "সমস্যা রাখো: সকল পরিবর্তন হারিয়ে যাবে"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "বন্ধ করো না"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "যে ভাবেই হোক বন্ধ করো"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "বন্ধ"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "পুর্বাবস্থায়"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "আবার করো"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "কপি"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "পেস্ট"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "ব্যক্তিগত"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "আমার চারদিকে"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "বর্ণনা"
 
@@ -186,22 +186,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "লেখা"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "ছবি"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "অডিও"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "ভিডিও"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "লিংক"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 8456865..d9571c8 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2013-08-29 16:14+0200\n"
 "Last-Translator: Mohona <mohonabose@gmail.com>\n"
 "Language-Team: Sugar Labs\n"
@@ -26,56 +26,56 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s খেলা"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "ত্রুটি সংরক্ষণ করে রাখো"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "ত্রুটি সংরক্ষণ করা হবে: সবে পরিবর্তন মুছে যাবে"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "থামানো যাবে না"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "বন্ধ করা হবে"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "বন্ধ করা হবে"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "পূর্বাবস্থা"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "পুনরায় করা হবে"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "কপি করা হবে"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "পেস্ট করা হবে"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "ব্যক্তিগত"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "আমার পরিবেশ"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "বর্ণনা"
 
@@ -195,26 +195,302 @@
 msgid "%d GB"
 msgstr "%d জি.বি. (গিগাবাইট)"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "টেক্সট"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "ছবি"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "অডিও"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "ভিডিও"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "লিংক"
 
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
+
 #~ msgid "Share with:"
 #~ msgstr "যৌথভাবে ব্যবহার:"
 
diff --git a/po/br.po b/po/br.po
index f1a1426..b3e1393 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-20 04:50+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-29 01:31+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475112691.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Oberiantiz"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 #, fuzzy
 msgid "Stop"
 msgstr "Paouez"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Pegañ"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Deskrivadur"
 
@@ -187,22 +188,303 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "bulgareg"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosneg"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalaneg"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "tchekeg"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "kembraeg"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "daneg"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "alamaneg"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "gresianeg"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "saozneg Breizh-Veur"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "saozneg"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "saozneg"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "saozneg"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "saozneg"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "saozneg (S.U.A.)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "saozneg"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperanteg"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "spagnoleg"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "spagnoleg"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "estoneg"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "perseg"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "persegi-saozneg"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finneg"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "galleg (Belgia)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "galleg"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "iwerzhoneg"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Gresianeg, kozh"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "kroateg"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "hungareg"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "armenianeg"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "armenianeg"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonezeg"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islandeg"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "italianeg"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "jorjianeg"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kanareg"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurdeg"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "lituaneg"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "latvieg"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "makedoneg"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malayseg"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepaleg"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "nederlandeg"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norvegeg"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "poloneg"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugaleg (Brazil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugaleg (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "roumaneg"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "rusianeg"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "slovakeg"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albaneg"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "serbeg"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "svedeg"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamileg"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turkeg"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnameg"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnameg_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnameg_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "sinaeg"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "sinaeg"
diff --git a/po/bs.po b/po/bs.po
index 3d35d0a..c7ad144 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 06:58+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 03:18+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474946333.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivnost"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Zadrži grešku"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Zadrži grešku: sve promjene će biti izgubljene"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Nezaustavljaj se"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ipak se zaustavi"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stani"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Vrati akciju"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Ponovi akciju"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Zalijepi"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privatno"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Opis"
 
@@ -193,25 +194,305 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Slika"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "afrikanerski"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "aragonežanski"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "bugarski"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosanski"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalonski"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "češki"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "velški"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "danski"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "njemački"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "grčki"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "britanski engleski"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "engleski"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "engleski"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "engleski"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "engleski_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "engleski (SAD)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "engleski"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "španski"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "španski"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "estonski"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "perzijski"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "perzijski-engleski"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finski"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "francuski (Belgija)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "francuski"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "irski"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grčki, Antički"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "hrvatski"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "mađarski"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonezijski"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islandski"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "italijanski"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "gruzijski"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kanada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurdski"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latinski"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "litvanski"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "letonski"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "makedonski"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malajalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malajski"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepalski"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "holandski"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norveški"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "pandžabski"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "poljski"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "portugalski (brazilski)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "portugalski (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "rumunski"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ruski"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "slovački"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albanski"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "srpski"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "švedski"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "svahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamilski"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turski"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vijetnamski"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vijetnamski_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vijetnamski_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "mandarinski"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "kantonski"
 
 #~ msgid "Untitled"
 #~ msgstr "Neimenovano"
diff --git a/po/ca.po b/po/ca.po
index 53f8da4..d678d6f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,74 +6,74 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 07:13+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 04:50+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474779027.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Activitat %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Error de manteniment"
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Error de manteniment: es perdran tots els canvis"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
-msgstr "No aturar"
-
-#: ../src/sugar3/activity/activity.py:882
+msgstr "No aturis"
+
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr "Aturar igualment"
-
-#: ../src/sugar3/activity/widgets.py:87
+msgstr "Atura de totes maneres"
+
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
-msgstr "Aturar"
-
-#: ../src/sugar3/activity/widgets.py:99
+msgstr "Atura"
+
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr "Desfer"
-
-#: ../src/sugar3/activity/widgets.py:107
-#, fuzzy
+msgstr "Desfés"
+
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
-msgstr "Vermell"
-
-#: ../src/sugar3/activity/widgets.py:114
+msgstr "Refés"
+
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
-msgstr "Copiar"
-
-#: ../src/sugar3/activity/widgets.py:122
+msgstr "Copia"
+
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr "Engatxar"
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Enganxa"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "El meu veïnat"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Descripció"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
@@ -82,7 +82,7 @@
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr "Continuar"
+msgstr "Continua"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
@@ -111,14 +111,14 @@
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
 msgid "Seconds ago"
-msgstr "segons enrere"
+msgstr "Fa un instant"
 
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr "fa %s"
+msgstr "Fa %s"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
 #: ../src/sugar3/util.py:240
@@ -165,44 +165,324 @@
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
-msgstr ""
+msgstr "Buit"
 
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
-
+msgstr "%d KB"
+
+# well-spelled: MB
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
-
+msgstr "%d MB"
+
+# well-spelled: GB
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Text"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imatge"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Àudio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Enllaç"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Paquet"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonès"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Búlgar"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnià"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Català"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Txec"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Gal·lès"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danès"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alemany"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grec"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Predeterminat"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Anglès (Britànic)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Anglès (Escòcia)"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Anglès"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Anglès_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Anglès_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Anglès (EUA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Anglès"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Espanyol"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Espanyol (Amèrica Llatina)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonià"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persa"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persa-Anglès"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finlandès"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Francès (Bèlgica)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Francès"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandès"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grec antic"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Croat"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hongarès"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armeni"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armeni (occidental)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesi"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandès"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italià"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgià"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kanarès"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurd"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Llatí"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituà"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letó"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Macedoni"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malaiàlam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malai"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalès"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Holandès"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Noruec"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Panjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polonès"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portuguès (Brasil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portuguès (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romanès"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rus"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Eslovac"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanès"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbi"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Suec"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tàmil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamita_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamita_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarí"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonès"
diff --git a/po/cpp.po b/po/cpp.po
index 8b2b41f..65de993 100644
--- a/po/cpp.po
+++ b/po/cpp.po
@@ -2,70 +2,70 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: cpp\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -185,22 +185,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index c533066..c508263 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,71 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-21 03:30+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:29+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475699388.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Činnost"
 
 # i4OTF0  <a href="http://jujxkbmuieke.com/">jujxkbmuieke</a>, [url=http://fxljomdjujqw.com/]fxljomdjujqw[/url], [link=http://cdvazmceogeg.com/]cdvazmceogeg[/link], http://gaqjvqrflwbv.com/
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
-"i4OTF0  <a href=\"http://jujxkbmuieke.com/\">jujxkbmuieke</a>, "
-"[url=http://fxljomdjujqw.com/]fxljomdjujqw[/url], "
-"[link=http://cdvazmceogeg.com/]cdvazmceogeg[/link], http://gaqjvqrflwbv.com/"
-
-#: ../src/sugar3/activity/activity.py:875
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Zastavit úplně"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Zastavit"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Zpět"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Znovu"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Vložit"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Soukromý"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:234
+msgstr "Moje blízké okolí"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Popis"
 
@@ -179,39 +177,320 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Text"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Vzhled"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Poslech"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Odkaz"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "afrikánština"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "aragonština"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "bulharština"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosenština"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalánština"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "čeština"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "velština"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "dánština"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "němčina"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "řečtina"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "angličtina (britská)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "angličtina_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "angličtina (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "španělština"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "španělské (latinskoamerické)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "estonština"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "perština"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "perština-angličtina"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finština"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "francouzština (Belgie)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "francouzština"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "irština"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Starořečtina"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindština"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "chorvatština"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "maďarština"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "arménština"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "arménština (západní)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonéština"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islandština"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "italština"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "gruzínština"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannadština"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurdština"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latina"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "litevština"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "lotyština"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "makedonština"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malajálamština"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malajština"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepálština"
+
+#: ../src/sugar3/speech.py:96
+#, fuzzy
+msgid "Dutch"
+msgstr "nizozemština"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norština"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "paňdžábština"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "polština"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "portugalština (Brazílie)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "portugalština (Evropa)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "rumunština"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ruština"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "slovenština"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albánština"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "srbština"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "švédština"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "svahilština"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamilština"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turečtina"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnamština"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnamština_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnamština_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "čínština"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantonština"
diff --git a/po/da.po b/po/da.po
index 8a7113e..2dd86fc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 06:10+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 03:38+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474774701.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivitet"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Beholdefejl"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Beholdefejl: alle ændringer går tabt"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Stop ikke"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Stop alligevel"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Fortryd"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Gentag"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopiér"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Sæt ind"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Mit nabolag"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -186,22 +187,301 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Billede"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Henvisning"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Bundt"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonesisk"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgarsk"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnisk"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalansk"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tjekkisk"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Walisisk"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Dansk"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Tysk"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Græsk"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Engelsk (Britisk)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Engelsk"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Engelsk"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Engelsk_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Engelsk_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Engelsk (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Engelsk"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spansk"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Spansk (latinamerikansk)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estisk"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persisk"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persisk-Engelsk"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finsk"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Fransk (Belgien)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Fransk"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irsk"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Græsk, oldtids"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroatisk"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armensk"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armensk (vestlig)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesisk"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandsk"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgisk"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdisk"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Lettisk"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Makedonsk"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malajisk"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalesisk"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Hollandsk"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norsk"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polsk"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasilien)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugisisk (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumænsk"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovakisk"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albansk"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbisk"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Svensk"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamilsk"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Tyrkisk"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamesisk"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamesisk_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamesisk_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Kinesisk (Mandarin)"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantonesisk"
diff --git a/po/de.po b/po/de.po
index d9ff840..ec09ded 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: sugar-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-05 21:53+0200\n"
-"Last-Translator: Markus <m.slg@gmx.de>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 04:52+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: OLPC-German <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474779164.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivität"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Fehler beim Speichern"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr "Fehler beim Speichern: Alle Änderungen gehen verloren."
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Fehler beim Speichern: Alle Änderungen gehen verloren"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Nicht beenden"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Trotzdem beenden"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Beenden"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Meine Nachbarn"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -191,22 +192,299 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Text"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Verknüpfung"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonesisch"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgarisch"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnisch"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalanisch"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Walisisch"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Dänisch"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Deutsch"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Griechisch"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Englisch (Britisch)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Englisch (Schottisch)"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Englisch (Nord)"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Englisch_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Englisch_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Englisch (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Englisch"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Spabisch (Lateinamerikanisch)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estnisch"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persisch"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persisch-Englisch"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finnisch"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Französisch (Belgien)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Französisch"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irisch (Gälisch)"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Altgriechisch"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armenisch"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armenisch (westlich)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesisch"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Isländisch"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italienisch"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdisch"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Lateinisch"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Litauisch"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Lettisch"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Mazedonisch"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malaiisch"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalesisch"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Niederländisch"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norwegisch"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polnisch"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugiesisch (Brasilien)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugiesisch (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumänisch"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Russisch"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slowakisch"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanisch"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbisch"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suaheli"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Türkisch"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamesisch"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamesisch_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamesisch_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarin"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantonesisch"
diff --git a/po/dz.po b/po/dz.po
index 22683b3..b9d20fe 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,74 +6,75 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-18 20:51+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 02:27+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475634427.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 #, python-format, fuzzy
 msgid "%s Activity"
 msgstr "%s ལཱ།"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 #, fuzzy
 msgid "Stop"
 msgstr "བཀག"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 #, fuzzy
 msgid "Undo"
 msgstr "འབད་བཤོལ།"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 #, fuzzy
 msgid "Redo"
 msgstr "ལོག་འབད།"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 #, fuzzy
 msgid "Copy"
 msgstr "འདྲ་བཤུས།"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 #, fuzzy
 msgid "Paste"
 msgstr "སྦྱར།"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 #, fuzzy
 msgid "Private"
 msgstr "སྒེར་དོན།"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 #, fuzzy
 msgid "Description"
 msgstr "འགྲེལ་བཤད།"
@@ -196,27 +197,311 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 #, fuzzy
 msgid "Text"
 msgstr "ཚིག་ཡིག"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 #, fuzzy
 msgid "Image"
 msgstr "གཟུགས་བརྙན།"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 #, fuzzy
 msgid "Audio"
 msgstr "རྣར་ཉན།"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 #, fuzzy
 msgid "Video"
 msgstr "ཝི་ཌིའོ།"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 #, fuzzy
 msgid "Link"
 msgstr "འབྲེལ་ལམ།"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ཨཕ་རི་ཀཱནས་ཁ"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "བཱལ་གེ་རི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "བྷོས་ནི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "ཀེ་ཊ་ལཱན་ཁ"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ཅེཀ་ཁ"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ཝེལཤ་ཁ"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ཌེ་ནིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ཇཱར་མཱན་ཁ"
+
+#: ../src/sugar3/speech.py:57
+#, fuzzy
+msgid "Greek"
+msgstr "ལྗང་ཁུ།"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "སྔོན་སྒྲིག"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ཨིང་ལིཤ(བིརི་ཊིཤ)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ཨིང་ལིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ཨིང་ལིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "ཨེས་པ་རཱན་ཏོ་ཁ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ཨིས་པེ་ནིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "ཨིས་པེ་ནིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "ཨེས་ཊོ་ནི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "པར་ཤི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "པར་ཤི་ཡཱན་ཁ-ཨིང་ལིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ཕི་ནིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "ཕྲནཅ་ཁ"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ཨར་མི་ནི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ཨར་མི་ནི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ཨིན་ཌོ་ནེ་ཤི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ཨ་ཡིས་ལེན་ཌིཀ་ཁ"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ཨི་ཊ་ལི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ཇཽ་ཇི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "ཀ་ན་ཌ་ཁ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "ཀར་ཌིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ཌཆ་ཁ"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ནོར་ཝི་ཇི་ཡན་ཁ"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "པཱན་ཇ་བི་ཁ"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "པོ་ལིཤ་ཁ"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "པོར་ཊུ་གིསི།(བ་ར་ཛིལ།)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "པོར་ཊུ་གེསི(པོར་ཊུ་གཱལ)།"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "རོ་མེ་ནི་ཡཱན་ཁ"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ཨུ་རུ་སུའི་ཁ"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "སུ་ལོ་བཱཀ་ཁ"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "བེཊ་ནཱ་མིས་ཁ"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "བེཊ་ནཱ་མིས་ཁ"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "བེཊ་ནཱ་མིས་ཁ"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "རྒྱ་མི་ཁ"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "ཀེན་ཊོ་ནིསི།"
diff --git a/po/el.po b/po/el.po
index d2eaead..2ac8fdc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 08:09+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 00:42+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474936937.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Δραστηριότητα %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Διατήρηση σφάλματος"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Διατήρηση σφάλματος: όλες οι αλλαγές θα χαθούν"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Αδυναμία κλεισίματος"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Κλείσιμο παρ' όλα αυτά"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Κλείσιμο"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Αναίρεση"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Ακύρωση αναίρεσης"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Ιδιωτικό"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Η γειτονιά μου"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -190,22 +191,305 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Ήχος"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Βίντεο"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Σύνδεσμος"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Αφρικάανς"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Αραγκονικά"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Βουλγαρικά"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Βοσνιακά"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Καταλανικά"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Τσεχικά"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Ουαλικά"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Δανικά"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Γερμανικά"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Ελληνικά"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Αγγλικά Ηνωμένου Βασιλείου"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Αγγλικά"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Αγγλικά"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Αγγλικά"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "Αγγλικά"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Αγγλικά (ΗΠΑ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Αγγλικά"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Εσπεράντο"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Ισπανικά"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Ισπανικά (Λατινική Αμερική)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Εσθονικά"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Περσικά"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Περσικά-Αγγλικά"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Φινλανδικά"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Γαλλικά (Βέλγιο)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Γαλλικά"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Ιρλανδικά"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Ελληνικά, αρχαία"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Χίντι"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Κροατικά"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Ουγγρικά"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Αρμενικά"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Αρμενικά"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Ινδονησιακά"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Ισλανδικά"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Ιταλικά"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Λόζμπαν"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Γεωργιανά"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Κανάντα"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Κουρδικά"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Λατινικά"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Λιθουανικά"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Λετονικά"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Σλαβομακεδονικά"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Μαλαγιαλάμ"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Μαλάι"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Νεπάλι"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Ολλανδικά"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Νορβηγικά"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Παντζαπικά"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Πολωνικά"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Πορτογαλική (Βραζιλία)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Πορτογαλική (Πορτογαλία)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Ρουμανικά"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Ρωσικά"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Σλοβακικά"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Αλβανικά"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Σερβικά"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Σουηδικά"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Σουαχίλι"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Ταμίλ"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Τουρκικά"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Βιετναμικά"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "Βιετναμικά"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "Βιετναμικά"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Μανταρινά"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Καντονέζικη"
diff --git a/po/es.po b/po/es.po
index e7842b1..71832a7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-22 12:40+0000\n"
-"PO-Revision-Date: 2015-01-22 13:36+0000\n"
-"Last-Translator: Martin <tch@sugarlabs.org>\n"
+"PO-Revision-Date: 2016-03-05 03:01+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "X-Generator: Pootle 2.5.1.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: .\n"
-"X-POOTLE-MTIME: 1421933807.000000\n"
+"X-POOTLE-MTIME: 1457146864.000000\n"
 
 #: ../src/sugar3/activity/activity.py:416
 #, python-format
@@ -402,7 +402,7 @@
 
 #: ../src/sugar3/speech.py:93
 msgid "Malayalam"
-msgstr "Malayo"
+msgstr "Malayalam"
 
 #: ../src/sugar3/speech.py:94
 msgid "Malay"
diff --git a/po/eu.po b/po/eu.po
index 18f28a0..00157bd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-20 04:43+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 05:20+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474953609.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Gelditu"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Desegin"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Berregin"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:140
+msgstr "Pribatua"
+
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:234
+msgstr "Nire auzokideak"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -81,24 +82,23 @@
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr ""
+msgstr "Jarraitu"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "Berregin"
+msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Berdea"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Urdina"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -170,39 +170,319 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Testu"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Irudi"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Bideo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Estekatu"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaansa"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragoiera"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgariera"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosniera"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalana"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Txekiera"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Galesera"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Daniera"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alemana"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Greziera"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Lehenetsia"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Ingelesa (Britainiakoa)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ingelesa"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ingelesa"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ingelesa"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "ingelesa_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Ingelesa (AEB)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "ingelesa"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperantoa"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "espainiera"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "espainiera"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "estoniera"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "persiera"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "persiera-ingelesa"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finlandiera"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "frantsesa (Belgika)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "frantsesa"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "gaelikoa"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grekoa, aintzinakoa"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindia"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "kroaziera"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "hungariera"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "armeniera"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "armeniera"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonesiera"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islandiera"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "italiera"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "georgiera"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannadera"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurduera"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latina"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "lituaniera"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "letoniera"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "mazedoniera"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malayalamera"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malaysiera"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepalera"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "nederlandera"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norvegiera"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "punjabera"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "poloniera"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "portugesa (Brasil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "portugesa (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "errumaniera"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "errusiera"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "eslovakiera"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albaniera"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "serbiera"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "suediera"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamilera"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turkiera"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnamera"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnamera_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnamera_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "mandarin"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "kantonesa"
diff --git a/po/fa.po b/po/fa.po
index f4892b7..90b24e9 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,35 +6,36 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-01-28 22:37+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-30 01:52+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475200342.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -66,7 +67,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -87,17 +88,17 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:276
+msgstr "قرمز"
+
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:278
+msgstr "سبز"
+
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "آبی"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -180,22 +181,303 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:52
+msgstr "متن"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "آفریکانس"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "آراگونی"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "بلغاری"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "بوسنیایی"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "کاتالان"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "چکی"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ولزی"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "یونانی"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "پیش‌فرض"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "انگلیسی بریتانیا"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "اسپانیایی"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "اسپانیایی"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "اسپانیایی"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "اسپانیایی"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "انگلیسی (ایالات متحده)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "اسپانیایی"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "فرانسوی (بلژیک)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "فرانسوی"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ایرلندی"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "یونانی"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "هندی"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "کروات"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "مجاری"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ارمنی"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ارمنی"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "کردی"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "لاتین"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "لیتوانیایی"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "لتونیایی"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "مقدونی"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "مالایالامی"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "مالایی"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "نپالی"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "هلندی"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "اسلواکی"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "آلبانیایی"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "صربی"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "سوئدی"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "سواحلی"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "تامیلی"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/ff.po b/po/ff.po
index af7626d..73d7ccd 100644
--- a/po/ff.po
+++ b/po/ff.po
@@ -6,73 +6,74 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-01-28 22:34+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 00:39+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ff\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475627957.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "%s Dille"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:99
+msgstr "Dartin"
+
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:107
+msgstr "Firtu"
+
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:114
+msgstr "Waɗtu"
+
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:122
+msgstr "Natto"
+
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Ɗakku"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Cifagol"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Haaytu"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
@@ -81,7 +82,7 @@
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr ""
+msgstr "Jokku"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
@@ -89,15 +90,15 @@
 
 #: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
+msgstr "Boɗeejo"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Haakeejo"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Bulaajo"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -186,22 +187,308 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
-msgstr ""
-
-#: ../src/sugar3/mime.py:78
+msgstr "Ojoo"
+
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr ""
-
-#: ../src/sugar3/mime.py:90
+msgstr "Widewo"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgariire"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Cekkere"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Docceere"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Gerke"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "Engeleere"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Engeleere"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Engeleere"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Engeleere"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "Engeleere"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Engeleere (Dowlaaji Dentuɗi)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Engeleere"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Español"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Español"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Perseere"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Perseere-Engeleere"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Farayseere (Belsik)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Farayseere"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hinndi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hongariire"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Endonesiire"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiyeere"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malayeere"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepaaleere"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Dacceere"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabeere"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Poloneere"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Purtugeere (Beresiil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Purtugeere (Purtugaal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romaneere"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Riis"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Sweedeere"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turkeere"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Wiyetnameere"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "Wiyetnameere"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "Wiyetnameere"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "Sinuwaare"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "Sinuwaare"
diff --git a/po/fi.po b/po/fi.po
index 32eceb7..27833bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-20 04:55+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:28+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475699328.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktiviteetti"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:234
+msgstr "Oma naapurustoni"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -169,7 +170,7 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d t"
 
 #: ../src/sugar3/util.py:350
 #, python-format
@@ -179,29 +180,309 @@
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d Mt"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d Gt"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:64
+msgstr "Teksti"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
-msgstr ""
-
-#: ../src/sugar3/mime.py:70
+msgstr "Kuva"
+
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr ""
-
-#: ../src/sugar3/mime.py:90
+msgstr "Video"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "aragonia"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "bulgaria"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosnia"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalaani"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "tšekki"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "kymri"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "tanska"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "saksa"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "kreikka"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "britannianenglanti"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "englanti"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "englanti"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "englanti"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "englanti_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "amerikanenglanti"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "englanti"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "espanja"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "espanja (Latinalainen Amerikka)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "viro"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "farsi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "farsi-englanti"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "suomi"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ranska (Belgia)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ranska"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "iiri"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "kreikka, muinais-"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "kroatia"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "unkari"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "armenia"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "armenia"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonesia"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islanti"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "italia"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "georgia"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurdi"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latina"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "liettua"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "latvia"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "makedonia"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malajalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malaiji"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "hollanti"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norja"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "pandžabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "puola"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "portugali (Brasilia)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "portugali (Portugali)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "romania"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "venäjä"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "slovakki"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albania"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "serbia"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ruotsi"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamili"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turkki"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnam"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnam_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnam_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "mandariinikiina"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "kantoninkiina"
diff --git a/po/fil.po b/po/fil.po
index 1c2fe21..8388d22 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2012-08-19 17:20+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktibidad"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Panatilihin ang pagkakamali"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Panatilihin ang pagkakamali: lahat ng pagbabago ay mawawala"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "huwag huminto"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ihinto gayon pa man"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Ihinto"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Bawiin"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Ulitin"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopyahin"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Idikit"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Pribado"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Aking kapitbahayan"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Paglalarawan"
 
@@ -189,22 +189,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Larawan"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index dec1b9d..fb09fcf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 08:04+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-03-05 02:09+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1457143741.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Activité %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Erreur d'enregistrement"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Erreur d'enregistrement : toutes les modifications seront perdues"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Ne pas arrêter"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Arrêter quand même"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Annuler"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Répéter"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Copier"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Coller"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privé"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Mon voisinage"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Description"
 
@@ -190,22 +191,298 @@
 msgid "%d GB"
 msgstr "%d Go"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Image"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Lien"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Ensemble"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonais"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgare"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosniaque"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Catalan"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tchèque"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Gallois"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danois"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Allemand"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grec"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Défaut"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Anglais (Britanique)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Anglais Écossais"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Anglais-nord"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Anglais-rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Anglais wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Anglais (États-Unis)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Anglais indes occidentales"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Espéranto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Espagnol (amérique latine)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonien"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Perse"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Perse-Anglais"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finnois"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Français (Belgique)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Français"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandais-gaélique"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grec, ancient"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Croate"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hongrois"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Arménien"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Arménien (occidentale)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonésien"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandais"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italien"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Géorgien"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannara"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurde"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituanien"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letton"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Macédonien"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malais"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Népalais"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Néerlandais"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norvégien"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Pendjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polonais"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugais (Brésil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugais (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Roumain"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Russe"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovaque"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanais"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbe"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Suédois"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamoul"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamien"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamien hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamien_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarin"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonais"
diff --git a/po/gl.po b/po/gl.po
index efd820c..fbaba61 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,115 +6,101 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-23 04:01+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-05-24 02:07+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1464055628.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "Actividade %s"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Manter o erro"
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Manter o erro: perderanse todos os cambios"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:882
+msgstr "Non deter"
+
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:87
-#, fuzzy
+msgstr "Deter aínda así"
+
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Deter"
 
-#: ../src/sugar3/activity/widgets.py:99
-#, fuzzy
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Desfacer"
 
-#: ../src/sugar3/activity/widgets.py:107
-#, fuzzy
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Refacer"
 
-#: ../src/sugar3/activity/widgets.py:114
-#, fuzzy
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/sugar3/activity/widgets.py:122
-#, fuzzy
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../src/sugar3/activity/widgets.py:133
-#, fuzzy
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privado"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:234
-#, fuzzy
+msgstr "A miña contorna"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Descrición"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
-#, fuzzy
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
-#, fuzzy
 msgid "Ok"
 msgstr "Aceptar"
 
 #: ../src/sugar3/graphics/alert.py:434
-#, fuzzy
 msgid "Continue"
 msgstr "Continuar"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
-#, fuzzy
 msgid "Choose a color"
-msgstr "Escoller unha cor"
+msgstr "Escolla unha cor"
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
 msgstr "Vermello"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
-#, fuzzy
 msgid "Green"
 msgstr "Verde"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
-#, fuzzy
 msgid "Blue"
-msgstr "Blue"
+msgstr "Azul"
 
 #: ../src/sugar3/util.py:217
-#, fuzzy
 msgid " and "
 msgstr " e "
 
@@ -124,7 +110,6 @@
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
-#, fuzzy
 msgid "Seconds ago"
 msgstr "Hai segundos"
 
@@ -133,12 +118,12 @@
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr ""
+msgstr "Hai %s"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
 #: ../src/sugar3/util.py:240
 #, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d ano"
@@ -146,7 +131,7 @@
 
 #: ../src/sugar3/util.py:241
 #, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mes"
@@ -154,7 +139,7 @@
 
 #: ../src/sugar3/util.py:242
 #, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
@@ -162,7 +147,7 @@
 
 #: ../src/sugar3/util.py:243
 #, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
@@ -170,7 +155,7 @@
 
 #: ../src/sugar3/util.py:244
 #, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
@@ -178,14 +163,13 @@
 
 #: ../src/sugar3/util.py:245
 #, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
 #: ../src/sugar3/util.py:346
-#, fuzzy
 msgid "Empty"
 msgstr "Baleiro"
 
@@ -209,26 +193,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/sugar3/mime.py:64
-#, fuzzy
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../src/sugar3/mime.py:70
-#, fuzzy
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Son"
 
-#: ../src/sugar3/mime.py:78
-#, fuzzy
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/sugar3/mime.py:90
-#, fuzzy
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Ligazón"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Feixe"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Africáner"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonés"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosníaco"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Catalán"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Checo"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Galés"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danés"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alemán"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grego"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Inglés (Británico)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Inglés (Escocés)"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Inglés (Norte)"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Inglés (RP)"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Inglés (West Midlands)"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Inglés (EE.UU.)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Inglés (Indias occidentais)"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Español"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Español (latinoamericano)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estoniano"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persa"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persa (Pinglish)"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finés"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Francés (Bélxica)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Francés"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandés, gaélico"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grego, antigo"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindú"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armenio"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armenio (occidental)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesio"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandés"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Xeorxiano"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Canará"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdo"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latino"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letón"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Macedonio"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malaialam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malaio"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalés"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Holandés"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Noruegués"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Panxabí"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polaco"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugués (Brasil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugués (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romanés"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Ruso"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanés"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbio"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suahili (Proba)"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Támil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamita"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamita (Hue)"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamita (SGN)"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarín"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonés"
diff --git a/po/gu.po b/po/gu.po
index b75bad1..d42e7a6 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,69 +6,70 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-02-10 08:39+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 04:39+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474951143.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s ક્રિયા"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "ક્ષતિ રાખો"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "અટકાવો નહી"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "ગમેતેમ કરી અટકાવો"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "બંધ કરો"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "કરેલ પાછું લાવો"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "ફરી કરો"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "નકલ"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "ચોંટાડો"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "અંગત"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "મારા પડોશી"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "વર્ણન"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
@@ -88,17 +89,16 @@
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "ફરી કરો"
+msgstr "લાલ"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "લીલો"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "ભૂરી"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -168,44 +168,330 @@
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
-msgstr ""
+msgstr "ખાલી"
 
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:64
+msgstr "લખાણ"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "આફ્રિકન્સ"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "અર્ગોનીઝ"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "બલ્ગેરિયન"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "બોસ્નિયન"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "કતલાન"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ચેક"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "વેલ્શ"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ડેનિશ"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "જર્મન"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ગ્રીક"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "મૂળભૂત"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "અંગ્રેજી (બ્રિટિશ)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "અંગ્રેજી"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "અંગ્રેજી"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "અંગ્રેજી"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "અંગ્રેજી"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "અંગ્રેજી (યુએસએ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "અંગ્રેજી"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "એસ્પેરાન્ટો"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "સ્પેનિશ"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "સ્પેનિશ"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "એસ્ટોનિયન"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "ફારસી"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "ફારસી-અંગ્રેજી"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ફિનિશ"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ફ્રેંચ (બેલ્જીયમ)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ફ્રેન્ચ"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "આઇરિશ"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ગ્રીક, પ્રાચીન"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "હિન્દી"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ક્રોએશિયન"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "હંગેરિયન"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "આર્મેનિયન"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "આર્મેનિયન"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ઇન્ડોનેશિયન"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "આઇસલેન્ડિક"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ઇટાલિયન"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "લોજ્બાન"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "જ્યોર્જિઅન"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "કન્નડ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "કુર્દિશ"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "લેટિન"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "લિથુનિયન"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "લાતવિયન"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "મેસેડોનિયન"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "મલયાલમ"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "મલય"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "નેપાળી"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ડચ"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "નૉર્વેજીયન"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "પંજાબી"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "પોલીશ"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "પોર્ટુગીઝ (બ્રાઝીલ)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "પોર્ટુગીઝ (પોર્ટુગલ)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "રોમાનિયન"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "રશિયન"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "સ્લોવૅક"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "અલ્બેનિયન"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "સર્બિયન"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "સ્વીડિશ"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "સ્વાહિલી"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "તમિલ"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ટર્કીશ"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "વિયેતનામીસ"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "વિયેતનામીસ"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "વિયેતનામીસ"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "ચાઇનીઝ"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "ચાઇનીઝ"
diff --git a/po/ha.po b/po/ha.po
index 8b2b41f..8f58e24 100644
--- a/po/ha.po
+++ b/po/ha.po
@@ -2,70 +2,72 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-04 00:45+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ha\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475541913.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -185,22 +187,313 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
-msgstr ""
-
-#: ../src/sugar3/mime.py:70
+msgstr "Zane"
+
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afirkanci"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgaranci"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosniyanci"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Kataloniyanci"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Harshen Cak"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Kabilar Welsh"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danish"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Jamusanci"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Girkanci"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "Turanci"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Turanci"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Turanci"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "Turanci"
+
+#: ../src/sugar3/speech.py:64
+#, fuzzy
+msgid "English USA"
+msgstr "Turanci"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Turanci"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Ispaniyanci"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Ispaniyanci"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Istoniyanci"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Parisanci"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "Parisanci"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Yaren mutanen Finland"
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "Faransanci"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Faransanci"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "Girkanci"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Harshen Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kuroshiyan"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Harshen Hungari"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armeniyanci"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Armeniyanci"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Harshen Indunusiya"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Yaren mutanen Iceland"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiyanci"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Jojiyanci"
+
+#: ../src/sugar3/speech.py:87
+#, fuzzy
+msgid "Kannada"
+msgstr "Kabilar Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdanci"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Dan Kabilar Latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituweniyanci"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Latbiyanci"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Dan Masedoniya"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Kabilar Maleyalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Harshen Malai"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Holanci"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Yaren mutanen Norway"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Harshen Polan"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Fotigis (Burazil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Yaren Kasar Portugal"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romaniyanci"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rashanci"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Basulake"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Kabilar Albaniya"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Sabiyan"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Harshen Suwedan"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Harshen Suwahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Harshen Turkiyya"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Harshen Biyetinam"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "Harshen Biyetinam"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "Harshen Biyetinam"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "Harshen Sin"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "Harshen Sin"
diff --git a/po/he.po b/po/he.po
index 2aceec5..30242d2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,71 +6,71 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-20 05:03+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 00:21+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474935690.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "פעילות %s"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "עצור"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 #, fuzzy
 msgid "Redo"
 msgstr "אדום"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
-#, fuzzy
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr "תאור:"
+msgstr ""
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
@@ -107,7 +107,7 @@
 
 #: ../src/sugar3/util.py:218
 msgid ", "
-msgstr ",_"
+msgstr ", "
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
@@ -188,22 +188,308 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "טקסט"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "תמונה"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "צליל"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "וידאו"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "קישור"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "אפריקאנס"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "אראגונית"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "בולגרית"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "בוסנית"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "קטלאנית"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "צ׳כית"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "לשית"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "דנית"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "גרמנית"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "יוונית"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "אנגלית בריטית"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "אנגלית"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "אנגלית"
+
+#: ../src/sugar3/speech.py:62
+#, fuzzy
+msgid "English_rp"
+msgstr "אנגלית"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "אנגלית"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "אנגלית אמריקאית"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "אנגלית"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "אספרנטו"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ספרדית"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "ספרדית (אמריקה הלטינית)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "אסטונית"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "אסטונית"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "אסטונית-אנגלית"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "פינית"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "צרפתית (בלגיה)‏"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "צרפתית"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "אירית"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "יוונית עתיקה"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "הינד"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "קרואטית"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "הונגרית"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ארמנית"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ארמנית"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "אינדונזית"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "איסלנדית"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "איטלקית"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "לויבאן"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "גאורגית"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "קנאדה"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "כורדית"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "לטינית"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ליטאית"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "לטבית"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "מקדונית"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "מלאיאלם"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "מלאית"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "נפאלית"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "הולנדית"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "נורבגית"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "פנג׳אבית"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "פולנית"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "פורטוגלית (ברזיל)‏"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "פורטוגזית (פורטוגל)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "רומנית"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "רוסית"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "סלובקית"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "אלבנית"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "סרבית"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "שוודית"
+
+#: ../src/sugar3/speech.py:108
+#, fuzzy
+msgid "Swahili-test"
+msgstr "סווהילית"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "טמילית"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "טורקית"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "יאטנמית"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "יאטנמית"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "יאטנמית"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 0f00d71..8d44c44 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 16:21+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2015-02-21 18:55+0000\n"
+"Last-Translator: Manas <manastaneja@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1424544900.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s क्रियाएँ"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "त्रुटि को रखे रहें"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "त्रुटि को रखे रहें: सारे परिवर्तन खो जाएँगे"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "बन्द न करें"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "जैसे भी हो बन्द करें"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "रूकें"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "पहले जैसा"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "दोहराएँ"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "नक़ल"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "चिपकाएँ"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "निजी"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "मेरा पड़ोस"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "वर्णन"
 
@@ -186,22 +187,298 @@
 msgid "%d GB"
 msgstr "%d गी.बा."
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "पाठ"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "फ़ोटो"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "ऑडियो"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "वीडियो"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "कड़ी"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "बंडल"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "अफ्रीकांस"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "अरेगोनिस"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "बल्गेरिअन"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "बोस्नियेन"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "केटालन"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "चेक"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "वेल्श"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "डैनिश"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "जर्मन"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "यूनानी"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "डिफ़ॉल्ट"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "अंग्रेजी ब्रिटिश"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "अंग्रेजी स्काटिश"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "अंग्रेजी-उत्तर"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "अंग्रेजी_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "अंग्रेजी_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "अंग्रेजी (USA)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "अंग्रेजी वेस्ट इंडीज"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "एस्पेरांटो"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "स्पेनिश"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "स्पेनी लाटिन अमरीका"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "ऐस्तोनियन्"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "फ़ारसी"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "फारसी-pinglish"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "फिनिश"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "फ्रेंच बेल्जियम"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "फ्रेंच"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "आयरिश-Gaeilge"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "यूनान-प्राचीन"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "हिंदी"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "क्रोएशिअन"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "हंगेरीअन"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "अरमेनियान"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "अरमेनियान(पश्चिम)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "इंडोनेशियन"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "आईस्लैंडिक्"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ईटालियन्"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "लोजबान"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "जॉर्जिअन"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "कन्नड़"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "कुर्दिश"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "लैटिन"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "लिथुनेइन"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "लाटवियन्"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "मेसिडोनियन"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "मलयालम"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "मलय"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "नेपाली"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "डच्"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "नॉर्वेजीयन"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "पंजाबी"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "पोलिश"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "पोर्तुगीज (ब्राझील)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "पुर्तगाली (पुर्तगाल)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "रोमॅनिअन"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "रशियन"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "स्लोवाक्"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "अल्बेनिअन"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "सर्बियन"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "स्वीडिश"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "स्वाहिली-परीक्षण"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "तमिल"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "तुर्कीश"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "विएतनाम"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "विएतनाम_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "विएतनाम_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "मंदारिन"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "कैंटोनीज़"
diff --git a/po/ht.po b/po/ht.po
index 0558b4d..58ed3f0 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -6,69 +6,70 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 08:12+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-03-16 12:39+0000\n"
+"Last-Translator: Blondel <blondel.md@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ht\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n !=1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1458131971.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivite"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr "Erè anrejistreman"
-
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Kontinye avèk erè"
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr "Erè anrejistreman: Tout chanjman yo ap pèdi"
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Kontinye avèk erè: Tout chanjman yo ap pèdi"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Pa kanpe"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr "Kanpe kan menm"
-
-#: ../src/sugar3/activity/widgets.py:87
+msgstr "Kanpe kanmenm"
+
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Kanpe"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr "Defè"
-
-#: ../src/sugar3/activity/widgets.py:107
+msgstr "Defèt"
+
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Refè"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopye"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr "Pase"
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Kole"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Prive"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Vwazinaj mwen"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Deskripsyon"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
@@ -85,20 +86,19 @@
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
-msgstr ""
+msgstr "Chwazi yon koulè"
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "Refè"
+msgstr "Wouj"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Vè"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Ble"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -112,7 +112,7 @@
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
 msgid "Seconds ago"
-msgstr "yon segond pase"
+msgstr "Sa gen kèk segonn"
 
 # TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 # "[2 minutes] in the past", or "[3 years, 1 month] earlier"
@@ -121,7 +121,7 @@
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr "Li gen %s"
+msgstr "Sa gen %s"
 
 # TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
@@ -130,83 +130,359 @@
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d ane"
-msgstr[1] ""
+msgstr[1] "%d ane"
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mwa"
-msgstr[1] ""
+msgstr[1] "%d mwa"
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semèn"
-msgstr[1] ""
+msgstr[1] "%d semèn"
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jou"
-msgstr[1] ""
+msgstr[1] "%d jou"
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d hè"
-msgstr[1] ""
+msgstr[0] "%d èdtan"
+msgstr[1] "%d èdtan"
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minit"
-msgstr[1] ""
+msgstr[1] "%d minit"
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
-msgstr ""
+msgstr "Vid"
 
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Tèks"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imaj"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Odio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr "Video"
-
-#: ../src/sugar3/mime.py:90
+msgstr "Videyo"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
-msgstr "Liyen"
+msgstr "lyen"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Gwoup"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonè"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bilgaryen"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnyak"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalan"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tchèk"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Wèlch"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danwa"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alman"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grèk"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Tou Aktive"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Anglè Britanik"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Anglè Skotlann"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Anglè nò"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Anglè_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Anglè_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Anglè Ameriken"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Anglè west indies"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Espanyòl"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Espanyòl latino"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonyen"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Farsi-pinglish"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finwa"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Fransè beljik"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Fransè"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irish-gaeilge"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grèk ansyen"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Endi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kwoat"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Ongwa"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Amenyen"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Amenyen (Wès)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Endonezyen"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Island"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italyen"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Jòjyen"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kid"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Laten"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lityanyen"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Latvyen"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Masedonyen"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Male"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalè"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Olandè"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Nòvejyen"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjab"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polonè"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Pòtigè (Brezil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Pòtigè (Pòtigal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Roumen"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Ris"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovak"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanyen"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Sèb"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Swedwa"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili-test"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamoul"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Tik"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vyetnam"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnam_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnam_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandaren"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantonè"
diff --git a/po/hu.po b/po/hu.po
index fe4ba65..53f17da 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 17:03+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 03:41+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474947677.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivitás"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Ellátási hiba: minden változtatás el fog veszni"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Ne állj le"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Állj meg mindenféleképpen"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Állj"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Vond vissza, Érvénytelenítsd"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Kezd újra"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Másolj"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Személyes"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Szomszédaim"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -88,17 +89,16 @@
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "Kezd újra"
+msgstr "Vörös"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Zöld"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Kék"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -170,39 +170,320 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Kép"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Hang"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Videó"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Kapcsolat"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "bolgár"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosnyák"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalán"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "cseh"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "walesi"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "dán"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "német"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "görög"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Angol (brit)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "angol"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "angol"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "angol"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "angol_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "angol (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "angol"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "eszperantó"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "spanyol"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "spanyol (latin-amerikai)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "észt"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "perzsa"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "perzsa-angol"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finn"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "francia (Belgium)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "francia"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ír"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "Ógörög"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "horvát"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "magyar"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "örmény"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "örmény (nyugati)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonéz"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "izlandi"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "olasz"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "grúz"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurd"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "litván"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "lett"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "macedón"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malajálam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "maláj"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepáli"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "holland"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norvég"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "pandzsábi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "lengyel"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "portugál (Brazil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "portugál (Portugália)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "román"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "orosz"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "szlovák"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albán"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "szerb"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "svéd"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "szuahéli"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "török"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnami"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnami_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnami_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "Kínai"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantoni"
diff --git a/po/id.po b/po/id.po
index b74b293..04ec9b5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-06 20:09+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-04-16 14:40+0000\n"
+"Last-Translator: andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1460817601.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Kegiatan"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Ada kesalahan saat menyimpan"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 "Ada kesalahan saat menyimpan: Semua yang tadi diubah tidak akan tersimpan"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Jangan berhenti"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Hentikan saja"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Batalkan"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Ulangi"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Salin"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Tempel"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Pribadi"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Lingkungan Saya"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Keterangan"
 
@@ -181,22 +182,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Teks"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Gambar"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Suara"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Tautan"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Bundel"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragon"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgaria"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnia"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katala"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Ceko"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Wales"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Denmark"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Jerman"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Yunani"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Baku"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Inggris Britania"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Inggris Skotlandia"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Inggris AS"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spanyol"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Spanyol amerika latin)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonia"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persia"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finlandia"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Perancis belgia"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Perancis"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroasia"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hungaria"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armenia"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armenia (barat)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesia"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandia"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italia"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgia"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdi"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituania"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Latvia"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Makedonia"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malaysia"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepal"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Belanda"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norwegia"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjab"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polandia"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugis (Brasil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugis (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumania"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rusia"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovakia"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albania"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbia"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Swedia"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turki"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarin"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kanton"
diff --git a/po/is.po b/po/is.po
index 45f0c72..e4b8dbc 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,74 +6,75 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-06-20 05:07+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-04 03:59+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n%10!=1 || n%100==11);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475553557.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "%s Aðgerð"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 #, fuzzy
 msgid "Stop"
 msgstr "Stöðva"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Líma"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:234
+msgstr "Nágrannarnir mínir"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Lýsing"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Hætta við"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
@@ -98,7 +99,7 @@
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Blár"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -187,22 +188,307 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
-msgstr ""
-
-#: ../src/sugar3/mime.py:78
+msgstr "Hljóð"
+
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "afríkanska"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "aragonska"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "búlgarska"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosníska"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalónska"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "tékkneska"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "velska"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "danska"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "þýska"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "gríska"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "enska (Breska)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "enska"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "enska"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "enska"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "enska_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "enska (Bandaríkin)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "enska"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperantó"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "spænska"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "spænska"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "eistneska"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "persneska"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "persneska-enska"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finnska"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "franska (Belgía)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "franska"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "írska"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Forngríska"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindí"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "króatíska"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ungverska"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "armenska"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "armenska"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indónesíska"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "íslenska"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ítalska"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "georgíska"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kúrdíska"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latína"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "litháíska"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "lettneska"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "makedónska"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malajalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malaíska"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepalska"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "hollenska"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norska"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "púnjabí"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "pólska"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "brasílísk portúgalska"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "evrópsk portúgalska"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "rúmenska"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "rússneska"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "slóvakíska"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albanska"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "serbneska"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "sænska"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "svahílí"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamílska"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "tyrkneska"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "víetnamska"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "víetnamska_hue"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "víetnamska_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "kínverska"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "kantónska"
diff --git a/po/it.po b/po/it.po
index 9e03c2b..a90dae1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 17:06+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-03-16 15:18+0000\n"
+"Last-Translator: Carlo <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1458141481.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Attività %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Errore di memorizzazione"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Errore di memorizzazione: tutte le modifiche saranno perse"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Non Fermare"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ferma comunque"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Chiudi"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Annulla"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Ripeti"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Incolla"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privato"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "I miei vicini"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Descrizione"
 
@@ -195,22 +196,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Immagine"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Collegamento"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Bundle"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonese"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgaro"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosniaco"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Catalano"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Ceco"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Gallese"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danese"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Tedesco"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Greco"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Predefinita"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Inglese (Britannico)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Inglese (Scozia)"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Inglese del Nord"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "English_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "English_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Inglese (USA)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Inglese (Indie Occidentali)"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spagnolo"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Spagnolo (America latina)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estone"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Farsi-pinglish"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finlandese"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Francese (Belgio)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Francese"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandese-Gaelico"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Greco antico"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Croato"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Ungherese"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armeno"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armena (occidentale)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesiano"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandese"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgiano"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Curdo"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latino"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Lettone"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Macedone"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malese"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalese"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Olandese"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norvegese"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polacco"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portoghese (Brasile)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portoghese (Portogallo)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romeno"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Russo"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovacco"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanese"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbo"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Svedese"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili-test"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnam_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnam_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarino standard"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonese"
diff --git a/po/ja.po b/po/ja.po
index 97de997..ed8c931 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,67 +5,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 17:08+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:32+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475699551.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s アクティビティ"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "保存エラー"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "保存エラー: 全ての変更は失われてしまいます"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "やめない"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "とにかくやめる"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "元に戻す"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "やり直し"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "コピー"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "（共有しない）"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "私のお隣さん"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "説明"
 
@@ -104,7 +105,7 @@
 
 #: ../src/sugar3/util.py:218
 msgid ", "
-msgstr ",  "
+msgstr ", "
 
 # TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
@@ -183,22 +184,304 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "文字"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "画像"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "音声"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "動画"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "リンク"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "アフリカーンス語"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "アラゴン語"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "ボスニア語"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "カタロニア語"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "チェコ語"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ウェールズ語"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "デンマーク語"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ドイツ語"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ギリシャ語"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "イギリス英語"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "英語"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "英語"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "英語"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "英語"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "英語 (米国)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "英語"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "エスペラント語"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "スペイン語"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "スペイン語 (ラテンアメリカ)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "エストニア語"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "ペルシア語"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "ペルシア語-英語"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "フィンランド語"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "フランス語 (ベルギー)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "フランス語"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "アイルランド語"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ギリシャ語, 古代"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ヒンディー語"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "クロアチア語"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ハンガリー語"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "アルメニア語"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "アルメニア語 (西方)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "インドネシア語"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "アイスランド語"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "イタリア語"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "ロジバン語"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ジョージア語"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "カンナダ語"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "クルド語"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ラテン語"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "リトアニア語"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ラトビア語"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "マケドニア語"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "マラヤーラム語"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "マレー語"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "ネパール語"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "オランダ語"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ノルウェー語"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "パンジャブ語"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "ポーランド語"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "ポルトガル語 (ブラジル)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "ポルトガル語 (ポルトガル)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "ルーマニア語"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ロシア語"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "スロバキア語"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "アルバニア語"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "セルビア語"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "スウェーデン語"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "スワヒリ語"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "タミル語"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "トルコ語"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "ベトナム語"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "ベトナム語"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "ベトナム語"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "中国語 (普通話)"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "広東語"
diff --git a/po/km.po b/po/km.po
index a6e0e2a..5ed5ae2 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 21:06+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 03:58+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474862335.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s សកម្មភាព"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "រក្សាទុកកំហុស"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "រក្សាទុកកំហុសរាលការប្តូរនឹងត្រូវបាត់បង់"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "កុំ​ឈប់"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "ទោះបី​យាង​ណា​ក៍ដោយ​ក៍ឈប់​ដែរ"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "ឈប់"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "កុំ​ធ្វើ​វិញ"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "ធ្វើ​វិញ"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "ចំលង"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "បិតត"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "ឯកជន"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "ភូមិរបស់ខ្ញុំ"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
@@ -186,22 +187,305 @@
 msgid "%d GB"
 msgstr "%d ជីកាបៃ"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "អត្ថបទ"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "រូបភាព"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "សំលេង"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "វីដេអូ"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "តភ្ជាប់"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "អាហ្វ្រិកាន"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "អារ៉ាហ្គោន"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "ប៊ុលហ្ការី"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "បូស្នី"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "កាតាឡាន"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ឆេក"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "វេល"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ដាណឺម៉ាក"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "អាល្លឺម៉ង់"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ក្រិច"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "​លំនាំដើម"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "អង់គ្លេស (ច.អ.)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "អង់គ្លេស"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "អង់គ្លេស"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "អង់គ្លេស"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "អង់គ្លេស"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "អង់គ្លេស (សហរដ្ឋ​អាមេរិក)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "អង់គ្លេស"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "អេស្ពេរ៉ាន់តូ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "អេស្ប៉ាញ"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "អេស្ប៉ាញ (អាមេរិក​ឡាទីន)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "អេស្តូនី"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "ភឺសៀន"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "ភឺសៀន-អង់គ្លេស"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ហ្វាំងឡង់"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "បារាំង (បែលហ្ស៊ីក)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "បារាំង"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "អៀរឡង់"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ក្រិក បុរាណ"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ហិណ្ឌី"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ក្រូអាត"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ហុងគ្រី"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "អារមេនី"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "អារមេនី"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ឥណ្ឌូណេស៊ី"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "អ៊ីស្លង់"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "អ៊ីតាលី"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "ឡូបាន"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ហ្សក​ហ្ស៊ី"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "កន្នដ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "ឃឺដ"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ឡាតំាង"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "លីទុយអានី"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ឡាតវី"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "ម៉ាសេដូនី"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "មលយាល័ម"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "ម៉ាឡេស៊ី"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "នេប៉ាល់"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ហុល្លង់"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ភាសាន័រវែស"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "បឹនជាពិ"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "ប៉ូឡូញ"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "ព័រទុយហ្គាល់ (ប្រេស៊ីល)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "ព័រទុយហ្គាល់ (ព័រទុយហ្គាល់)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "រូម៉ានី"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "រុស្ស៊ី"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "ស្លូវ៉ាគី"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "អាល់បានី"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "ស៊ែប"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ស៊ុយអែដ"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "ស្វាហ៊ីលី"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "តាមីល"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ទួរគី"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "វៀតណាម"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "វៀតណាម"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "វៀតណាម"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "ម៉ង់ដារីន"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "កាន់តូនេស៊ី"
diff --git a/po/kn.po b/po/kn.po
index 75448e1..3be87e8 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,36 +6,37 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-05-24 07:59+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-29 01:04+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475111060.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 #, python-format, fuzzy
 msgid "%s Activity"
 msgstr "%s ಚಟುವಟಿಕೆ"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -69,7 +70,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 #, fuzzy
 msgid "Description"
 msgstr "ವಿವರಣೆ"
@@ -91,17 +92,17 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 #, fuzzy
 msgid "Red"
 msgstr "ಕೆಂಪು"
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 #, fuzzy
 msgid "Green"
 msgstr "ಹಸಿರು"
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 #, fuzzy
 msgid "Blue"
 msgstr "ನೀಲಿ"
@@ -195,22 +196,308 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:52
+msgstr "ಪಠ್ಯ"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ಆಫ್ರಿಕಾನ್ಸ್"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "ಅರಗೊನೀಸ್"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "ಬಲ್ಗೇರಿಯನ್"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "ಬೋಸ್ನಿಯನ್"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "ಕೆಟಲಾನ್"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ಜೆಕ್"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ವೆಲ್ಶ್"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ಡ್ಯಾನಿಶ್"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ಜರ್ಮನ್"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ಗ್ರೀಕ್"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ಇಂಗ್ಲಿಷ್ (ಬ್ರಿಟಿಷ್)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ಇಂಗ್ಲೀಷ್"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ಇಂಗ್ಲೀಷ್"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ಇಂಗ್ಲೀಷ್"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "ಇಂಗ್ಲೀಷ್"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ಇಂಗ್ಲಿಷ್ (ಯುಎಸ್ಎ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ಇಂಗ್ಲೀಷ್"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "ಎಸ್ಪೆರಾಂಟೊ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ಸ್ಪ್ಯಾನಿಷ್"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "ಸ್ಪ್ಯಾನಿಷ್"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "ಎಸ್ಟೊನಿಯನ್"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "ಪರ್ಶಿಯನ್"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "ಪರ್ಶಿಯನ್-ಇಂಗ್ಲೀಷ್"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ಫಿನ್ನಿಶ್"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ಫ್ರೆಂಚ್ (ಬೆಲ್ಜಿಯಮ್)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ಫ್ರೆಂಚ್"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ಐರಿಷ್"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ಗ್ರೀಕ್, ಪುರಾತನ"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ಹಿಂದಿ"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ಕ್ರೊಯೇಶಿಯನ್"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ಹಂಗೇರಿಯನ್"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ಅರ್ಮೇನಿಯನ್"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ಅರ್ಮೇನಿಯನ್"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ಇಂಡೋನೇಶಿಯನ್"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ಐಸ್ಲಾಂಡಿಕ್"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ಇಟಾಲಿಯನ್"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "ಲೊಜ್ಬಾನ್"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ಜಾರ್ಜಿಯನ್"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "ಕನ್ನಡ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "ಕುರ್ದಿಷ್"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ಲ್ಯಾಟಿನ್"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ಲಿಥುವೇನಿಯನ್"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ಲಟ್ವಿಯನ್"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "ಮೆಸಿಡೋನಿಯನ್"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "ಮಲಯಾಳಂ"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "ಮಲಯ್"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "ನೇಪಾಳಿ"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ಡಚ್"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ನಾರ್ವೇಜಿಯನ್"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "ಪಂಜಾಬಿ"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "ಪೋಲಿಶ್"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "ಪೋರ್ಚುಗೀಸ್ (ಬ್ರೆಜಿಲ್)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "ಪೋರ್ಚುಗೀಸ್ (ಪೋರ್ಚುಗಲ್)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "ರೊಮೇನಿಯನ್"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ರಷ್ಯನ್"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "ಸ್ಲೋವಾಕ್"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "ಅಲ್ಬೇನಿಯನ್"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "ಸರ್ಬಿಯನ್"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ಸ್ವೀಡಿಷ್"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "ಸ್ವಹಿಲಿ"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "ತಮಿಳು"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ಟರ್ಕಿಶ್"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "ವಿಯೇಟ್ನಾಮೀಸ್"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "ವಿಯೇಟ್ನಾಮೀಸ್"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "ವಿಯೇಟ್ನಾಮೀಸ್"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "ಚೈನೀಸ್"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "ಚೈನೀಸ್"
diff --git a/po/ko.po b/po/ko.po
index e1a197c..f5a2d92 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 06:36+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 01:05+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474938300.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s 활동"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "에러 무시"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "에러 무시: 변경된 모든내용이 사라집니다"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "멈추지 않기"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "일단 멈춤"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "멈춤"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "실행 취소"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "다시 실행"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "복사"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "붙이기"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "개인"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "나의 이웃"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "설명"
 
@@ -180,22 +181,303 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "텍스트"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "이미지"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "오디오"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "비디오"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "링크"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "아프리칸스어"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "아라곤어"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "불가리아어"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "보스니아어"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "카탈로니아어"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "체코어"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "웨일스어"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "덴마크어"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "독일어"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "그리스어"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "기본값"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "영어 (영국)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "영어"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "영어"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "영어"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "영어"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "영어(미국)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "영어"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "에스페란토어"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "스페인어"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "스페인어(라틴 아메리카)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "에스토니아어"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "페르시아어"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "페르시아어-영어"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "핀란드어"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "프랑스어(벨기에)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "프랑스어"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "아일랜드어"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "고대 그리스어"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "힌디어"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "크로아티아어"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "헝가리어"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "아르메니아어"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "아르메니아(서부)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "인도네시아어"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "아이슬란드어"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "이탈리아어"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "로반어"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "조지아어"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "칸나다어"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "쿠르드어"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "라틴어"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "리투아니아어"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "라트비아어"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "마케도니아어"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "말라얄람어"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "말레이어"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "네팔어"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "네덜란드어"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "노르웨이어"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "펀잡어"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "폴란드어"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "포르투갈어(브라질)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "포르투갈어(포르투갈)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "루마니아어"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "러시아어"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "슬로바키아어"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "알바니아어"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "세르비아어"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "스웨덴어"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "스와힐리어"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "타밀어"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "터키어"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "베트남어"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "베트남어"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "베트남어"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "중국어 (중국)"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "광동어"
diff --git a/po/kos.po b/po/kos.po
index 5d18c3d..3426ad0 100644
--- a/po/kos.po
+++ b/po/kos.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: 2012-02-11 06:44+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Tui"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -180,22 +180,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/ku.po b/po/ku.po
index ba43674..0d7974c 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -2,70 +2,71 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Translate Toolkit 1.7.0\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -185,22 +186,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/lg.po b/po/lg.po
index 1ea7616..b1a659e 100644
--- a/po/lg.po
+++ b/po/lg.po
@@ -6,72 +6,74 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-08-21 07:41+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
+"PO-Revision-Date: 2016-10-04 04:53+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: lg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
-#, python-format, fuzzy
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475556806.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
+#, python-format, python-format
 msgid "%s Activity"
 msgstr "%s Omulimu"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 #, fuzzy
 msgid "Stop"
 msgstr "Yimiriza"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 #, fuzzy
 msgid "Undo"
 msgstr "Zzayo"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 #, fuzzy
 msgid "Redo"
 msgstr "Zzilamu"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 #, fuzzy
 msgid "Copy"
 msgstr "Kukopa"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 #, fuzzy
 msgid "Paste"
 msgstr "Okusiga"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 #, fuzzy
 msgid "Private"
 msgstr "Ekyama"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 #, fuzzy
 msgid "Description"
 msgstr "Ennyinyonyola"
@@ -106,7 +108,6 @@
 msgstr "Kiragala"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
-#, fuzzy
 msgid "Blue"
 msgstr "Bululu"
 
@@ -136,42 +137,36 @@
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:346
 #, fuzzy
@@ -198,27 +193,316 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 #, fuzzy
 msgid "Text"
 msgstr "Ekiwandiike"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 #, fuzzy
 msgid "Image"
 msgstr "Ekifananyi"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 #, fuzzy
 msgid "Audio"
 msgstr "Eddobozzi"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 #, fuzzy
 msgid "Video"
 msgstr "Vidiyo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 #, fuzzy
 msgid "Link"
 msgstr "Akagatta"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Lubulugariya"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Luceeke"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Ludaaki"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Lugereeki"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "Lungereza"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Lungereza"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Lungereza"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Lungereza"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Lungereza"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Lusipanya"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Lusipanya"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Luperusi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Luperusi-Lungereza"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "Lufalansa"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Lufalansa"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "Lugereeki"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Luhindu"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Luhangare"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Luyindonezya"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Luyitale"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Lumalayi"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Lunepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Luholandi"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Lupunjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Lupolandi"
+
+#: ../src/sugar3/speech.py:100
+#, fuzzy
+msgid "Portuguese (Brazil)"
+msgstr "Lupotugiizi"
+
+#: ../src/sugar3/speech.py:101
+#, fuzzy
+msgid "Portuguese (Portugal)"
+msgstr "Lupotugiizi"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Lulomaniya"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Lulasa"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Luswideni"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Lutamiiru"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Lutake"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Luvyetinaamu"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "Luvyetinaamu"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "Luvyetinaamu"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "Lucayina"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "Lucayina"
diff --git a/po/lt.po b/po/lt.po
index 1070e43..f034710 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,74 +6,75 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-02-11 06:45+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 04:58+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474779539.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:882
+msgstr "Nestabdyti"
+
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:87
+msgstr "Vis tiek stabdyti"
+
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:99
+msgstr "Stabdyti"
+
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:107
+msgstr "Atšaukti"
+
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:114
+msgstr "Grąžinti"
+
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:122
+msgstr "Kopijuoti"
+
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Įdėti"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Aprašas"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
@@ -82,7 +83,7 @@
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr ""
+msgstr "Tęsti"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
@@ -90,23 +91,23 @@
 
 #: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
+msgstr "Raudona"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
+msgstr "Žalia"
 
 #: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Mėlyna"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
-msgstr ""
+msgstr " ir "
 
 #: ../src/sugar3/util.py:218
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
@@ -118,56 +119,56 @@
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr ""
+msgstr "Prieš %s"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
 #: ../src/sugar3/util.py:240
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d metai"
+msgstr[1] "%d metai"
+msgstr[2] "%d metų"
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d mėnuo"
+msgstr[1] "%d mėnesiai"
+msgstr[2] "%d mėnesių"
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d savaitė"
+msgstr[1] "%d savaitės"
+msgstr[2] "%d savaičių"
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d diena"
+msgstr[1] "%d dienos"
+msgstr[2] "%d dienų"
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d valanda"
+msgstr[1] "%d valandos"
+msgstr[2] "%d valandų"
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d minutė"
+msgstr[1] "%d minutės"
+msgstr[2] "%d minučių"
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
@@ -176,39 +177,319 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:64
+msgstr "Tekstas"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
-msgstr ""
-
-#: ../src/sugar3/mime.py:70
+msgstr "Paveikslėlis"
+
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
-msgstr ""
-
-#: ../src/sugar3/mime.py:78
+msgstr "Garso įrašas"
+
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr ""
-
-#: ../src/sugar3/mime.py:90
+msgstr "Vaizdo įrašas"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
-msgstr ""
+msgstr "Nuoroda"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikanų"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgarų"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnių"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalonų"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Čekų"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Velsų"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danų"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Vokiečių"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Graikų"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Anglų britų"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Anglų škotų"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Anglų šiaurės"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Anglų_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Anglų_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Anglų JAV"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Anglų"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Ispanų"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Ispanų (Lotynų Amerika)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estų"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persų"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persų-Anglų"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Suomių"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Prancūzų (Belgija)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Prancūzų"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Airių"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Senovės graikų"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Indų"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroatų"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Vengrų"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armėnų"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armėnų (Vakarų)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indoneziečių"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandų"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italų"
+
+#: ../src/sugar3/speech.py:85
+#, fuzzy
+msgid "Lojban"
+msgstr "Loiban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Gruzinų"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kanadų"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdų"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Lotynų"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lietuvių"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Latvių"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Makedonų"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malajalių"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malajiečių"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepaliečių"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Olandų"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norvegų"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Pandžabų"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Lenkų"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugalų (Brazilija)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugalų (Portugalija)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumunų"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rusų"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovakų"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanų"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbų"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Švedų"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suahilių"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamilų"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turkų"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamiečių"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "Vietnamiečių_hue"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "Vietnamiečių_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarinų"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantoniečių"
diff --git a/po/mg.po b/po/mg.po
index 88d27a2..13b7c29 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 17:51+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 03:00+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: mg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474945210.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s sahanasa"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Aza ajanona"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "ajanony ihany"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "ajanony"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "avereno"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "avereno"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "adikao"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "apetaho"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "manokana"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "ny manodidina ahy"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "fitanisana"
 
@@ -186,22 +187,301 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Lahatsoratra"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Sary"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Feo"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Sary sy feo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Rohy"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Biolgara"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tseky"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alemanina"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grika"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Anglisy (Britanika)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Anglisy"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Anglisy"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Anglisy"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Anglisy_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Anglisy"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Anglisy"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Espaniola"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persa"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persa-Anglisy"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Frantsay (Belzika)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Frantsay"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "hongroà"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armenianina"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italianina"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Holandey"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norvezianina"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Pôlôney"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portogay (Brezilianina)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portogay (Portogaly)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Romanianina"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slave"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Suedoa"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamoila"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Tiorka"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamianina"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamianina_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamianina_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/mi.po b/po/mi.po
index e9bc3ad..9b74a41 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2012-09-21 10:19+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Hohe"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Penapena hapa"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Penapena hapa: ka ngaro ngā huringa katoa"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Kaua e tū"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Tū tonu"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Tū"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Wete"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Mahi Anō"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Tārua"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Whakapiri"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Tūmataiti"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Taku Takiwā"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Whakaaturanga"
 
@@ -191,22 +191,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Kuputuhi"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Atahanga"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Ororongo"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Ataata"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Hononga"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 8b2b41f..503e1a7 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2,76 +2,78 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-02 03:41+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475379681.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:122
+msgstr "Копирај"
+
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:133
+msgstr "Вметни"
+
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Опис"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
@@ -168,39 +170,325 @@
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
-msgstr ""
-
-#: ../src/sugar3/mime.py:70
+msgstr "Слика"
+
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
-msgstr ""
-
-#: ../src/sugar3/mime.py:78
+msgstr "Аудио"
+
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr ""
-
-#: ../src/sugar3/mime.py:90
+msgstr "Видео"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "африканс"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "арагонски"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "бугарски"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "босански"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "каталонски"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "чешки"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "велшки"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "дански"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "германски"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "грчки"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Стандардно"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Англиски (Британски)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "англиски"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "англиски"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "англиски"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "англиски"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Англиски (САД)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "англиски"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "есперанто"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "шпански"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Шпански (Латинска Америка)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "естонски"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "персиски"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "персиски-англиски"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "фински"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Француски (Белгија)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "француски"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ирски"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "грчки"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "хинди"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "хрватски"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "унгарски"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ерменски"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ерменски"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "индонезиски"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "исландски"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "италијански"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "ложбан"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "грузиски"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "каннада"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "курдски"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "латински"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "литвански"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "латвиски"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "македонски"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "малајалам"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "малајски"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "непалски"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "холандски"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "норвешки"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "пенџапски"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "полски"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Португалски (Бразил)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Португалски (Португалија)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "романски"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "руски"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "словачки"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "пенџапски"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "српски"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "шведски"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "свахили"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "тамилски"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "турски"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "виетнамски"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "виетнамски"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "виетнамски"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "кинески"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "кинески"
diff --git a/po/ml.po b/po/ml.po
index 8b2b41f..77a1653 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -2,70 +2,72 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-02 03:00+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475377256.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -185,22 +187,308 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ആഫ്രിക്കാൻസ്"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "അരഗോണീസ്"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "ബൾഗേറിയൻ"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "ബോസ്നിയൻ"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "കറ്റാലാൻ"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ചെക്ക്"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "വെൽഷ്"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ഡാനിഷ്"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ജർമ്മൻ"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ഗ്രീക്ക്"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ഇംഗ്ളീഷ് (ബ്രിട്ടിഷ്)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ഇംഗ്ലീഷ്"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ഇംഗ്ലീഷ്"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ഇംഗ്ലീഷ്"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "ഇംഗ്ലീഷ്"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ഇംഗ്ലിഷ് (യുഎസ്എ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ഇംഗ്ലീഷ്"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "എസ്‌പരാന്റോ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "സ്‌പാനിഷ്"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "സ്‌പാനിഷ്"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "എസ്റ്റോണിയൻ"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "പേർഷ്യൻ"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "പേർഷ്യൻ-ഇംഗ്ലീഷ്"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ഫിന്നിഷ്"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ഫ്രെഞ്ച് (ബെല്‍ജിയം)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ഫ്രഞ്ച്"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ഐറിഷ്"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ഗ്രീക്ക്, പുരാതന"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ഹിന്ദി"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ക്രൊയേഷ്യൻ"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ഹംഗേറിയൻ"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "അർമേനിയൻ"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "അർമേനിയൻ"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ഇൻഡോനേഷ്യൻ"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ഐസ്‌ലാൻഡിക്"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ഇറ്റാലിയൻ"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "ലോജ്ബാൻ"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ജോർജിയൻ"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "കന്നഡ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "കുർദ്ദിഷ്"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ലാറ്റിൻ"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ലിത്വാനിയൻ"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ലാറ്റ്വിയൻ"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "മാസിഡോണിയൻ"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "മലയാളം"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "മലെയ്"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "നേപ്പാളി"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ഡച്ച്"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "നോർവീജിയൻ"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "പഞ്ചാബി"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "പോളിഷ്"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "പോര്‍ച്ചുഗീസ് (ബ്രസീല്‍)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "പോറ്ട്ടുഗിസ്(പോറ്ട്ടുഗല്)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "റൊമാനിയൻ"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "റഷ്യൻ"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "സ്ലോവാക്"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "അൽബേനിയൻ"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "സെർബിയൻ"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "സ്വീഡിഷ്"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "സ്വാഹിലി"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "തമിഴ്"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ടർക്കിഷ്"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "വിയറ്റ്നാമീസ്"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "വിയറ്റ്നാമീസ്"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "വിയറ്റ്നാമീസ്"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "ചൈനീസ്"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "ചൈനീസ്"
diff --git a/po/mn.po b/po/mn.po
index 05290c0..5469fff 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 18:33+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 04:28+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474777696.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Програм"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Хадгалахын алдаа"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Хадгалахын алдаа: бүх өөрчлөлт устана"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Бүү зогсоо"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ямар ч үед хаах"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Хаах"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Буцаах"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Давтах"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Хуулах"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Тавих"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Хувийн"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Миний Хөршүүд"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Тодорхойлолт"
 
@@ -190,22 +191,298 @@
 msgid "%d GB"
 msgstr "%d ГБайт"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Бичвэр"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Дүрслэл"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Дуу"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Бичлэг"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Холбоос"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Багц"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Африкаан"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Болгар хэл"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Босни хэл"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Каталан хэл"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Чех хэл"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Вэлш хэл"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Дани хэл"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Герман хэл"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Грек хэл"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Үндсэн төлөв"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Англи хэл (Их британи)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Шотландын англи"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Умард англи хэл"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Англи_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Англи_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Америкийн англи хэл"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Өрнөд Энэтхэгийн англи хэл"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Эсперанто"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Испани хэл"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Өмнөд Америкийн испани хэл"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Эстони хэл"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Фарси хэл"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "перс-Англи"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Фин хэл"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Франц хэл"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Франц хэл"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ирланд"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Эртний-Грек"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Хинди"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Хорват"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Унгар хэл"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Армени хэл"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Армени хэл (өрнөд)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Индонез хэл"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Исланд хэл"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Итали хэл"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Ложбан"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Гүрж"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Каннада"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Күрд хэл"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Латин"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Литва хэл"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Латви хэл"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Макидон хэл"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Малайлам хэл"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Малай"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Непал"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Голланд хэл"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Норвеги хэл"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Пунжаб хэл"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Польш хэл"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Португали хэл (Бразил)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Португали хэл (Португали)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Румын хэл"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Орос хэл"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Словак"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Албани хэл"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Серб хэл"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Швед хэл"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Свахил хэл"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Тамил хэл"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Түрк хэл"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Вьетнам"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "вьетнам_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "вьетнам_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Эх газрын хятад хэл"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Зүүн урдын хятад хэл"
diff --git a/po/mr.po b/po/mr.po
index 63038f2..e27c47f 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 18:29+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 02:31+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474857101.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s क्रिया"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "चुक संभाला"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "चुक संभाला : सगळ्या सुधारणा नष्ट होतील"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "थांबू नका"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "कसेही करुन थांबा"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "थांबा"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "केलेल्या गोष्टीवर बोला फिरवने"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "परत करा"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "नक्कल"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "छापणे"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "खासगी"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "माझे शेजार"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "वर्णन"
 
@@ -190,22 +191,306 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "शब्द"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "छायाचित्र"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "आवाज"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "दूरचित्रवाणी"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "लिंक"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "अफ्रिकान्स"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "अर्गोनीज"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "बल्गेरियन"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "बोस्नियन"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "कातालान"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "झेक"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "चूवाश"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "डॅनिश"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "जर्मन"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ग्रीक"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ब्रिटिश इंग्रजी"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "इंग्रजी"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "इंग्रजी"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "इंग्रजी"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "इंग्रजी"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "इंग्लिश (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "इंग्रजी"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "एस्परान्टो"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "स्पॅनिश"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "स्पॅनिश"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "इस्टोनियन"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "फारसी"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "फारसी-इंग्रजी"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "फिन्निश"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "फ्रेंच (बेलजियम)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "फ्रेंच"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "आयरिश"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ग्रीक, जुणे"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "हिंदी"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "क्रोएशियन"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "हंगेरियन"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "आर्मेनियन"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "आर्मेनियन"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "इंडोनेशियन"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "आईसलँडिक"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "इटालियन"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "लोज्बन"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "जॉर्जियन"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "कन्नड"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "कुर्दिश"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "लॅटिन"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "लिथुआनियन"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "लात्व्हियन"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "मॅसेडोनियन"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "मल्याळम"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "मलय"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "नेपाळी"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "डच"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "नोर्वेजियन"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "पंजाबी"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "पोलिश"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "पुर्तुगीज (ब्राजिल)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "पुर्तुगीज (पुर्तगाल)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "रोमानियन"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "रशियन"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "स्लोव्हाक"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "अल्बानियन"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "सर्बियन"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "स्वीडिश"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "स्वाहिली"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "तामिळ"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "तुर्की"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "व्हिएतनामी"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "व्हिएतनामी"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "व्हिएतनामी"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 2f222a5..f11e519 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 18:26+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 03:35+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474860924.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktiviti"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Simpan ralat"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Simpan ralat: semua perubahan akan hilang"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Jangan berhenti"
 
 # OxhpmI  <a href="http://horkrqscztdc.com/">horkrqscztdc</a>, [url=http://cvmtclowygrg.com/]cvmtclowygrg[/url], [link=http://qturluvxkhhj.com/]qturluvxkhhj[/link], http://nitafdmbspiz.com/
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Bagaimanapun berhenti"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Buat asal"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Buat semula"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Salin"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Tampal"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Persendirian"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Kejiranan saya"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Penerangan"
 
@@ -181,22 +182,299 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Teks"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imej"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Bunyi"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Pautan"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+#, fuzzy
+msgid "Greek"
+msgstr "Hijau"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/mvo.po b/po/mvo.po
index 69bdbb1..9304974 100644
--- a/po/mvo.po
+++ b/po/mvo.po
@@ -2,38 +2,38 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: mvo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -65,7 +65,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -86,15 +86,15 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr ""
 
@@ -185,22 +185,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/nah.po b/po/nah.po
index 26cbf79..22ab507 100644
--- a/po/nah.po
+++ b/po/nah.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2013-08-30 17:49+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,58 +17,59 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
+#, python-format
 #, python-format, fuzzy
 msgid "%s Activity"
 msgstr "tlen ti chiuas %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 #, fuzzy
 msgid "Keep error"
 msgstr "kuapolo"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "kuapolo kema ti ajukui katli ti chijki pulus"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "inka moketsas"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "moketsas"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 #, fuzzy
 msgid "Stop"
 msgstr "Moketsas"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "patik"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "ompawi"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "ixcopina"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "tlatskis"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "san iyaya"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "nechicokalime"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "tlaixkuilolli"
 
@@ -189,22 +190,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "tlakuilolpa"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "ixnextli"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "kakiilistli"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "ixnextilli"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "saloli"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 9e9d6ef..07023a8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2012-06-20 18:40+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Lek"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Ikke stans"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Stans uansett"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stans"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Gjøre om"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Mitt Nabolag"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -186,22 +186,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Film"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Lenke"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/ne.po b/po/ne.po
index d850164..7900454 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 09:10+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 02:13+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474855982.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s क्रियाकलाप"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "त्रुटि राख"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "त्रुटि राख: सबै परिवर्तनहरु हराँउछन्"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "नरोक"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "जसरीभएपनि रोक"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "रोक"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "पहिलेकै अवस्थामा फर्काउ"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "फेरि गर"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "प्रतिलिपी बनाऊ"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "प्रतिलिपी सार"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "गुप्‍त"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "मेरो छिमेकी"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "वर्णन"
 
@@ -191,22 +192,305 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "पाठ"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "चित्र"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "आवाज"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "चलचित्र"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "जोडान"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "अफ्रिकान्स"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "अरागोनिज"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "बुल्गेरियाली"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "बोस्नियाली"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "क्याटालन"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "चेक"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "वेल्श"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "डेनिस"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "जर्मन"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ग्रीक"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "अंग्रेजी (ब्रिटेन)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "अङ्ग्रेजी"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "अङ्ग्रेजी"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "अङ्ग्रेजी"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "अङ्ग्रेजी"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "अङ्ग्रेजी (संयुक्त राज्य अमेरिका)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "अङ्ग्रेजी"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "एस्पेरान्तो"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "स्पेनी"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "स्पेनी"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "इस्टोनियाली"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "फारसी"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "फारसी-अङ्ग्रेजी"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "फिनिस"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "फ्रेन्च (बेल्जियम)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "फ्रान्सेली"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "आयरिस"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ग्रिक, प्राचीन"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "हिन्दी"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "क्रोयसियाली"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "हङ्गेरियाली"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "आर्मेनियाली"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "आर्मेनियाली"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "इन्डोनेसियाली"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "आइसल्यान्डियाली"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "इटालेली"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "लोजबान"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "जर्जियाली"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "कन्नाडा"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "कुर्दी"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ल्याटिन"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "लिथुआनियाली"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "लात्भियाली"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "म्यासेडोनियाली"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "मलयालम"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "मलाय"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "नेपाली"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "डच"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "नर्वेली"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "पंजाबी"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "पोलिस"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "पोर्चुगाली (ब्राजिल)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "पोर्तुगाली (पोर्तुगल)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "रोमानियाली"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "रूसी"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "स्लोभाकियाली"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "अल्बानियाली"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "सर्बियाली"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "स्विडिस"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "स्वाहिली"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "तामिल"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "टर्किश"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "भियतनामी"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "भियतनामी"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "भियतनामी"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "क्यान्टोनी"
diff --git a/po/pa.po b/po/pa.po
index 69bdbb1..7bc812a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,38 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-29 03:39+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475120369.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -65,7 +67,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -86,17 +88,17 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:276
+msgstr "ਲਾਲ"
+
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:278
+msgstr "ਹਰਾ"
+
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "ਨੀਲਾ"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
@@ -185,22 +187,307 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ਅਫ਼ਰੀਕੀ"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "ਬੁਲਗਾਰੀਆਈ"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "ਬੋਸਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "ਕੈਟਾਲਾਨ"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "ਚੈਕ"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ਚੁਵਾਸ਼"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ਡੈਨਿਸ਼"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ਜਰਮਨ"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ਯੂਨਾਨੀ"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ਬਰਤਾਨਵੀ ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ਅੰਗਰੇਜ਼ੀ (ਅਮਰੀਕੀ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "ਇਸਪੇਰਾਂਟੋ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ਸਪੇਨੀ"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "ਸਪੇਨੀ (ਲੈਟਿਨ ਅਮਰੀਕਾ)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "ਇਸਟੋਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "ਫ਼ਾਰਸੀ"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "ਫ਼ਾਰਸੀ-ਅੰਗਰੇਜ਼ੀ"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ਫਿਨਿਸ਼"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ਫਰੈਂਚ (ਬੈਲਜੀਅਮ)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ਫਰਾਂਸੀਸੀ"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ਆਇਰੀ"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ਗਰੀਕ, ਪੁਰਾਤਨ"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ਹਿੰਦੀ"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ਕ੍ਰੋਏਸ਼ਿਆਈ"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ਹੰਗਰੀਆਈ"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ਅਰਮੀਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ਅਰਮੀਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ਆਈਸਲੈਂਡਿਕ"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ਇਤਾਲਵੀ"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ਜਾਰਜੀਆਈ"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "ਕੰਨੜ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "ਕੁਰਦ"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ਲਾਤੀਨੀ"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ਲਿਥੁਆਨੀਅਨ"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ਲਾਟਵਿਅਨ"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "ਮੈਕਡੋਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "ਮਲਿਆਲਮ"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "ਮਲਯ"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "ਨੇਪਾਲੀ"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ਡੱਚ"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ਨਾਰਵੇਜੀਅਨ"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "ਪੰਜਾਬੀ"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "ਪੋਲੈਂਡੀ"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "ਪੁਰਤਗਾਲੀ (ਬਰਾਜ਼ੀਲ)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "ਪੁਰਤਗਾਲੀ (ਪੁਰਤਗਾਲ)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "ਰੋਮਾਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ਮਲਯ"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "ਸਲੋਵਾਕ"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "ਅਲਬਾਨੀਆਈ"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "ਸਰਬੀਆਈ"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ਸਵੀਡਿਸ਼"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "ਸਵਾਹਿਲੀ"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "ਤਮਿਲ"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ਤੁਰਕੀ"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "ਵੀਅਤਨਾਮੀ"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "ਵੀਅਤਨਾਮੀ"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "ਵੀਅਤਨਾਮੀ"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "ਚੀਨੀ"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "ਚੀਨੀ"
diff --git a/po/pap.po b/po/pap.po
index 98cc0f5..7370873 100644
--- a/po/pap.po
+++ b/po/pap.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2013-08-29 19:13+0200\n"
 "Last-Translator: Manuel <themaduros@gmail.com>\n"
 "Language-Team: JuneLeonora\n"
@@ -18,57 +18,57 @@
 "X-Generator: Pootle 2.0.5\n"
 
 # ../src/sugar/activity/activity.py:329
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktividad"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Warda eror"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Warda eror: tur kambio lo bai pèrdí"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "No stòp"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Stòp di tur manera"
 
 # Stòp / no si siqi
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stòp"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Deshasí"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Rehasí"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopia"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Pega"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privá"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Mi Besindario"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Deskripshon"
 
@@ -191,22 +191,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imáhen"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Oudio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vidio"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Lenk"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/ps.po b/po/ps.po
index 26ec545..7bcf52f 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 18:48+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:31+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ps\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475699504.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s چارندتیا"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "تیروتنه خوندی کول"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "تیروتنه خوندی کول: ټول بدلونونه به ورک شی"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "مه یې بندوی"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "په هر حال بند یې کړی"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "بندول"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "نا کړ"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "بیا کړ"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "لمېسل"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "سریښل"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "ځاني"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "زما ګاونډ"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "تشریح"
 
@@ -118,10 +119,9 @@
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #: ../src/sugar3/util.py:225
-#, python-format
-#, python-format, fuzzy
+#, python-format, python-format
 msgid "%s ago"
-msgstr "وړاندې"
+msgstr ""
 
 # TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
@@ -191,22 +191,307 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "متن"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "انځور"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "اوریز"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "لیدیز"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "پیوند"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "افريکاني"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "ایراګوني"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "بلغاري"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "بوسني"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "کټلاني"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "چېک"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ويلشي"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ډېنش"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "الماني"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "یوناني"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "انګلیسي"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "انګلیسي"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "انګلیسي"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "انګلیسي"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "انګلیسي"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "(انګريزي (يو اېس"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "انګلیسي "
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "اسپرانتو"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "هسپانوي"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "هسپانوي"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "حبشي"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "فارسي"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "فارسي انګلیسي"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "فینلنډي"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "(فرنچ (بلجيم"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "فرانسوي"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ائيرلېنډي"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "یوناني"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "هندي"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "کروواتي"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "هنګري"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ارمني"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ارمني"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "انډونېشيايي"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "أيسلېنډي"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ایټالوي"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "جورجيائي"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "کنأډه"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "کردي"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "لاتیني"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ليتواني"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "لېټواني"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "مقدوني"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "مالايالم"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "ملایا"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "نېپالي"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "هالېنډي"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "ناروېئې"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "پنجابي"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "پولنډي"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "(پرټګيز (برازيل"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "(پرټګيز (پرټګال"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "روماني"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "روسي"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "سلوواکي"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "الباني"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "سربيائي"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "سویډنی"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "سواهېلي"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "تامل"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ترکي"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "وېتنامي"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "وېتنامي"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "وېتنامي"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index d0db560..13625bc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2013-09-19 00:28+0200\n"
-"Last-Translator: Alexander Dupuy <alex.dupuy@mac.com>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 01:55+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474854948.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Atividade %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Erro ao guardar"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Erro ao guardar: todas as alterações serão perdidas"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Não parar"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Parar mesmo assim"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Refazer"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Colar"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privado"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "A Minha Vizinhança"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Descrição"
 
@@ -190,22 +191,302 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Ligação"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "africâner"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "aragonês"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "búlgaro"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bósnio"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "catalão"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "tcheco"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "galês"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "dinamarquês"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "alemão"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "grego"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Predefinido"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "inglês britânico"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "inglês"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "inglês"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "inglês"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "inglês_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Inglês (EUA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "inglês"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "espanhol"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Espanhol (América Latina)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "estoniano"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persa"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "persa-inglês"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "finlandês"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Francês (Bélgica)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "francês"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "irlandês"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Grego, Antigo"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "híndi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "croata"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "húngaro"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "armênio"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "armênio"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonésio"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islandês"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "italiano"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "georgiano"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "curdo"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latim"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "lituano"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "letão"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "macedônio"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malaiala"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malaio"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "holandês"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "norueguês"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "panjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "polonês"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Português (Brazil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Português (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "romeno"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "russo"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "eslovaco"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albanês"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "sérvio"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "sueco"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "suaíli"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tâmil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turco"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnamita"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnamita_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnamita_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarim"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonês"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3d596a1..4f332e1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2012-06-20 20:57+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Atividade %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Manter erro"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Manter erro: todas as mudanças serão perdidas"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Não parar"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Parar de qualquer forma"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Refazer"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Colar"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Privado"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Minha Vizinhança"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Descrição"
 
@@ -186,22 +186,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Links"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/quz.po b/po/quz.po
index 8dc5071..4fe5709 100644
--- a/po/quz.po
+++ b/po/quz.po
@@ -6,40 +6,41 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-06-21 01:28+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-05-24 02:04+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: quz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Generator: Pootle 2.0.5\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1464055495.000000\n"
 
 #  "Actividad %s"
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr "%s Ruwana"
-
-#  "Error al guardar"
-#: ../src/sugar3/activity/activity.py:874
+msgstr "%s Rurana"
+
+# TRAD. ANT. Allchakuchkaptin pantarun
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr "Allchakuchkaptin pantarun"
-
-#  "Error al guardar: todos los cambios se perderán"
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Waqaychaspam pantarqun"
+
+# TRAD. ANT. Allchakuchkaptin pantarun: llapan huknirasqaqa chinkarinqan
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr "Allchakuchkaptin pantarun: llapan huknirasqaqa chinkarinqan"
+msgstr "Waqaychaspam pantarqun: llapan rurasqakunaqa chinkarinqañam"
 
 #  "No detener"
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Ama sayachiychu"
 
 #  "Detener de todas formas"
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Sayachinaykipunim"
 
@@ -78,10 +79,10 @@
 msgid "My Neighborhood"
 msgstr "Aylluy"
 
-# "Descripción:"
-#: ../src/sugar3/activity/widgets.py:226
+# Riqsichinapaq
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr "Riqsichinapaq"
+msgstr "Sut’inchay"
 
 #  "Cancelar"
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
@@ -97,25 +98,25 @@
 #  "Continuar"
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr "Purillay"
+msgstr "Purichkallay"
 
 #  "Escoja un color"
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
-msgstr "Huk llinp'ita akllay"
+msgstr "Huk llimp'ita akllay"
 
 #  "Rojo"
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr "Puka"
 
 #  "Verde"
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr "Q´umer"
+msgstr "Q´umir"
 
 #  "Azul"
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr "Anqas"
 
@@ -133,7 +134,7 @@
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
 msgid "Seconds ago"
-msgstr "As tumpalla"
+msgstr "Ñaqha ch'illmirpaypi"
 
 #  "%s atrás"
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
@@ -189,8 +190,7 @@
 msgstr[0] "%d pacha"
 msgstr[1] "%d pachakuna"
 
-#  "%d minuto"
-#  "%d minutos"
+# Buena propuesta del traductor anterior. En Bolivia también se usa.
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
@@ -201,7 +201,7 @@
 #  "Vacio"
 #: ../src/sugar3/util.py:346
 msgid "Empty"
-msgstr "Ch´usaq"
+msgstr "Ch'usaq"
 
 #  "%d B"
 #: ../src/sugar3/util.py:348
@@ -227,22 +227,303 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr "Qillqa"
-
-#: ../src/sugar3/mime.py:52
+msgstr "Qillqasqa"
+
+# Imagen
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Wanki"
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Uyarina"
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Qhawarina"
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Waskhana"
+
+# Paquete
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "T'iqi"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikáans simi"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonés simi"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Búlgaro simi"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosnio simi"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Catalán simi"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Checo simi"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Galés simi"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danés simi"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alemán simi"
+
+# "Verde"
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Griego simi"
+
+# Predeterminado
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Kasqanmantapacha kikin"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Inglés Británico simi"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Inglés Escocés simi"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Inglés (Chinchay) simi"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Inglés_t'uqyachiy chaskisqa"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Inglés (kunti) simi"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Inglés (Estados Unidos) simi"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Inglés (Antillas) simi"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto simi"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Castellano simi"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Castellano (Latinoamérica) simi"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonio simi"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persa simi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persa (pinglish) simi"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finlandés simi"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Francés (Bélgica) simi"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Francés simi"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandés (Gaeilge) simi"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Unay Griego simi"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi simi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Croata simi"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Húngaro simi"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armenio simi"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armenio (kunti) simi"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesio simi"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandés simi"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiano simi"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban simi"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgiano simi"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Canarés simi"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdo simi"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latín simi"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituano simi"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letón simi"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Macedonio simi"
+
+# No es el malayo (hay error en castellano)
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malabari simi"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malayo simi"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalí simi"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Holandés simi"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Noruego simi"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabi simi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polaco simi"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Brasil Portugués simi"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugués simi"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumano simi"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Ruso simi"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Eslovaco simi"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanés simi"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbio simi"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Sueco simi"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suajili simi"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil simi"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turco simi"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamita simi"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamita (Hue) simi"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamita (Tan Son Nhat) simi"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarín simi"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonés simi"
diff --git a/po/ro.po b/po/ro.po
index 69bdbb1..b05d537 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,205 +2,490 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-05-24 01:58+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1464055098.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "Activitate %s"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Eroare la salvare"
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Eroare la salvarea: toate modificările vor fi pierdute"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:881
+msgstr "Nu opri"
+
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr ""
+msgstr "Oprește in orice caz"
 
 #: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr ""
+msgstr "Desface"
 
 #: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
-msgstr ""
+msgstr "Reface"
 
 #: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
-msgstr ""
+msgstr "Copiază"
 
 #: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
+msgstr "Lipire"
 
 #: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:226
+msgstr "Vecinătatea mea"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Descriere"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Renunţă"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
 msgid "Ok"
-msgstr ""
+msgstr "Acceptă"
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr ""
+msgstr "Continuă"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:274
+msgstr "Alegeți culoarea"
+
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:276
+msgstr "Roșu"
+
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:278
+msgstr "Verde"
+
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "Albastru"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
-msgstr ""
+msgstr " și "
 
 #: ../src/sugar3/util.py:218
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
 msgid "Seconds ago"
-msgstr ""
+msgstr "Secunde în urmă"
 
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s înapoi"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
 #: ../src/sugar3/util.py:240
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d an"
+msgstr[1] "%d ani"
+msgstr[2] "%d ani"
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d lună"
+msgstr[1] "%d luni"
+msgstr[2] "%d luni"
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d săptămână"
+msgstr[1] "%d săptămâni"
+msgstr[2] "%d săptămâni"
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d zi"
+msgstr[1] "%d zile"
+msgstr[2] "%d zile"
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d oră"
+msgstr[1] "%d ore"
+msgstr[2] "%d ore"
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minut"
+msgstr[1] "%d minute"
+msgstr[2] "%d minute"
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
-msgstr ""
+msgstr "Gol"
 
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:43
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:52
+msgstr "Text"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
-msgstr ""
-
-#: ../src/sugar3/mime.py:58
+msgstr "Imagine"
+
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
-msgstr ""
-
-#: ../src/sugar3/mime.py:66
+msgstr "Audio"
+
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr ""
-
-#: ../src/sugar3/mime.py:72
+msgstr "Video"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
-msgstr ""
+msgstr "Legătură"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Pachet"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Africană"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragoneză"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgară"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosniacă"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Catalană"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Cehă"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Galeză"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Daneză"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Germană"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grec"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Implicit"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Engleză (Britanică)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Engleză (Scotiană)"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Engleză (Nord)"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Engleză ( Pronunție primită)"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Engleză (Vest)"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Engleză (SUA)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Engleză (Antile)"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spaniolă"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Spaniolă (America Latină)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonă"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persană"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persană (pinglish)"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finlandeză"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Franceză (Belgia)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Franceză"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandeză (Gaeilge)"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Greacă (veche)"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Croată"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Maghiară"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armean"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armean (vest)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indoneziană"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandeză"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italiană"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgian"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdă"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latină"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituaniană"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letonă"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Macedoniană"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malailamă"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malaeziană"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepaleză"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Olandeză"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norvegiană"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabă"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Poloneză"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugheză (Brazilia)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugheză (Portugalia)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Română"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rusă"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovacă"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albaneză"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Sârbă"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Suedeză"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamilă"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turcă"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnameză(Hue)"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnameză (Tan Son Nhat)"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarină"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Cantonese"
diff --git a/po/ru.po b/po/ru.po
index eda5670..a88f189 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 00:32+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 01:36+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474853791.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Активность %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Ошибка хранения"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Ошибка хранения: все изменения будут потеряны"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Не останавливаться"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Остановить в любом случае"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Откат"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Повтор"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Вставить"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Персонально"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Мои соседи"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Описание"
 
@@ -199,22 +200,302 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Изображение"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Аудио"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Видео"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Ссылка"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "африкаанс"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "арагонский"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "болгарский"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "боснийский"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "каталанский"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "чешский"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "валлийский"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "датский"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "немецкий"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "греческий"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "британский английский"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "английский"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "английский"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "английский"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "английский"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Английский (США)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "английский"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "эсперанто"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "испанский"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Испанская (латиноамериканская)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "эстонский"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "персидский"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "персидский-английский"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "финский"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Французский (Бельгия)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "французский"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ирландский"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Греческий (древний)"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "хинди"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "хорватский"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "венгерский"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "армянский"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Армянская (западная)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "индонезийский"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "исландский"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "итальянский"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "ложбан"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "грузинский"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "каннада"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "курдский"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "латинский"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "литовский"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "латышский"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "македонский"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "малаялам"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "малайский"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "непальский"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "нидерландский"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "норвежский"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "панджаби"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "польский"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "бразильский португальский"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "европейский португальский"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "румынский"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "русский"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "словацкий"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "албанский"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "сербский"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "шведский"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "суахили"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "тамильский"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "турецкий"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "вьетнамский"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "вьетнамский"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "вьетнамский"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Мандаринский диалект"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Кантонский"
diff --git a/po/rw.po b/po/rw.po
index 1172b6b..1572fa8 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 17:18+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
+"PO-Revision-Date: 2016-09-26 03:32+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: Sugar Labs\n"
 "Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1) ;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474860770.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Igikorwa"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Gumana ikosa"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Gumana ikosa:impinduka zose zirabura"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Ntuhagarare"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Hagarara muburyo bwose"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Hagarika"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Subiramo"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Gukuraho icyariho"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Gukoporora"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Omeka"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Byihariye"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Guturana kwanjye"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Igisobanuro"
 
@@ -186,22 +187,306 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Unyandiko"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Ishusho"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Isohoramajwi"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Isohoramashusho"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Huza"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Ikinyafurikaneri"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Icyaragoneze"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Urunyabuligariya"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Inyebosiniya"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Igikatalani"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Igiceke"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Ikigaluwa"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Ikidaninwa"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Ikidage"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Ikigereki"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+#, fuzzy
+msgid "English Britain"
+msgstr "Icyongereza"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Icyongereza"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Icyongereza"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Icyongereza"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "Icyongereza"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Icyongereza (Leta Zunze Ubumwe z'Amerika)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Icyongereza"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Icyesiperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Icyesipanyolo"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Icyesipanyolo"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Icyesitoniya"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Inyeperisi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Inyeperisi-Icyongereza"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Igifinilande"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Igifaransa (Ububirigi)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Igifaransa"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Ikirilandi"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "Ikigereki"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Igihindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Igikorowasiya"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Igihongiriya"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Ikinyarumeniya"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Ikinyarumeniya"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Ikinyendoziya"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Igisilande"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Igitaliyani"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Ikilojibani"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Inyejeworujiya"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Igikanada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Inyekuridishi"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Ikilatini"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Ikilituwaniya"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Ikinyaletoviyani"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Ikimasedoniyani"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Ikimalayalami"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Ikimalayi"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Ikinepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Ikinerilande"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Ikinoruveji"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Igipunjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Igipolone"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Inyeporutigali (Brezili)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Inyeporutigali (Brezili)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Ikinyarumaniya"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Ikirusiya"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Igisilovaki"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Icyalubaniya"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Igiseribe"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Igisuweduwa"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Igiswahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Igitamili"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Igiturukiya"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Ikinyaviyetinamu"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Ikinyaviyetinamu_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Ikinyaviyetinamu_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/sd.po b/po/sd.po
index 69bdbb1..e3a43d6 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -2,38 +2,38 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -65,7 +65,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -86,15 +86,15 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr ""
 
@@ -185,22 +185,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/si.po b/po/si.po
index f07dc17..daca7c2 100644
--- a/po/si.po
+++ b/po/si.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 00:06+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 00:45+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474850733.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s ක්‍රියාකාරකම"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "දෝශය තබාගන්න"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "දෝශය තබාගන්න: සියළු වෙනස්කිරීම් නැතිවනු ඇත"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "නවත්වන්න එපා"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "කෙසේ හෝ නවත්වන්න"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "නවත්වන්න"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "නිශ්ප්‍රභ කරන්න"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "යළි කරන්න"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "පිටපත් කරන්න"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "අලවන්න"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "පුද්ගලික"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "මගේ වටපිටාව"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "විස්තර"
 
@@ -190,22 +191,306 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "පෙළ"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "පින්තූරය"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "ශබ්දය"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "වීඩියෝ දසුන"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "සබැඳිය"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "අප්‍රිකානු"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "ඇරගොන්ස්"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "බල්ගේරියානු"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "බොස්නියානු"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "කැටලන්"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "චෙත්"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "වේල්ස්"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ඩැනිශ්"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ජර්මන්"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "ග්‍රීක"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "ප්‍රකෘතිය"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "බ්‍රිතාන්‍ය ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ඉංග්‍රීසි (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "එස්පැරන්ටෝ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ස්පාඤ්ඤ"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "ස්පාඤ්ඤ"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "එස්තෝනියානු"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "පර්සියානු"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "පර්සියානු-ඉංග්‍රීසි"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ෆින්ලන්ත"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ප්‍රංශ (බෙල්ජියම)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ප්‍රංශ"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "අයර්ලන්ත"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "ග්‍රීක, පුරාණ"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "හින්දි"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "ක්‍රෝයේශියානු"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "හන්ගේරියානු"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ආර්මේනියානු"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ආර්මේනියානු"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ඉන්දුනීසියානු"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "අයිස්ලන්ත"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ඉතාලි"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ජෝර්ජියානු"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "කණ්ණඩ"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "කුර්දි"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ලතින්"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ලිතුවේනියානු"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ලැට්වියානු"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "මැසිඩෝනියානු"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "මලයාලම්"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "මැලේ"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "නේපාල"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ලන්දේසි"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "නෝවීජියානු"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "ජන්ජාබි"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "පෝලන්ත"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "බ්‍රසීල පෘතුගීසි"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "යුරෝපීය පෘතුගීසි"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "රොමේනියානු"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "රුසියානු"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "ස්ලෝවැක්"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "ඇල්බේනියානු"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "සර්බියානු"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ස්වීඩන්"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "ස්වාහිලි"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "දෙමළ"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "තුර්කි"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "වියට්නාම්"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "වියට්නාම්"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "වියට්නාම්"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "මැන්ඩරීන"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "කැන්තනීස්"
diff --git a/po/sk.po b/po/sk.po
index ccbdc93..59e06fc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-19 23:31+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-27 02:44+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474944244.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivita"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Chyba: všetky zmeny budú stratené"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Nezastavovať"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Aj tak zastaviť"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Späť"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Dopredu"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Vložiť"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Súkromné"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Moji susedia"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Popis"
 
@@ -88,9 +89,8 @@
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
-#, fuzzy
 msgid "Red"
-msgstr "Dopredu"
+msgstr "Červená"
 
 #: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
@@ -193,22 +193,302 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Text"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "afrikánčina"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "aragónčina"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "bulharčina"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "bosniačtina"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "katalánčina"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "čeština"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "waleština"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "dánčina"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "nemčina"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "gréčtina"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "angličtina (britská)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "angličtina_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "angličtina (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "angličtina"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "španielčina"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Španielska (Latinská Amerika)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "estónčina"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "perzština"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "perzština-angličtina"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "fínčina"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "francúzština (Belgicko)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "francúzština"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "írčina"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "gréčtina (historická)"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "hindčina"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "chorvátčina"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "maďarčina"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "arménčina"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "arménčina"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "indonézština"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "islandčina"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "taliančina"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "gruzínčina"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "kannadčina"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "kurdčina"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "latinčina"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "litovčina"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "lotyština"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "macedónčina"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "malajálamčina"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "malajčina"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "nepálčina"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "holandčina"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "nórčina"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "pandžábčina"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "poľština"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "portugalčina (brazílska)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "portugalský (Portugalsko)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "rumunčina"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ruština"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "slovenčina"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "albánčina"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "srbčina"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "švédčina"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "svahilčina"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "tamilčina"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "turečtina"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "vietnamčina"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "vietnamčina_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "vietnamčina_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarínčina"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantonský"
diff --git a/po/sm.po b/po/sm.po
index 34ae47f..8ea655e 100644
--- a/po/sm.po
+++ b/po/sm.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: 2012-09-15 23:14+1400\n"
 "Last-Translator: ChrisB <edresources@bickersc.com>\n"
 "Language-Team: sm\n"
@@ -16,56 +16,56 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Gāoioiga"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Mau sesē"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Mau sesē: E tia'i nei suiga 'uma"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "'Aua le tāofi"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Tāofi so'o se mea"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Tāofi"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "'Ave'ese"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Toe-fa'aaogā"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Lōmiga"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Fa'apipi'i"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Patino"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Lo'u Tuā'oi"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Fa'amatala"
 
@@ -185,22 +185,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/son.po b/po/son.po
index c15ba3c..1547a5b 100644
--- a/po/son.po
+++ b/po/son.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-19 23:27+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-05-18 01:29+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: son\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1463534966.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Goyyan"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Gaabuyan firka"
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Gaabuyan firka: barmayyaney kul ga dere"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:882
+msgstr "Ma ši kay"
+
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:87
+msgstr "May kay binde"
+
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Kay"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Taafeeri"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Tee koyne"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Berandi"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Dobu"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Sutura"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:234
+msgstr "Ay fargandoo"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Šilbayyan"
 
@@ -77,7 +78,7 @@
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
 msgid "Ok"
-msgstr ""
+msgstr "Ayyo"
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
@@ -85,7 +86,7 @@
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
-msgstr ""
+msgstr "Noone foo suuba"
 
 #: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
@@ -101,7 +102,7 @@
 
 #: ../src/sugar3/util.py:217
 msgid " and "
-msgstr ""
+msgstr " nda "
 
 #: ../src/sugar3/util.py:218
 msgid ", "
@@ -110,93 +111,374 @@
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
 msgid "Seconds ago"
-msgstr ""
+msgstr "A mana gay"
 
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr ""
+msgstr "A ga too %s"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
 #: ../src/sugar3/util.py:240
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
+msgstr[0] "jiiri %d"
+msgstr[1] "jiiri %d"
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
+msgstr[0] "handu %d"
+msgstr[1] "handu %d"
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
+msgstr[0] "jirbiyye %d"
+msgstr[1] "jirbiyye %d"
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
+msgstr[0] "zaari %d"
+msgstr[1] "zaari %d"
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
+msgstr[0] "guuru %d"
+msgstr[1] "guuru %d"
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
+msgstr[0] "miniti %d"
+msgstr[1] "miniti %d"
 
 #: ../src/sugar3/util.py:346
-#, fuzzy
 msgid "Empty"
 msgstr "Koonu"
 
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "B %d"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "KB %d"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "MB %d"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:55
+msgstr "GB %d"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr "Kalimaɲaa kuru"
-
-#: ../src/sugar3/mime.py:64
+msgstr "Hantum"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Bii"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Jinde"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Widewo"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
-msgstr ""
+msgstr "Dobu"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "Margari"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afirikaŋ"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Araagooni"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgaari"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bozini"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalaŋ"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Ceki"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Weliši"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Daanuwa"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Alemaŋ"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Gereki"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Tilasu"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Ingiliši (Briten)"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Ingiliši ekosu"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Ingiliši hawsa"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Ingiliši-rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Ingiliši wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Ingiliši (Amereki laama margantey)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Ingiliši Dangay endey"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esiperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Esipaaɲi"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Esipaaɲi (Ameriki gurma laamey)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estooni"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Farsi ingiliši birji"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Fiini"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Faranse (Belžik)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Faranse"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandi geliki"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Gereki žeena"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Korowaati"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hongiri (Maagyar)"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armeeni"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armeeni (dangay)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indoneezi"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Isilandu"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Itaali"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojiban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Žorži"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdi"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Laateŋ"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituyaani"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Leetooni"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Maaseedooni"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Maalayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Maalay"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Neepaali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Hoolandi"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norweeži"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjaabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Poloɲ"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portuge (Berezil)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portuge (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Urumaani"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Iriisi"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Suloowaki"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albaani"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbi"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Suweedi"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suwahiili (šiiyan)"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Taamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turki"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Wiyetinaami"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Wiyetinaami hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Wiyetinaami sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Mandarin"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantoone"
diff --git a/po/sq.po b/po/sq.po
index aed1742..3664bcb 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 07:34+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 04:12+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474776777.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivitet"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Gabim gjat mbajtjes"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Gabim gjat mbajtjes: të gjitha ndrryshimet do humbasin"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Mos ndalo"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ndalo gjithsesi"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Ndalo"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Zhbëj"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Bëj"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopjo"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Ngjit"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Private"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Lagjja Ime"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Përshkrimi"
 
@@ -186,22 +187,305 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Fotografi"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Zë"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Lidhje"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikanisht"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bullgarisht"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Boshnjakisht"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalanisht"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Çekisht"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Uelsisht"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danisht"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Gjermanisht"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Greqisht"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Paracaktuar"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Anglisht (Britani)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Anglisht"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Anglisht"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Anglisht_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Anglisht_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Anglisht (SHBA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Anglisht"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spanjisht"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Spanjisht"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estonisht"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persisht"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persisht-anglisht"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finlandisht"
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "Frëngjisht"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Frengjisht"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Irlandisht"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "Greqisht"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Indisht"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroatisht"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Hungarisht"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armenisht"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Armenisht"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonezisht"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Islandisht"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italisht"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Gjeorgjisht"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kanade"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdisht"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latinisht"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Lituanisht"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Letonisht"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Maqedonisht"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malajalamisht"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malajisht"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalisht"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Holandisht"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norvegjisht"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punxhabisht"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polonisht"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugalishte braziliane"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugalishte evropiane"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumanisht"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Rusisht"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovakisht"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Shqip"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbisht"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Suedisht"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Suahilisht"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamile"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turqisht"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamisht"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamisht_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamisht_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Kinezisht (Mandarin)"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kinezisht (Cantonese)"
diff --git a/po/sr.po b/po/sr.po
index 69adfa3..6846a18 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,68 +6,69 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-20 00:10+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-26 01:11+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474852294.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s активност"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Задржи грешку"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Задржи грешку: све измене ће бити изгубљене"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Не заустављај"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ипак заустави"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Заустави"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Поништи"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Поврати"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Умножи"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Убаци"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Приватно"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Мој комшилук"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Опис"
 
@@ -193,22 +194,307 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Слика"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Аудио"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Видео"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Веза"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "африканс"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Арагонежански"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "бугарски"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Босански"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "каталонски"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "чешки"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "велшки"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "дански"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "немачки"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "грчки"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "енглески (УК)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "енглески"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "енглески"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "енглески"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "енглески"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "енглески (САД)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "енглески"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "есперанто"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "шпански"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "шпански"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "естонски"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "персијски"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "персијски-енглески"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "фински"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "француски (Белгија)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "француски"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ирски"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "старогрчки"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "хинди"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "хрватски"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "мађарски"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "јерменски"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "јерменски"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "индонежански"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "исландски"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "италијански"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "лојбан"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "грузијски"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "канада"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "курдски"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "латински"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "литвански"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "летонски"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "македонски"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "малајалам"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "малајски"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "непалски"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "холандски"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Норвешки"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "панџаби"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "пољски"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Португалски (Бразил)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "португалски (Португал)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "румунски"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "руски"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "словачки"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "албански"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "српски"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "шведски"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "свахили"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "тамилски"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "турски"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "вијетнамски"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "вијетнамски"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "вијетнамски"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Мандарински"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Кантонски"
diff --git a/po/sv.po b/po/sv.po
index 5dce8be..897120d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-19 23:21+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-25 23:29+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474846182.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "(%s)aktivitet"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Sparfel"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Sparfel: alla ändringar kommer att förloras"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Avsluta inte"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Stäng utan att spara"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Avsluta"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Ångra"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Återställ"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Mig själv"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Mina grannar"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -190,22 +191,301 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Text"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Ljud"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Länk"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Aragonesiska"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Bulgariska"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Bosniska"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Katalanska"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tjeckiska"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Kymriska (walesiska)"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Danska"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Tyska"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Grekiska"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Engelska (Britisk)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Engelska"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Engelska"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Engelska"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Engelska_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Engelska (USA)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Engelska"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Spanska"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Spansk (Latinamerikansk)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Estniska"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Persiska"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Persiska-Engelska"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Finska"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Franska (Belgien)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Franska"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Iriska"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "klassisk grekiska"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kroatiska"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Armeniska"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Armeniska (västlig)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Indonesiska"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "isländska"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Italienska"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Georgiska"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kurdiska"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Litauiska"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Lettiska"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Makedonska"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Malajiska"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Nepalesiska"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Nederländska"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Norska"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Polska"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Portugisiska (Brasilien)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Portugisiska (Portugal)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Rumänska"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Ryska"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Slovakiska"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Albanska"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Serbiska"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Svenska"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Turkiska"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Vietnamesiska"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Vietnamesiska_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Vietnamesiska_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Kinesiska (Mandarin)"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kantonesiska"
diff --git a/po/sw.po b/po/sw.po
index 36ae08b..dd8a10c 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-19 23:24+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:33+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475699624.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s Kazi"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "hifadhi kosa"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "hifadhi kosa: mabadiliko yote yatapotea"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Usisimame"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Simama hata hiyo"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Simama"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "rudi kabla"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Rudia kufanya"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "nakili"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "bandika"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Binafsi"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Jirani yangu"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Maelezo"
 
@@ -186,22 +187,304 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Maandishi"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Tawsira"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Sauti"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Video"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Kiunganishi"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Kiafrikana"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Kiaragoni"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Kibulgaria"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Kibosnia"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Kikatalani"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Kicheki"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Kiwelisi"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Kidenmaki"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Kijerumani"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Kigiriki"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Kiingereza (UK)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Kiingereza"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Kiingereza"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Kiingereza"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Kiingereza_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Kiingereza (US)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Kiingereza"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Kiesperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Kihispania"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Kihispania"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Kiestonia"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Kifini"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Kifaransa (Ubeligiji)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Kifaransa"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Kiayalandi"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "Kigiriki"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Kihindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Kikroeshia"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Kihangari"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Kiarmenia"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Kiarmenia"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Kiindonesia"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Kiaisilandi"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Kiitaliano"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Kijojia"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Kikurdi"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Kilatini"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Kilithuania"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Kilatvia"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Kimasedonia"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Kimalayalamu"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Kimalesia"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Kinepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Kiholanzi"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Kinoweji"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Kipunjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Kipolandi"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Kireno (Brazili)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Kireno (Ureno)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Kiromania"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Kirusi"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Kislovakia"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Kialbania"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Kiserbia"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Kiswidi"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Kiswahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Kitamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Kituruki"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Kivietinamu"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Kivietinamu_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Kivietinamu_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Kichina (Mandarin)"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Kichina (Cantonese)"
diff --git a/po/ta.po b/po/ta.po
index 42412fb..dcdb13e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-19 19:29+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:34+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475699682.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s செயற்பாடு"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "தவறை வைத்திரு"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "தவறை வைத்திரு: எல்லா மாற்றங்களும் அழிந்துவிடும்."
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "நிறுத்து"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "நிறுத்து"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "நிறுத்து"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "மீட்டலை ரத்து செய்"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "மீள் செய்"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "பிரதியெடு"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "ஒட்டு"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "தனியார்"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "எனது சுற்றுபுறங்கள்"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "விளக்கம்"
 
@@ -152,7 +153,7 @@
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d மணித்தியாலம்"
+msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/sugar3/util.py:245
@@ -186,22 +187,307 @@
 msgid "%d GB"
 msgstr "%d ஜிபி(GB)"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "உரை"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "படம்"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "ஒலி"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "காணொளி"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "இணைப்பு"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ஆஃப்ரிகான்ஸ்"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "ஆர்கோனீஸ்"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "பல்கேரியன்"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "போஸ்னியன்"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "கேட்டலான்"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "செக்"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "வேல்ஷ்"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "டேனிஷ்"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "ஜெர்மன்"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "கிரேக்கம்"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ஆங்கிலம் (பிரிட்டன்)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ஆங்கிலம்"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ஆங்கிலம்"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ஆங்கிலம்"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "ஆங்கிலம்"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ஆங்கிலம் (அமெரிக்கா)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ஆங்கிலம்"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "எஸ்பரேன்டோ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ஸ்பானிஷ்"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "ஸ்பானிஷ் (லத்தின் அமெரிக்கா)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "எஸ்டோனியன்"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "பெர்ஷியன்"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "பெர்ஷியன்-ஆங்கிலம்"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ஃபின்னிஷ்"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "பிரெஞ்சு (பெல்ஜியம்)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "பிரெஞ்சு"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ஐரிஷ்"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "கிரேக்கம், பழங்காலம்"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "இந்தி"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "குரோஷியன்"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ஹங்கேரியன்"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ஆர்மேனியன்"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ஆர்மேனியன்"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "இந்தோனேஷியன்"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ஐஸ்லேண்டிக்"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "இத்தாலியன்"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "லோஜ்பன்"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "ஜார்ஜியன்"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "கன்னடம்"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "குர்திஷ்"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "லத்தின்"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "லிதுவேனியன்"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "லாட்வியன்"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "மாஸிடோனியன்"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "மலையாளம்"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "மலாய்"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "நேபாளி"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "டச்சு"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "நார்வே"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "பஞ்சாபி"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "போலிஷ்"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "போர்ச்சுகீஸ் (பிரேசில்)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "போர்ச்சுகீஸ் (ஐரோப்பா)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "ரோமேனியன்"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "ரஷியன்"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "ஸ்லோவாக்"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "அல்பேனியன்"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "செர்பியன்"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "ஸ்வீடிஷ்"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "சுவாஹிலி"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "தமிழ்"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "துருக்கிஷ்"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "வியட்நாமிஸ்"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "வியட்நாமிஸ்"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "வியட்நாமிஸ்"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "சீனம்"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "கேன்டொனீஸ்"
diff --git a/po/th.po b/po/th.po
index f6df3ef..a5ec43b 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,35 +6,36 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-06-19 19:06+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:41+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475700091.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr "กิจกรรม%s"
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "กิจกรรม %s"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "การเก็บผิดพลาด"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "การเก็บผิดพลาด: การเปลี่ยนแปลงทั้งหมดจะหายไป"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "ไม่หยุด"
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "บังคับให้หยุด"
 
@@ -66,7 +67,7 @@
 msgid "My Neighborhood"
 msgstr "เพื่อนบ้านของฉัน"
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "คำอธิบาย"
 
@@ -87,15 +88,15 @@
 msgid "Choose a color"
 msgstr "เลือกสี"
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr "สีแดง"
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr "สีเขียว"
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr "สีน้ำเงิน"
 
@@ -180,22 +181,306 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "ข้อความ"
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "ภาพ"
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "เสียง"
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "วีดิโอ"
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "เชื่อมโยง"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "แอฟริกานส์"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "อารากอน"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "บัลแกเรีย"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "บอสเนีย"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "กาตาลัง"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "เช็ก"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "เวลส์"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "เดนมาร์ก"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "เยอรมัน"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "กรีก"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "อังกฤษ (บริติช)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "อังกฤษ"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "อังกฤษ"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "อังกฤษ"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "อังกฤษ"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ภาษาอังกฤษ (แบบอเมริกา)"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "เอสเปอรันโต"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "สเปน"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "ภาษาสเปน (ละตินอเมริกา)"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "เอสโตเนีย"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "เปอร์เซีย"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "เปอร์เซีย"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "ฟินแลนด์"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "ภาษาฝรั่งเศส (เบลเยียม)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "ฝรั่งเศส"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ไอริช"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "กรีก"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ฮินดี"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "โครเอเชีย"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ฮังการี"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "อาร์เมเนีย"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "อาร์เมเนีย"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "อินโดนีเชีย"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ไอซ์แลนด์"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "อิตาลี"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "เคิร์ด"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "ละติน"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "ลิทัวเนีย"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "ลัตเวีย"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "มาซิโดเนีย"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "มาเลย์"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "เนปาล"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ดัตช์"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "นอร์เวย์"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "ปัญจาบ"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "โปแลนด์"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "โปรตุเกส (บราซิล)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "โปรตุเกส - ยุโรป"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "โรมาเนีย"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "รัสเซีย"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "สโลวัก"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "แอลเบเนีย"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "เซอร์เบีย"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "สวีเดน"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "สวาฮีลี"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "ทมิฬ"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ตุรกี"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "เวียดนาม"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "เวียดนาม_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "เวียดนาม_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "จีน"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "จีน"
diff --git a/po/to.po b/po/to.po
index afd5079..5123922 100644
--- a/po/to.po
+++ b/po/to.po
@@ -6,34 +6,36 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-06-18 06:38+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
+"PO-Revision-Date: 2016-09-25 05:26+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: to\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474781195.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s 'Ekitiviti"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Tauhi pe ngaahi fehalaaki"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Tauhi pe ngaahi fehalaaki: 'e mole kotoa e ngaahi me'a ne liliu"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "'Oua e ta'ofi"
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Ta'ofi pe ia"
 
@@ -65,7 +67,7 @@
 msgid "My Neighborhood"
 msgstr "Hoku ngaahi kaunga 'api"
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Fakamatala"
 
@@ -86,15 +88,15 @@
 msgid "Choose a color"
 msgstr "Fili ha lanu"
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr "Kulokula"
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr "Lanumata"
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr "Pulû"
 
@@ -124,42 +126,36 @@
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
@@ -185,22 +181,305 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "'Imisi"
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "'Otio"
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Vitio"
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "lea fakaʻafilikana"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "lea fakapulukalia"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "lea fakaposinia"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "lea fakakatalani"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "lea fakaseki"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "lea fakauēlesi"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "lea fakatenimaʻake"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "lea fakasiamane"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "lea fakakalisi"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "lea fakapilitānia"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "lea fakapālangi-ʻamelika"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "lea fakasipēnisi"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "lea fakasipēnisi"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "lea fakaʻesitōnia"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "lea fakapēsia"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "lea fakapēsia"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "lea fakafinilani"
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "lea fakafalanisē"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "lea fakafalanisē"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "lea fakaʻaelani"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "lea fakakalisi"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "lea fakahinitī"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "lea fakakuloisia"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "lea fakahungakalia"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "lea fakaʻāmenia"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "lea fakaʻāmenia"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "lea fakaʻaisilani"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "lea fakaʻītali"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "lea fakalosipani"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "lea fakaseōsia"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "lea fakakanata"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "lea fakakulitī"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "lea fakalatina"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "lea fakalituania"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "lea fakalativia"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "lea fakamasitōnia"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "lea fakamalei"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "lea fakanepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "lea fakahōlani"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "lea fakanouaē"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "lea fakapūnusapi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "lea fakapolani"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "lea fakapotukali-palāsili"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "lea fakapotukali-ʻiulope"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "lea fakalōmenia"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "lea fakalūsia"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "lea fakasolāvaki"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "lea fakaʻalapēnia"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "lea fakasēpia"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "lea fakasuēteni"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "lea fakasuahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "lea fakatamili"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "lea fakatoake"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "lea fakavietinami"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "lea fakavietinami_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "lea fakavietinami_sgn"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "lea fakasiaina"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "lea fakasiaina"
diff --git a/po/tzm.po b/po/tzm.po
index b7a0519..74c8538 100644
--- a/po/tzm.po
+++ b/po/tzm.po
@@ -2,39 +2,39 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: tzm\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.7.0\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 #, python-format,
 msgid "%s Activity"
 msgstr "%s ⴰⵎⵓⵙⵙⵓ"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -66,7 +66,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -87,15 +87,15 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr ""
 
@@ -186,22 +186,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 69bdbb1..2578263 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2,38 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-29 02:46+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ug\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475117211.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -65,7 +67,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -86,15 +88,15 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr ""
 
@@ -124,42 +126,36 @@
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
@@ -185,22 +181,309 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ئافرىكانچە"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "ئاراگونچە"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "بۇلغارچە"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "بوسنىيەچە"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "كاتالانچە"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "چېخچە"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ۋېلشچە"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "دانىشچە"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "گېرمانچە"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "گىرېكچە"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "ئەنگلىيە ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "ئىنگلىزچە (ئا ق ش)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "دۇنيا تىلى"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ئىسپانچە"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "ئىسپانچە"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "ئېستونچە"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "پارسچە"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "پارسچە-ئىنگلىزچە"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "فىنچە"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "گوللاندىيىچە (بىلگىيە)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "فىرانسۇزچە"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "ئىرېلاندچە"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "گرېكچە، قەدىمكى"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ھىندىچە"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "خورۋاتچە"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ماجارچە"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ئەرمەنچە"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ئەرمەنچە"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "ھىندونېزىيەچە"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "ئىسلاندچە"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "ئىتاليانچە"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "لوجبانچە"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "گىرۇزىنچە"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "كانناداچە"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "كۇردچە"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "لاتىنچە"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "لىتۋاچە"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "لاتۋىيەچە"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "ماكېدونچە"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "مالايامچە"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "مالايچە"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "نېپالچە"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "گوللاندىيەچە"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "نورۋېگچە"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "لاتۋىيەچە"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "پولەكچە"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "پورتۇگالچە (بىرازىلىيە)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "پورتۇگالچە (پورتۇگالىيە)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "رۇمىنىيەچە"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "رۇسچە"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "سىلوۋاكچە"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "ئالبانچە"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "سېربچە"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "شۋېدچە"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "سىۋالىچە"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "تامىلچە"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "تۈركچە"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "ۋىيېتنامچە"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "ۋىيېتنامچە"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "ۋىيېتنامچە"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "خەنچە"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "خەنچە"
diff --git a/po/ur.po b/po/ur.po
index c6796bc..8e88b6d 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,35 +6,36 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-06-19 05:45+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2014-10-08 09:45-0400\n"
+"PO-Revision-Date: 2016-09-25 05:34+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: Sugar Labs\n"
 "Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1474781651.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%sسرگرمی"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "غلطی رکھيں"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "غلطی رکھيں: تمام تبديلياں ختم ہو سکتی ہیں"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "مت رکيں"
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "رک جائيں"
 
@@ -67,7 +68,7 @@
 msgstr "ميرا گردونواح"
 
 # وضاحت
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 #, fuzzy
 msgid "Description"
 msgstr "وضاحت"
@@ -91,17 +92,17 @@
 msgstr "رنگ منتخب کریں"
 
 # لال
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr "لال"
 
 # سبز
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr "سبز"
 
 # نیلا
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr "نیلا"
 
@@ -198,22 +199,312 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "ٹيکسٹ"
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "تصوير"
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "آڈيو"
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "ويڈيو"
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "لنک"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "ایفریکانز"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "ایراگونیز"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "بلغاری"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "بوسنی"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "کیٹالان"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "چیک"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "ویلش"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "ڈینش"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "جرمن"
+
+# سبز
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "یونانی"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "برطانوی انگریزی"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "انگریزی"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "انگریزی"
+
+#: ../src/sugar3/speech.py:62
+#, fuzzy
+msgid "English_rp"
+msgstr "انگریزی"
+
+#: ../src/sugar3/speech.py:63
+#, fuzzy
+msgid "English_wmids"
+msgstr "انگریزی"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "امریکی انگریزی"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "ایسپرانٹو"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "ہسپانوی"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "ہسپانوی"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "اسٹونین"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "فارسی"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "فارسی"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "فینیش"
+
+#: ../src/sugar3/speech.py:73
+#, fuzzy
+msgid "French belgium"
+msgstr "فرانسیسی"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "فرانسیسی"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "آئیرِش"
+
+#: ../src/sugar3/speech.py:76
+#, fuzzy
+msgid "Greek-ancient"
+msgstr "یونانی"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "ہندی"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "کراتی"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "ہنگیرین"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "ارمینی"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "ارمینی"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "انڈونیثیائی"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "آئس لینڈک"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "اطالوی"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "جارجی"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "کنّاڈا"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "کردش"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "لاطینی"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "لتھُواینین"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "لیٹوین"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "مقدونیائی"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "ملیالم"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "مالائی"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "نیپالی"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "ڈچ"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "نارویجین"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "پنجابی"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "پولستانی"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "برازیلی پرتگالی"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "یورپی پرتگالی"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "رومینین"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "روسی"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "سلوواک"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "البانی"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "صربی"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "سویڈش"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "سواحلی"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "تمل"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "ترکی"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "ویتنامی"
+
+#: ../src/sugar3/speech.py:112
+#, fuzzy
+msgid "Vietnam_hue"
+msgstr "ویتنامی"
+
+#: ../src/sugar3/speech.py:113
+#, fuzzy
+msgid "Vietnam_sgn"
+msgstr "ویتنامی"
+
+#: ../src/sugar3/speech.py:114
+#, fuzzy
+msgid "Mandarin"
+msgstr "چینی"
+
+#: ../src/sugar3/speech.py:115
+#, fuzzy
+msgid "Cantonese"
+msgstr "چینی"
diff --git a/po/vi.po b/po/vi.po
index ffcd4d1..56477ab 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,67 +9,68 @@
 msgstr ""
 "Project-Id-Version: sugar-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-19 01:12+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-05 20:41+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475700116.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "Hoạt động %s"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "Giữ lỗi"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "Giữ lỗi: tất cả các thay đổi sẽ bị mất"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "Không dừng"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "Vẫn dừng"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "Chép"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "Dán"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "Riêng"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "Hàng xóm mình"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "Mô tả"
 
@@ -187,22 +188,304 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "Văn bản"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "Ảnh"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "Âm thanh"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "Phim"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "Liên kết"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Tiếng Nam Phi"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Tiếng Aragon"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Tiếng Bulgaria"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Tiếng Nam Tư"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Tiếng Catalan"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Tiếng Séc"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Tiếng Wales"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Tiếng Đan Mạch"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Tiếng Đức"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Tiếng Hy Lạp"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Mặc định"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Tiếng Anh (Quốc Anh)"
+
+#: ../src/sugar3/speech.py:60
+#, fuzzy
+msgid "English scottish"
+msgstr "Tiếng Anh"
+
+#: ../src/sugar3/speech.py:61
+#, fuzzy
+msgid "English-north"
+msgstr "Tiếng Anh"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Tiếng Anh"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Tiếng Anh_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Tiếng Anh (Mỹ)"
+
+#: ../src/sugar3/speech.py:65
+#, fuzzy
+msgid "English west indies"
+msgstr "Tiếng Anh"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Tiếng Quốc Tế Ngữ"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Tiếng Tây Ban Nha"
+
+#: ../src/sugar3/speech.py:68
+#, fuzzy
+msgid "Spanish latin american"
+msgstr "Tiếng Tây Ban Nha"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Tiếng Estonia"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Tiếng Ba Tư"
+
+#: ../src/sugar3/speech.py:71
+#, fuzzy
+msgid "Farsi-pinglish"
+msgstr "Tiếng Ba Tư-Tiếng Anh"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Tiếng Phần Lan"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Tiếng Pháp (Bỉ)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Tiếng Pháp"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Tiếng Ai-len"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Tiếng Hy Lạp, cổ"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Tiếng Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Tiếng Croatia"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Tiếng Hungary"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Tiếng Acmênia"
+
+#: ../src/sugar3/speech.py:81
+#, fuzzy
+msgid "Armenian (west)"
+msgstr "Tiếng Acmênia"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Tiếng Ý"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Tiếng Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Tiếng Macedonia"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Tiếng Mã lai"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Tiếng Nê-pan"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Tiếng Hà Lan"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Tiếng Na Uy"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Tiếng Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Tiếng Ba Lan"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Tiếng Bồ Đào Nha (Braxin)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Tiếng Thụy Điển"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Tiếng Swahili"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Tiếng Tamil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Tiếng Thổ Nhĩ Kỳ"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Tiếng Việt"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Tiếng Việt_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Tiếng Việt_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Hoa phổ thông"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 69bdbb1..a627111 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -2,38 +2,38 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: wa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -65,7 +65,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -86,15 +86,15 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
 msgstr ""
 
@@ -185,22 +185,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/yo.po b/po/yo.po
index 69bdbb1..8859a2d 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -2,205 +2,483 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-09-16 04:19+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: yo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1473999579.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:874
+msgstr "%s aṣayan iṣẹ-ṣiṣe"
+
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:875
+msgstr "Pa aṣiṣe"
+
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:878
+msgstr "Pa aṣiṣe: gbogbo awọn ayipada yoo wa ni ti sọnu"
+
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
-msgstr ""
-
-#: ../src/sugar3/activity/activity.py:881
+msgstr "Ma ko da"
+
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
-msgstr ""
+msgstr "Da lonakona"
 
 #: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
-msgstr ""
+msgstr "Duro"
 
 #: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
-msgstr ""
+msgstr "Mu"
 
 #: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
-msgstr ""
+msgstr "lẹẹkansi"
 
 #: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
-msgstr ""
+msgstr "ẹda-iwe"
 
 #: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
-msgstr ""
+msgstr "lẹẹ"
 
 #: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
-msgstr ""
+msgstr "ikọkọ"
 
 #: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar3/activity/widgets.py:226
+msgstr "Mi adugbo"
+
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
-msgstr ""
+msgstr "Apejuwe"
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
 msgid "Cancel"
-msgstr ""
+msgstr "Fagilee"
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
 #: ../src/sugar3/graphics/alert.py:479
 msgid "Ok"
-msgstr ""
+msgstr "Dara"
 
 #: ../src/sugar3/graphics/alert.py:434
 msgid "Continue"
-msgstr ""
+msgstr "Tesiwaju"
 
 #: ../src/sugar3/graphics/colorbutton.py:54
 msgid "Choose a color"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:274
+msgstr "Yan a awọ"
+
+#: ../src/sugar3/graphics/colorbutton.py:279
 msgid "Red"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:276
+msgstr "Pupa"
+
+#: ../src/sugar3/graphics/colorbutton.py:281
 msgid "Green"
-msgstr ""
-
-#: ../src/sugar3/graphics/colorbutton.py:278
+msgstr "Àwö ewéko"
+
+#: ../src/sugar3/graphics/colorbutton.py:283
 msgid "Blue"
-msgstr ""
+msgstr "àwö sánmà"
 
 #: ../src/sugar3/util.py:217
 msgid " and "
-msgstr ""
+msgstr " ati "
 
 #: ../src/sugar3/util.py:218
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #: ../src/sugar3/util.py:221
 msgid "Seconds ago"
-msgstr ""
+msgstr "Ikeji ṣaaju"
 
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #: ../src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s ṣaaju ki o to"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
 #: ../src/sugar3/util.py:240
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ọdun"
+msgstr[1] "%d ọdun"
 
 #: ../src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d osù"
+msgstr[1] "%d osù"
 
 #: ../src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ọsẹ"
+msgstr[1] "%d ọsẹ"
 
 #: ../src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ọjọ"
+msgstr[1] "%d ọjọ"
 
 #: ../src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d wakati"
+msgstr[1] "%d wakati"
 
 #: ../src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d iseju"
+msgstr[1] "%d iseju"
 
 #: ../src/sugar3/util.py:346
 msgid "Empty"
-msgstr ""
+msgstr "sofo"
 
 #: ../src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
-msgstr ""
+msgstr "%d B"
 
 #: ../src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
-msgstr ""
+msgstr "%d MB"
 
 #: ../src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
-msgstr ""
-
-#: ../src/sugar3/mime.py:43
+msgstr "%d GB"
+
+#: ../src/sugar3/mime.py:56
 msgid "Text"
-msgstr ""
-
-#: ../src/sugar3/mime.py:52
+msgstr "ọrọ"
+
+#: ../src/sugar3/mime.py:63
 msgid "Image"
-msgstr ""
-
-#: ../src/sugar3/mime.py:58
+msgstr "aworan"
+
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
-msgstr ""
-
-#: ../src/sugar3/mime.py:66
+msgstr "dun"
+
+#: ../src/sugar3/mime.py:75
 msgid "Video"
-msgstr ""
-
-#: ../src/sugar3/mime.py:72
+msgstr "fiimu"
+
+#: ../src/sugar3/mime.py:86
 msgid "Link"
-msgstr ""
+msgstr "Ìsopọ"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr "lapapo"
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr "Èdè Afrikani"
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr "Èdè Aragoní"
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "Èdè Bùlgáríà"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr "Èdè Bosnia"
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "Èdè Katala"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "Èdè Tsẹ́kì"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "Èdè Welshi"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "Èdè Dẹ́mákì"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "Èdè Jẹ́mánì"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "Èdè Giriki"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr "Aiyipada"
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr "Èdè Gẹẹsi Ilu oyinbo Briteeni"
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr "Èdè Gẹẹsi Scotland"
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr "Èdè Gẹẹsì-ariwa"
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr "Èdè Gẹẹsi_rp"
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr "Èdè Gẹẹsi_wmids"
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr "Èdè Gẹẹsi USA"
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr "Èdè Gẹẹsì ìwọ oòrùn Indies"
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "Èdè Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "Èdè Spéìn"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr "Èdè Sipanisi"
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr "Èdè Esitonia"
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr "Èdè Pẹ́rsíà"
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr "Èdè Pẹ́rsíà-Gẹ̀ẹ́sì"
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "Èdè Filandi"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "Èdè Faransé Bégíọ́mù"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "Èdè Faransé"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "Èdè Ireland"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "Èdè Gríìkì Ijọ́un"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "Èdè Híndì"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr "Èdè Kroatíà"
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "Èdè Húngárì"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr "Èdè Arméníà"
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr "Èdè Arméníà (ìwọ oòrùn)"
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "Èdè Indonasia"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "Èdè Aṣilandi"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "Èdè Italiani"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "Èdè Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "Èdè Georgia"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "Èdè Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "Èdè Kurdish"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "Èdè Latini"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "Èdè Lituéníà"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "Èdè Latifia"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "Èdè Masidoniya"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr "Èdè Malayalam"
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "Èdè Malaya"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Èdè Nepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "Èdè Duki"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr "Èdè ará Nọ́rwèy"
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "Èdè Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr "Èdè Pólándì"
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "Èdè Pọtogí (Bàràsílì)"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr "Èdè Pọtogí (Pọtugi)"
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "Èdè Romaníà"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "Èdè Rọ́síà"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr "Èdè Slofákíà"
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr "Èdè Albáníà"
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr "Èdè Sérbíà"
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "Èdè Suwidiisi"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "Èdè Swàhílì-igbeyewo"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr "Èdè Tàmil"
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr "Èdè Túrkì"
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr "Èdè Fiẹtnám"
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr "Èdè Fiẹtnám_hue"
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr "Èdè Fiẹtnám_sgn"
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr "Èdè Ṣáínà Mandari"
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "Èdè Ṣáínà (Kanton)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index da93e1d..9f9d515 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,67 +6,68 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
-"PO-Revision-Date: 2012-06-18 06:06+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-03-04 23:02+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1457132541.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s活动"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "保存出错"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "保存出错: 所有更改将会丢失"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "不要停止"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "无论如何停止"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "撤销"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "重做"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "复制"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "粘贴"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "私有的"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "我的邻近"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "描述"
 
@@ -184,22 +185,299 @@
 msgid "%d GB"
 msgstr "%d 吉字节"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "文字"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "图片"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "音频"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "视频"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "链接"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "威尔士语"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+#, fuzzy
+msgid "Greek"
+msgstr "绿"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "西班牙"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "印地语"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "冰岛语"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "马其顿语"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr "荷兰语"
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr "葡萄牙语（巴西）"
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr "俄语"
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr "斯瓦西里语"
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr "粤语"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ba43674..ac8d79d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,70 +2,70 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.7.0\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr ""
 
@@ -185,22 +185,298 @@
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 34bc088..4c66717 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-26 00:33-0400\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
 "PO-Revision-Date: 2012-06-18 06:09+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../src/sugar3/activity/activity.py:378
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr "%s 活動"
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr "保存時發生錯誤"
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr "保存時發生錯誤：所作的變動將遺失"
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr "不停止"
 
-#: ../src/sugar3/activity/activity.py:882
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr "確定停止"
 
-#: ../src/sugar3/activity/widgets.py:87
+#: ../src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/sugar3/activity/widgets.py:99
+#: ../src/sugar3/activity/widgets.py:98
 msgid "Undo"
 msgstr "復原"
 
-#: ../src/sugar3/activity/widgets.py:107
+#: ../src/sugar3/activity/widgets.py:106
 msgid "Redo"
 msgstr "取消復原"
 
-#: ../src/sugar3/activity/widgets.py:114
+#: ../src/sugar3/activity/widgets.py:113
 msgid "Copy"
 msgstr "複製"
 
-#: ../src/sugar3/activity/widgets.py:122
+#: ../src/sugar3/activity/widgets.py:121
 msgid "Paste"
 msgstr "貼上"
 
-#: ../src/sugar3/activity/widgets.py:133
+#: ../src/sugar3/activity/widgets.py:132
 msgid "Private"
 msgstr "私人"
 
-#: ../src/sugar3/activity/widgets.py:140
+#: ../src/sugar3/activity/widgets.py:139
 msgid "My Neighborhood"
 msgstr "我的鄰居"
 
-#: ../src/sugar3/activity/widgets.py:234
+#: ../src/sugar3/activity/widgets.py:233
 msgid "Description"
 msgstr "描述"
 
@@ -184,22 +184,298 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:55
+#: ../src/sugar3/mime.py:56
 msgid "Text"
 msgstr "文字"
 
-#: ../src/sugar3/mime.py:64
+#: ../src/sugar3/mime.py:63
 msgid "Image"
 msgstr "圖片"
 
-#: ../src/sugar3/mime.py:70
+#: ../src/sugar3/mime.py:68
 msgid "Audio"
 msgstr "聲音"
 
-#: ../src/sugar3/mime.py:78
+#: ../src/sugar3/mime.py:75
 msgid "Video"
 msgstr "影像"
 
-#: ../src/sugar3/mime.py:90
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr "連結"
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr ""
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr ""
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr ""
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr ""
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr ""
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr ""
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr ""
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr ""
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr ""
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr ""
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr ""
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr ""
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr ""
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr ""
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr ""
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/po/zu.po b/po/zu.po
index c920221..6a9d44b 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -6,35 +6,36 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 00:32-0400\n"
-"PO-Revision-Date: 2012-06-18 21:45+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2015-01-22 12:40+0000\n"
+"PO-Revision-Date: 2016-10-04 01:07+0000\n"
+"Last-Translator: Chris <cjl@sugarlabs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
-
-#: ../src/sugar3/activity/activity.py:378
+"X-Generator: Pootle 2.5.1.1\n"
+"X-POOTLE-MTIME: 1475543233.000000\n"
+
+#: ../src/sugar3/activity/activity.py:416
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:874
+#: ../src/sugar3/activity/activity.py:967
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:875
+#: ../src/sugar3/activity/activity.py:968
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:878
+#: ../src/sugar3/activity/activity.py:971
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:881
+#: ../src/sugar3/activity/activity.py:975
 msgid "Stop anyway"
 msgstr ""
 
@@ -70,7 +71,7 @@
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:226
+#: ../src/sugar3/activity/widgets.py:233
 #, fuzzy
 msgid "Description"
 msgstr "Incazelo"
@@ -94,17 +95,17 @@
 msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar3/graphics/colorbutton.py:274
+#: ../src/sugar3/graphics/colorbutton.py:279
 #, fuzzy
 msgid "Red"
 msgstr "Okubomvu"
 
-#: ../src/sugar3/graphics/colorbutton.py:276
+#: ../src/sugar3/graphics/colorbutton.py:281
 #, fuzzy
 msgid "Green"
 msgstr "Okuluhlaza satshani"
 
-#: ../src/sugar3/graphics/colorbutton.py:278
+#: ../src/sugar3/graphics/colorbutton.py:283
 #, fuzzy
 msgid "Blue"
 msgstr "Okuluhlaza sasibhakabhaka"
@@ -200,26 +201,302 @@
 msgid "%d GB"
 msgstr "%d GB"
 
-#: ../src/sugar3/mime.py:43
+#: ../src/sugar3/mime.py:56
 #, fuzzy
 msgid "Text"
 msgstr "Umbhalo"
 
-#: ../src/sugar3/mime.py:52
+#: ../src/sugar3/mime.py:63
 #, fuzzy
 msgid "Image"
 msgstr "Isithombe"
 
-#: ../src/sugar3/mime.py:58
+#: ../src/sugar3/mime.py:68
 #, fuzzy
 msgid "Audio"
 msgstr "Umsindo"
 
-#: ../src/sugar3/mime.py:66
+#: ../src/sugar3/mime.py:75
 #, fuzzy
 msgid "Video"
 msgstr "Ividiyo"
 
-#: ../src/sugar3/mime.py:72
+#: ../src/sugar3/mime.py:86
 msgid "Link"
 msgstr ""
+
+#: ../src/sugar3/mime.py:91
+msgid "Bundle"
+msgstr ""
+
+#: ../src/sugar3/speech.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: ../src/sugar3/speech.py:49
+msgid "Aragonese"
+msgstr ""
+
+#: ../src/sugar3/speech.py:50
+msgid "Bulgarian"
+msgstr "isi-Bulgari"
+
+#: ../src/sugar3/speech.py:51
+msgid "Bosnian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:52
+msgid "Catalan"
+msgstr "isi-Catalan"
+
+#: ../src/sugar3/speech.py:53
+msgid "Czech"
+msgstr "isi-Czech"
+
+#: ../src/sugar3/speech.py:54
+msgid "Welsh"
+msgstr "isi-Welsh"
+
+#: ../src/sugar3/speech.py:55
+msgid "Danish"
+msgstr "isi-Danish"
+
+#: ../src/sugar3/speech.py:56
+msgid "German"
+msgstr "isi-German"
+
+#: ../src/sugar3/speech.py:57
+msgid "Greek"
+msgstr "isi-Greek"
+
+#: ../src/sugar3/speech.py:58
+msgid "Default"
+msgstr ""
+
+#: ../src/sugar3/speech.py:59
+msgid "English Britain"
+msgstr ""
+
+#: ../src/sugar3/speech.py:60
+msgid "English scottish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:61
+msgid "English-north"
+msgstr ""
+
+#: ../src/sugar3/speech.py:62
+msgid "English_rp"
+msgstr ""
+
+#: ../src/sugar3/speech.py:63
+msgid "English_wmids"
+msgstr ""
+
+#: ../src/sugar3/speech.py:64
+msgid "English USA"
+msgstr ""
+
+#: ../src/sugar3/speech.py:65
+msgid "English west indies"
+msgstr ""
+
+#: ../src/sugar3/speech.py:66
+msgid "Esperanto"
+msgstr "isi-Esperanto"
+
+#: ../src/sugar3/speech.py:67
+msgid "Spanish"
+msgstr "isi-Spanish"
+
+#: ../src/sugar3/speech.py:68
+msgid "Spanish latin american"
+msgstr ""
+
+#: ../src/sugar3/speech.py:69
+msgid "Estonian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:70
+msgid "Farsi"
+msgstr ""
+
+#: ../src/sugar3/speech.py:71
+msgid "Farsi-pinglish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:72
+msgid "Finnish"
+msgstr "isi-Finnish"
+
+#: ../src/sugar3/speech.py:73
+msgid "French belgium"
+msgstr "isi-French (Belgium)"
+
+#: ../src/sugar3/speech.py:74
+msgid "French"
+msgstr "isi-French"
+
+#: ../src/sugar3/speech.py:75
+msgid "Irish-gaeilge"
+msgstr "isi-Irish"
+
+#: ../src/sugar3/speech.py:76
+msgid "Greek-ancient"
+msgstr "isi-Greek, sakudala"
+
+#: ../src/sugar3/speech.py:77
+msgid "Hindi"
+msgstr "isi-Hindi"
+
+#: ../src/sugar3/speech.py:78
+msgid "Croatian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:79
+msgid "Hungarian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:80
+msgid "Armenian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:81
+msgid "Armenian (west)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:82
+msgid "Indonesian"
+msgstr "isi-Indonesian"
+
+#: ../src/sugar3/speech.py:83
+msgid "Icelandic"
+msgstr "isi-Icelandic"
+
+#: ../src/sugar3/speech.py:84
+msgid "Italian"
+msgstr "isi-Italian"
+
+#: ../src/sugar3/speech.py:85
+msgid "Lojban"
+msgstr "isi-Lojban"
+
+#: ../src/sugar3/speech.py:86
+msgid "Georgian"
+msgstr "isi-Georgian"
+
+#: ../src/sugar3/speech.py:87
+msgid "Kannada"
+msgstr "isi-Kannada"
+
+#: ../src/sugar3/speech.py:88
+msgid "Kurdish"
+msgstr "isi-Kurdish"
+
+#: ../src/sugar3/speech.py:89
+msgid "Latin"
+msgstr "isi-Latin"
+
+#: ../src/sugar3/speech.py:90
+msgid "Lithuanian"
+msgstr "isi-Lithuanian"
+
+#: ../src/sugar3/speech.py:91
+msgid "Latvian"
+msgstr "isi-Latvian"
+
+#: ../src/sugar3/speech.py:92
+msgid "Macedonian"
+msgstr "isi-Macedonian"
+
+#: ../src/sugar3/speech.py:93
+msgid "Malayalam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:94
+msgid "Malay"
+msgstr "isi-Malay"
+
+#: ../src/sugar3/speech.py:95
+msgid "Nepali"
+msgstr "Isi-Nepali"
+
+#: ../src/sugar3/speech.py:96
+msgid "Dutch"
+msgstr ""
+
+#: ../src/sugar3/speech.py:97
+msgid "Norwegian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:98
+msgid "Punjabi"
+msgstr "isi-Punjabi"
+
+#: ../src/sugar3/speech.py:99
+msgid "Polish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:100
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:101
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+#: ../src/sugar3/speech.py:102
+msgid "Romanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:103
+msgid "Russian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:104
+msgid "Slovak"
+msgstr ""
+
+#: ../src/sugar3/speech.py:105
+msgid "Albanian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:106
+msgid "Serbian"
+msgstr ""
+
+#: ../src/sugar3/speech.py:107
+msgid "Swedish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:108
+msgid "Swahili-test"
+msgstr ""
+
+#: ../src/sugar3/speech.py:109
+msgid "Tamil"
+msgstr ""
+
+#: ../src/sugar3/speech.py:110
+msgid "Turkish"
+msgstr ""
+
+#: ../src/sugar3/speech.py:111
+msgid "Vietnam"
+msgstr ""
+
+#: ../src/sugar3/speech.py:112
+msgid "Vietnam_hue"
+msgstr ""
+
+#: ../src/sugar3/speech.py:113
+msgid "Vietnam_sgn"
+msgstr ""
+
+#: ../src/sugar3/speech.py:114
+msgid "Mandarin"
+msgstr ""
+
+#: ../src/sugar3/speech.py:115
+msgid "Cantonese"
+msgstr ""
diff --git a/src/Makefile.in b/src/Makefile.in
index c0b77fd..f214dc6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -239,6 +239,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/Makefile.in b/src/sugar3/Makefile.in
index 70d3b8e..b708e5c 100644
--- a/src/sugar3/Makefile.in
+++ b/src/sugar3/Makefile.in
@@ -326,6 +326,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/activity/Makefile.in b/src/sugar3/activity/Makefile.in
index 770945e..f9b677a 100644
--- a/src/sugar3/activity/Makefile.in
+++ b/src/sugar3/activity/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py
index 0506147..2061232 100644
--- a/src/sugar3/activity/activity.py
+++ b/src/sugar3/activity/activity.py
@@ -1,9 +1,12 @@
-"""Base class for activities written in Python
+'''
+Base class for activities written in Python
+===========================================
 
 This is currently the only definitive reference for what an
 activity must do to participate in the Sugar desktop.
 
-   A Basic Activity
+A Basic Activity
+----------------
 
 All activities must implement a class derived from 'Activity' in this class.
 The convention is to call it ActivitynameActivity, but this is not required as
@@ -12,6 +15,7 @@
 
 For example the most minimal Activity:
 
+.. code-block:: python
 
    from sugar3.activity import activity
 
@@ -19,7 +23,9 @@
         pass
 
 To get a real, working activity, you will at least have to implement:
-    __init__(), read_file() and write_file()
+
+__init__(), :func:`sugar3.activity.activity.Activity.read_file()` and
+:func:`sugar3.activity.activity.Activity.write_file()`
 
 Aditionally, you will probably need a at least a Toolbar so you can have some
 interesting buttons for the user, like for example 'exit activity'
@@ -27,8 +33,8 @@
 See the methods of the Activity class below for more information on what you
 will need for a real activity.
 
-STABLE.
-"""
+.. note:: This API is STABLE.
+'''
 # Copyright (C) 2006-2007 Red Hat, Inc.
 # Copyright (C) 2007-2009 One Laptop Per Child
 # Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
@@ -61,7 +67,6 @@
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GObject
-from gi.repository import Gio
 import dbus
 import dbus.service
 from dbus import PROPERTIES_IFACE
@@ -75,6 +80,7 @@
 
 from sugar3 import util
 from sugar3 import power
+from sugar3.profile import get_nick_name, get_color
 from sugar3.presence import presenceservice
 from sugar3.activity.activityservice import ActivityService
 from sugar3.graphics import style
@@ -84,6 +90,9 @@
 from sugar3.datastore import datastore
 from sugar3.bundle.activitybundle import get_bundle_instance
 from sugar3.bundle.helpers import bundle_from_dir
+from sugar3 import env
+from errno import EEXIST
+
 from gi.repository import SugarExt
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit-gtk3', msg)
@@ -156,24 +165,32 @@
 
 
 class Activity(Window, Gtk.Container):
-    """This is the base Activity class that all other Activities derive from.
-       This is where your activity starts.
+    '''
+    This is the base Activity class that all other Activities derive from.
+    This is where your activity starts.
 
     To get a working Activity:
         0. Derive your Activity from this class:
-                class MyActivity(activity.Activity):
-                    ...
+
+        .. code-block:: python
+
+            class MyActivity(activity.Activity):
+                ...
 
         1. implement an __init__() method for your Activity class.
 
-           Use your init method to create your own ToolbarBox.
-           This is the code to make a basic toolbar with the activity
-           toolbar and a stop button.
-                from sugar3.graphics.toolbarbox import ToolbarBox
-                from sugar3.activity.widgets import ActivityToolbarButton
-                from sugar3.activity.widgets import StopButton
-
-                ...
+        Use your init method to create your own ToolbarBox.
+        This is the code to make a basic toolbar with the activity
+        toolbar and a stop button.
+
+        .. code-block:: python
+
+            from sugar3.graphics.toolbarbox import ToolbarBox
+            from sugar3.activity.widgets import ActivityToolbarButton
+            from sugar3.activity.widgets import StopButton
+
+            def __init__(self, handle):
+                activity.Activity.__init__(self, handle)
 
                 toolbar_box = ToolbarBox()
                 activity_button = ActivityToolbarButton(self)
@@ -194,60 +211,72 @@
                 self.set_toolbar_box(toolbar_box)
                 toolbar_box.show()
 
-           Add extra Toolbars to your toolbox.
-
-           You should setup Activity sharing here too.
-
-           Finaly, your Activity may need some resources which you can claim
-           here too.
-
-           The __init__() method is also used to make the distinction between
-           being resumed from the Journal, or starting with a blank document.
-
-        2. Implement read_file() and write_file()
-           Most activities revolve around creating and storing Journal entries.
-           For example, Write: You create a document, it is saved to the
-           Journal and then later you resume working on the document.
-
-           read_file() and write_file() will be called by sugar to tell your
-           Activity that it should load or save the document the user is
-           working on.
+        Add extra Toolbars to your toolbox.
+
+        You should setup Activity sharing here too.
+
+        Finaly, your Activity may need some resources which you can claim
+        here too.
+
+        The __init__() method is also used to make the distinction between
+        being resumed from the Journal, or starting with a blank document.
+
+        2. Implement :func:`sugar3.activity.activity.Activity.read_file()` and
+        :func:`sugar3.activity.activity.Activity.write_file()`
+        Most activities revolve around creating and storing Journal entries.
+        For example, Write: You create a document, it is saved to the
+        Journal and then later you resume working on the document.
+
+        :func:`sugar3.activity.activity.Activity.read_file()` and
+        :func:`sugar3.activity.activity.Activity.write_file()`
+        will be called by sugar to tell your
+        Activity that it should load or save the document the user is
+        working on.
 
         3. Implement our Activity Toolbars.
-           The Toolbars are added to your Activity in step 1 (the toolbox), but
-           you need to implement them somewhere. Now is a good time.
-
-           There are a number of standard Toolbars. The most basic one, the one
-           your almost absolutely MUST have is the ActivityToolbar. Without
-           this, you're not really making a proper Sugar Activity (which may be
-           okay, but you should really stop and think about why not!) You do
-           this with the ActivityToolbox(self) call in step 1.
-
-           Usually, you will also need the standard EditToolbar. This is the
-           one which has the standard copy and paste buttons. You need to
-           derive your own EditToolbar class from sugar3.EditToolbar:
-                from sugar3.activity.widgets import EditToolbar
-
-                class MyEditToolbar(EditToolbar):
-                    ...
-
-           See EditToolbar for the methods you should implement in your class.
-
-           Finaly, your Activity will very likely need some activity specific
-           buttons and options you can create your own toolbars by deriving a
-           class from Gtk.Toolbar:
-                class MySpecialToolbar(Gtk.Toolbar):
-                    ...
+
+        The Toolbars are added to your Activity in step 1 (the toolbox), but
+        you need to implement them somewhere. Now is a good time.
+
+        There are a number of standard Toolbars. The most basic one, the one
+        your almost absolutely MUST have is the ActivityToolbar. Without
+        this, you're not really making a proper Sugar Activity (which may be
+        okay, but you should really stop and think about why not!) You do
+        this with the ActivityToolbox(self) call in step 1.
+
+        Usually, you will also need the standard EditToolbar. This is the
+        one which has the standard copy and paste buttons. You need to
+        derive your own EditToolbar class from
+        :class:`sugar3.activity.widgets.EditToolbar`:
+
+        .. code-block:: python
+
+            from sugar3.activity.widgets import EditToolbar
+
+            class MyEditToolbar(EditToolbar):
+                ...
+
+        See EditToolbar for the methods you should implement in your class.
+
+        Finaly, your Activity will very likely need some activity specific
+        buttons and options you can create your own toolbars by deriving a
+        class from :class:`Gtk.Toolbar`:
+
+        .. code-block:: python
+
+            class MySpecialToolbar(Gtk.Toolbar):
+            ...
 
         4. Use your creativity. Make your Activity something special and share
            it with your friends!
 
-    Read through the methods of the Activity class below, to learn more about
-    how to make an Activity work.
-
-    Hint: A good and simple Activity to learn from is the Read activity. To
-    create your own activity, you may want to copy it and use it as a template.
-    """
+        Read through the methods of the Activity class below, to learn more
+        about how to make an Activity work.
+
+        Hint: A good and simple Activity to learn from is the Read activity.
+        To create your own activity, you may want to copy it and use it as a
+        template.
+    '''
 
     __gtype_name__ = 'SugarActivity'
 
@@ -260,16 +289,19 @@
     }
 
     def __init__(self, handle, create_jobject=True):
-        """Initialise the Activity
-
-        handle -- sugar3.activity.activityhandle.ActivityHandle
+        '''
+        Initialise the Activity
+
+        Args:
+
+        handle (sugar3.activity.activityhandle.ActivityHandle)
             instance providing the activity id and access to the
             presence service which *may* provide sharing for this
             application
-
-        create_jobject -- boolean
-            define if it should create a journal object if we are
-            not resuming
+        create_jobject (boolean)
+            DEPRECATED: define if it should create a journal object if we are
+            not resuming. The parameter is ignored, and always  will
+            be created a object in the Journal.
 
         Side effects:
 
@@ -288,7 +320,8 @@
             If your Activity implements __init__(), it should call
             the base class __init()__ before doing Activity specific things.
 
-        """
+        '''
+
         # Stuff that needs to be done early
         icons_path = os.path.join(get_bundle_path(), 'icons')
         Gtk.IconTheme.get_default().append_search_path(icons_path)
@@ -303,6 +336,7 @@
         settings = Gtk.Settings.get_default()
         settings.set_property('gtk-theme-name', sugar_theme)
         settings.set_property('gtk-icon-theme-name', 'sugar')
+        settings.set_property('gtk-button-images', True)
         settings.set_property('gtk-font-name',
                               '%s %f' % (style.FONT_FACE, style.FONT_SIZE))
 
@@ -378,7 +412,7 @@
         self.shared_activity = None
         self._join_id = None
 
-        if handle.object_id is None and create_jobject:
+        if handle.object_id is None:
             logging.debug('Creating a jobject.')
             self._jobject = self._initialize_journal_object()
 
@@ -397,10 +431,6 @@
                                                   warn_if_none=False)
             self._set_up_sharing(mesh_instance, share_scope)
 
-        if not create_jobject:
-            self.set_title(get_bundle_name())
-            return
-
         if self.shared_activity is not None:
             self._jobject.metadata['title'] = self.shared_activity.props.name
             self._jobject.metadata['icon-color'] = \
@@ -410,13 +440,17 @@
                                            self.__jobject_updated_cb)
         self.set_title(self._jobject.metadata['title'])
 
+        bundle = get_bundle_instance(get_bundle_path())
+        self.set_icon_from_file(bundle.get_icon())
+
+
     def run_main_loop(self):
         Gtk.main()
 
     def _initialize_journal_object(self):
         title = _('%s Activity') % get_bundle_name()
-        settings = Gio.Settings('org.sugarlabs.user')
-        icon_color = settings.get_string('color')
+       
+        icon_color = get_color().to_string()
 
         jobject = datastore.create()
         jobject.metadata['title'] = title
@@ -516,6 +550,11 @@
         type=bool, default=False, getter=get_active, setter=set_active)
 
     def get_max_participants(self):
+        '''
+        Returns:
+            int: the max number of users than can share a instance of the
+            activity. Should be configured in the activity.info file.
+        '''
         # If max_participants has not been set in the activity, get it
         # from the bundle.
         if self._max_participants is None:
@@ -531,29 +570,43 @@
         setter=set_max_participants)
 
     def get_id(self):
-        """Returns the activity id of the current instance of your activity.
-
-        The activity id is sort-of-like the unix process id (PID). However,
-        unlike PIDs it is only different for each new instance (with
-        create_jobject = True set) and stays the same everytime a user
-        resumes an activity. This is also the identity of your Activity to
-        other XOs for use when sharing.
-        """
+        '''
+        Returns:
+
+            int: the activity id of the current instance of your activity.
+
+            The activity id is sort-of-like the unix process id (PID). However,
+            unlike PIDs it is only different for each new instance
+            and stays the same everytime a user
+            resumes an activity. This is also the identity of your Activity to
+            other XOs for use when sharing.
+        '''
         return self._activity_id
 
     def get_bundle_id(self):
-        """Returns the bundle_id from the activity.info file"""
+        '''
+        Returns:
+            int: the bundle_id from the activity.info file
+        '''
         return os.environ['SUGAR_BUNDLE_ID']
 
     def get_canvas(self):
+        '''
+        Returns:
+            :class:`Gtk.Widget`: the widget used as canvas
+        '''
         return Window.get_canvas(self)
 
     def set_canvas(self, canvas):
-        """Sets the 'work area' of your activity with the canvas of your
-        choice.
+        '''
+        Sets the 'work area' of your activity with the canvas of your choice.
 
         One commonly used canvas is Gtk.ScrolledWindow
-        """
+
+        Args:
+            canvas (:class:`Gtk.Widget`): the widget used as canvas
+        '''
+
         Window.set_canvas(self, canvas)
         if not self._read_file_called:
             canvas.connect('map', self.__canvas_map_cb)
@@ -568,11 +621,12 @@
 
     def _adapt_window_to_screen(self):
         screen = Gdk.Screen.get_default()
+        workarea = screen.get_monitor_workarea(screen.get_number())
         geometry = Gdk.Geometry()
         geometry.max_width = geometry.base_width = geometry.min_width = \
-            screen.get_width()
+            workarea.width
         geometry.max_height = geometry.base_height = geometry.min_height = \
-            screen.get_height()
+            workarea.height
         geometry.width_inc = geometry.height_inc = geometry.min_aspect = \
             geometry.max_aspect = 1
         hints = Gdk.WindowHints(Gdk.WindowHints.ASPECT |
@@ -605,10 +659,12 @@
         logging.debug('Error creating activity datastore object: %s' % err)
 
     def get_activity_root(self):
-        """ FIXME: Deprecated. This part of the API has been moved
+        '''
+        Deprecated. This part of the API has been moved
         out of this class to the module itself
 
-        Returns a path for saving Activity specific preferences, etc.
+        Returns:
+            str: a path for saving Activity specific preferences, etc.
 
         Returns a path to the location in the filesystem where the activity can
         store activity related data that doesn't pertain to the current
@@ -620,14 +676,14 @@
         Activities should ONLY save settings, user preferences and other data
         which isn't specific to a journal item here. If (meta-)data is in
         anyway specific to a journal entry, it MUST be stored in the DataStore.
-        """
+        '''
         if os.environ.get('SUGAR_ACTIVITY_ROOT'):
             return os.environ['SUGAR_ACTIVITY_ROOT']
         else:
-            return '/'
+            return get_activity_root()
 
     def read_file(self, file_path):
-        """
+        '''
         Subclasses implement this method if they support resuming objects from
         the journal. 'file_path' is the file to read from.
 
@@ -642,11 +698,14 @@
         description and other metadata['tags'] may change. So if it is
         important for you to notice changes, this is the time to record the
         originals.
-        """
+
+        Args:
+            str: the file path to read
+        '''
         raise NotImplementedError
 
     def write_file(self, file_path):
-        """
+        '''
         Subclasses implement this method if they support saving data to objects
         in the journal. 'file_path' is the file to write to.
 
@@ -661,14 +720,17 @@
         received in file_read(). Even if you kept the file_path from
         file_read() open until now, you must still write the entire file to
         this file_path.
-        """
+
+        Args:
+            file_path (str): complete path of the file to write
+        '''
         raise NotImplementedError
 
     def notify_user(self, summary, body):
-        """
+        '''
         Display a notification with the given summary and body.
         The notification will go under the activities icon in the frame.
-        """
+        '''
         bundle = get_bundle_instance(get_bundle_path())
         icon = bundle.get_icon()
 
@@ -709,8 +771,11 @@
             self._jobject = None
 
     def get_preview(self):
-        """Returns an image representing the state of the activity. Generally
-        this is what the user is seeing in this moment.
+        '''
+        Returns:
+            str: with data ready to save with an image representing the state
+            of the activity. Generally this is what the user is seeing in
+            this moment.
 
         Activities can override this method, which should return a str with the
         binary content of a png image with a width of PREVIEW_SIZE pixels.
@@ -718,7 +783,7 @@
         The method does create a cairo surface similar to that of the canvas'
         window and draws on that. Then we create a cairo image surface with
         the desired preview size and scale the canvas surface on that.
-        """
+        '''
         if self.canvas is None or not hasattr(self.canvas, 'get_window'):
             return None
 
@@ -776,13 +841,14 @@
             return {}
 
     def save(self):
-        """Request that the activity is saved to the Journal.
+        '''
+        Request that the activity is saved to the Journal.
 
         This method is called by the close() method below. In general,
         activities should not override this method. This method is part of the
         public API of an Acivity, and should behave in standard ways. Use your
         own implementation of write_file() to save your Activity specific data.
-        """
+        '''
 
         if self._jobject is None:
             logging.debug('Cannot save, no journal object.')
@@ -819,7 +885,7 @@
         if not self.metadata.get('activity_id', ''):
             self.metadata['activity_id'] = self.get_id()
 
-        file_path = os.path.join(self.get_activity_root(), 'instance',
+        file_path = os.path.join(get_activity_root(), 'instance',
                                  '%i' % time.time())
         try:
             self.write_file(file_path)
@@ -842,12 +908,13 @@
                             error_handler=self.__save_error_cb)
 
     def copy(self):
-        """Request that the activity 'Keep in Journal' the current state
-           of the activity.
+        '''
+        Request that the activity 'Keep in Journal' the current state
+        of the activity.
 
         Activities should not override this method. Instead, like save() do any
         copy work that needs to be done in write_file()
-        """
+        '''
         logging.debug('Activity.copy: %r' % self._jobject.object_id)
         self.save()
         self._jobject.object_id = None
@@ -878,14 +945,19 @@
         self.__privacy_changed_cb(self.shared_activity, None)
 
     def get_shared_activity(self):
-        """Returns an instance of the shared Activity or None
+        '''
+        Returns:
+            an instance of the shared Activity or None
 
         The shared activity is of type sugar3.presence.activity.Activity
-        """
+        '''
         return self.shared_activity
 
     def get_shared(self):
-        """Returns TRUE if the activity is shared on the mesh."""
+        '''
+        Returns:
+             bool: True if the activity is shared on the mesh.
+        '''
         if not self.shared_activity:
             return False
         return self.shared_activity.props.joined
@@ -930,12 +1002,17 @@
                               account_path, contact_id)
 
     def invite(self, account_path, contact_id):
-        """Invite a buddy to join this Activity.
+        '''
+        Invite a buddy to join this Activity.
+
+        Args:
+            account_path
+            contact_id
 
         Side Effects:
             Calls self.share(True) to privately share the activity if it wasn't
             shared before.
-        """
+        '''
         self._invites_queue.append((account_path, contact_id))
 
         if (self.shared_activity is None
@@ -945,14 +1022,16 @@
             self._send_invites()
 
     def share(self, private=False):
-        """Request that the activity be shared on the network.
-
-        private -- bool: True to share by invitation only,
+        '''
+        Request that the activity be shared on the network.
+
+        Args:
+            private (bool): True to share by invitation only,
             False to advertise as shared to everyone.
 
         Once the activity is shared, its privacy can be changed by setting
         its 'private' property.
-        """
+        '''
         if self.shared_activity and self.shared_activity.props.joined:
             raise RuntimeError('Activity %s already shared.' %
                                self._activity_id)
@@ -990,8 +1069,10 @@
             self._session.will_quit(self, False)
 
     def can_close(self):
-        """Activities should override this function if they want to perform
-        extra checks before actually closing."""
+        '''
+        Activities should override this function if they want to perform
+        extra checks before actually closing.
+        '''
 
         return True
 
@@ -1024,12 +1105,16 @@
         power.get_power_manager().shutdown()
 
     def close(self, skip_save=False):
-        """Request that the activity be stopped and saved to the Journal
+        '''
+        Request that the activity be stopped and saved to the Journal
 
         Activities should not override this method, but should implement
         write_file() to do any state saving instead. If the application wants
         to control wether it can close, it should override can_close().
-        """
+
+        Args:
+            skip_save (bool)
+        '''
         if not self.can_close():
             return
 
@@ -1044,26 +1129,42 @@
             self._complete_close()
 
     def __realize_cb(self, window):
-        xid = window.get_window().get_xid()
-        SugarExt.wm_set_bundle_id(xid, self.get_bundle_id())
-        SugarExt.wm_set_activity_id(xid, str(self._activity_id))
+        display_name = Gdk.Display.get_default().get_name()
+        if ':' in display_name: 
+            # X11 for sure; this only works in X11
+            xid = window.get_window().get_xid()
+            SugarExt.wm_set_bundle_id(xid, self.get_bundle_id())
+            SugarExt.wm_set_activity_id(xid, str(self._activity_id))
+        elif display_name is 'Broadway': 
+            # GTK3's HTML5 backend
+            # This is needed so that the window takes the whole browser window
+            self.maximize()
 
     def __delete_event_cb(self, widget, event):
         self.close()
         return True
 
     def get_metadata(self):
-        """Returns the jobject metadata or None if there is no jobject.
+        '''
+        Returns:
+
+            dict: the jobject metadata or None if there is no jobject.
 
         Activities can set metadata in write_file() using:
+
+        .. code-block:: python
+
             self.metadata['MyKey'] = 'Something'
 
         and retrieve metadata in read_file() using:
+
+        .. code-block:: python
+
             self.metadata.get('MyKey', 'aDefaultValue')
 
         Note: Make sure your activity works properly if one or more of the
         metadata items is missing. Never assume they will all be present.
-        """
+        '''
         if self._jobject:
             return self._jobject.metadata
         else:
@@ -1072,6 +1173,11 @@
     metadata = property(get_metadata, None)
 
     def handle_view_source(self):
+        '''
+        A developer can impleement this method to show aditional information
+        in the View Source window. Example implementations are available
+        on activities Browse or TurtleArt.
+        '''
         raise NotImplementedError
 
     def get_document_path(self, async_cb, async_err_cb):
@@ -1138,21 +1244,36 @@
 
 
 def get_bundle_name():
-    """Return the bundle name for the current process' bundle"""
+    '''
+    Returns:
+        str: the bundle name for the current process' bundle
+    '''
     return os.environ['SUGAR_BUNDLE_NAME']
 
 
 def get_bundle_path():
-    """Return the bundle path for the current process' bundle"""
+    '''
+    Returns:
+        str: the bundle path for the current process' bundle
+    '''
     return os.environ['SUGAR_BUNDLE_PATH']
 
 
 def get_activity_root():
-    """Returns a path for saving Activity specific preferences, etc."""
+    '''
+    Returns:
+        str: a path for saving Activity specific preferences, etc.
+    '''
     if os.environ.get('SUGAR_ACTIVITY_ROOT'):
         return os.environ['SUGAR_ACTIVITY_ROOT']
     else:
-        raise RuntimeError('No SUGAR_ACTIVITY_ROOT set.')
+        activity_root = env.get_profile_path(os.environ['SUGAR_BUNDLE_ID'])
+        try:
+            os.mkdir(activity_root)
+        except OSError, e:
+            if e.errno != EEXIST:
+                raise e
+        return activity_root
 
 
 def show_object_in_journal(object_id):
diff --git a/src/sugar3/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py
index a948c26..d3cdb1e 100644
--- a/src/sugar3/activity/activityfactory.py
+++ b/src/sugar3/activity/activityfactory.py
@@ -38,6 +38,7 @@
 import tempfile
 import subprocess
 import pwd
+import shutil
 
 _SHELL_SERVICE = 'org.laptop.Shell'
 _SHELL_PATH = '/org/laptop/Shell'
@@ -67,26 +68,30 @@
     return util.unique_id()
 
 
+def _mkdir(path):
+    try:
+        os.mkdir(path)
+    except OSError, e:
+        if e.errno != EEXIST:
+            raise e
+
+
 def get_environment(activity):
     environ = os.environ.copy()
 
     bin_path = os.path.join(activity.get_path(), 'bin')
 
     activity_root = env.get_profile_path(activity.get_bundle_id())
-    if not os.path.exists(activity_root):
-        os.mkdir(activity_root)
-
-    data_dir = os.path.join(activity_root, 'instance')
-    if not os.path.exists(data_dir):
-        os.mkdir(data_dir)
+    _mkdir(activity_root)
+
+    instance_dir = os.path.join(activity_root, 'instance')
+    _mkdir(instance_dir)
 
     data_dir = os.path.join(activity_root, 'data')
-    if not os.path.exists(data_dir):
-        os.mkdir(data_dir)
+    _mkdir(data_dir)
 
     tmp_dir = os.path.join(activity_root, 'tmp')
-    if not os.path.exists(tmp_dir):
-        os.mkdir(tmp_dir)
+    _mkdir(tmp_dir)
 
     environ['SUGAR_BUNDLE_PATH'] = activity.get_path()
     environ['SUGAR_BUNDLE_ID'] = activity.get_bundle_id()
@@ -222,30 +227,6 @@
                               self._handle.object_id, self._handle.uri,
                               self._handle.invited)
 
-        environment_dir = None
-        if os.path.exists('/etc/olpc-security') \
-                and os.access('/usr/bin/rainbow-run', os.X_OK):
-            environment_dir = tempfile.mkdtemp()
-            command = ['sudo', '-E', '--',
-                       'rainbow-run',
-                       '-v', '-v',
-                       '-a', 'rainbow-sugarize',
-                       '-s', '/var/spool/rainbow/2',
-                       '-f', '1',
-                       '-f', '2',
-                       '-c', self._bundle.get_path(),
-                       '-u', pwd.getpwuid(os.getuid()).pw_name,
-                       '-i', environ['SUGAR_BUNDLE_ID'],
-                       '-e', environment_dir,
-                       '--',
-                       ] + command
-
-            for key, value in environ.items():
-                file_path = os.path.join(environment_dir, str(key))
-                open(file_path, 'w').write(str(value))
-
-            log_file.write(' '.join(command) + '\n\n')
-
         dev_null = file('/dev/null', 'r')
         child = subprocess.Popen([str(s) for s in command],
                                  env=environ,
@@ -257,8 +238,8 @@
 
         GObject.child_watch_add(child.pid,
                                 _child_watch_cb,
-                                (environment_dir, log_file,
-                                    self._handle.activity_id))
+                                (log_file,
+                                 self._handle.activity_id))
 
     def _no_reply_handler(self, *args):
         pass
@@ -319,11 +300,7 @@
 
 
 def _child_watch_cb(pid, condition, user_data):
-    # FIXME we use standalone method here instead of ActivityCreationHandler's
-    # member to have workaround code, see #1123
-    environment_dir, log_file, activity_id = user_data
-    if environment_dir is not None:
-        subprocess.call(['/bin/rm', '-rf', environment_dir])
+    log_file, activity_id = user_data
 
     if os.WIFEXITED(condition):
         status = os.WEXITSTATUS(condition)
diff --git a/src/sugar3/activity/activityhandle.py b/src/sugar3/activity/activityhandle.py
index 37db460..d7973a9 100644
--- a/src/sugar3/activity/activityhandle.py
+++ b/src/sugar3/activity/activityhandle.py
@@ -15,49 +15,49 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-STABLE.
-"""
+'''
+Provides a class for storing activity metadata such as activity id's,
+journal object id's,
+'''
 
 
 class ActivityHandle(object):
-    """Data structure storing simple activity metadata"""
+    '''
+    Data structure storing simple activity metadata
+    
+    Args:
+        activity_id (string): unique id for the activity to be
+        created
+        
+        object_id (string): identity of the journal object
+        associated with the activity.
+        
+        When you resume an activity from the journal
+        the object_id will be passed in. It is optional
+        since new activities does not have an
+        associated object.
+        
+        uri (string): URI associated with the activity. Used when
+        opening an external file or resource in the
+        activity, rather than a journal object
+        (downloads stored on the file system for
+        example or web pages)
+        
+        invited (bool): True if the activity is being 
+        launched for handling an invite from the network
+    '''
 
     def __init__(self, activity_id=None, object_id=None, uri=None,
                  invited=False):
-        """Initialise the handle from activity_id
-
-        activity_id -- unique id for the activity to be
-            created
-        object_id -- identity of the journal object
-            associated with the activity. It was used by
-            the journal prototype implementation, might
-            change when we do the real one.
-
-            When you resume an activity from the journal
-            the object_id will be passed in. It's optional
-            since new activities does not have an
-            associated object (yet).
-
-            XXX Not clear how this relates to the activity
-            id yet, i.e. not sure we really need both. TBF
-        uri -- URI associated with the activity. Used when
-            opening an external file or resource in the
-            activity, rather than a journal object
-            (downloads stored on the file system for
-            example or web pages)
-        invited -- the activity is being launched for handling an invite
-                   from the network
-        """
         self.activity_id = activity_id
         self.object_id = object_id
         self.uri = uri
         self.invited = invited
 
     def get_dict(self):
-        """Retrieve our settings as a dictionary"""
-        result = {'activity_id': self.activity_id,
-                  'invited': self.invited}
+        '''Returns activity settings as a dictionary in format 
+            {activity_id:XXXX, object_id:XXXX, uri:XXXX, invited:BOOL}'''
+        result = {'activity_id': self.activity_id, 'invited': self.invited}
         if self.object_id:
             result['object_id'] = self.object_id
         if self.uri:
@@ -67,7 +67,7 @@
 
 
 def create_from_dict(handle_dict):
-    """Create a handle from a dictionary of parameters"""
+    '''Returns an activity handle from a dictionary of parameters'''
     result = ActivityHandle(handle_dict['activity_id'],
                             object_id=handle_dict.get('object_id'),
                             uri=handle_dict.get('uri'),
diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py
index 80a548e..313909b 100644
--- a/src/sugar3/activity/bundlebuilder.py
+++ b/src/sugar3/activity/bundlebuilder.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2008 Red Hat, Inc.
+# Copyright (C) 2016 Sam Parkinson <sam@sam.today>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,9 +16,72 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-STABLE.
-"""
+'''
+The bundle builder provides a build system for Sugar activities.  Usually, it
+is setup by creating a `setup.py` file in the project with the following::
+
+    # setup.py
+    #!/usr/bin/env python
+
+    from sugar3.activity import bundlebuilder
+    bundlebuilder.start()
+
+AppStream Metadata
+==================
+
+AppStream is the standard, distro-agnostic way of providing package metadata.
+For Sugar activities, the AppStream metadata is automatically exported from
+the activity.info file by the bundlebuilder.
+
+Activities must have the following metadata fields under the [Activity] header
+(of the `activity.info` file):
+
+* `metadata_license` - license for screenshots and description.  AppStream
+  requests only using one of the following: `CC0-1.0`, `CC-BY-3.0`,
+  `CC-BY-SA-3.0` or `GFDL-1.3`
+* `license` - a `SPDX License Code`__, eg. `GPL-3.0+`
+* `name`, `icon`, `bundle_id`, `summary` - same usage as in Sugar
+* `description` - a long (multi paragraph) description of your application.
+  This must be written in a subset of HTML.  Only the p, ol, ul and li tags
+  are supported.
+
+Other good metadata items to have are:
+
+* `url` - link to the home page for the activity on the internet
+* `repository_url` - link to repository for activity code
+* `screenshots` - a space separated list of screenshot URLs.  PNG or JPEG files
+  are supported.
+
+__ http://spdx.org/licenses/
+
+Example `activity.info`
+-----------------------
+
+.. code-block:: ini
+    :emphasize-lines: 10-12,20-21
+
+    [Activity]
+    name = Browse
+    bundle_id = org.laptop.WebActivity
+    exec = sugar-activity webactivity.WebActivity
+    activity_version = 200
+    icon = activity-web
+    max_participants = 100
+    summary = Surf the world!
+
+    license = GPL-2.0+
+    metadata_license = CC0-1.0
+    description:
+        <p>Surf the world! Here you can do research, watch educational videos, take online courses, find books, connect with friends and more.  Browse is powered by the WebKit2 rendering engine with the Faster Than Light javascript interpreter - allowing you to view the full beauty of the web.</p>
+        <p>To help in researching, Browse offers many features:</p>
+        <ul>
+            <li>Bookmark (save) good pages you find - never loose good resources or forget to add them to your bibliography</li>
+            <li>Bookmark pages with collaborators in real time - great for researching as a group or teachers showing pages to their class</li>
+            <li>Comment on your bookmarked pages - a great tool for making curated collections</li>
+        </ul>
+    url = https://github.com/sugarlabs/browse-activity
+    screenshots = https://people.sugarlabs.org/sam/activity-ss/browse-1-1.png https://people.sugarlabs.org/sam/activity-ss/browse-1-2.png
+'''
 
 import argparse
 import operator
@@ -31,7 +95,11 @@
 import re
 import gettext
 import logging
+from glob import glob
 from fnmatch import fnmatch
+from ConfigParser import ConfigParser
+import xml.etree.cElementTree as ET
+from HTMLParser import HTMLParser
 
 from sugar3 import env
 from sugar3.bundle.activitybundle import ActivityBundle
@@ -80,6 +148,7 @@
         self.xo_name = None
         self.tar_name = None
         self.summary = None
+        self.description = None
 
         self.update()
 
@@ -90,6 +159,7 @@
         self.activity_name = bundle.get_name()
         self.bundle_id = bundle.get_bundle_id()
         self.summary = bundle.get_summary()
+        self.description = bundle.get_description()
         self.bundle_name = reduce(operator.add, self.activity_name.split())
         self.bundle_root_dir = self.bundle_name + '.activity'
         self.tar_root_dir = '%s-%s' % (self.bundle_name, self.version)
@@ -144,6 +214,8 @@
             cat = gettext.GNUTranslations(open(mo_file, 'r'))
             translated_name = cat.gettext(self.config.activity_name)
             translated_summary = cat.gettext(self.config.summary)
+            if translated_summary is None:
+                translated_summary = ''
             if translated_summary.find('\n') > -1:
                 translated_summary = translated_summary.replace('\n', '')
                 logging.warn(
@@ -168,12 +240,15 @@
         if not os.path.exists(self.config.dist_dir):
             os.mkdir(self.config.dist_dir)
 
-    def get_files_in_git(self):
+    def get_files_in_git(self, root=None):
+        if root is None:
+            root = self.config.source_dir
+
         git_ls = None
         try:
             git_ls = subprocess.Popen(['git', 'ls-files'],
                                       stdout=subprocess.PIPE,
-                                      cwd=self.config.source_dir)
+                                      cwd=root)
         except OSError:
             logging.warn('Packager: git is not installed, '
                          'fall back to filtered list')
@@ -196,7 +271,14 @@
                             ignore = True
                             break
                     if not ignore:
-                        files.append(line)
+                        sub_path = os.path.join(root, line)
+                        if os.path.isdir(sub_path) \
+                           and os.path.exists(os.path.join(sub_path, '.git')):
+                            sub_list = self.get_files_in_git(sub_path)
+                            for f in sub_list:
+                                files.append(os.path.join(line, f))
+                        else:
+                            files.append(line)
 
                 for pattern in IGNORE_FILES:
                     files = [f for f in files if not fnmatch(f, pattern)]
@@ -253,7 +335,7 @@
         Packager.__init__(self, builder.config)
         self.builder = builder
 
-    def install(self, prefix, install_mime=True):
+    def install(self, prefix, install_mime=True, install_desktop_file=True):
         self.builder.build()
 
         activity_path = os.path.join(prefix, 'share', 'sugar', 'activities',
@@ -287,6 +369,107 @@
 
         if install_mime:
             self.config.bundle.install_mime_type(self.config.source_dir)
+
+        if install_desktop_file:
+            self._install_desktop_file(prefix, activity_path)
+            self._generate_appdata(prefix, activity_path)
+
+    def _install_desktop_file(self, prefix, activity_path):
+        cp = ConfigParser()
+        section = 'Desktop Entry'
+        cp.add_section(section)
+        cp.optionxform = str  # Allow CamelCase entries
+
+        # Get it from the activity.info for the non-translated version
+        info = ConfigParser()
+        info.read(os.path.join(activity_path, 'activity', 'activity.info'))
+        cp.set(section, 'Name', info.get('Activity', 'name'))
+        if info.has_option('Activity', 'summary'):
+            cp.set(section, 'Comment', info.get('Activity', 'summary'))
+
+        for path in glob(os.path.join(activity_path, 'locale',
+                                      '*', 'activity.linfo')):
+            locale = path.split(os.path.sep)[-2]
+            info = ConfigParser()
+            info.read(path)
+            if info.has_option('Activity', 'name'):
+                cp.set(section, 'Name[{}]'.format(locale),
+                       info.get('Activity', 'name'))
+            if info.has_option('Activity', 'summary'):
+                cp.set(section, 'Comment[{}]'.format(locale),
+                       info.get('Activity', 'summary'))
+
+        cp.set(section, 'Terminal', 'false')
+        cp.set(section, 'Type', 'Application')
+        cp.set(section, 'Categories', 'Education;')
+        cp.set(section, 'Icon', os.path.join(
+            activity_path, 'activity', self.config.bundle.get_icon_filename()))
+        cp.set(section, 'Exec', self.config.bundle.get_command())
+        cp.set(section, 'Path', activity_path)  # Path == CWD for running
+
+        name = '{}.activity.desktop'.format(self.config.bundle_id)
+        path = os.path.join(prefix, 'share', 'applications', name)
+        if not os.path.isdir(os.path.dirname(path)):
+            os.makedirs(os.path.dirname(path))
+        with open(path, 'w') as f:
+            cp.write(f)
+
+    def _generate_appdata(self, prefix, activity_path):
+        info = ConfigParser()
+        info.read(os.path.join(activity_path, 'activity', 'activity.info'))
+
+        required_fields = ['metadata_license', 'license', 'name', 'icon',
+                           'description']
+        for name in required_fields:
+            if not info.has_option('Activity', name):
+                print('[WARNING] Activity needs more metadata for AppStream '
+                      'file')
+                print('  Without an AppStream file, the activity will NOT '
+                      'show in software stores!')
+                print('  Please `pydoc sugar3.activity.bundlebuilder` for'
+                      'more info')
+                return
+
+        # See https://www.freedesktop.org/software/appstream/docs/
+        root = ET.Element('component', type='desktop')
+        ET.SubElement(root, 'project_group').text = 'Sugar'
+        ET.SubElement(root, 'translation', type='gettext').text = \
+            self.config.bundle_id
+        ET.SubElement(root, 'id').text = \
+            self.config.bundle_id + '.activity.desktop'
+        desc = ET.fromstring('<description>{}</description>'.format(
+            info.get('Activity', 'description')))
+        root.append(desc)
+
+        copy_pairs = [('metadata_license', 'metadata_license'),
+                      ('license', 'project_license'),
+                      ('summary', 'summary'),
+                      ('name', 'name')]
+        for key, ename in copy_pairs:
+            ET.SubElement(root, ename).text = info.get('Activity', key)
+
+        if info.has_option('Activity', 'screenshots'):
+            screenshots = info.get('Activity', 'screenshots').split()
+            ss_root = ET.SubElement(root, 'screenshots')
+            for i, screenshot in enumerate(screenshots):
+                e = ET.SubElement(ss_root, 'screenshot')
+                if i == 0:
+                    e.set('type', 'default')
+                ET.SubElement(e, 'image').text = screenshot
+
+        if info.has_option('Activity', 'url'):
+            ET.SubElement(root, 'url', type='homepage').text = \
+                info.get('Activity', 'url')
+        if info.has_option('Activity', 'repository_url'):
+            ET.SubElement(root, 'url', type='bugtracker').text = \
+                info.get('Activity', 'repository_url')
+
+        path = os.path.join(prefix, 'share', 'metainfo',
+                            self.config.bundle_id + '.appdata.xml')
+        if not os.path.isdir(os.path.dirname(path)):
+            os.makedirs(os.path.dirname(path))
+        tree = ET.ElementTree(root)
+        tree.write(path, encoding='UTF-8')
 
 
 def cmd_check(config, options):
@@ -350,8 +533,11 @@
 
 def cmd_dist_xo(config, options):
     """Create a xo bundle package"""
-
-    packager = XOPackager(Builder(config, options.no_fail))
+    no_fail = False
+    if options is not None:
+        no_fail = options.no_fail
+
+    packager = XOPackager(Builder(config, no_fail))
     packager.package()
 
 
@@ -375,6 +561,10 @@
 
     installer = Installer(Builder(config))
     installer.install(options.prefix, options.install_mime)
+
+
+def _po_escape(string):
+    return re.sub('([\\\\"])', '\\\\\\1', string)
 
 
 def cmd_genpot(config, options):
@@ -400,16 +590,29 @@
     # to the end of the .pot file afterwards, because that might
     # create a duplicate msgid.)
     pot_file = os.path.join('po', '%s.pot' % config.bundle_name)
-    escaped_name = re.sub('([\\\\"])', '\\\\\\1', config.activity_name)
+    escaped_name = _po_escape(config.activity_name)
     f = open(pot_file, 'w')
     f.write('#: activity/activity.info:2\n')
     f.write('msgid "%s"\n' % escaped_name)
     f.write('msgstr ""\n')
     if config.summary is not None:
-        escaped_summary = re.sub('([\\\\"])', '\\\\\\1', config.summary)
+        escaped_summary = _po_escape(config.summary)
         f.write('#: activity/activity.info:3\n')
         f.write('msgid "%s"\n' % escaped_summary)
         f.write('msgstr ""\n')
+
+    if config.description is not None:
+        parser = HTMLParser()
+        strings = []
+        parser.handle_data = strings.append
+        parser.feed(config.description)
+
+        for s in strings:
+            s = s.strip()
+            if s:
+                f.write('#: activity/activity.info:4\n')
+                f.write('msgid "%s"\n' % _po_escape(s))
+                f.write('msgstr ""\n')
     f.close()
 
     args = ['xgettext', '--join-existing', '--language=Python',
diff --git a/src/sugar3/bundle/Makefile.in b/src/sugar3/bundle/Makefile.in
index 739d786..1cc618b 100644
--- a/src/sugar3/bundle/Makefile.in
+++ b/src/sugar3/bundle/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py
index b7628ba..bf77a25 100644
--- a/src/sugar3/bundle/activitybundle.py
+++ b/src/sugar3/bundle/activitybundle.py
@@ -111,6 +111,7 @@
         self._tags = None
         self._activity_version = '0'
         self._summary = None
+        self._description = None
         self._single_instance = False
         self._max_participants = 0
 
@@ -143,7 +144,7 @@
             else:
                 raise MalformedBundleException(
                     'Activity bundle %s does not specify a bundle id' %
-                    self._path)
+                    self.get_path())
 
         if ' ' in self._bundle_id:
             raise MalformedBundleException('Space in bundle_id')
@@ -152,7 +153,7 @@
             self._name = cp.get(section, 'name')
         else:
             raise MalformedBundleException(
-                'Activity bundle %s does not specify a name' % self._path)
+                'Activity bundle %s does not specify a name' % self.get_path())
 
         if cp.has_option(section, 'exec'):
             self.bundle_exec = cp.get(section, 'exec')
@@ -165,7 +166,7 @@
                               'changed to exec')
             else:
                 raise MalformedBundleException(
-                    'Activity bundle %s must specify exec' % self._path)
+                    'Activity bundle %s must specify exec' % self.get_path())
 
         if cp.has_option(section, 'mime_types'):
             mime_list = cp.get(section, 'mime_types').strip(';')
@@ -189,11 +190,13 @@
             except InvalidVersionError:
                 raise MalformedBundleException(
                     'Activity bundle %s has invalid version number %s' %
-                    (self._path, version))
+                    (self.get_path(), version))
             self._activity_version = version
 
         if cp.has_option(section, 'summary'):
             self._summary = cp.get(section, 'summary')
+        if cp.has_option(section, 'description'):
+            self._description = cp.get(section, 'description')
 
         if cp.has_option(section, 'single_instance'):
             if cp.get(section, 'single_instance') == 'yes':
@@ -206,7 +209,7 @@
             except ValueError:
                 raise MalformedBundleException(
                     'Activity bundle %s has invalid max_participants %s' %
-                    (self._path, max_participants))
+                    (self.get_path(), max_participants))
 
     def _get_linfo_file(self):
         # Using method from gettext.py, first find languages from environ
@@ -255,13 +258,13 @@
         """Get the locale path inside the (installed) activity bundle."""
         if self._zip_file is not None:
             raise NotInstalledException
-        return os.path.join(self._path, 'locale')
+        return os.path.join(self.get_path(), 'locale')
 
     def get_icons_path(self):
         """Get the icons path inside the (installed) activity bundle."""
         if self._zip_file is not None:
             raise NotInstalledException
-        return os.path.join(self._path, 'icons')
+        return os.path.join(self.get_path(), 'icons')
 
     def get_name(self):
         """Get the activity user-visible name."""
@@ -277,7 +280,7 @@
         # we don't need to create a temp file in the zip case
         icon_path = os.path.join('activity', self._icon + '.svg')
         if self._zip_file is None:
-            return os.path.join(self._path, icon_path)
+            return os.path.join(self.get_path(), icon_path)
         else:
             icon_data = self.get_file(icon_path).read()
             temp_file, temp_file_path = tempfile.mkstemp(prefix=self._icon,
@@ -286,6 +289,10 @@
             os.close(temp_file)
             return temp_file_path
 
+    def get_icon_filename(self):
+        '''Get the icon file name'''
+        return self._icon + '.svg'
+
     def get_activity_version(self):
         """Get the activity version"""
         return self._activity_version
@@ -305,6 +312,14 @@
     def get_summary(self):
         """Get the summary that describe the activity"""
         return self._summary
+
+    def get_description(self):
+        """
+        Get the description for the activity.  The description is a
+        pace of multi paragraph text about the activity.  It is written
+        in a HTML subset using only the p, ul, li and ol tags.
+        """
+        return self._description
 
     def get_single_instance(self):
         """Get whether there should be a single instance for the activity"""
diff --git a/src/sugar3/datastore/Makefile.in b/src/sugar3/datastore/Makefile.in
index eefac98..0ce0fdb 100644
--- a/src/sugar3/datastore/Makefile.in
+++ b/src/sugar3/datastore/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/datastore/datastore.py b/src/sugar3/datastore/datastore.py
index 4c98b23..5274406 100644
--- a/src/sugar3/datastore/datastore.py
+++ b/src/sugar3/datastore/datastore.py
@@ -32,6 +32,7 @@
 from sugar3 import env
 from sugar3 import mime
 from sugar3 import dispatch
+from sugar3.profile import get_color
 
 DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
 DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
@@ -71,8 +72,6 @@
 created = dispatch.Signal()
 deleted = dispatch.Signal()
 updated = dispatch.Signal()
-
-_get_data_store()
 
 
 class DSMetadata(GObject.GObject):
@@ -224,7 +223,6 @@
 
     def __init__(self, file_path):
         stat = os.stat(file_path)
-        settings = Gio.Settings('org.sugarlabs.user')
         metadata = {
             'uid': file_path,
             'title': os.path.basename(file_path),
@@ -232,7 +230,7 @@
             'mime_type': Gio.content_type_guess(file_path, None)[0],
             'activity': '',
             'activity_id': '',
-            'icon-color': settings.get_string('color'),
+            'icon-color': get_color().to_string(),
             'description': file_path,
         }
 
diff --git a/src/sugar3/dispatch/Makefile.in b/src/sugar3/dispatch/Makefile.in
index f4b3339..fdf6e65 100644
--- a/src/sugar3/dispatch/Makefile.in
+++ b/src/sugar3/dispatch/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/event-controller/Makefile.in b/src/sugar3/event-controller/Makefile.in
index 5638700..2b66a58 100644
--- a/src/sugar3/event-controller/Makefile.in
+++ b/src/sugar3/event-controller/Makefile.in
@@ -275,6 +275,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/graphics/Makefile.am b/src/sugar3/graphics/Makefile.am
index 0621750..e5fdf09 100644
--- a/src/sugar3/graphics/Makefile.am
+++ b/src/sugar3/graphics/Makefile.am
@@ -16,6 +16,7 @@
 	palettemenu.py          \
 	palettewindow.py        \
 	panel.py                \
+	popwindow.py            \
 	radiopalette.py         \
 	radiotoolbutton.py      \
 	scrollingdetector.py    \
diff --git a/src/sugar3/graphics/Makefile.in b/src/sugar3/graphics/Makefile.in
index 66bd939..c145d21 100644
--- a/src/sugar3/graphics/Makefile.in
+++ b/src/sugar3/graphics/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -331,6 +332,7 @@
 	palettemenu.py          \
 	palettewindow.py        \
 	panel.py                \
+	popwindow.py            \
 	radiopalette.py         \
 	radiotoolbutton.py      \
 	scrollingdetector.py    \
diff --git a/src/sugar3/graphics/alert.py b/src/sugar3/graphics/alert.py
index bdc272b..1bc7bbd 100644
--- a/src/sugar3/graphics/alert.py
+++ b/src/sugar3/graphics/alert.py
@@ -7,18 +7,17 @@
 to your activity when any of these buttons are clicked, along with a
 response_id to help you identify what button was clicked.
 
-
-Examples
---------
-create a simple alert message.
-
-.. code-block:: python
-  from sugar3.graphics.alert import Alert
-  ...
-       # Create a new simple alert
+Example:
+    Create a simple alert message.
+
+    .. code-block:: python
+
+        from sugar3.graphics.alert import Alert
+
+        # Create a new simple alert
         alert = Alert()
         # Populate the title and text body of the alert.
-        alert.props.title=_('Title of Alert Goes Here')
+        alert.props.title = _('Title of Alert Goes Here')
         alert.props.msg = _('Text message of alert goes here')
         # Call the add_alert() method (inherited via the sugar3.graphics.Window
         # superclass of Activity) to add this alert to the activity window.
@@ -65,19 +64,15 @@
 
     Alerts are used inside the activity window instead of being a
     separate popup window. They do not hide canvas content. You can
-    use add_alert(widget) and remove_alert(widget) inside your activity
+    use `add_alert()` and `remove_alert()` inside your activity
     to add and remove the alert. The position of the alert is below the
     toolbox or top in fullscreen mode.
 
-    Properties:
-        'title': the title of the alert,
-        'message': the message of the alert,
-        'icon': the icon that appears at the far left
-
-    See __gproperties__
-
-    """
-
+    Args:
+        title (str): the title of the alert
+        message (str): the message of the alert
+        icon (str): the icon that appears at the far left
+    """
     __gtype_name__ = 'SugarAlert'
 
     __gsignals__ = {
@@ -91,7 +86,6 @@
     }
 
     def __init__(self, **kwargs):
-
         self._title = None
         self._msg = None
         self._icon = None
@@ -104,10 +98,12 @@
         self._msg_box = Gtk.VBox()
         self._title_label = Gtk.Label()
         self._title_label.set_alignment(0, 0.5)
+        self._title_label.set_ellipsize(style.ELLIPSIZE_MODE_DEFAULT)
         self._msg_box.pack_start(self._title_label, False, False, 0)
 
         self._msg_label = Gtk.Label()
         self._msg_label.set_alignment(0, 0.5)
+        self._msg_label.set_ellipsize(style.ELLIPSIZE_MODE_DEFAULT)
         self._msg_box.pack_start(self._msg_label, False, False, 0)
         self._hbox.pack_start(self._msg_box, False, False, 0)
 
@@ -129,18 +125,10 @@
 
     def do_set_property(self, pspec, value):
         """
-        Set alert property
-
-        Parameters
-        ----------
-        pspec :
-
-        value :
-
-        Returns
-        -------
-        None
-
+        Set alert property, GObject internal method.
+        Use the `alert.props` object, eg::
+
+            alert.props.title = 'Are you happy?'
         """
         if pspec.name == 'title':
             if self._title != value:
@@ -159,17 +147,10 @@
 
     def do_get_property(self, pspec):
         """
-        Get alert property
-
-        Parameters
-        ----------
-        pspec :
-            property for which the value will be returned
-
-        Returns
-        -------
-        value of the property specified
-
+        Get alert property, GObject internal method.
+        Use the `alert.props` object, eg::
+
+            title = alert.props.title
         """
         if pspec.name == 'title':
             return self._title
@@ -180,23 +161,17 @@
         """
         Add a button to the alert
 
-        Parameters
-        ----------
-        response_id :
-            will be emitted with the response signal a response ID should one
-            of the pre-defined GTK Response Type Constants or a positive number
-        label :
-            that will occure right to the buttom
-
-        icon :
-            this can be a SugarIcon or a Gtk.Image
-
-        postion :
-            the position of the button in the box (optional)
-
-        Returns
-        -------
-        button :Gtk.Button
+        Args:
+            response_id (int): will be emitted with the response signal a
+                response ID should one of the pre-defined GTK Response Type
+                Constants or a positive number
+            label (str): that will occure right to the buttom
+            icon (:class:`sugar3.graphics.icon.Icon` or :class:`Gtk.Image`, optional):
+                icon for the button, placed before the text
+            postion (int, optional): the position of the button in the box
+
+        Returns:
+            Gtk.Button: the button added to the alert
 
         """
         button = Gtk.Button()
@@ -215,19 +190,18 @@
         """
         Remove a button from the alert by the given response id
 
-        Parameters
-        ----------
-        response_id :
-
-        Returns
-        -------
-        None
+        Args:
+            response_id (int): the same response id passed to add_button
+
+        Returns:
+            None
 
         """
         self._buttons_box.remove(self._buttons[response_id])
 
     def _response(self, response_id):
-        """Emitting response when we have a result
+        """
+        Emitting response when we have a result
 
         A result can be that a user has clicked a button or
         a timeout has occured, the id identifies the button
@@ -237,26 +211,29 @@
 
     def __button_clicked_cb(self, button, response_id):
         self._response(response_id)
+if hasattr(Alert, 'set_css_name'):
+    Alert.set_css_name('alert')
 
 
 class ConfirmationAlert(Alert):
     """
-    This is a ready-made two button (Cancel,Ok) alert.
+    This is a ready-made two button (Cancel, Ok) alert.
 
     A confirmation alert is a nice shortcut from a standard Alert because it
     comes with 'OK' and 'Cancel' buttons already built-in. When clicked, the
-    'OK' button will emit a response with a response_id of Gtk.ResponseType.OK,
-    while the 'Cancel' button will emit Gtk.ResponseType.CANCEL.
-
-    Examples
-    --------
+    'OK' button will emit a response with a response_id of
+    :class:`Gtk.ResponseType.OK`, while the 'Cancel' button will emit
+    :class:`Gtk.ResponseType.CANCEL`.
+
+    Args:
+        **kwargs: options for :class:`sugar3.graphics.alert.Alert`
 
     .. code-block:: python
-      from sugar3.graphics.alert import ConfirmationAlert
-      ...
-        #### Method: _alert_confirmation, create a Confirmation alert (with ok
-                     and cancel buttons standard)
-        # and add it to the UI.
+
+        from sugar3.graphics.alert import ConfirmationAlert
+
+        # Create a Confirmation alert (with ok and cancel buttons standard)
+        # then add it to the UI.
         def _alert_confirmation(self):
             alert = ConfirmationAlert()
             alert.props.title=_('Title of Alert Goes Here')
@@ -264,20 +241,17 @@
             alert.connect('response', self._alert_response_cb)
             self.add_alert(alert)
 
-
-        #### Method: _alert_response_cb, called when an alert object throws a
-                     response event.
+        # Called when an alert object throws a response event.
         def _alert_response_cb(self, alert, response_id):
-            #remove the alert from the screen, since either a response button
-            #was clicked or there was a timeout
+            # Remove the alert from the screen, since either a response button
+            # was clicked or there was a timeout
             self.remove_alert(alert)
 
-            #Do any work that is specific to the type of button clicked.
+            # Do any work that is specific to the type of button clicked.
             if response_id is Gtk.ResponseType.OK:
                 print 'Ok Button was clicked. Do any work upon ok here ...'
             elif response_id is Gtk.ResponseType.CANCEL:
                 print 'Cancel Button was clicked.'
-
     """
 
     def __init__(self, **kwargs):
@@ -298,16 +272,17 @@
 
     An error alert is a nice shortcut from a standard Alert because it
     comes with the 'OK' button already built-in. When clicked, the
-    'OK' button will emit a response with a response_id of Gtk.ResponseType.OK.
-
-    Examples
-    --------
+    'OK' button will emit a response with a response_id of
+    :class:`Gtk.ResponseType.OK`.
+
+    Args:
+        **kwargs: options for :class:`sugar3.graphics.alert.Alert`
 
     .. code-block:: python
-      from sugar3.graphics.alert import ErrorAlert
-      ...
-        #### Method: _alert_error, create a Error alert (with ok
-                     button standard)
+
+        from sugar3.graphics.alert import ErrorAlert
+
+        # Create a Error alert (with ok button standard)
         # and add it to the UI.
         def _alert_error(self):
             alert = ErrorAlert()
@@ -316,18 +291,15 @@
             alert.connect('response', self._alert_response_cb)
             self.add_alert(alert)
 
-
-        #### Method: _alert_response_cb, called when an alert object throws a
-                     response event.
+        # called when an alert object throws a response event.
         def _alert_response_cb(self, alert, response_id):
-            #remove the alert from the screen, since either a response button
-            #was clicked or there was a timeout
+            # Remove the alert from the screen, since either a response button
+            # was clicked or there was a timeout
             self.remove_alert(alert)
 
-            #Do any work that is specific to the response_id.
+            # Do any work that is specific to the response_id.
             if response_id is Gtk.ResponseType.OK:
-                print 'Ok Button was clicked. Do any work upon ok here ...'
-
+                print 'Ok Button was clicked. Do any work upon ok here'
     """
 
     def __init__(self, **kwargs):
@@ -376,115 +348,115 @@
 
     def set_text(self, text):
         self._text.set_markup('<b>%s</b>' % GLib.markup_escape_text(str(text)))
-
-
-class TimeoutAlert(Alert):
-    """
-    This is a ready-made two button (Cancel,Continue) alert
-
-    It times out with a positive response after the given amount of seconds.
-
-
-    Examples
-    --------
+if hasattr(_TimeoutIcon, 'set_css_name'):
+    _TimeoutIcon.set_css_name('timeouticon')
+
+
+class _TimeoutAlert(Alert):
+    def __init__(self, timeout=5, label=_('Ok'), **kwargs):
+        Alert.__init__(self, **kwargs)
+
+        self._timeout = timeout
+
+        self._timeout_text = _TimeoutIcon()
+        self._timeout_text.set_text(self._timeout)
+        self.add_button(Gtk.ResponseType.OK, label, self._timeout_text)
+        self._timeout_text.show()
+
+        self._timeout_sid = GLib.timeout_add(1000, self.__timeout_cb)
+
+    def __timeout_cb(self):
+        self._timeout -= 1
+        self._timeout_text.set_text(self._timeout)
+        if self._timeout == 0:
+            Alert._response(self, Gtk.ResponseType.OK)
+            return False
+        return True
+
+    def _response(self, *args):
+        GLib.source_remove(self._timeout_sid)
+        Alert._response(self, *args)
+
+
+class TimeoutAlert(_TimeoutAlert):
+    """
+    This is a ready-made two button (Continue, Cancel) alert.  The continue
+    button contains a visual countdown indicating the time remaining to the
+    user.  If the user does not select a button before the timeout, the
+    response callback is called and the alert is usually removed.
+
+    Args:
+        timeout (int, optional): the length in seconds for the timeout to
+            last, defaults to 5 seconds
+        **kwargs: options for :class:`sugar3.graphics.alert.Alert`
 
     .. code-block:: python
-      from sugar3.graphics.alert import TimeoutAlert
-      ...
-        #### Method: _alert_timeout, create a Timeout alert (with ok and cancel
-                     buttons standard)
-        # and add it to the UI.
+
+        from sugar3.graphics.alert import TimeoutAlert
+
+        # Create a Timeout alert (with ok and cancel buttons standard) then
+        # add it to the UI
         def _alert_timeout(self):
-            #Notice that for a TimeoutAlert, you pass the number of seconds in
-            #which to timeout. By default, this is 5.
+            # Notice that for a TimeoutAlert, you pass the number of seconds
+            # in which to timeout. By default, this is 5.
             alert = TimeoutAlert(10)
-            alert.props.title=_('Title of Alert Goes Here')
+            alert.props.title = _('Title of Alert Goes Here')
             alert.props.msg = _('Text message of timeout alert goes here')
-            alert.connect('response', self._alert_response_cb)
+            alert.connect('response', self.__alert_response_cb)
             self.add_alert(alert)
 
-        #### Method: _alert_response_cb, called when an alert object throws a
-                     response event.
-        def _alert_response_cb(self, alert, response_id):
-            #remove the alert from the screen, since either a response button
-            #was clicked or there was a timeout
+        # Called when an alert object throws a response event.
+        def __alert_response_cb(self, alert, response_id):
+            # Remove the alert from the screen, since either a response button
+            # was clicked or there was a timeout
             self.remove_alert(alert)
 
-            #Do any work that is specific to the type of button clicked.
+            # Do any work that is specific to the type of button clicked.
             if response_id is Gtk.ResponseType.OK:
                 print 'Ok Button was clicked. Do any work upon ok here ...'
             elif response_id is Gtk.ResponseType.CANCEL:
                 print 'Cancel Button was clicked.'
             elif response_id == -1:
-                print 'Timout occurred'
-
+                print 'Timeout occurred'
     """
 
     def __init__(self, timeout=5, **kwargs):
-        Alert.__init__(self, **kwargs)
-
-        self._timeout = timeout
+        _TimeoutAlert.__init__(self, timeout, _('Continue'), **kwargs)
 
         icon = Icon(icon_name='dialog-cancel')
         self.add_button(Gtk.ResponseType.CANCEL, _('Cancel'), icon)
         icon.show()
 
-        self._timeout_text = _TimeoutIcon()
-        self._timeout_text.set_text(self._timeout)
-        self.add_button(Gtk.ResponseType.OK, _('Continue'), self._timeout_text)
-        self._timeout_text.show()
-
-        GLib.timeout_add_seconds(1, self.__timeout)
-
-    def __timeout(self):
-        self._timeout -= 1
-        self._timeout_text.set_text(self._timeout)
-        if self._timeout == 0:
-            self._response(Gtk.ResponseType.OK)
-            return False
-        return True
-
-
-class NotifyAlert(Alert):
-    """
-    Timeout alert with only an "OK" button - just for notifications
-
-    Examples
-    --------
+
+class NotifyAlert(_TimeoutAlert):
+    """
+    Timeout alert with only an "OK" button.  This should be used just for
+    notifications and not for user interaction.  The alert will timeout after
+    a given length, similar to a :class:`sugar3.graphics.alert.TimeoutAlert`.
+
+    Args:
+        timeout (int, optional): the length in seconds for the timeout to
+            last, defaults to 5 seconds
+        **kwargs: options for :class:`sugar3.graphics.alert.Alert`
 
     .. code-block:: python
-      from sugar3.graphics.alert import NotifyAlert
-      ...
-        #### Method: _alert_notify, create a Notify alert (with only an 'OK'
-                     button)
-        # and add it to the UI.
+
+        from sugar3.graphics.alert import NotifyAlert
+
+        # create a Notify alert (with only an 'OK' button) then show it
         def _alert_notify(self):
-            #Notice that for a NotifyAlert, you pass the number of seconds in
-            #which to notify. By default, this is 5.
-            alert = NotifyAlert(10)
-            alert.props.title=_('Title of Alert Goes Here')
+            alert = NotifyAlert()
+            alert.props.title = _('Title of Alert Goes Here')
             alert.props.msg = _('Text message of notify alert goes here')
             alert.connect('response', self._alert_response_cb)
             self.add_alert(alert)
 
+        def __alert_response_cb(self, alert, response_id):
+            # Hide the alert from the user
+            self.remove_alert(alert)
+
+            assert response_id == Gtk.ResponseType.OK
     """
 
     def __init__(self, timeout=5, **kwargs):
-        Alert.__init__(self, **kwargs)
-
-        self._timeout = timeout
-
-        self._timeout_text = _TimeoutIcon()
-        self._timeout_text.set_text(self._timeout)
-        self.add_button(Gtk.ResponseType.OK, _('Ok'), self._timeout_text)
-        self._timeout_text.show()
-
-        GLib.timeout_add(1000, self.__timeout)
-
-    def __timeout(self):
-        self._timeout -= 1
-        self._timeout_text.set_text(self._timeout)
-        if self._timeout == 0:
-            self._response(Gtk.ResponseType.OK)
-            return False
-        return True
+        _TimeoutAlert.__init__(self, timeout, _('Ok'), **kwargs)
diff --git a/src/sugar3/graphics/animator.py b/src/sugar3/graphics/animator.py
index 7610b74..7d4ca90 100644
--- a/src/sugar3/graphics/animator.py
+++ b/src/sugar3/graphics/animator.py
@@ -16,6 +16,41 @@
 # Boston, MA 02111-1307, USA.
 
 """
+The animator module provides a simple framework to create animations.
+
+Example:
+    Animate the size of a window::
+
+        from gi.repository import Gtk
+        from sugar3.graphics.animator import Animator, Animation
+
+        # Construct a window to animate
+        w = Gtk.Window()
+        w.connect('destroy', Gtk.main_quit)
+        # Start the animation when the window is shown
+        w.connect('realize', lambda self: animator.start())
+        w.show()
+
+        # Construct a 5 second animator
+        animator = Animator(5, widget=w)
+
+        # Create an animation subclass to animate the widget
+        class SizeAnimation(Animation):
+            def __init__(self):
+                # Tell the animation to give us values between 20 and
+                # 420 during the animation
+                Animation.__init__(self, 20, 420)
+
+            def next_frame(self, frame):
+                size = int(frame)
+                w.resize(size, size)
+        # Add the animation the the animator
+        animation = SizeAnimation()
+        animator.add(animation)
+
+        # The animation needs to run inside a GObject main loop
+        Gtk.main()
+
 STABLE.
 """
 
@@ -29,42 +64,102 @@
 
 
 class Animator(GObject.GObject):
+    '''
+    The animator class manages the timing for calling the
+    animations.  The animations can be added using the `add` function
+    and then started with the `start` function.  If multiple animations
+    are added, then they will be played back at the same time and rate
+    as each other.
+
+    The `completed` signal is emitted upon the completion of the
+    animation and also when the `stop` function is called.
+
+    Args:
+        duration (float): the duration of the animation in seconds
+        fps (int, optional): the number of animation callbacks to make
+            per second (frames per second)
+        easing (int): the desired easing mode, either `EASE_OUT_EXPO`
+            or `EASE_IN_EXPO`
+        widget (:class:`Gtk.Widget`): one of the widgets that the animation
+            is acting on.  If supplied and if the user's Gtk+ version
+            supports it, the animation will run on the frame clock of the
+            widget, resulting in a smoother animation and the fps value
+            will be disregarded.
+
+    .. note::
+
+        When creating an animation, take into account the limited cpu power
+        on some devices, such as the XO.  Setting the fps too high on can
+        use significant cpu usage on the XO.
+    '''
 
     __gsignals__ = {
         'completed': (GObject.SignalFlags.RUN_FIRST, None, ([])),
     }
 
-    def __init__(self, duration, fps=20, easing=EASE_OUT_EXPO):
+    def __init__(self, duration, fps=20, easing=EASE_OUT_EXPO, widget=None):
         GObject.GObject.__init__(self)
         self._animations = []
         self._duration = duration
         self._interval = 1.0 / fps
         self._easing = easing
+        self._widget = widget
         self._timeout_sid = 0
         self._start_time = None
 
     def add(self, animation):
+        '''
+        Add an animation to this animator
+
+        Args:
+            animation (:class:`sugar3.graphics.animator.Animation`):
+                the animation instance to add
+        '''
         self._animations.append(animation)
 
     def remove_all(self):
+        '''
+        Remove all animations and stop this animator
+        '''
         self.stop()
         self._animations = []
 
     def start(self):
+        '''
+        Start the animation running.  This will stop and restart the
+        animation if the animation is currently running
+        '''
         if self._timeout_sid:
             self.stop()
 
         self._start_time = time.time()
-        self._timeout_sid = GLib.timeout_add(
-            int(self._interval * 1000), self._next_frame_cb)
+        if hasattr(self._widget, 'add_tick_callback'):
+            self._timeout_sid = self._widget.add_tick_callback(
+                self._next_frame_cb, None)
+            # Make sure the 1st frame is animated so we get ticks
+            self._next_frame_cb()
+        else:
+            self._timeout_sid = GLib.timeout_add(
+                int(self._interval * 1000), self._next_frame_cb)
 
     def stop(self):
-        if self._timeout_sid:
+        '''
+        Stop the animation and emit the `completed` signal
+        '''
+        for animation in self._animations:
+            animation.do_stop()
+
+        if self._timeout_sid and \
+           not hasattr(self._widget, 'add_tick_callback'):
             GObject.source_remove(self._timeout_sid)
             self._timeout_sid = 0
             self.emit('completed')
-
-    def _next_frame_cb(self):
+        if self._timeout_sid and hasattr(self._widget, 'add_tick_callback'):
+            self._widget.remove_tick_callback(self._timeout_sid)
+            self._timeout_sid = 0
+            self.emit('completed')
+
+    def _next_frame_cb(self, *args):
         current_time = min(self._duration, time.time() - self._start_time)
         current_time = max(current_time, 0.0)
 
@@ -79,12 +174,46 @@
 
 
 class Animation(object):
+    '''
+    The animation class is a base class for creating an animation.
+    It should be subclassed.  Subclasses should specify a `next_frame`
+    function to set the required properties based on the animation
+    progress.  The range of the `frame` value passed to the `next_frame`
+    function is defined by the `start` and `end` values.
+
+    Args:
+        start (float): the first `frame` value for the `next_frame` method
+        end (float): the last `frame` value for the `next_frame` method
+
+    .. code-block:: python
+
+        # Create an animation subclass
+        class MyAnimation(Animation):
+            def __init__(self, thing):
+                # Tell the animation to give us values between 0.0 and
+                # 1.0 during the animation
+                Animation.__init__(self, 0.0, 1.0)
+                self._thing = thing
+
+            def next_frame(self, frame):
+                # Use the `frame` value to set properties
+                self._thing.set_green_value(frame)
+    '''
 
     def __init__(self, start, end):
         self.start = start
         self.end = end
 
     def do_frame(self, t, duration, easing):
+        '''
+        This method is called by the animator class every frame.  This
+        method calculated the `frame` value to then call `next_frame`.
+
+        Args:
+            t (float): the current time elapsed of the animation in seconds
+            duration (float): the length of the animation in seconds
+            easing (int): the easing mode passed to the animator
+        '''
         start = self.start
         change = self.end - self.start
 
@@ -100,4 +229,52 @@
         self.next_frame(frame)
 
     def next_frame(self, frame):
+        '''
+        This method is called every frame and should be overridden by
+        subclasses.
+
+        Args:
+            frame (float): a value between `start` and `end` representing
+                the current progress in the animation
+        '''
         pass
+
+    def do_stop(self):
+        '''
+        This method is called whenever the animation is stopped, either
+        due to the animation ending or being stopped by the animation.
+        `next_frame` will not be called after do_stop, unless the animation
+        is restarted.
+
+        .. versionadded:: 0.109.0.3
+
+        This should be used in subclasses if they bind any signals.  Eg.
+        if they bind the draw signal for a widget:
+
+        .. code-block:: python
+
+            class SignalAnimation(Animation):
+
+                def __init__(self, widget):
+                    Animation.__init__(self, 0, 1)
+                    self._draw_hid = None
+                    self._widget = widget
+
+                def next_frame(self, frame):
+                    self._frame = frame
+                    if self._draw_hid is None:
+                        self._draw_hid = self._widget.connect_after(
+                            'draw', self.__draw_cb)
+                    self._widget.queue_draw()
+
+                def __draw_cb(self, widget, cr):
+                    cr.save()
+                    # Do the draw
+                    cr.restore()
+
+                def do_stop(self):
+                    self._widget.disconnect(self._draw_hid)
+                    self._widget.queue_draw()
+
+        '''
+        pass
diff --git a/src/sugar3/graphics/colorbutton.py b/src/sugar3/graphics/colorbutton.py
index 5092d2a..59922e8 100644
--- a/src/sugar3/graphics/colorbutton.py
+++ b/src/sugar3/graphics/colorbutton.py
@@ -59,7 +59,7 @@
         self._accept_drag = True
 
         self._preview = Icon(icon_name='color-preview',
-                             icon_size=Gtk.IconSize.BUTTON)
+                             pixel_size=style.SMALL_ICON_SIZE)
 
         GObject.GObject.__init__(self, **kwargs)
 
@@ -402,7 +402,7 @@
     # TODO: should we remove the accelerator from the prev top level?
 
     if not hasattr(tool_button.get_toplevel(), 'sugar_accel_group'):
-        logging.warning('No Gtk.AccelGroup in the top level window.')
+        logging.debug('No Gtk.AccelGroup in the top level window.')
         return
 
     accel_group = tool_button.get_toplevel().sugar_accel_group
diff --git a/src/sugar3/graphics/combobox.py b/src/sugar3/graphics/combobox.py
index df1b970..e98c571 100644
--- a/src/sugar3/graphics/combobox.py
+++ b/src/sugar3/graphics/combobox.py
@@ -15,9 +15,15 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-STABLE.
-"""
+'''
+The combobox module provides a combo box; a button like widget which
+creates a list popup when clicked.  It's best used outside of a
+toolbar when the user needs to choose from a *short* list of items.
+
+Example:
+
+.. literalinclude:: ../examples/combobox.py
+'''
 
 from gi.repository import GObject
 from gi.repository import Gtk
@@ -25,7 +31,11 @@
 
 
 class ComboBox(Gtk.ComboBox):
-
+    '''
+    This class provides a simple wrapper based on the :class:`Gtk.ComboBox`.
+    This lets you make a list of items, with a value, label and optionally an
+    icon.
+    '''
     __gtype_name__ = 'SugarComboBox'
 
     def __init__(self):
@@ -43,6 +53,13 @@
         self.set_row_separator_func(self._is_separator, None)
 
     def get_value(self):
+        '''
+        The value of the currently selected item; the same as the `value`
+        argument that was passed to the `append_item` func.
+
+        Returns:
+            object, value of selected item
+        '''
         row = self.get_active_item()
         if not row:
             return None
@@ -61,7 +78,22 @@
         del info
         return fname
 
-    def append_item(self, action_id, text, icon_name=None, file_name=None):
+    def append_item(self, value, text, icon_name=None, file_name=None):
+        '''
+        This function adds another item to the bottom of the combo box list.
+
+        If either `icon_name` or `file_name` are supplied and icon column
+        will be added to the combo box list.
+
+        Args:
+            value (object):  the value that will be returned by `get_value`,
+                when this item is selected
+            text (str):  the user visible label for the item
+            icon_name (str):  the name of the icon in the theme to use for
+                this item, optional and conflicting with `file_name`
+            file_name (str):  the path to a sugar (svg) icon to use for this
+                item, optional and conflicting with `icon_name`
+        '''
         if not self._icon_renderer and (icon_name or file_name):
             self._icon_renderer = Gtk.CellRendererPixbuf()
 
@@ -93,12 +125,24 @@
         else:
             pixbuf = None
 
-        self._model.append([action_id, text, pixbuf, False])
+        self._model.append([value, text, pixbuf, False])
 
     def append_separator(self):
+        '''
+        Add a separator to the bottom of the combo box list.  The separator
+        can not be selected.
+        '''
         self._model.append([0, None, None, True])
 
     def get_active_item(self):
+        '''
+        Get the row of data for the currently selected item.
+
+        Returns:
+            row of data in the format::
+
+                [value, text, pixbuf, is_separator]
+        '''
         index = self.get_active()
         if index == -1:
             index = 0
@@ -109,6 +153,9 @@
         return self._model[row]
 
     def remove_all(self):
+        '''
+        Remove all list items from the combo box.
+        '''
         self._model.clear()
 
     def _is_separator(self, model, row, data):
diff --git a/src/sugar3/graphics/icon.py b/src/sugar3/graphics/icon.py
index 43b78a7..46fefc7 100644
--- a/src/sugar3/graphics/icon.py
+++ b/src/sugar3/graphics/icon.py
@@ -15,11 +15,77 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-A small fixed size picture, typically used to decorate components.
-
-STABLE.
-"""
+'''
+Icons are small pictures that are used to decorate components.  In Sugar, icons
+are SVG files that are re-coloured with a fill and a stroke colour.  Typically,
+icons representing the system use a greyscale color palette, whereas icons
+representing people take on their selected XoColors.
+
+Designing a Sugar Icon
+======================
+
+If you want to make an icon to use in Sugar, start by designing something in
+a vector program, like Inkscape.  When you are designing the icon, use a canvas
+that is 55x55px.
+
+When designing your icon, use 2 colors.  For example, use a black stroke and a
+white fill color.  You need to keep this consistent and remember those colors.
+
+You should also keep the subcell grid in mind when designing the icon.  A grid
+cell (which the size of an icon) is made up of 5 by 5 subcells.  To use this in
+Inkscape, enable the page grid (View -> Page Grid), the go to grid properties
+(File -> Document Properties -> Grids).  In grid properties, set the "Spacing
+X" option to 11, "Spacing Y" to 11 and "Major grid line every" to 1.
+
+Before your icon is ready to be used in Sugar, it needs to be Sugarized.  This
+converts the colors to SVG entities, which allows Sugar to change the colors
+of the icon.  To do that, just run the `sugar-iconfiy`__ script.  Usually, it
+"just works" like::
+
+    python path/to/sugar-iconify.py -o icon.svg
+
+__ https://github.com/GhostAlgorithm/sugariconify/blob/master/sugariconify.py
+
+Code Example
+============
+
+Example of using icons with badges:
+
+.. literalinclude:: ../examples/iconbadges.py
+
+Badge Icons
+===========
+Badge icons are small icons that are attached to the normal icon.
+For example, a WiFi network icon might have a star badge attached to
+the bottom left corner (the "attach point") that indicates that the
+network is connected to.
+
+Badge icons are displayed at _BADGE_SIZE percent (45% currently),
+of their main icon.
+
+Badge icons are specified by the icon name, in the same sense that
+normal icons have a :any:`Icon.set_icon_name` function.
+
+Attach Points
+-------------
+
+Where the badge icon is placed is defined by the main icon.  By
+default, it is centered on 0, 0.  That means that the 3 quarters of
+the icon will be cut off!  Therefore, it is helpful to define the
+attach points.
+
+When Sugar loads the main icon, it looks for a `.icon` file.  For
+example, if the icon path is resolved to `/theme/computer-xo.svg`,
+the `/theme/computer-xo.icon` will be tried to find the attach points.
+
+The `.icon` files are to be formatted as follows::
+
+    [Icon Data]
+    AttachPoints=970,850
+
+In this example, the badge will be centered at 97.0% on the X axis,
+and 85.0% on the Y axis.
+'''
 
 import re
 import math
@@ -27,6 +93,8 @@
 import os
 from ConfigParser import ConfigParser
 
+import gi
+gi.require_version('Rsvg', '2.0')
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Gdk
@@ -361,6 +429,40 @@
 
 
 class Icon(Gtk.Image):
+    '''
+    The most basic Sugar icon class.  Displays the icon given.
+
+    You must set either the `file_name`, `file` or `icon_name` properties,
+    otherwise, no icon will be visible.
+
+    You should set the `pixel_size`, using constants the `*_ICON_SIZE`
+    constants from :any:`sugar3.graphics.style`.
+
+    You should set the color (either via `xo_color` or `fill_color` and
+    `stroke_color`), otherwise the default black and white fill and stroke
+    will be used.
+
+    Keyword Args:
+        file_name (str): a path to the SVG icon file
+        file (object): same behaviour as file_name, but for
+            :class:`sugar3.util.TempFilePath` type objects
+        icon_name (str): a name of an icon in the theme to display.  The
+            icons in the theme include those in the sugar-artwork project
+            and icons in the activity's '/icons' directory
+        pixel_size (int): size of the icon, in pixels.  Best to use the
+            constants from :class:`sugar3.graphics.style`, as those constants
+            are scaled based on the user's preferences
+        xo_color (sugar3.graphics.xocolor.XoColor): color to display icon,
+            a shortcut that just sets the fill_color and stroke_color
+        fill_color (str): a string, like '#FFFFFF', that will serve as the
+            fill color for the icon
+        stroke_color (str): a string, like '#282828', that will serve as the
+            stroke color for the icon
+        icon_size: deprecated since 0.102.0, use pixel_size instead
+        badge_name (str): the icon_name for a badge icon,
+            see :any:`set_badge_name`
+        alpha (float): transparency of the icon, defaults to 1.0
+    '''
 
     __gtype_name__ = 'SugarIcon'
 
@@ -393,13 +495,31 @@
     file = GObject.property(type=object, setter=set_file, getter=get_file)
 
     def get_pixbuf(self):
+        '''
+        Returns the :class:`GdkPixbuf.Pixbuf` for the icon, if one has been
+        loaded yet.  If the icon has been drawn (:any:`do_draw`), the icon
+        will be loaded.
+
+        The pixbuf only contains the SVG icon that has been loaded and
+        recoloured.  It does not contain the badge.
+        '''
         return self._buffer.pixbuf
 
     def set_pixbuf(self, pixbuf):
+        '''
+        Set the pixbuf.  This will force the icon to be rendered with the
+        given pixbuf.  The icon will still be centered, badge added, etc.
+
+        Args:
+            pixbuf (GdkPixbuf.Pixbuf): pixbuf to set
+        '''
         self._buffer.pixbuf = pixbuf
 
     pixbuf = GObject.property(type=object, setter=set_pixbuf,
                               getter=get_pixbuf)
+    '''
+    icon.props.pixbuf -> see :any:`get_pixbuf` and :any:`set_pixbuf`
+    '''
 
     def _sync_image_properties(self):
         if self._buffer.icon_name != self.props.icon_name:
@@ -434,6 +554,7 @@
         self._buffer.file_name = self.props.file
 
     def do_get_preferred_height(self):
+        '''Gtk widget implementation method'''
         self._sync_image_properties()
         surface = self._buffer.get_surface()
         if surface:
@@ -445,6 +566,7 @@
         return (height, height)
 
     def do_get_preferred_width(self):
+        '''Gtk widget implementation method'''
         self._sync_image_properties()
         surface = self._buffer.get_surface()
         if surface:
@@ -456,6 +578,7 @@
         return (width, width)
 
     def do_draw(self, cr):
+        '''Gtk widget implementation method'''
         self._sync_image_properties()
         sensitive = (self.is_sensitive())
         surface = self._buffer.get_surface(sensitive, self)
@@ -491,71 +614,176 @@
             cr.paint_with_alpha(self._alpha)
 
     def set_xo_color(self, value):
+        '''
+        Set the colors used to display the icon
+
+        Args:
+            value (sugar3.graphics.xocolor.XoColor): new XoColor to use
+        '''
         if self._buffer.xo_color != value:
             self._buffer.xo_color = value
             self.queue_draw()
 
     xo_color = GObject.property(
         type=object, getter=None, setter=set_xo_color)
+    '''
+    icon.props.xo_color -> see :any:`set_xo_color`, note there is no getter
+    '''
 
     def set_fill_color(self, value):
+        '''
+        Set the color used to fill the icon
+
+        Args:
+            value (str): SVG color string, like '#FFFFFF'
+        '''
         if self._buffer.fill_color != value:
             self._buffer.fill_color = value
             self.queue_draw()
 
     def get_fill_color(self):
+        '''
+        Get the color used to fill the icon
+
+        Returns:
+            str, SVG color string, like '#FFFFFF'
+        '''
         return self._buffer.fill_color
 
     fill_color = GObject.property(
         type=object, getter=get_fill_color, setter=set_fill_color)
+    '''
+    icon.props.fill_color -> see :any:`get_fill_color`
+        and :any:`set_fill_color`
+    '''
 
     def set_stroke_color(self, value):
+        '''
+        Set the color used to paint the icon stroke
+
+        Args:
+            value (str): SVG color string, like '#282828'
+        '''
         if self._buffer.stroke_color != value:
             self._buffer.stroke_color = value
             self.queue_draw()
 
     def get_stroke_color(self):
+        '''
+        Get the color used to paint the icon stroke
+
+        Returns:
+            str, SVG color string, like '#282828'
+        '''
         return self._buffer.stroke_color
 
     stroke_color = GObject.property(
         type=object, getter=get_stroke_color, setter=set_stroke_color)
+    '''
+    icon.props.stroke_color -> see :any:`get_stroke_color`
+        and :any:`set_stroke_color`
+    '''
 
     def set_badge_name(self, value):
+        '''
+        See the Badge Icons section at the top of the file.
+
+        Args:
+            value (str): the icon name for the badge
+        '''
         if self._buffer.badge_name != value:
             self._buffer.badge_name = value
             self.queue_resize()
 
     def get_badge_name(self):
+        '''
+        Get the badge name, as set by :any:`set_badge_name`
+
+        Returns:
+            str, badge icon name
+        '''
         return self._buffer.badge_name
 
     badge_name = GObject.property(
         type=str, getter=get_badge_name, setter=set_badge_name)
+    '''
+    icon.props.badge_name -> see :any:`get_badge_name`
+        and :any:`set_badge_name`
+    '''
 
     def get_badge_size(self):
+        '''
+        Returns:
+            int, size of badge icon, in pixels
+        '''
         return int(_BADGE_SIZE * self.props.pixel_size)
 
     def set_alpha(self, value):
+        '''
+        Set the transparency for the icon.  Defaults to 1.0, which is
+        fully visible icon.
+
+        Args:
+            value (float): alpha value from 0.0 to 1.0
+        '''
         if self._alpha != value:
             self._alpha = value
             self.queue_draw()
 
     alpha = GObject.property(
         type=float, setter=set_alpha)
+    '''
+    icon.props.alpha -> see :any:`set_alpha`, note no getter
+    '''
 
     def set_scale(self, value):
+        '''
+        Scales the icon, with the transformation origin at the top left
+        corner.  Note that this only scales the resulting drawing, so
+        at large scales the icon will appear pixilated.
+
+        Args:
+            value (float): new scaling factor
+        '''
         if self._scale != value:
             self._scale = value
             self.queue_draw()
 
     scale = GObject.property(
         type=float, setter=set_scale)
+    '''
+    icon.props.scale -> see :any:`set_scale`, note no getter
+    '''
 
 
 class EventIcon(Gtk.EventBox):
-    """
+    '''
     An Icon class that provides access to mouse events and that can act as a
     cursor-positioned palette invoker.
-    """
+
+    The palette invoker can be used in 3 ways:
+
+    1.  Set the palette during your constructor, see :any:`set_palette`
+    2.  Override the create_palette method, see :any:`create_palette`
+    3.  Set the tooltip, see :any:`create_tooltip`
+
+    Otherwise, the icon setup api is the same as the basic :class:`Icon`.
+    This EventIcon class supports the icon_name, stroke_color, fill_color,
+    file_name, xo_color, pixel_size, scale and alpha keyword arguments as
+    the :class:`Icon`.  The added arguments are as follows:
+
+    Keyword Args:
+        background_color (Gdk.Color): the color to draw the icon on top of.
+            It defaults to None, which means no background is drawn
+            (transparent).  The alpha channel of the Gdk.Color is disregarded.
+        cache (bool): if True, the icon file contents will be cached to
+            reduce disk usage
+        palette (sugar3.graphics.palette.Palette): a palette to connect
+    '''
+
+    __gsignals__ = {
+        'activate': (GObject.SignalFlags.RUN_FIRST, None, []),
+    }
 
     __gtype_name__ = 'SugarEventIcon'
 
@@ -569,6 +797,10 @@
         self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK |
                         Gdk.EventMask.TOUCH_MASK |
                         Gdk.EventMask.BUTTON_RELEASE_MASK)
+        # Connect after the default so that the palette can silence events
+        # for example, after a touch palette invocation
+        self.connect_after('button-release-event',
+                           self.__button_release_event_cb)
         for key, value in kwargs.iteritems():
             self.set_property(key, value)
 
@@ -578,6 +810,7 @@
         self.connect('destroy', self.__destroy_cb)
 
     def do_draw(self, cr):
+        '''Gtk widget implementation method'''
         surface = self._buffer.get_surface()
         if surface:
             allocation = self.get_allocation()
@@ -592,6 +825,7 @@
                 cr.paint_with_alpha(self._alpha)
 
     def do_get_preferred_height(self):
+        '''Gtk widget implementation method'''
         surface = self._buffer.get_surface()
         if surface:
             height = surface.get_height()
@@ -602,6 +836,7 @@
         return (height, height)
 
     def do_get_preferred_width(self):
+        '''Gtk widget implementation method'''
         surface = self._buffer.get_surface()
         if surface:
             width = surface.get_width()
@@ -668,15 +903,28 @@
         type=object, getter=get_stroke_color, setter=set_stroke_color)
 
     def set_background_color(self, value):
+        '''
+        Args:
+            value (Gdk.Color): color use as background (alpha is ignored),
+                or None meaning no background is drawn (transparent)
+        '''
         if self._buffer.background_color != value:
             self._buffer.background_color = value
             self.queue_draw()
 
     def get_background_color(self):
+        '''
+        Returns:
+            Gdk.Color, current background color, may be None
+        '''
         return self._buffer.background_color
 
     background_color = GObject.property(
         type=object, getter=get_background_color, setter=set_background_color)
+    '''
+    event_icon.props.get_background_color -> see :any:`set_background_color`
+        and :any:`get_background_color`
+    '''
 
     def set_size(self, value):
         if self._buffer.width != value:
@@ -710,13 +958,27 @@
         type=float, setter=set_alpha)
 
     def set_cache(self, value):
+        '''
+        Sugar caches icon file contents in a smart cache.  Currently, we use
+        a LRU (Least Recently Used) algorithm to manage the cache.
+
+        Args:
+            value (bool): if True, the icon file will be cached in the LRU
+        '''
         self._buffer.cache = value
 
     def get_cache(self):
+        '''
+        Returns:
+            bool, if the icon file will be saved in the LRU
+        '''
         return self._buffer.cache
 
     cache = GObject.property(
         type=bool, default=False, getter=get_cache, setter=set_cache)
+    '''
+    event_icon.props.cache -> see :any:`set_cache` and :any:`get_cache`
+    '''
 
     def set_badge_name(self, value):
         if self._buffer.badge_name != value:
@@ -730,16 +992,51 @@
         type=object, getter=get_badge_name, setter=set_badge_name)
 
     def create_palette(self):
+        '''
+        The create_palette function is called when the palette needs to be
+        invoked.  For example, when the user has right clicked the icon or
+        the user has hovered over the icon for a long time.
+
+        The create_palette will only be called once or zero times.  The palette
+        returned will be stored and re-used if the user invokes the palette
+        multiple times.
+
+        Your create_palette implementation does not need to
+        :any:`Gtk.Widget.show` the palette, as this will be done by the
+        invoker.  However, you still need to show
+        the menu items, etc that you place in the palette.
+
+        Returns:
+            sugar3.graphics.palette.Palette, or None to indicate that you
+            do not want a palette shown
+
+        The default implementation returns None, to indicate no palette should
+        be shown.
+        '''
         return None
 
     def get_palette(self):
+        '''
+        Gets the current palette, either set by :any:`set_palette` or cached
+        after a call to :any:`create_palette`
+        '''
         return self._palette_invoker.palette
 
     def set_palette(self, palette):
+        '''
+        Sets the palette to show.  If the palette is not None, this will
+        override the palette set by create_palette.
+
+        Args:
+            palette (sugar3.graphics.palette.Palette): palette or None
+        '''
         self._palette_invoker.palette = palette
 
     palette = GObject.property(
         type=object, setter=set_palette, getter=get_palette)
+    '''
+    event_icon.props.palette -> see :any:`get_palette` and :any:`set_palette`
+    '''
 
     def get_palette_invoker(self):
         return self._palette_invoker
@@ -752,25 +1049,42 @@
         type=object, setter=set_palette_invoker, getter=get_palette_invoker)
 
     def set_tooltip(self, text):
+        '''
+        Creates a palette with the tooltip text.  This will override any
+        current palette set through :any:`set_palette` or that will ever be
+        returned by :any:`create_palette`.
+
+        Args:
+            text (str): tooltip text
+        '''
         from sugar3.graphics.palette import Palette
 
         self.set_palette(Palette(text))
 
+    def __button_release_event_cb(self, icon, event):
+        if event.button == 1:
+            alloc = self.get_allocation()
+            if 0 < event.x < alloc.width and 0 < event.y < alloc.height:
+                self.emit('activate')
+
 
 class CanvasIcon(EventIcon):
-    """
+    '''
     An EventIcon with active and prelight states, and a styleable
-    background.
-
-    If the icon pops up a palette, the prelight state is set until the
-    palette pops down.
-
-    """
+    background.  If the icon pops up a palette, the prelight state is
+    set until the palette pops down.  This is used to render a light
+    grey highlight, however can be configured by Gtk+ CSS with the
+    `:prelight` selector.
+
+    Care should to use :any:`connect_to_palette_pop_events` for all palettes
+    created and shown around this icon.
+    '''
 
     __gtype_name__ = 'SugarCanvasIcon'
 
     def __init__(self, **kwargs):
         EventIcon.__init__(self, **kwargs)
+        self._button_down = False
 
         self.connect('enter-notify-event', self.__enter_notify_event_cb)
         self.connect('leave-notify-event', self.__leave_notify_event_cb)
@@ -778,11 +1092,26 @@
         self.connect('button-release-event', self.__button_release_event_cb)
 
     def connect_to_palette_pop_events(self, palette):
+        '''
+        Connect to the palette's popup and popdown events, so that the prelight
+        state is set at the right times.  You should run this call
+        before you :any:`EventIcon.set_palette` or before you return from
+        your :any:`EventIcon.create_palette` function, eg:
+
+            def create_palette(self):
+                palette = ...
+
+                self.connect_to_palette_pop_events(palette)
+                return palette
+
+        Args:
+            palette (sugar3.graphics.palette.Palette): palette to connect
+        '''
         palette.connect('popup', self.__palette_popup_cb)
         palette.connect('popdown', self.__palette_popdown_cb)
 
     def do_draw(self, cr):
-        """Render a background that fits the allocated space."""
+        '''Gtk widget implementation method'''
         allocation = self.get_allocation()
         context = self.get_style_context()
         Gtk.render_background(context, cr, 0, 0,
@@ -794,27 +1123,33 @@
     def __enter_notify_event_cb(self, icon, event):
         self.set_state_flags(self.get_state_flags() | Gtk.StateFlags.PRELIGHT,
                              clear=True)
+        if self._button_down:
+            self.set_state_flags(Gtk.StateFlags.ACTIVE, clear=False)
 
     def __leave_notify_event_cb(self, icon, event):
         if self.palette and self.palette.is_up():
             return
 
-        self.unset_state_flags(Gtk.StateFlags.PRELIGHT)
+        self.unset_state_flags(Gtk.StateFlags.PRELIGHT | Gtk.StateFlags.ACTIVE)
 
     def __button_press_event_cb(self, icon, event):
         if self.palette and not self.palette.is_up():
+            self._button_down = True
             self.set_state_flags(
                 self.get_state_flags() | Gtk.StateFlags.ACTIVE,
                 clear=True)
 
     def __button_release_event_cb(self, icon, event):
         self.unset_state_flags(Gtk.StateFlags.ACTIVE)
+        self._button_down = False
 
     def __palette_popup_cb(self, palette):
         self.set_state_flags(Gtk.StateFlags.PRELIGHT, clear=True)
 
     def __palette_popdown_cb(self, palette):
         self.unset_state_flags(Gtk.StateFlags.PRELIGHT)
+if hasattr(CanvasIcon, 'set_css_name'):
+    CanvasIcon.set_css_name('canvasicon')
 
 
 class CellRendererIcon(Gtk.CellRenderer):
@@ -1036,6 +1371,40 @@
 
 
 def get_icon_state(base_name, perc, step=5):
+    '''
+    Get the closest icon name for a given state in percent.
+
+    First, you need a set of icons.  They must be prefixed with `base_name`, for
+    example "network-wireless".  They must be suffixed with 3 digit percentage
+    numbers, for example "-000", "-200", etc.  Eventually, you get a collection
+    of icon names like:
+
+    * network-wireless-000
+    * network-wireless-020
+    * network-wireless-040
+    * network-wireless-060
+    * network-wireless-080
+    * network-wireless-100
+
+    All of these icons must be placed in the icon theme, such that they are
+    addressable by their `icon_name`.
+
+    Args:
+        base_name (str): base icon name, eg `network-wireless`
+        perc (float): desired percentage between 0 and 100, eg. 67.8
+
+    Keyword Arguments:
+        step (int): step to increment to find all possible icons
+
+            From the example above, we could step 5, because 0, 5, 10, 15, etc,
+            includes all number suffixes in our set of icons (0, 20, 40, etc).
+
+            If we had the number suffixes 0, 33, 66, 99, we could not use 5,
+            as none of the numbers are divisible by 5.
+
+    Returns:
+        str, icon name that represent given state, or None if not found
+    '''
     strength = round(perc / step) * step
     icon_theme = Gtk.IconTheme.get_default()
 
@@ -1048,6 +1417,14 @@
 
 
 def get_icon_file_name(icon_name):
+    '''
+    Resolves a given icon name into a file path.  Looks for any icon in them
+    theme, including those in sugar-artwork and those in the activities
+    '/icons/' directory.
+
+    Returns:
+        str, path to icon, or None is the icon is not found in the theme
+    '''
     icon_theme = Gtk.IconTheme.get_default()
     info = icon_theme.lookup_icon(icon_name, Gtk.IconSize.LARGE_TOOLBAR, 0)
     if not info:
@@ -1058,27 +1435,13 @@
 
 
 def get_surface(**kwargs):
-    """Get cached cairo surface.
-
-        Keyword arguments:
-        icon_name        -- name of icon to load, default None
-        file_name        -- path to image file, default None
-        fill_color       -- for svg images, change default fill color
-                            default None
-        stroke_color     -- for svg images, change default stroke color
-                            default None
-        background_color -- draw background or surface will be transparent
-                            default None
-        badge_name       -- name of icon which will be drawn on top of
-                            original image, default None
-        width            -- change image width, default None
-        height           -- change image height, default None
-        cache            -- if image is svg, keep svg file content for later
-        scale            -- scale image, default 1.0
-
-        Return: cairo surface or None if image was not found
-
-        """
+    '''
+    Get cairo surface of the icon.  Supports the same arguments as
+    :any:`Icon`, in exactly the same way.
+
+    Returns:
+        cairo surface or None if image was not found
+    '''
     icon = _IconBuffer()
     for key, value in kwargs.items():
         icon.__setattr__(key, value)
diff --git a/src/sugar3/graphics/menuitem.py b/src/sugar3/graphics/menuitem.py
index a6b516e..0d6d937 100644
--- a/src/sugar3/graphics/menuitem.py
+++ b/src/sugar3/graphics/menuitem.py
@@ -77,7 +77,7 @@
         # TODO: should we remove the accelerator from the prev top level?
 
         if not hasattr(self.get_toplevel(), 'sugar_accel_group'):
-            logging.warning('No Gtk.AccelGroup in the top level window.')
+            logging.debug('No Gtk.AccelGroup in the top level window.')
             return
 
         accel_group = self.get_toplevel().sugar_accel_group
diff --git a/src/sugar3/graphics/notebook.py b/src/sugar3/graphics/notebook.py
index a3a261b..a467a7d 100644
--- a/src/sugar3/graphics/notebook.py
+++ b/src/sugar3/graphics/notebook.py
@@ -15,21 +15,25 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""Notebook class
+'''
+Notebook class
 
-This class create a Gtk.Notebook() widget supporting
-a close button in every tab when the 'can-close-tabs' gproperty
-is enabled (True)
+This class creates a :class:`Gtk.Notebook` widget supporting
+a close button in every tab when the `can-close-tabs` gproperty
+is enabled (True).
 
-STABLE.
-"""
+.. literalinclude:: ../examples/notebook.py
+'''
 
 from gi.repository import Gtk
 from gi.repository import GObject
 
 
 class Notebook(Gtk.Notebook):
-
+    '''
+    Notebook class that creates a :class:`Gtk.Notebook`. It is possible to set
+    the `can-close-tabs` property from the constructor through Notebook(can_close_tabs=True)
+    '''
     __gtype_name__ = 'SugarNotebook'
 
     __gproperties__ = {
@@ -52,23 +56,9 @@
         self.show()
 
     def do_set_property(self, pspec, value):
-        """
-        Set notebook property
-
-        Parameters
-        ----------
-        pspec :
-            property for which the value will be set
-
-        Returns
-        -------
-        None
-
-        Raises
-        ------
-        AssertionError
-
-        """
+        '''
+        Implementation method. Use notebook.props to set properties.
+        '''
         if pspec.name == 'can-close-tabs':
             self._can_close_tabs = value
         else:
@@ -114,21 +104,16 @@
         return event_box
 
     def add_page(self, text_label, widget):
-        """
-        Adds a page to the notebook.
+        '''
+        Adds a page to the notebook and sets the newly added page as current.
+        Returns True if the page is successfully added to the notebook.
+        If `can-close-tabs` is true, then a GtkEventBox is also created to close the tab.
 
-        Parameters
-        ----------
-        text_label :
+        Args:
+            text_label (string): label of page to be added
 
-        widget :
-
-        Returns
-        -------
-        Boolean
-          Returns TRUE if the page is successfully added to the notebook.
-
-        """
+            widget (Gtk.Widget): widget to be used as contents of current page
+        '''
         # Add a new page to the notebook
         if self._can_close_tabs:
             eventbox = self._create_custom_tab(text_label, widget)
diff --git a/src/sugar3/graphics/objectchooser.py b/src/sugar3/graphics/objectchooser.py
index 9c68661..e7fad88 100644
--- a/src/sugar3/graphics/objectchooser.py
+++ b/src/sugar3/graphics/objectchooser.py
@@ -42,16 +42,31 @@
 
 
 def get_preview_pixbuf(preview_data, width=-1, height=-1):
-    """Retrive a pixbuf with the content of the preview field
-
-    Keyword arguments:
-    metadata -- the metadata dictionary.
-                Can't be None, use metadata.get('preview', '')
-    width -- the pixbuf width, if is not set, the default width will be used
-    height -- the pixbuf width, if is not set, the default height will be used
-
-    Return: a Pixbuf or None if couldn't create it
-
+    """
+    Retrive a pixbuf with the content of the preview field
+
+    Args:
+        metadata (dictionary): preview data from the metadata dictionary. Can't
+            be None. Returned from the
+            sugar3.datastore.datastore.DSObject.get_metadata() method.
+
+    Keyword Args:
+        width (int): the pixbuf width, if is not set, the default width will be used
+        height (int): the pixbuf width, if is not set, the default height will be used
+
+    Returns:
+        Pixbuf, the generated Pixbuf
+        None, if it could not be created
+
+    Example:
+        pixbuf = get_preview_pixbuf(metadata.get('preview', ''))                
+        has_preview = pixbuf is not None                                        
+                                                                               
+        if has_preview:                                                        
+            im = Gtk.Image()                                                    
+            im.set_from_pixbuf(pixbuf)                                          
+            box.add(im)                                                        
+            im.show()
     """
     if width == -1:
         width = PREVIEW_SIZE[0]
@@ -99,22 +114,20 @@
 
 
 class ObjectChooser(object):
-
-    def __init__(self, parent=None, what_filter=None, filter_type=None,
-                 show_preview=False):
-        """Initialise the ObjectChoser
-
-        parent -- the widget calling ObjectChooser
-
-        what_filter -- string
-
-            string should be an activity bundle_id or a generic mime
-            type as defined in mime.py used to determine which objects
+    """
+    UI interface for object choosers.
+
+    Object choosers can be used by acivities to allow the user to select objects
+    from the file system or from some other similar source.
+
+    Keyword Args:
+        parent (:class:`Gtk.Widget`): the widget calling ObjectChooser
+
+        what_filter (str): an activity bundle_id or a generic mime type as
+            defined in :mod:`sugar3.mime` used to determine which objects
             will be presented in the object chooser
-
-        filter_type -- string
-
-            string should be one of [None, FILTER_TYPE_GENERIC_MIME,
+        
+        filter_type (str): should be one of [None, FILTER_TYPE_GENERIC_MIME,
             FILTER_TYPE_ACTIVITY, FILTER_TYPE_MIME_BY_ACTIVITY]
 
             If filter_type is None, the default behavior of the
@@ -136,13 +149,20 @@
             field and the mime types defined by the activity in the
             activity.info file.
 
-        show_preview -- boolean
-
-            if True will show the preview image asociated with
-            the object in the Journal. This option is only available
-            if filter_type is selected.
-        """
-
+        show_preview (bool): if True will show the preview image asociated with
+            the object in the Journal. This option is only available if
+            filter_type is selected.
+
+    Examples:
+        chooser = ObjectChooser(self._activity, what_filter='Image')
+        
+        chooser = ObjectChooser(parent=self,
+                                what_filter=self.get_bundle_id(),
+                                filter_type=FILTER_TYPE_ACTIVITY)
+    """
+
+    def __init__(self, parent=None, what_filter=None, filter_type=None,
+                 show_preview=False):
         if parent is None:
             parent_xid = 0
         elif hasattr(parent, 'get_window') and hasattr(parent.get_window(),
@@ -170,6 +190,13 @@
         self._filter_type = filter_type
 
     def run(self):
+        """
+        Runs the object chooser and displays it.
+        
+        Returns:
+            Gtk.ResponseType constant, the response received from displaying the
+                object chooser.
+        """
         self._object_id = None
 
         self._main_loop = GObject.MainLoop()
@@ -211,12 +238,21 @@
         return self._response_code
 
     def get_selected_object(self):
+        """
+        Gets the object selected using the object chooser.
+
+        Returns:
+            object, the object selected
+        """
         if self._object_id is None:
             return None
         else:
             return datastore.get(self._object_id)
 
     def destroy(self):
+        """
+        Destroys and cleans up (disposes) the object chooser.
+        """
         self._cleanup()
 
     def _cleanup(self):
diff --git a/src/sugar3/graphics/palette.py b/src/sugar3/graphics/palette.py
index 5a0bfea..a3cd02b 100644
--- a/src/sugar3/graphics/palette.py
+++ b/src/sugar3/graphics/palette.py
@@ -123,7 +123,6 @@
         self._secondary_text = None
         self._icon = None
         self._icon_visible = True
-        self._palette_state = self.PRIMARY
 
         self._primary_event_box = Gtk.EventBox()
         self._primary_event_box.show()
@@ -165,9 +164,7 @@
 
         self._separator = Gtk.HSeparator()
         self._secondary_box.pack_start(self._separator, True, True, 0)
-
-        self._secondary_anim = animator.Animator(2.0, 10)
-        self._secondary_anim.add(_SecondaryAnimation(self))
+        self._secondary_box.show()
 
         # we init after initializing all of our containers
         PaletteWindow.__init__(self, **kwargs)
@@ -186,7 +183,6 @@
         self.action_bar.show()
 
         self.connect('notify::invoker', self.__notify_invoker_cb)
-        self.connect('popdown', self.__popdown_cb)
 
         # Default to a normal window palette
         self._content_widget = None
@@ -203,14 +199,10 @@
             self._widget.present()
 
     def __destroy_cb(self, palette):
-        self._secondary_anim.stop()
         self.popdown(immediate=True)
         # Break the reference cycle. It looks like the gc is not able to free
         # it, possibly because Gtk.Menu memory handling is very special.
         self._widget = None
-
-    def __popdown_cb(self, widget):
-        self._secondary_anim.stop()
 
     def __notify_invoker_cb(self, palette, pspec):
         invoker = self.props.invoker
@@ -225,33 +217,32 @@
     def get_full_size_request(self):
         return self._full_request
 
-    def popup(self, immediate=False, state=None):
+    def popup(self, immediate=False):
         if self._invoker is not None:
             self._update_full_request()
 
-        if state is None:
-            state = self.PRIMARY
-        self.set_palette_state(state)
-
-        if state == self.PRIMARY:
-            self._secondary_anim.start()
-        else:
-            self._secondary_anim.stop()
-
         PaletteWindow.popup(self, immediate)
 
-    def popdown(self, immediate=False):
+    def popdown(self, immediate=False, state=None):
+        '''
+        Popdown (or show the full contents of) the palette.
+
+        Keyword Args:
+            immediate (bool): if True, the palette will be shown instantly (as
+                if the user right clicked the item).  If False, the palette
+                will be shown after the usual activation wait time.
+
+        .. deprecated:: 0.109
+            The state keyword argument is deprecated.  The old
+            secondary state has become the only state.
+        '''
         if immediate:
-            self._secondary_anim.stop()
-            # to suppress glitches while later re-opening
-            self.set_palette_state(self.PRIMARY)
             if self._widget:
                 self._widget.size_request()
         PaletteWindow.popdown(self, immediate)
 
     def on_enter(self):
         PaletteWindow.on_enter(self)
-        self._secondary_anim.start()
 
     def _add_content(self):
         # The content is not shown until a widget is added
@@ -430,26 +421,8 @@
         self._widget.set_accept_focus(accept_focus)
 
     def _update_full_request(self):
-        if self._palette_state == self.PRIMARY:
-            self._secondary_box.show()
-
         if self._widget is not None:
             self._full_request = self._widget.size_request()
-
-        if self._palette_state == self.PRIMARY:
-            self._secondary_box.hide()
-
-    def _set_palette_state(self, state):
-        if self._palette_state == state:
-            return
-
-        if state == self.PRIMARY:
-            self._secondary_box.hide()
-        elif state == self.SECONDARY:
-            self._secondary_box.show()
-            self.update_position()
-
-        self._palette_state = state
 
     def get_menu(self):
         assert self._content_widget is None
@@ -475,13 +448,7 @@
     menu = GObject.property(type=object, getter=get_menu)
 
     def _invoker_right_click_cb(self, invoker):
-        self.popup(immediate=True, state=self.SECONDARY)
-
-    def _invoker_toggle_state_cb(self, invoker):
-        if self.is_up() and self._palette_state == self.SECONDARY:
-            self.popdown(immediate=True)
-        else:
-            self.popup(immediate=True, state=self.SECONDARY)
+        self.popup(immediate=True)
 
 
 class PaletteActionBar(Gtk.HButtonBox):
@@ -496,14 +463,3 @@
 
         self.pack_start(button, True, True, 0)
         button.show()
-
-
-class _SecondaryAnimation(animator.Animation):
-
-    def __init__(self, palette):
-        animator.Animation.__init__(self, 0.0, 1.0)
-        self._palette = palette
-
-    def next_frame(self, current):
-        if current == 1.0:
-            self._palette.set_palette_state(Palette.SECONDARY)
diff --git a/src/sugar3/graphics/palettemenu.py b/src/sugar3/graphics/palettemenu.py
index 355590e..b05871e 100644
--- a/src/sugar3/graphics/palettemenu.py
+++ b/src/sugar3/graphics/palettemenu.py
@@ -13,6 +13,75 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+'''
+The palettemenu module is the main port of call for making palettes.  It
+covers creating menu items, seperators and placing them in a box.
+
+Example:
+
+    Create a palette menu with 2 items with a seperator in the middle.
+
+    .. code-block:: python
+
+        from gi.repository import Gtk
+        from gettext import gettext as _
+
+        from sugar3.graphics.palette import Palette
+        from sugar3.graphics.palettemenu import PaletteMenuBox
+        from sugar3.graphics.palettemenu import PaletteMenuItem
+        from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
+
+
+        class ItemPalette(Palette):
+            def __init__(self):
+                Palette.__init__(
+                    self, primary_text='List Item')
+                box = PaletteMenuBox()
+                self.set_content(box)
+                box.show()
+
+                menu_item = PaletteMenuItem(
+                    _('Edit'), icon_name='toolbar-edit')
+                menu_item.connect('activate', self.__edit_cb)
+                box.append_item(menu_item)
+                menu_item.show()
+
+                sep = PaletteMenuItemSeparator()
+                box.append_item(sep)
+                sep.show()
+
+                menu_item = PaletteMenuItem(
+                    _('Delete'), icon_name='edit-delete')
+                box.append_item(menu_item)
+                menu_item.show()
+
+            def __edit_cb(self, menu_item):
+                print 'Edit...'
+
+        # Usually the Palette instance is returned in a create_palette function
+        p = ItemPalette()
+        p.popup()
+        Gtk.main()
+
+    Add a palettebox to a toolbutton:
+
+    .. code-block:: python
+
+        image = ToolButton('insert-picture')
+        image.set_tooltip(_('Insert Image'))
+        self._image_id = image.connect('clicked', self.__image_cb)
+        toolbar_box.toolbar.insert(image, -1)
+
+        palette = image.get_palette()
+        box = PaletteMenuBox()
+        palette.set_content(box)
+        box.show()
+
+        menu_item = PaletteMenuItem(_('Floating'))
+        menu_item.connect('activate', self.__image_cb, True)
+        box.append_item(menu_item)
+        menu_item.show()
+'''
 
 from gi.repository import GObject
 from gi.repository import Gtk
@@ -22,11 +91,39 @@
 
 
 class PaletteMenuBox(Gtk.VBox):
+    '''
+    The PaletteMenuBox is a box that is useful for making palettes.  It
+    supports adding :class:`sugar3.graphics.palettemenu.PaletteMenuItem`,
+    :class:`sugar3.graphics.palettemenu.PaletteMenuItemSeparator` and
+    it automatically adds padding to other widgets.
+    '''
+
     def __init__(self):
         Gtk.VBox.__init__(self)
 
     def append_item(self, item_or_widget, horizontal_padding=None,
                     vertical_padding=None):
+        '''
+        Add a menu item, seperator or other widget to the end of the palette
+        (simmilar to `Gtk.Box.pack_start`).
+
+        If an item is appended
+        (a :class:`sugar3.graphics.palettemenu.PaletteMenuItem` or a
+        :class:`sugar3.graphics.palettemenu.PaletteMenuItemSeparator`) no
+        padding will be added, as that is handled by the item.  If a widget is
+        appended (:class:`Gtk.Widget` subclass) padding will be added.
+
+        Args:
+            item_or_widget (:class:`Gtk.Widget` or menu item or seperator):
+                item or widget to add the the palette
+            horizontal_padding (int):  by default,
+                :class:`sugar3.graphics.style.DEFAULT_SPCAING` is applied
+            vertical_padding (int):  by default,
+                :class:`sugar3.graphics.style.DEFAULT_SPCAING` is applied
+
+        Returns:
+            None
+        '''
         item = None
         if (isinstance(item_or_widget, PaletteMenuItem) or
                 isinstance(item_or_widget, PaletteMenuItemSeparator)):
@@ -56,7 +153,9 @@
 
 
 class PaletteMenuItemSeparator(Gtk.EventBox):
-    """Contains a HSeparator and has the proper height for the menu."""
+    '''
+    Horizontal seperator to put in a palette
+    '''
 
     __gtype_name__ = 'SugarPaletteMenuItemSeparator'
 
@@ -69,6 +168,30 @@
 
 
 class PaletteMenuItem(Gtk.EventBox):
+    '''
+    A palette menu item is a line of text, and optionally an icon, that the
+    user can activate.
+
+    The `activate` signal is usually emitted when the item is clicked.  It has
+    no arguments.  When a menu item is activated, the palette is also closed.
+
+    Args:
+        text_label (str):  a text to display in the menu
+
+        icon_name (str):  the name of a sugar icon to be displayed. Takse
+            precedence over file_name
+
+        text_maxlen (int):  the desired maximum width of the label, in
+            characters.  By default set to 60 chars
+
+        xo_color (:class:`sugar.graphics.XoColor`):  the color to be applied to
+            the icon
+
+        file_name (str):  the path to a svg file used as icon
+
+        accelerator (str):  a text used to display the keyboard shortcut
+            associated to the menu
+    '''
 
     __gtype_name__ = 'SugarPaletteMenuItem'
 
@@ -78,31 +201,6 @@
 
     def __init__(self, text_label=None, icon_name=None, text_maxlen=60,
                  xo_color=None, file_name=None, accelerator=None):
-
-        """
-            text_label -- str
-                a text to display in the menu.
-
-            icon_name -- str
-                the name of a sugar icon to be displayed. Takse precedence
-                over file_name.
-
-            text_maxlen -- int
-                the desired maximum width of the label, in characters.
-                By default is 60.
-
-            xo_color -- sugar.graphics.XoColor
-                the color to be applied to the icon.
-
-            file_name -- str
-                the path to a svg file used as icon.
-
-            accelerator -- str
-                a text used to display the keyboard shortcut associated
-                to the menu.
-
-        """
-
         Gtk.EventBox.__init__(self)
         self.set_above_child(True)
 
@@ -159,7 +257,9 @@
         self.show_all()
 
     def __button_release_cb(self, widget, event):
-        self.emit('activate')
+        alloc = self.get_allocation()
+        if 0 < event.x < alloc.width and 0 < event.y < alloc.height:
+            self.emit('activate')
 
     def __enter_notify_cb(self, widget, event):
         self.modify_bg(Gtk.StateType.NORMAL,
@@ -170,19 +270,47 @@
                        style.COLOR_BLACK.get_gdk_color())
 
     def set_label(self, text_label):
+        '''
+        Sets the text to display in the menu.
+
+        Args:
+            text_label (str):  text label
+        '''
         text = '<span foreground="%s">' % style.COLOR_WHITE.get_html() + \
             text_label + '</span>'
         self.label.set_markup(text)
 
     def set_image(self, icon):
+        '''
+        Sets the icon widget.  Usually this will be a
+        :class:`sugar3.graphics.icon.Icon`.
+
+        Args:
+            icon (:class:`Gtk.Widget`):  icon widget
+        '''
         self._hbox.pack_start(icon, expand=False, fill=False,
                               padding=style.DEFAULT_PADDING)
         self._hbox.reorder_child(icon, 0)
 
     def set_accelerator(self, text):
+        '''
+        Sets the text used to display the keyboard shortcut associated with
+        the menu.
+
+        Args:
+            text (str): accelerator text
+        '''
         self._accelerator_label.set_text(text)
 
     def set_sensitive(self, sensitive):
+        '''
+        Sets whether the widget should be activateable by the user and changes
+        the widget's appearence to the appropriate state.
+
+        Args:
+            sensitive (bool):  if `True`, the widget will be activateable by
+                the user. Otherwise, it will not be activateable
+        '''
         is_sensitive = bool(not self.get_state_flags() &
                             Gtk.StateFlags.INSENSITIVE)
         if is_sensitive == sensitive:
diff --git a/src/sugar3/graphics/palettewindow.py b/src/sugar3/graphics/palettewindow.py
index 3ea5f01..7369519 100644
--- a/src/sugar3/graphics/palettewindow.py
+++ b/src/sugar3/graphics/palettewindow.py
@@ -37,6 +37,18 @@
 from sugar3.graphics import style
 from sugar3.graphics.icon import CellRendererIcon
 
+
+_pointer = None
+
+def _get_pointer_position(widget):
+    global _pointer
+
+    if _pointer is None:
+        display = widget.get_display()
+        manager = display.get_device_manager()
+        _pointer = manager.get_client_pointer()
+    screen, x, y = _pointer.get_position()
+    return (x, y)
 
 def _calculate_gap(a, b):
     """Helper function to find the gap position and size of widget a"""
@@ -363,7 +375,7 @@
 
         allocation = self.get_allocation()
         context = self.get_style_context()
-        context.add_class('toolitem')
+        context.add_class('palette')
         if gap:
             cr.save()
             cr.set_source_rgb(0, 0, 0)
@@ -394,7 +406,6 @@
 
     def popup(self, invoker):
         if self.get_visible():
-            logging.error('PaletteWindowWidget popup get_visible True')
             return
         self.connect('enter-notify-event', self.__enter_notify_event_cb)
         self.connect('leave-notify-event', self.__leave_notify_event_cb)
@@ -406,6 +417,8 @@
         self.disconnect_by_func(self.__enter_notify_event_cb)
         self.disconnect_by_func(self.__leave_notify_event_cb)
         self.hide()
+if hasattr(_PaletteWindowWidget, 'set_css_name'):
+    _PaletteWindowWidget.set_css_name('palette')
 
 
 class MouseSpeedDetector(GObject.GObject):
@@ -435,7 +448,7 @@
     def start(self):
         self.stop()
 
-        self._mouse_pos = self._get_mouse_position()
+        self._mouse_pos = _get_pointer_position(self.parent)
         self._timeout_hid = GLib.timeout_add(self._delay, self._timer_cb)
 
     def stop(self):
@@ -444,19 +457,9 @@
             self._timeout_hid = None
         self._state = None
 
-    def _get_mouse_position(self):
-        if hasattr(self.parent, 'get_display'):
-            display = self.parent.get_display()
-        else:
-            display = Gdk.Display.get_default()
-        manager = display.get_device_manager()
-        pointer_device = manager.get_client_pointer()
-        screen, x, y = pointer_device.get_position()
-        return (x, y)
-
     def _detect_motion(self):
         oldx, oldy = self._mouse_pos
-        (x, y) = self._get_mouse_position()
+        (x, y) = _get_pointer_position(self.parent)
         self._mouse_pos = (x, y)
 
         dist2 = (oldx - x) ** 2 + (oldy - y) ** 2
@@ -484,9 +487,6 @@
     Provides basic management of child widget, invoker, and animation.
     """
 
-    PRIMARY = 0
-    SECONDARY = 1
-
     __gsignals__ = {
         'popup': (GObject.SignalFlags.RUN_FIRST, None, ([])),
         'popdown': (GObject.SignalFlags.RUN_FIRST, None, ([])),
@@ -500,7 +500,6 @@
         self._cursor_y = 0
         self._alignment = None
         self._up = False
-        self._palette_state = None
         self._widget = None
 
         self._popup_anim = animator.Animator(.5, 10)
@@ -621,18 +620,19 @@
             return
 
         req = self._widget.size_request()
-        # on Gtk 3.10, menu at the bottom of the screen are resized
-        # to not fall out, and report a wrong size.
-        # measure the children and move the menu - SL #4673
-        total_height = 0
-        for child in self._widget.get_children():
-            child_req = child.size_request()
-            total_height += child_req.height
-
-        # need add the border line width as defined in sugar-artwork
-        line_width = 2
-        total_height += line_width * 2
-        req.height = total_height
+        if isinstance(self._widget, _PaletteMenuWidget):
+            # on Gtk 3.10, menu at the bottom of the screen are resized
+            # to not fall out, and report a wrong size.
+            # measure the children and move the menu - SL #4673
+            total_height = 0
+            for child in self._widget.get_children():
+                child_req = child.size_request()
+                total_height += child_req.height
+
+            # need add the border line width as defined in sugar-artwork
+            line_width = 2
+            total_height += line_width * 2
+            req.height = total_height
 
         position = invoker.get_position_for_alignment(self._alignment, req)
         if position is None:
@@ -753,17 +753,6 @@
         rect.height = minimum.height
 
         return rect
-
-    def get_palette_state(self):
-        return self._palette_state
-
-    def _set_palette_state(self, state):
-        self._palette_state = state
-
-    def set_palette_state(self, state):
-        self._set_palette_state(state)
-
-    palette_state = property(get_palette_state)
 
 
 class _PopupAnimation(animator.Animation):
@@ -842,15 +831,8 @@
         invoker_valign = alignment[3]
 
         if self._cursor_x == -1 or self._cursor_y == -1:
-            if hasattr(self.parent, 'get_display'):
-                display = self.parent.get_display()
-            else:
-                display = Gdk.Display.get_default()
-            manager = display.get_device_manager()
-            pointer_device = manager.get_client_pointer()
-            screen, x, y = pointer_device.get_position()
-            self._cursor_x = x
-            self._cursor_y = y
+            position = _get_pointer_position(self.parent)
+            (self._cursor_x, self._cursor_y) = position
 
         if self._position_hint is self.ANCHORED:
             rect = self.get_rect()
@@ -969,15 +951,19 @@
             dright = screen_area.x + screen_area.width - rect.x - rect.width
 
             ih = 0
-
-            # Set palette_halign to align to screen on left
-            if dleft > dright:
-                ph = -float(dleft) / palette_dim.width
-
-            # Set palette_halign to align to screen on right
+            
+            if palette_dim.width == 0:
+                ph = 0
+
             else:
-                ph = -float(palette_dim.width - dright - rect.width) \
-                    / palette_dim.width
+                # Set palette_halign to align to screen on left
+                if dleft > dright:
+                    ph = -float(dleft) / palette_dim.width
+
+                # Set palette_halign to align to screen on right
+                else:
+                    ph = -float(palette_dim.width - dright - rect.width) \
+                        / palette_dim.width
 
         return (ph, pv, ih, iv)
 
@@ -1007,13 +993,32 @@
     def notify_mouse_leave(self):
         self.emit('mouse-leave')
 
-    def notify_right_click(self):
+    def notify_right_click(self, x=None, y=None):
+        '''
+        Notify the palette invoker of a right click and expand the
+        palette as required.  The x and y args should be that of
+        where the event happened, relative to the root of the screen.
+
+        Args
+            x (float): the x coord of the event relative to the root
+                of the screen, eg. :class:`Gdk.EventTouch.x_root`
+            y (float): the y coord of the event relative to the root
+                of the screen, eg. :class:`Gdk.EventTouch.y_root`
+        '''
         self._ensure_palette_exists()
+        self._process_event(x, y)
         self.emit('right-click')
 
     def notify_toggle_state(self):
         self._ensure_palette_exists()
         self.emit('toggle-state')
+
+    def _process_event(self, x, y):
+        if x is None or y is None:
+            return
+
+        self._cursor_x = x
+        self._cursor_y = y
 
     def get_palette(self):
         return self._palette
@@ -1091,6 +1096,7 @@
 
         self._widget = None
         self._expanded = False
+        self._pointer_position = (-1, -1)
         self._enter_hid = None
         self._leave_hid = None
         self._release_hid = None
@@ -1109,6 +1115,8 @@
             self._widget = widget
         else:
             self._widget = parent
+
+        self._pointer_position = _get_pointer_position(self._widget)
 
         self.notify('widget')
 
@@ -1176,6 +1184,7 @@
 
         context = self.parent.get_style_context()
         context.add_class('toolitem')
+        context.add_class('palette-down')
 
         gap = _calculate_gap(self.get_rect(), palette.get_rect())
         if gap:
@@ -1185,6 +1194,9 @@
                                  gap[0], gap[1], gap[1] + gap[2])
 
     def __enter_notify_event_cb(self, widget, event):
+        if (event.x_root, event.y_root) == self._pointer_position:
+            self._pointer_position = (-1, -1)
+            return False
         if event.mode == Gdk.CrossingMode.NORMAL:
             self.notify_mouse_enter()
 
@@ -1230,14 +1242,14 @@
             if self.props.toggle_palette:
                 self.notify_toggle_state()
         elif event.button == 3:
-            self.notify_right_click()
+            self.notify_right_click(event.x_root, event.y_root)
             return True
         else:
             return False
 
     def __long_pressed_event_cb(self, controller, x, y, widget):
         self._long_pressed_recognized = True
-        self.notify_right_click()
+        self.notify_right_click(x, y)
 
     def get_toplevel(self):
         return self._widget.get_toplevel()
@@ -1276,6 +1288,7 @@
         Invoker.__init__(self)
 
         self._position_hint = self.AT_CURSOR
+        self._pointer_position = (-1, -1)
         self._enter_hid = None
         self._leave_hid = None
         self._release_hid = None
@@ -1291,6 +1304,9 @@
         Invoker.attach(self, parent)
 
         self._item = parent
+
+        self._pointer_position = _get_pointer_position(self.parent)
+
         self._enter_hid = self._item.connect('enter-notify-event',
                                              self.__enter_notify_event_cb)
         self._leave_hid = self._item.connect('leave-notify-event',
@@ -1325,6 +1341,9 @@
         return rect
 
     def __enter_notify_event_cb(self, button, event):
+        if (event.x_root, event.y_root) == self._pointer_position:
+            self._pointer_position = (-1, -1)
+            return False
         if event.mode == Gdk.CrossingMode.NORMAL:
             self.notify_mouse_enter()
         return False
@@ -1335,6 +1354,11 @@
         return False
 
     def __button_release_event_cb(self, button, event):
+        # check if the release is done outside of the parent widget
+        alloc = self._item.get_allocation()
+        if not (0 < event.x < alloc.width and 0 < event.y < alloc.height):
+            return False
+
         if self._long_pressed_recognized:
             self._long_pressed_recognized = False
             return True
@@ -1342,28 +1366,51 @@
             if self.props.toggle_palette:
                 self.notify_toggle_state()
         if event.button == 3:
-            self.notify_right_click()
+            self.notify_right_click(event.x_root, event.y_root)
             return True
         else:
             return False
 
     def __long_pressed_event_cb(self, controller, x, y, widget):
         self._long_pressed_recognized = True
-        self.notify_right_click()
+        x, y = widget.get_window().get_root_coords(x, y)
+        self.notify_right_click(x, y)
 
     def get_toplevel(self):
         return self._item.get_toplevel()
 
 
 class ToolInvoker(WidgetInvoker):
+    '''
+    A palette invoker for toolbar buttons and other items.  This invoker
+    will properly align the palette so that is perpendicular to the toolbar
+    (a horizontal toolbar will spawn a palette going downwards).  It also
+    draws the highlights specific to a toolitem.
+
+    For :class:`sugar3.graphics.toolbutton.ToolButton` and subclasses, you
+    should not use the toolinvoker directly.  Instead, just subclass the
+    tool button and override the `create_palette` function.
+
+    Args:
+        parent (Gtk.Widget):  toolitem to connect invoker to
+    '''
 
     def __init__(self, parent=None):
         WidgetInvoker.__init__(self)
+        self._tool = None
 
         if parent:
             self.attach_tool(parent)
 
     def attach_tool(self, widget):
+        '''
+        Attach a toolitem to the invoker.  Same behaviour as passing the
+        `parent` argument to the constructor.
+
+        Args:
+            widget (Gtk.Widget):  toolitem to connect invoker to
+        '''
+        self._tool = widget
         self.attach_widget(widget, widget.get_child())
 
     def _get_alignments(self):
@@ -1379,6 +1426,14 @@
     def primary_text_clicked(self):
         self._widget.emit('clicked')
 
+    def notify_popup(self):
+        WidgetInvoker.notify_popup(self)
+        self._tool.queue_draw()
+
+    def notify_popdown(self):
+        WidgetInvoker.notify_popdown(self)
+        self._tool.queue_draw()
+
 
 class TreeViewInvoker(Invoker):
     def __init__(self):
@@ -1386,15 +1441,12 @@
 
         self._tree_view = None
         self._motion_hid = None
-        self._leave_hid = None
         self._release_hid = None
         self._long_pressed_hid = None
         self._position_hint = self.AT_CURSOR
 
         self._long_pressed_controller = SugarGestures.LongPressController()
 
-        self._mouse_detector = MouseSpeedDetector(200, 5)
-
         self._tree_view = None
         self._path = None
         self._column = None
@@ -1406,10 +1458,6 @@
 
         self._motion_hid = tree_view.connect('motion-notify-event',
                                              self.__motion_notify_event_cb)
-        self._enter_hid = tree_view.connect('enter-notify-event',
-                                            self.__enter_notify_event_cb)
-        self._leave_hid = tree_view.connect('leave-notify-event',
-                                            self.__leave_notify_event_cb)
         self._release_hid = tree_view.connect('button-release-event',
                                               self.__button_release_event_cb)
         self._long_pressed_hid = self._long_pressed_controller.connect(
@@ -1418,19 +1466,14 @@
             tree_view,
             SugarGestures.EventControllerFlags.NONE)
 
-        self._mouse_detector.connect('motion-slow', self.__mouse_slow_cb)
-        self._mouse_detector.parent = tree_view
         Invoker.attach(self, tree_view)
 
     def detach(self):
         Invoker.detach(self)
         self._tree_view.disconnect(self._motion_hid)
-        self._tree_view.disconnect(self._enter_hid)
-        self._tree_view.disconnect(self._leave_hid)
         self._tree_view.disconnect(self._release_hid)
         self._long_pressed_controller.detach(self._tree_view)
         self._long_pressed_controller.disconnect(self._long_pressed_hid)
-        self._mouse_detector.disconnect_by_func(self.__mouse_slow_cb)
 
     def get_rect(self):
         return self._tree_view.get_background_area(self._path, self._column)
@@ -1439,25 +1482,27 @@
         return self._tree_view.get_toplevel()
 
     def __motion_notify_event_cb(self, widget, event):
-        try:
-            path, column, x_, y_ = self._tree_view.get_path_at_pos(
-                int(event.x), int(event.y))
-            if path != self._path or column != self._column:
-                self._redraw_cell(self._path, self._column)
-                self._redraw_cell(path, column)
-
-                self._path = path
-                self._column = column
-
-                if self.palette is not None:
-                    self.palette.popdown(immediate=True)
-                    self.palette = None
-
-                self._mouse_detector.start()
-        except TypeError:
-            # tree_view.get_path_at_pos() fail if x,y poition is over
-            # a empty area
-            pass
+        here = self._tree_view.get_path_at_pos(int(event.x), int(event.y))
+        if here is None:
+            if self._path is not None:
+                self.notify_mouse_leave()
+            self._path = None
+            self._column = None
+            return
+
+        path, column, x_, y_ = here
+        if path != self._path or column != self._column:
+            self._redraw_cell(self._path, self._column)
+            self._redraw_cell(path, column)
+
+            self._path = path
+            self._column = column
+
+            if self.palette is not None:
+                self.palette.popdown(immediate=True)
+                self.palette = None
+
+            self.notify_mouse_enter()
 
     def _redraw_cell(self, path, column):
         area = self._tree_view.get_background_area(path, column)
@@ -1465,15 +1510,12 @@
             self._tree_view.convert_bin_window_to_widget_coords(area.x, area.y)
         self._tree_view.queue_draw_area(x, y, area.width, area.height)
 
-    def __enter_notify_event_cb(self, widget, event):
-        self._mouse_detector.start()
-
-    def __leave_notify_event_cb(self, widget, event):
-        self._mouse_detector.stop()
-
     def __button_release_event_cb(self, widget, event):
         x, y = int(event.x), int(event.y)
-        path, column, cell_x, cell_y = self._tree_view.get_path_at_pos(x, y)
+        here = self._tree_view.get_path_at_pos(x, y)
+        if here is None:
+            return False
+        path, column, cell_x, cell_y = here
         self._path = path
         self._column = column
         if event.button == 1:
@@ -1487,11 +1529,10 @@
                 cellrenderer.emit('clicked', path)
             # So the treeview receives it and knows a drag isn't going on
             return False
-        if event.button == 3:
+        elif event.button == 3:
             # right mouse button
-            self._mouse_detector.stop()
-            self._change_palette()
-            self.notify_right_click()
+            self._ensure_palette_exists()
+            self.notify_right_click(event.x_root, event.y_root)
             return True
         else:
             return False
@@ -1500,15 +1541,10 @@
         path, column, x_, y_ = self._tree_view.get_path_at_pos(x, y)
         self._path = path
         self._column = column
-        self._change_palette()
-        self.notify_right_click()
-
-    def __mouse_slow_cb(self, widget):
-        self._mouse_detector.stop()
-        self._change_palette()
-        self.emit('mouse-enter')
-
-    def _change_palette(self):
+        self._ensure_palette_exists()
+        self.notify_right_click(x, y)
+
+    def _ensure_palette_exists(self):
         if hasattr(self._tree_view, 'create_palette'):
             self.palette = self._tree_view.create_palette(
                 self._path, self._column)
diff --git a/src/sugar3/graphics/popwindow.py b/src/sugar3/graphics/popwindow.py
new file mode 100644
index 0000000..5a4a4d9
--- /dev/null
+++ b/src/sugar3/graphics/popwindow.py
@@ -0,0 +1,202 @@
+# Copyright (C) 2016 Abhijit Patel
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+'''
+Provide a PopWindow class for pop-up windows.
+Making PopWindow containing Gtk.Toolbar which also contains Gtk.Label
+and Toolbutton at the end of the Gtk.Toolbar.
+
+It is possible to change props like size and add more widgets PopWindow
+and also to Gtk.Toolbar.
+
+Example:
+    .. literalinclude: ..sugar/src/jarabe/view/viewsource.py
+    .. literalinclude: ..sugar/src/jarabe/view/viewhelp.py
+'''
+from gettext import gettext as _
+from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GdkX11
+from gi.repository import GObject
+
+from sugar3.graphics import style
+from sugar3.graphics.toolbutton import ToolButton
+
+from jarabe.model import shell
+
+
+class PopWindow(Gtk.Window):
+    """
+    UI interface for activity Pop-up Windows.
+    PopWindows are the windows that open on the top of the current window.
+    These pop-up windows don't cover the whole screen.
+    They contain canvas content, alerts messages, a tray and a
+    toolbar.
+
+    FULLSCREEN and HALF_WIDTH for setting size of the window.
+
+    Kwargs:
+        size (int,int): size to be set of the window
+        window_xid (xlib.Window): xid of the parent window
+    """
+    FULLSCREEN = (Gdk.Screen.width() - style.GRID_CELL_SIZE * 3,
+                  Gdk.Screen.height() - style.GRID_CELL_SIZE * 2)
+
+    HALF_WIDTH = ((Gdk.Screen.height() - style.GRID_CELL_SIZE * 3)/2,
+                  (Gdk.Screen.height() - style.GRID_CELL_SIZE * 2))
+
+    def __init__(self, window_xid=None, **kwargs):
+        Gtk.Window.__init__(self, **kwargs)
+        self._parent_window_xid = window_xid
+
+        self.set_decorated(False)
+        self.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
+        self.set_border_width(style.LINE_WIDTH)
+        self.set_has_resize_grip(False)
+        self.props.size = self.FULLSCREEN
+
+        self.connect('realize', self.__realize_cb)
+        self.connect('key-press-event', self.__key_press_event_cb)
+        self.connect('hide', self.__hide_cb)
+
+        self._vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        self.add(self._vbox)
+        self._vbox.show()
+
+        self._title_box = TitleBox()
+        self._title_box.close_button.connect(
+            'clicked',
+            self.__close_button_clicked_cb)
+        self._title_box.set_size_request(-1, style.GRID_CELL_SIZE)
+
+        self._vbox.pack_start(self._title_box, False, True, 0)
+        self._title_box.show()
+
+        # Note:
+        # Not displaying the pop-up from here instead allowing
+        # the child class to display the window after modifications
+        # like chaninging window size, decorating, changing position.
+
+    def set_size(self, size):
+        width, height = size
+        self.set_size_request(width, height)
+
+    size = GObject.Property(type=None, setter=set_size)
+
+    def get_title_box(self):
+        '''
+        Getter method for title-box
+
+        Returns:
+            self._title_box (): Title or Tool Box
+        '''
+        return self._title_box
+
+    title_box = GObject.Property(type=str, getter=get_title_box)
+
+    def get_vbox(self):
+        '''
+        Getter method for canvas
+
+        Returns:
+            self._vbox (Gtk.Box): canvas
+        '''
+        return self._vbox
+    vbox = GObject.Property(type=str, getter=get_vbox)
+
+    def __close_button_clicked_cb(self, button):
+        self.destroy()
+
+    def __key_press_event_cb(self, window, event):
+        keyname = Gdk.keyval_name(event.keyval)
+        if keyname == 'Escape':
+            self.destroy()
+
+    def __realize_cb(self, widget):
+        self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
+        window = self.get_window()
+        window.set_accept_focus(True)
+
+        if self._parent_window_xid is not None:
+            display = Gdk.Display.get_default()
+            parent = GdkX11.X11Window.foreign_new_for_display(
+                display, self._parent_window_xid)
+            window.set_transient_for(parent)
+            shell.get_model().push_modal()
+
+    def __hide_cb(self, widget):
+        shell.get_model().pop_modal()
+
+    def add_view(self, widget, expand=True, fill=True, padding=0):
+        '''
+        Adds child to the vbox.
+
+        Args:
+            widget (Gtk.Widget): widget to be added
+
+            expand (bool): True if child is to be given extra space allocated
+                to vbox.
+
+            fill (bool): True if space given to child by the expand option is
+                actually allocated to child, rather than just padding it.
+
+            padding (int): extra space in pixels to put between child and its
+                neighbors, over and above the global amount specified
+                by spacing in vbox.
+
+        Returns:
+            None
+        '''
+        self._vbox.pack_start(widget, expand, fill, padding)
+
+
+class TitleBox(Gtk.Toolbar):
+    '''
+    Title box at the top of the pop-up window.
+    Title and close button are added to the box and as needed more widgets
+    can be added using self.add_widget method.
+    This box is optional as the inherited class can remove this block by
+    setting the self._set_title_box to False.
+    '''
+
+    def __init__(self):
+        Gtk.Toolbar.__init__(self)
+
+        self.close_button = ToolButton(icon_name='dialog-cancel')
+        self.close_button.set_tooltip(_('Close'))
+        self.insert(self.close_button, -1)
+        self.close_button.show()
+
+        self._label = Gtk.Label()
+        self._label.set_alignment(0, 0.5)
+
+        tool_item = Gtk.ToolItem()
+        tool_item.set_expand(True)
+        tool_item.add(self._label)
+        self._label.show()
+        self.insert(tool_item, 0)
+        tool_item.show()
+
+    def set_title(self, title):
+        '''
+        setter function for 'title' property.
+        Args:
+           title (str): title for the pop-up window
+        '''
+        self._label.set_markup('<b>%s</b>' % title)
+        self._label.show()
+
+    title = GObject.Property(type=str, setter=set_title)
diff --git a/src/sugar3/graphics/radiotoolbutton.py b/src/sugar3/graphics/radiotoolbutton.py
index bb3223d..3d7e74d 100644
--- a/src/sugar3/graphics/radiotoolbutton.py
+++ b/src/sugar3/graphics/radiotoolbutton.py
@@ -16,9 +16,19 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-STABLE.
-"""
+'''
+Provides a RadioToolButton class, similar to a "push" button.
+A group of RadioToolButtons can be set, so that only one can be
+selected at a time. When a button is clicked, it depresses and
+is shaded darker.
+
+It is also possible to set a tooltip to be dispalyed when the
+user scrolls over it with their cursor as well as an accelerator
+keyboard shortcut.
+
+Example:
+    .. literalinclude:: ../examples/radiotoolbutton.py
+'''
 
 from gi.repository import Gtk
 from gi.repository import GObject
@@ -29,7 +39,24 @@
 
 
 class RadioToolButton(Gtk.RadioToolButton):
-    """An implementation of a "push" button."""
+    '''
+    An implementation of a "push" button.
+
+    Args:
+        icon_name (string): name of icon to be used
+
+    Keyword Args:
+
+        accelerator (string): keyboard shortcut to be used to
+        activate this button
+
+        tooltip (string): tooltip to be displayed when user hovers over button
+
+        xo_color (sugar3.graphics.xocolor.XoColor): XoColor of button
+
+        hide_tooltip_on_click (bool): Whether or not the tooltip
+            is hidden when user clicks on button
+    '''
 
     __gtype_name__ = 'SugarRadioToolButton'
 
@@ -48,6 +75,11 @@
         if icon_name:
             self.set_icon_name(icon_name)
 
+        # HACK: stop Gtk from adding a label and expanding the size of
+        # the button. This happen when set_icon_widget is called
+        # if label_widget is None
+        self.props.label_widget = Gtk.Box()
+
         self.connect('destroy', self.__destroy_cb)
 
     def __destroy_cb(self, icon):
@@ -55,6 +87,13 @@
             self._palette_invoker.detach()
 
     def set_tooltip(self, tooltip):
+        '''
+        Sets the tooltip of the radiotoolbutton. Displays when
+        user hovers over the button with cursor.
+
+        Args:
+            tooltip (string): tooltip to be added to the button
+        '''
         if self.palette is None or self._tooltip is None:
             self.palette = Palette(tooltip)
         elif self.palette is not None:
@@ -66,28 +105,50 @@
         Gtk.RadioToolButton.set_label(self, tooltip)
 
     def get_tooltip(self):
+        '''
+        Returns the tooltip
+        '''
         return self._tooltip
 
     tooltip = GObject.property(type=str, setter=set_tooltip,
                                getter=get_tooltip)
 
     def set_accelerator(self, accelerator):
+        '''
+        Sets keyboard shortcut that activates this button
+
+        Args:
+            accelerator (string): accelerator to be set. Should be in
+            form <modifier>Letter
+        '''
         self._accelerator = accelerator
         toolbutton.setup_accelerator(self)
 
     def get_accelerator(self):
+        '''
+        Returns accelerator string
+        '''
         return self._accelerator
 
     accelerator = GObject.property(type=str, setter=set_accelerator,
                                    getter=get_accelerator)
 
     def set_icon_name(self, icon_name):
+        '''
+        Sets name of icon
+
+        Args:
+            icon_name (string): name of icon
+        '''
         icon = Icon(icon_name=icon_name,
                     xo_color=self._xo_color)
         self.set_icon_widget(icon)
         icon.show()
 
     def get_icon_name(self):
+        '''
+        Returns icon name
+        '''
         if self.props.icon_widget is not None:
             return self.props.icon_widget.props.icon_name
         else:
@@ -97,12 +158,21 @@
                                  getter=get_icon_name)
 
     def set_xo_color(self, xo_color):
+        '''
+        Sets XoColor of button icon
+
+        Args:
+            xo_color (sugar3.graphics.xocolor.XoColor): xocolor to be set
+        '''
         if self._xo_color != xo_color:
             self._xo_color = xo_color
             if self.props.icon_widget is not None:
                 self.props.icon_widget.props.xo_color = xo_color
 
     def get_xo_color(self):
+        '''
+        Returns xocolor
+        '''
         return self._xo_color
 
     xo_color = GObject.property(type=object, setter=set_xo_color,
@@ -131,6 +201,9 @@
         type=object, setter=set_palette_invoker, getter=get_palette_invoker)
 
     def do_draw(self, cr):
+        '''
+        Implementation method for drawing the button
+        '''
         if self.palette and self.palette.is_up():
             allocation = self.get_allocation()
             # draw a black background, has been done by the engine before
@@ -147,9 +220,21 @@
         return False
 
     def get_hide_tooltip_on_click(self):
+        '''
+        Returns True if the tooltip is hidden when a user
+        clicks on the button, otherwise returns false
+        '''
         return self._hide_tooltip_on_click
 
     def set_hide_tooltip_on_click(self, hide_tooltip_on_click):
+        '''
+        Sets whether or not the tooltip is hidden when a user
+        clicks on the radiotoolbutton.
+
+        Args:
+            hide_tooltip_on_click (bool): True if the tooltip is
+            hidden on click, and False otherwise
+        '''
         if self._hide_tooltip_on_click != hide_tooltip_on_click:
             self._hide_tooltip_on_click = hide_tooltip_on_click
 
@@ -158,5 +243,8 @@
         setter=set_hide_tooltip_on_click)
 
     def do_clicked(self):
+        '''
+        Implementation method for hiding the tooltip when the button is clicked
+        '''
         if self._hide_tooltip_on_click and self.palette:
             self.palette.popdown(True)
diff --git a/src/sugar3/graphics/scrollingdetector.py b/src/sugar3/graphics/scrollingdetector.py
index e56dda7..c0b483b 100644
--- a/src/sugar3/graphics/scrollingdetector.py
+++ b/src/sugar3/graphics/scrollingdetector.py
@@ -15,16 +15,38 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
+'''
+ScrollingDetector emits signals when a ScrolledWindow starts and
+finish scrolling. Other widgets can use that information to
+avoid doing performance-expensive operations.
+
+Example:
+
+.. literalinclude:: ../examples/scrollingdetector.py
+'''
+
+
 from gi.repository import GObject
 from gi.repository import GLib
 
 
 class ScrollingDetector(GObject.GObject):
-    """
-    ScollingDetector emit signals when a ScrolledWindow starts and
-    finish scrolling. Other widets can use that information to
-    avoid do performance expensive operations.
-    """
+    '''
+    The scrolling detector sends signals when a scrolled window is scrolled and 
+    when a scrolled window stops scrolling. Only one `scroll-start` signal will be
+	emitted until scrolling stops.
+    
+    The `scroll-start` signal is emitted when scrolling begins and
+    The `scroll-end` signal is emitted when scrolling ends
+    Neither of these two signals have any arguments
+    
+    Args:
+        scrolled_window (Gtk.ScrolledWindow): A GTK scrolled window object for which
+            scrolling is to be detected
+        
+        timeout (int): time in milliseconds to establish the interval for which
+            scrolling is detected
+    '''
 
     scroll_start_signal = GObject.Signal('scroll-start')
     scroll_end_signal = GObject.Signal('scroll-end')
@@ -39,6 +61,14 @@
         GObject.GObject.__init__(self)
 
     def connect_scrolled_window(self):
+        '''
+        Connects scrolling detector to a scrolled window.
+        Detects scrolling when the vertical scrollbar
+        adjustment value is changed
+        
+        Should be used to link an instance of a scrolling detector
+        to a Scrolled Window, after setting scrolled_window
+        '''
         adj = self._scrolled_window.get_vadjustment()
         adj.connect('value-changed', self._value_changed_cb)
 
diff --git a/src/sugar3/graphics/style.py b/src/sugar3/graphics/style.py
index d8d8589..694bd90 100644
--- a/src/sugar3/graphics/style.py
+++ b/src/sugar3/graphics/style.py
@@ -15,12 +15,14 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
+'''
+The style module defines constants for spacing and sizing, as well as classes for 
+Colors and Fonts. Text rendering is handled by Pango and colors are inputted by their
+HTML code (e.g. #FFFFFFFF)
+
 All the constants are expressed in pixels. They are defined for the XO screen
 and are usually adapted to different resolution by applying a zoom factor.
-
-STABLE.
-"""
+'''
 
 import os
 import logging
@@ -36,6 +38,10 @@
 
 
 def _compute_zoom_factor():
+    '''
+    Calculates zoom factor based on size of screen. 
+    Returns double representing fraction of maximum possible screen size
+    '''
     try:
         scaling = int(os.environ.get('SUGAR_SCALING', '100'))
         return scaling / 100.0
@@ -46,39 +52,75 @@
 
 
 class Font(object):
-
+    '''
+    A font defines the style of how the text should be rendered. 
+    
+    Args:
+        desc (str): a description of the Font object
+    '''
     def __init__(self, desc):
         self._desc = desc
 
     def __str__(self):
+        '''
+        Returns description of font
+        '''
         return self._desc
 
     def get_pango_desc(self):
+        '''
+        Returns Pango description of font
+        '''
         return Pango.FontDescription(self._desc)
 
 
 class Color(object):
-
+    '''
+    A Color object defines a specific color. 
+
+    Args:
+        color (str): String in the form #FFFFFF representing the color
+        
+        alpha (double):  transparency of color
+    '''
     def __init__(self, color, alpha=1.0):
         self._r, self._g, self._b = self._html_to_rgb(color)
         self._a = alpha
 
     def get_rgba(self):
+        '''
+        Returns 4-tuple of red, green, blue, and alpha levels in range 0-1
+        '''
         return (self._r, self._g, self._b, self._a)
 
     def get_int(self):
+        '''
+        Returns color encoded as an int, in the form rgba
+        '''
         return int(self._a * 255) + (int(self._b * 255) << 8) + \
             (int(self._g * 255) << 16) + (int(self._r * 255) << 24)
 
     def get_gdk_color(self):
+        '''
+        Returns GDK standard color
+        '''
         return Gdk.Color(int(self._r * 65535), int(self._g * 65535),
                          int(self._b * 65535))
 
     def get_html(self):
+        '''
+        Returns string in the standard html Color format (#FFFFFF)
+        '''
         return '#%02x%02x%02x' % (self._r * 255, self._g * 255, self._b * 255)
 
     def _html_to_rgb(self, html_color):
-        """ #RRGGBB -> (r, g, b) tuple (in float format) """
+        '''
+        Converts and returns (r, g, b) tuple in float format from standard HTML format (#FFFFFF).
+        Colors will be in range 0-1
+        
+        Args:
+            html_color (string): html string in the format #FFFFFF
+        '''
 
         html_color = html_color.strip()
         if html_color[0] == '#':
@@ -93,6 +135,11 @@
         return (r, g, b)
 
     def get_svg(self):
+        '''
+        Returns HTML formatted color, unless the color is completely transparent, in
+        which case returns "none"
+        '''
+        
         if self._a == 0.0:
             return 'none'
         else:
@@ -100,6 +147,12 @@
 
 
 def zoom(units):
+    '''
+    Returns size of units pixels at current zoom level
+    
+    Args:
+        units (int): size of item at full size
+    '''
     return int(ZOOM_FACTOR * units)
 
 
@@ -116,9 +169,13 @@
 LARGE_ICON_SIZE = zoom(55 * 2.0)
 XLARGE_ICON_SIZE = zoom(55 * 2.75)
 
-settings = Gio.Settings('org.sugarlabs.font')
-FONT_SIZE = settings.get_double('default-size')
-FONT_FACE = settings.get_string('default-face')
+if 'org.sugarlabs.font' in Gio.Settings.list_schemas():
+    settings = Gio.Settings('org.sugarlabs.font')
+    FONT_SIZE = settings.get_double('default-size')
+    FONT_FACE = settings.get_string('default-face')
+else:
+    FONT_SIZE = 10
+    FONT_FACE = 'Sans Serif' 
 
 FONT_NORMAL = Font('%s %f' % (FONT_FACE, FONT_SIZE))
 FONT_BOLD = Font('%s bold %f' % (FONT_FACE, FONT_SIZE))
diff --git a/src/sugar3/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py
index 6d3c7bd..76f0f94 100644
--- a/src/sugar3/graphics/toggletoolbutton.py
+++ b/src/sugar3/graphics/toggletoolbutton.py
@@ -36,7 +36,7 @@
 
     # TODO: should we remove the accelerator from the prev top level?
     if not hasattr(tool_button.get_toplevel(), 'sugar_accel_group'):
-        logging.warning('No Gtk.AccelGroup in the top level window.')
+        logging.debug('No Gtk.AccelGroup in the top level window.')
         return
 
     accel_group = tool_button.get_toplevel().sugar_accel_group
diff --git a/src/sugar3/graphics/toolbarbox.py b/src/sugar3/graphics/toolbarbox.py
index 6c7a5bc..ee2b4cb 100644
--- a/src/sugar3/graphics/toolbarbox.py
+++ b/src/sugar3/graphics/toolbarbox.py
@@ -130,6 +130,7 @@
         alloc = self.get_allocation()
         context = self.get_style_context()
         context.add_class('toolitem')
+        context.add_class('toolbar-down')
         if not self.is_expanded() or self.props.palette is not None and \
                 self.props.palette.is_up():
             ToolButton.do_draw(self, cr)
@@ -143,6 +144,8 @@
 
 class ToolbarBox(Gtk.VBox):
 
+    __gtype_name__ = 'SugarToolbarBox'
+
     def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING):
         GObject.GObject.__init__(self)
         self._expanded_button_index = -1
@@ -200,6 +203,8 @@
         if button == self.expanded_button:
             self.remove(button.page_widget)
             self._expanded_button_index = -1
+if hasattr(ToolbarBox, 'set_css_name'):
+    ToolbarBox.set_css_name('toolbarbox')
 
 
 class _ToolbarPalette(PaletteWindow):
diff --git a/src/sugar3/graphics/toolbox.py b/src/sugar3/graphics/toolbox.py
index 5e0ee55..5cd41f1 100644
--- a/src/sugar3/graphics/toolbox.py
+++ b/src/sugar3/graphics/toolbox.py
@@ -15,9 +15,11 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-STABLE.
-"""
+'''
+A toolbox holds a group of toolbars in a list. One toolbar is displayed
+at a time. Toolbars are assigned an index and can be accessed using this index.
+Indices are generated in the order the toolbars are added.
+'''
 
 from gi.repository import Gtk
 from gi.repository import GObject
@@ -26,6 +28,15 @@
 
 
 class Toolbox(Gtk.VBox):
+    '''
+    Class to represent the toolbox of an activity. Groups a
+    number of toolbars vertically, which can be accessed using their
+    indices. The current toolbar is the only one displayed.
+    
+    Emits `current-toolbar-changed` signal when the
+    current toolbar is changed. This signal takes the current page index
+    as an argument.
+    '''
 
     __gtype_name__ = 'SugarToolbox'
 
@@ -58,6 +69,17 @@
         self.emit('current-toolbar-changed', notebook.props.page)
 
     def add_toolbar(self, name, toolbar):
+        '''
+        Adds a toolbar to this toolbox. Toolbar will be added
+        to the end of this toolbox, and it's index will be 
+        1 greater than the previously added index (index will be
+        0 if it is the first toolbar added).
+        
+        Args:
+            name (string): name of toolbar to be added
+            
+            toolbar (.. :class:`Gtk.Toolbar`): Gtk.Toolbar to be appended to this toolbox
+        '''
         label = Gtk.Label(label=name)
         req = label.size_request()
         label.set_size_request(max(req.width, style.TOOLBOX_TAB_LABEL_WIDTH),
@@ -82,6 +104,12 @@
             self._separator.show()
 
     def remove_toolbar(self, index):
+        '''
+        Removes toolbar at the index specified.
+        
+        Args:
+            index (int): index of the toolbar to be removed
+        '''
         self._notebook.remove_page(index)
 
         if self._notebook.get_n_pages() < 2:
@@ -89,9 +117,19 @@
             self._separator.hide()
 
     def set_current_toolbar(self, index):
+        '''
+        Sets the current toolbar to that of the index specified and 
+        displays it.
+        
+        Args:
+            index (int): index of toolbar to be set as current toolbar
+        '''
         self._notebook.set_current_page(index)
 
     def get_current_toolbar(self):
+        '''
+        Returns current toolbar.
+        '''
         return self._notebook.get_current_page()
 
     current_toolbar = property(get_current_toolbar, set_current_toolbar)
diff --git a/src/sugar3/graphics/toolbutton.py b/src/sugar3/graphics/toolbutton.py
index 865cdcf..63a6da3 100644
--- a/src/sugar3/graphics/toolbutton.py
+++ b/src/sugar3/graphics/toolbutton.py
@@ -36,7 +36,7 @@
 
     # TODO: should we remove the accelerator from the prev top level?
     if not hasattr(tool_button.get_toplevel(), 'sugar_accel_group'):
-        logging.warning('No Gtk.AccelGroup in the top level window.')
+        logging.debug('No Gtk.AccelGroup in the top level window.')
         return
 
     accel_group = tool_button.get_toplevel().sugar_accel_group
diff --git a/src/sugar3/graphics/tray.py b/src/sugar3/graphics/tray.py
index 21f7f0d..e44334e 100644
--- a/src/sugar3/graphics/tray.py
+++ b/src/sugar3/graphics/tray.py
@@ -323,6 +323,8 @@
 
     def scroll_to_item(self, item):
         self._viewport.scroll_to_item(item)
+if hasattr(HTray, 'set_css_name'):
+    HTray.set_css_name('htray')
 
 
 class VTray(Gtk.EventBox):
@@ -414,6 +416,8 @@
 
     def scroll_to_item(self, item):
         self._viewport.scroll_to_item(item)
+if hasattr(VTray, 'set_css_name'):
+    VTray.set_css_name('VTray')
 
 
 class TrayButton(ToolButton):
diff --git a/src/sugar3/graphics/window.py b/src/sugar3/graphics/window.py
index 43ad2f7..510949b 100644
--- a/src/sugar3/graphics/window.py
+++ b/src/sugar3/graphics/window.py
@@ -20,6 +20,9 @@
 STABLE.
 """
 
+import gi
+gi.require_version('GdkX11', '3.0')
+
 from gi.repository import GObject
 from gi.repository import GLib
 from gi.repository import Gdk
@@ -35,6 +38,12 @@
 
 
 class UnfullscreenButton(Gtk.Window):
+    """
+    A ready-made "Unfullscreen" button.
+
+    The type of button used by :class:`sugar3.graphics.window.Window` to exit
+    fullscreen mode when in fullscreen mode.
+    """
 
     def __init__(self):
         Gtk.Window.__init__(self)
@@ -84,6 +93,15 @@
 
 
 class Window(Gtk.Window):
+    """
+    UI interface for activity Windows
+
+    Windows are used as a container to display things that happen in an
+    activity. They contain canvas content, alerts messages, a tray and a
+    toolbar. Windows can either be in fullscreen or non-fullscreen mode.
+    Note that the toolbar is hidden in fullscreen mode, while it is visible in
+    non-fullscreen mode.
+    """
 
     def __init__(self, **args):
         self._enable_fullscreen_mode = True
@@ -131,11 +149,12 @@
         self._unfullscreen_button_timeout_id = None
 
     def reveal(self):
-        """ Make window active
-
-        In contrast with present(), brings window to the top
-        even after invoking on response on non-gtk events.
-        See #1423.
+        """
+        Make window active.
+
+        Brings the window to the top and makes it acive, even after invoking on
+        response to non-gtk events (in contrast to present()).
+        See bug #1423
         """
         window = self.get_window()
         if window is None:
@@ -147,9 +166,18 @@
         window.focus(timestamp)
 
     def is_fullscreen(self):
+        """
+        Check whether the window is fullscreen or not.
+
+        Returns:
+            bool: true if window is fullscreen, false otherwise
+        """
         return self._is_fullscreen
 
     def fullscreen(self):
+        """
+        Make the window fullscreen and hide the toolbar.
+        """
         palettegroup.popdown_all()
         if self._toolbar_box is not None:
             self._toolbar_box.hide()
@@ -171,6 +199,9 @@
                     self.__unfullscreen_button_timeout_cb)
 
     def unfullscreen(self):
+        """
+        Put the window in non-fullscreen mode and make the toolbar visible.
+        """
         if self._toolbar_box is not None:
             self._toolbar_box.show()
         if self.tray is not None:
@@ -186,6 +217,12 @@
                 self._unfullscreen_button_timeout_id = None
 
     def set_canvas(self, canvas):
+        """
+        Set current canvas of the window.
+
+        Args:
+            canvas (:class:`Gtk.Widget`): the canvas to set as current
+        """
         if self._canvas:
             self.__hbox.remove(self._canvas)
 
@@ -196,14 +233,32 @@
         self.__vbox.set_focus_child(self._canvas)
 
     def get_canvas(self):
+        """
+        Get current canvas content of the window.
+
+        Returns:
+            Gtk.Widget: the current canvas of the window
+        """
         return self._canvas
 
     canvas = property(get_canvas, set_canvas)
 
     def get_toolbar_box(self):
+        """
+        Return window's current toolbar.
+
+        Returns:
+            sugar3.graphics.toolbar_box.ToolbarBox: the current toolbar box of the window
+        """
         return self._toolbar_box
 
     def set_toolbar_box(self, toolbar_box):
+        """
+        Set window's current toolbar.
+
+        Args:
+            toolbar_box (:class:`sugar3.graphics.toolbarbox.ToolbarBox`): the toolbar box to set as current
+        """
         if self._toolbar_box:
             self.__vbox.remove(self._toolbar_box)
 
@@ -216,6 +271,13 @@
     toolbar_box = property(get_toolbar_box, set_toolbar_box)
 
     def set_tray(self, tray, position):
+        """
+        Set the window's current tray.
+
+        Args:
+            tray (:class:`sugar3.graphics.tray.HTray` or :class:`sugar3.graphics.tray.VTray`): the tray to set
+            position (Gtk.PositionType constant): the edge to set the tray at
+        """
         if self.tray:
             box = self.tray.get_parent()
             box.remove(self.tray)
@@ -230,6 +292,14 @@
         self.tray = tray
 
     def add_alert(self, alert):
+        """
+        Add an alert message to the window.
+        Add an alert to the window. Note that you do need to .show the alert
+        to make it visible.
+
+        Args:
+            alert (:class:`sugar3.graphics.alert.Alert`): the alert to add
+        """
         self._alerts.append(alert)
         if len(self._alerts) == 1:
             self.__vbox.pack_start(alert, False, False, 0)
@@ -239,6 +309,12 @@
                 self.__vbox.reorder_child(alert, 0)
 
     def remove_alert(self, alert):
+        """
+        Remove an alert message from the window.
+
+        Args:
+            alert (:class:`sugar3.graphics.alert.Alert`): the alert to remove
+        """
         if alert in self._alerts:
             self._alerts.remove(alert)
             # if the alert is the visible one on top of the queue
@@ -320,9 +396,21 @@
         self.__vbox.size_allocate(allocation)
 
     def set_enable_fullscreen_mode(self, enable_fullscreen_mode):
+        """
+        Set whether the window is allowed to enter fullscreen mode.
+
+        Args:
+            enable_fullscreen_mode (bool): the boolean to set `_enable_fullscreen_mode` to
+        """
         self._enable_fullscreen_mode = enable_fullscreen_mode
 
     def get_enable_fullscreen_mode(self):
+        """
+        Return whether the window is allowed to enter fullscreen mode.
+
+        Returns:
+            bool: true if window is allowed to be fullscreen, false otherwise
+        """
         return self._enable_fullscreen_mode
 
     enable_fullscreen_mode = GObject.property(
diff --git a/src/sugar3/graphics/xocolor.py b/src/sugar3/graphics/xocolor.py
index 8bad0d9..4c6e33a 100644
--- a/src/sugar3/graphics/xocolor.py
+++ b/src/sugar3/graphics/xocolor.py
@@ -15,9 +15,10 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-"""
-STABLE.
-"""
+'''
+This class represents all of the colors that the XO can take on.
+Each pair of colors represents the fill color and the stroke color
+'''
 
 import random
 import logging
@@ -207,6 +208,12 @@
 
 
 def _parse_string(color_string):
+    '''
+    Returns array of length 2 of two colors in standard html form of [stroke color, fill color]
+    
+    Args:
+        color_string (string): two html format strings separated by a comma
+    '''
     if not isinstance(color_string, (str, unicode)):
         logging.error('Invalid color string: %r', color_string)
         return None
@@ -224,13 +231,22 @@
 
 
 class XoColor:
-
+    '''
+    Defines color for XO
+    
+    Args:
+        color_string (string): two html format strings separated 
+		    by a comma, "white", or "insensitive". If color_string 
+		    is None, the user's color will be created. If parsed_color 
+		    cannot be created, a random color will be used
+    '''
     def __init__(self, color_string=None):
         parsed_color = None
 
         if color_string is None:
-            settings = Gio.Settings('org.sugarlabs.user')
-            color_string = settings.get_string('color')
+            if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
+                settings = Gio.Settings('org.sugarlabs.user')
+                color_string = settings.get_string('color')
 
         if color_string is not None:
             parsed_color = _parse_string(color_string)
@@ -242,18 +258,34 @@
             [self.stroke, self.fill] = parsed_color
 
     def __cmp__(self, other):
+        '''
+        Compares two XO colors by their stroke and fill color
+        Returns 0 if they are equal and -1 if they are unequal
+        
+        Args:
+            other (object): other XO color to compare
+        '''
         if isinstance(other, XoColor):
             if self.stroke == other.stroke and self.fill == other.fill:
                 return 0
         return -1
 
     def get_stroke_color(self):
+        '''
+        Returns stroke color in standard HTML format (#FFFFFF)
+        '''
         return self.stroke
 
     def get_fill_color(self):
+        '''
+        Returns fill color in standard HTML format (#FFFFFF)
+        '''
         return self.fill
 
     def to_string(self):
+        '''
+        Returns a formatted string in the format #STROKEHEX,#FILLHEX
+        '''
         return '%s,%s' % (self.stroke, self.fill)
 
 
diff --git a/src/sugar3/logger.py b/src/sugar3/logger.py
index 2a3ac22..da5a6f1 100644
--- a/src/sugar3/logger.py
+++ b/src/sugar3/logger.py
@@ -105,16 +105,21 @@
                 os.remove(os.path.join(root, f))
             os.rmdir(root)
         except OSError, e:
-            print "Could not remove old logs filesi %s" % e
+            print "Could not remove old logs files %s" % e
 
     if len(backup_logs) > 0:
         name = str(int(time.time()))
         backup_dir = os.path.join(logs_dir, name)
-        os.mkdir(backup_dir)
-        for log in backup_logs:
-            source_path = os.path.join(logs_dir, log)
-            dest_path = os.path.join(backup_dir, log)
-            os.rename(source_path, dest_path)
+        try:
+            os.mkdir(backup_dir)
+            for log in backup_logs:
+                source_path = os.path.join(logs_dir, log)
+                dest_path = os.path.join(backup_dir, log)
+                os.rename(source_path, dest_path)
+        except OSError, e:
+            # gracefully deal w/ disk full
+            if e.errno != errno.ENOSPC:
+                raise e
 
 
 def start(log_filename=None):
diff --git a/src/sugar3/presence/Makefile.in b/src/sugar3/presence/Makefile.in
index ee18b3d..64b4a80 100644
--- a/src/sugar3/presence/Makefile.in
+++ b/src/sugar3/presence/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/presence/activity.py b/src/sugar3/presence/activity.py
index 909fb07..65c00e3 100644
--- a/src/sugar3/presence/activity.py
+++ b/src/sugar3/presence/activity.py
@@ -554,6 +554,7 @@
         self._finished = False
         self.room_handle = room_handle
         self._global_self_handle = None
+        self._tubes_supported = True
 
     def run(self):
         if self._finished:
@@ -581,7 +582,7 @@
             self.room_handle,
             True,
             reply_handler=self.__create_tubes_channel_cb,
-            error_handler=self.__error_handler_cb,
+            error_handler=self.__tubes_error_handler_cb,
             dbus_interface=CONNECTION)
 
     def __create_text_channel_cb(self, channel_path):
@@ -591,6 +592,15 @@
     def __create_tubes_channel_cb(self, channel_path):
         Channel(self._connection.requested_bus_name, channel_path,
                 ready_handler=self.__tubes_channel_ready_cb)
+
+    def __tubes_error_handler_cb(self, error):
+        if (error.get_dbus_name() ==
+                'org.freedesktop.Telepathy.Error.NotImplemented'):
+            self._tubes_supported = False
+            self._tubes_ready()
+        else:
+            self._finished = True
+            self.emit('finished', error)
 
     def __error_handler_cb(self, error):
         self._finished = True
@@ -608,7 +618,7 @@
 
     def _tubes_ready(self):
         if self.text_channel is None or \
-                self.tubes_channel is None:
+                (self._tubes_supported and self.tubes_channel is None):
             return
 
         _logger.debug('%r: finished setting up tubes' % self)
diff --git a/src/sugar3/presence/buddy.py b/src/sugar3/presence/buddy.py
index 4605162..2533a3d 100644
--- a/src/sugar3/presence/buddy.py
+++ b/src/sugar3/presence/buddy.py
@@ -24,7 +24,6 @@
 import logging
 
 from gi.repository import GObject
-from gi.repository import Gio
 import dbus
 from telepathy.interfaces import CONNECTION, \
     CONNECTION_INTERFACE_ALIASING, \
@@ -32,6 +31,7 @@
 from telepathy.constants import HANDLE_TYPE_CONTACT
 
 from sugar3.presence.connectionmanager import get_connection_manager
+from sugar3.profile import get_color, get_nick_name
 
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
@@ -243,6 +243,6 @@
     def __init__(self):
         BaseBuddy.__init__(self)
 
-        settings = Gio.Settings('org.sugarlabs.user')
-        self.props.nick = settings.get_string('nick')
-        self.props.color = settings.get_string('color')
+        self.props.nick = get_nick_name()
+        self.props.color = get_color().to_string()
+
diff --git a/src/sugar3/presence/presenceservice.py b/src/sugar3/presence/presenceservice.py
index 8fb3870..8b66b0e 100644
--- a/src/sugar3/presence/presenceservice.py
+++ b/src/sugar3/presence/presenceservice.py
@@ -91,6 +91,11 @@
                     if e.get_dbus_name() == name:
                         logging.debug("There's no shared activity with the id "
                                       "%s" % activity_id)
+                    elif e.get_dbus_name() == \
+                         'org.freedesktop.DBus.Error.UnknownMethod':
+                        logging.warning(
+                            'Telepathy Account %r does not support '
+                            'Sugar collaboration', account_path)
                     else:
                         raise
                 else:
diff --git a/src/sugar3/profile.py b/src/sugar3/profile.py
index 950b5f8..d7f92e7 100644
--- a/src/sugar3/profile.py
+++ b/src/sugar3/profile.py
@@ -27,6 +27,7 @@
 from sugar3 import util
 from sugar3.graphics.xocolor import XoColor
 
+import getpass
 
 _profile = None
 
@@ -62,9 +63,8 @@
     privkey_hash = property(fget=_get_privkey_hash)
 
     def is_valid(self):
-        settings = Gio.Settings('org.sugarlabs.user')
-        nick = settings.get_string('nick')
-        color = settings.get_string('color')
+        nick = get_nick_name()
+        color = get_color()
 
         return nick is not '' and \
             color is not '' and \
@@ -204,14 +204,20 @@
 
 
 def get_nick_name():
-    settings = Gio.Settings('org.sugarlabs.user')
-    return settings.get_string('nick')
+    if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
+        settings = Gio.Settings('org.sugarlabs.user')
+        return settings.get_string('nick')
+    else:
+        return getpass.getuser()
 
 
 def get_color():
-    settings = Gio.Settings('org.sugarlabs.user')
-    color = settings.get_string('color')
-    return XoColor(color)
+    if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
+        settings = Gio.Settings('org.sugarlabs.user')
+        color = settings.get_string('color')
+        return XoColor(color)
+    else:
+        return XoColor()
 
 
 def get_pubkey():
diff --git a/src/sugar3/speech.py b/src/sugar3/speech.py
index 10777ee..a5936ad 100644
--- a/src/sugar3/speech.py
+++ b/src/sugar3/speech.py
@@ -47,73 +47,136 @@
 # If espeak add new voices, we need update this list.
 
 translated_espeak_voices = {
+    # Translators:  http://en.wikipedia.org/wiki/Afrikaans_language
     'af': _('Afrikaans'),
+    # Translators:  http://en.wikipedia.org/wiki/Aragonese_language
     'an': _('Aragonese'),
+    # Translators:  http://en.wikipedia.org/wiki/Bulgarian_language
     'bg': _('Bulgarian'),
+    # Translators:  http://en.wikipedia.org/wiki/Bosnian_language
     'bs': _('Bosnian'),
+    # Translators:  http://en.wikipedia.org/wiki/Catalan_language
     'ca': _('Catalan'),
+    # Translators:  http://en.wikipedia.org/wiki/Czech_language
     'cs': _('Czech'),
+    # Translators:  http://en.wikipedia.org/wiki/Welsh_language
     'cy': _('Welsh'),
+    # Translators:  http://en.wikipedia.org/wiki/Danish_language
     'da': _('Danish'),
+    # Translators:  http://en.wikipedia.org/wiki/German_language
     'de': _('German'),
+    # Translators:  http://en.wikipedia.org/wiki/Modern_Greek
     'el': _('Greek'),
     'en': _('Default'),
+    # Translators:  http://en.wikipedia.org/wiki/British_English
     'en_gb': _('English Britain'),
+    # Translators:  http://en.wikipedia.org/wiki/Scottish_English
     'en_sc': _('English scottish'),
     'en_uk-north': _('English-north'),
+    # Translators:  http://en.wikipedia.org/wiki/Received_Pronunciation
     'en_uk-rp': _('English_rp'),
+    # Translators:  http://en.wikipedia.org/wiki/West_Midlands_English
     'en_uk-wmids': _('English_wmids'),
+    # Translators:  http://en.wikipedia.org/wiki/American_English
     'en_us': _('English USA'),
-    'en_wi': _('English west indies'),
+    # Translators:  http://en.wikipedia.org/wiki/Caribbean_English
+    'en_wi': _('English West Indies'),
+    # Translators:  http://en.wikipedia.org/wiki/Esperanto
     'eo': _('Esperanto'),
+    # Translators:  http://en.wikipedia.org/wiki/Spanish_language
     'es': _('Spanish'),
     'es_la': _('Spanish latin american'),
+    # Translators:  http://en.wikipedia.org/wiki/Estonian_language
     'et': _('Estonian'),
+    # Translators:  http://en.wikipedia.org/wiki/Persian_language
     'fa': _('Farsi'),
+    # Translators:  http://en.wikipedia.org/wiki/Fingilish
     'fa_pin': _('Farsi-pinglish'),
+    # Translators:  http://en.wikipedia.org/wiki/Finnish_language
     'fi': _('Finnish'),
+    # Translators:  http://en.wikipedia.org/wiki/Belgian_French
     'fr_be': _('French belgium'),
+    # Translators:  http://en.wikipedia.org/wiki/French_language
     'fr_fr': _('French'),
+    # Translators:  http://en.wikipedia.org/wiki/Irish_language
     'ga': _('Irish-gaeilge'),
+    # Translators:  http://en.wikipedia.org/wiki/Ancient_Greek
     'grc': _('Greek-ancient'),
+    # Translators:  http://en.wikipedia.org/wiki/Hindi
     'hi': _('Hindi'),
+    # Translators:  http://en.wikipedia.org/wiki/Croatian_language
     'hr': _('Croatian'),
+    # Translators:  http://en.wikipedia.org/wiki/Hungarian_language
     'hu': _('Hungarian'),
+    # Translators:  http://en.wikipedia.org/wiki/Armenian_language
     'hy': _('Armenian'),
+    # Translators:  http://en.wikipedia.org/wiki/Western_Armenian
     'hy_west': _('Armenian (west)'),
+    # Translators:  http://en.wikipedia.org/wiki/Indonesian_language
     'id': _('Indonesian'),
+    # Translators:  http://en.wikipedia.org/wiki/Icelandic_language
     'is': _('Icelandic'),
+    # Translators:  http://en.wikipedia.org/wiki/Italian_language
     'it': _('Italian'),
+    # Translators:  http://en.wikipedia.org/wiki/Lojban
     'jbo': _('Lojban'),
+    # Translators:  http://en.wikipedia.org/wiki/Georgian_language
     'ka': _('Georgian'),
+    # Translators:  http://en.wikipedia.org/wiki/Kannada_language
     'kn': _('Kannada'),
+    # Translators:  http://en.wikipedia.org/wiki/Kurdish_language
     'ku': _('Kurdish'),
+    # Translators:  http://en.wikipedia.org/wiki/Latin
     'la': _('Latin'),
+    # Translators:  http://en.wikipedia.org/wiki/Lithuanian_language
     'lt': _('Lithuanian'),
+    # Translators:  http://en.wikipedia.org/wiki/Latvian_language
     'lv': _('Latvian'),
+    # Translators:  http://en.wikipedia.org/wiki/Macedonian_language
     'mk': _('Macedonian'),
+    # Translators:  http://en.wikipedia.org/wiki/Malayalam
     'ml': _('Malayalam'),
+    # Translators:  http://en.wikipedia.org/wiki/Malay_language
     'ms': _('Malay'),
+    # Translators:  http://en.wikipedia.org/wiki/Nepali_language
     'ne': _('Nepali'),
+    # Translators:  http://en.wikipedia.org/wiki/Dutch_language
     'nl': _('Dutch'),
+    # Translators:  http://en.wikipedia.org/wiki/Norwegian_language
     'no': _('Norwegian'),
+    # Translators:  http://en.wikipedia.org/wiki/Punjabi_language
     'pa': _('Punjabi'),
+    # Translators:  http://en.wikipedia.org/wiki/Polish_language
     'pl': _('Polish'),
+    # Translators:  http://en.wikipedia.org/wiki/Brazilian_Portuguese
     'pt_br': _('Portuguese (Brazil)'),
+    # Translators:  http://en.wikipedia.org/wiki/Portuguese_language
     'pt_pt': _('Portuguese (Portugal)'),
+    # Translators:  http://en.wikipedia.org/wiki/Romanian_language
     'ro': _('Romanian'),
+    # Translators:  http://en.wikipedia.org/wiki/Russian_language
     'ru': _('Russian'),
+    # Translators:  http://en.wikipedia.org/wiki/Slovak_language
     'sk': _('Slovak'),
+    # Translators:  http://en.wikipedia.org/wiki/Albanian_language
     'sq': _('Albanian'),
+    # Translators:  http://en.wikipedia.org/wiki/Serbian_language
     'sr': _('Serbian'),
+    # Translators:  http://en.wikipedia.org/wiki/Swedish_language
     'sv': _('Swedish'),
-    'sw': _('Swahili-test'),
+    # Translators:  http://en.wikipedia.org/wiki/Swahili_language
+    'sw': _('Swahili'),
+    # Translators:  http://en.wikipedia.org/wiki/Tamil_language
     'ta': _('Tamil'),
+    # Translators:  http://en.wikipedia.org/wiki/Turkish_language
     'tr': _('Turkish'),
+    # Translators:  http://en.wikipedia.org/wiki/Vietnamese_language
     'vi': _('Vietnam'),
     'vi_hue': _('Vietnam_hue'),
     'vi_sgn': _('Vietnam_sgn'),
+    # Translators:  http://en.wikipedia.org/wiki/Mandarin_Chinese
     'zh': _('Mandarin'),
+    # Translators:  http://en.wikipedia.org/wiki/Cantonese
     'zh_yue': _('Cantonese')
 }
 
diff --git a/src/sugar3/sugar-marshal.c b/src/sugar3/sugar-marshal.c
index d7525dc..0e8b274 100644
--- a/src/sugar3/sugar-marshal.c
+++ b/src/sugar3/sugar-marshal.c
@@ -73,9 +73,9 @@
                                                             guint        arg_2,
                                                             guint        arg_3,
                                                             gpointer     data2);
-  register GMarshalFunc_BOOLEAN__UINT_UINT_UINT callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__UINT_UINT_UINT callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
   gboolean v_return;
 
   g_return_if_fail (return_value != NULL);
diff --git a/src/sugar3/test/Makefile.in b/src/sugar3/test/Makefile.in
index 63bafda..643d1ad 100644
--- a/src/sugar3/test/Makefile.in
+++ b/src/sugar3/test/Makefile.in
@@ -212,6 +212,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/src/sugar3/test/uitree.py b/src/sugar3/test/uitree.py
index 3e530b9..a4e8e71 100644
--- a/src/sugar3/test/uitree.py
+++ b/src/sugar3/test/uitree.py
@@ -21,6 +21,8 @@
 import logging
 import time
 
+import gi
+gi.require_version('Atspi', '2.0')
 from gi.repository import Atspi
 from gi.repository import GLib