Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides

Conflicts:
	openslides/assignment/models.py

openslides/assignment/models.py

@@ -91,7 +91,7 @@ class Assignment(models.Model, SlideMixin):
             # if the candidation is blocked and anotherone tries to run the
             # candidate
             raise NameError(
-                _('The %s does not want to be a candidate.') % candidate)
+                _('%s does not want to be a candidate.') % candidate)
         elif candidation:
             candidation[0].blocked = False
             candidation[0].save()

openslides/projector/views.py

@@ -400,7 +400,7 @@ def get_widgets(request):
     context.update(csrf(request))
     widgets.append(Widget(
         name='overlays',
-        display_name=_('Manage Overlays'),
+        display_name=_('Overlays'),
         template='projector/overlay_widget.html',
         permission_required='projector.can_manage_projector',
         default_column=2,