diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 9c072a7bc..fd215a07f 100644 Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 59f5cb72f..94517f91b 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-14 22:06+0200\n" +"POT-Creation-Date: 2012-05-14 22:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: German\n" @@ -1071,7 +1071,8 @@ msgstr "Teilnehmer/in vorschlagen" #: assignment/forms.py:39 msgid "Only publish voting results for selected winners (Projector view only)" -msgstr "Wahlergebnisse der nicht gewählten Kandidaten auf dem Projektor verbergen" +msgstr "" +"Wahlergebnisse der nicht gewählten Kandidaten auf dem Projektor verbergen" #: assignment/forms.py:59 msgid "Title for PDF document (all elections)" @@ -1516,6 +1517,10 @@ msgstr "Vorname" msgid "Last name" msgstr "Nachname" +#: participant/forms.py:62 +msgid "Persmissions" +msgstr "Rechte" + #: participant/forms.py:82 msgid "For existing applications" msgstr "Bei existierenden Anträgen" @@ -1820,9 +1825,6 @@ msgid "Edit user group" msgstr "Benutzerrolle bearbeiten" #: participant/templates/participant/group_overview.html:6 -msgid "Groups" -msgstr "Gruppen" - #: participant/templates/participant/group_overview.html:9 msgid "User groups" msgstr "Benutzerrollen" diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py index 016e114a0..e83036bc5 100644 --- a/openslides/participant/forms.py +++ b/openslides/participant/forms.py @@ -32,6 +32,7 @@ USER_APPLICATION_IMPORT_OPTIONS = [ class UserNewForm(ModelForm, CssClassMixin): first_name = CharField(label=_("First name")) last_name = CharField(label=_("Last name")) + groups = ModelMultipleChoiceField(queryset=Group.objects.all(), label=_("User groups"), required=False) class Meta: model = User @@ -41,6 +42,7 @@ class UserNewForm(ModelForm, CssClassMixin): class UserEditForm(ModelForm, CssClassMixin): first_name = CharField(label=_("First name")) last_name = CharField(label=_("Last name")) + groups = ModelMultipleChoiceField(queryset=Group.objects.all(), label=_("User groups"), required=False) class Meta: model = User @@ -59,7 +61,7 @@ class ProfileForm(ModelForm, CssClassMixin): class GroupForm(ModelForm, CssClassMixin): - permissions = LocalizedModelMultipleChoiceField(queryset=Permission.objects.all()) + permissions = LocalizedModelMultipleChoiceField(queryset=Permission.objects.all(), label=_("Persmissions")) def __init__(self, *args, **kwargs): super(GroupForm, self).__init__(*args, **kwargs) diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html index e355ccc9a..66d9153da 100644 --- a/openslides/participant/templates/participant/group_overview.html +++ b/openslides/participant/templates/participant/group_overview.html @@ -3,7 +3,7 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{{ block.super }} - {%trans "Groups" %}{% endblock %} +{% block title %}{{ block.super }} - {%trans "User groups" %}{% endblock %} {% block content %}

{%trans "User groups" %}