Merge branch 'master' into bootstrap

Conflicts:
	weblate/trans/views/basic.py

weblate/trans/context_processors.py

@@ -38,15 +38,19 @@ def weblate_context(request):
     else:
         login_redirect_url = request.get_full_path()
 
+    projects = Project.objects.all_acl(request.user)
+
     # Load user translations if user is authenticated
     usertranslations = None
     if request.user.is_authenticated():
         usertranslations = Translation.objects.filter(
-            language__in=request.user.profile.languages.all()
+            language__in=request.user.profile.languages.all(),
+            subproject__project__in=projects,
         ).order_by(
             'subproject__project__name', 'subproject__name'
         ).select_related()
 
+
     return {
         'version': weblate.VERSION,
 
@@ -72,6 +76,6 @@ def weblate_context(request):
         'whiteboard_enabled': appsettings.ENABLE_WHITEBOARD,
 
         'registration_open': appsettings.REGISTRATION_OPEN,
-        'acl_projects': Project.objects.all_acl(request.user),
+        'acl_projects': projects,
         'usertranslations': usertranslations,
     }