Commit from Sugar Labs: Translation System by user cjl.: 398 of 398 messages translated (0 fuzzy).
Merge branch 'master' of github.com:sugarlabs/sugar
Merge branch 'master' of github.com:sugarlabs/sugar
Add support for multiple homeviews

This patch adds support for multiple home views as per [1]. The number
of home views is determined by the list of VIEW_ICONS found in
/desktop/sugar/desktop/view_icons. If no gconf entry is found,
defaults from jarabe/desktop/config.py are used. The icons in the list
are used both for the home view selection on the Home View toolbar and
the favorites list in the Home List View. Just one home view, using
the view-radial icon is used by default. Similarly, in the list view,
the favorities icons are found in
/desktop/sugar/desktop/favorite_icons. If not favorite icons are
found, emblem-favorites is used.

A unittest is included.

[1] http://wiki.sugarlabs.org/go/Features/Multiple_home_views
new desktop model

(need to complete multi-desktop commit)
new unit test for multi-homeview
Update for bundle helpers change (#4527)

The new bundle helpers caused Gi to be imported when running GTK2
activities. They have been moved to a place where they are not imported
in that situation. Update the users appropriately.
adding view used by unit test
Merge branch 'master' of github.com:sugarlabs/sugar
Commit from Sugar Labs: Translation System by user cjl.: 407 of 407 messages translated (0 fuzzy).
Commit from Sugar Labs: Translation System by user cjl.: 407 of 407 messages translated (0 fuzzy).
Commit from Sugar Labs: Translation System by user cjl.: 407 of 407 messages translated (0 fuzzy).
Commit from Sugar Labs: Translation System by user samybt.: 407 of 407 messages translated (0 fuzzy).
Commit from Sugar Labs: Translation System by user cjl.: 407 of 407 messages translated (0 fuzzy).
Commit from Sugar Labs: Translation System by user cjl.: 407 of 407 messages translated (0 fuzzy).
add_bundle does not specify a favorite, so a default value must be provided to _add_bundle
Really include content bundles in bundle registry

It looks like I messed up with some rebasing and dropped a bit of
8148fdf96f58fa017e3a68dc7 before submitting.

These additional changes are needed for content bundles to actually be
indexed in the bundle registry, and hence subject to automatic updates.
Bundle registry tests

Requested during the review of automatic activity updates.
Fix pep8 errors

pep8 1.6.4 detects more issues
Show content bundles on home screen

Implements http://wiki.sugarlabs.org/go/Features/Content_support