Merge pull request #32 from emanuelschuetze/master

Some fixes for 1.3

.gitattributes

@@ -0,0 +1,4 @@
+.gitattributes 	export-ignore
+.gitignore 	export-ignore
+/docs		export-ignore
+/extras 	export-ignore

openslides/assignment/templates/assignment/view.html

@@ -101,7 +101,7 @@
             {% endif %}
         </li>
     {% empty %}
-        <li>{% trans "There are no elected candidates available." %}</li>
+        <li>{% trans "No elected candidates available." %}</li>
     {% endfor %}
     </ul>
 
@@ -113,7 +113,7 @@
             {{ person }}<a href="{% url assignment_delother assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
         </li>
     {% empty %}
-        <li>{% trans "There are no blocked candidates available." %}</li>
+        <li>{% trans "No blocked candidates available." %}</li>
     {% endfor %}
     </ul>
 {% endif %}

openslides/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-30 22:38+0100\n"
+"POT-Creation-Date: 2012-11-03 09:32+0100\n"
 "PO-Revision-Date: 2012-07-28 11:07+0200\n"
 "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
 "Language-Team: support@openslides.de\n"
@@ -41,8 +41,9 @@ msgid "Text"
 msgstr "Text"
 
 #: agenda/models.py:44 agenda/templates/agenda/overview.html:65
-#: agenda/templates/agenda/view.html:13 participant/models.py:53
+#: agenda/templates/agenda/view.html:13 participant/models.py:56
 #: participant/templates/participant/overview.html:72
+#: participant/templates/participant/user_detail.html:45
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -221,9 +222,9 @@ msgstr "Zusammenfassung für diesen Eintrag projizieren"
 msgid "Do you want to save the changed order of agenda items?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
-#: agenda/templates/agenda/overview.html:46 assignment/models.py:300
-#: assignment/views.py:576 assignment/templates/assignment/view.html:166
-#: assignment/templates/assignment/view.html:170
+#: agenda/templates/agenda/overview.html:46 assignment/models.py:302
+#: assignment/views.py:577 assignment/templates/assignment/view.html:184
+#: assignment/templates/assignment/view.html:188
 #: assignment/templates/projector/Assignment.html:78
 #: assignment/templates/projector/Assignment.html:82 motion/models.py:574
 #: motion/views.py:804 motion/views.py:855
@@ -233,8 +234,8 @@ msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 msgid "Yes"
 msgstr "Ja"
 
-#: agenda/templates/agenda/overview.html:47 assignment/models.py:300
-#: assignment/views.py:577 assignment/templates/assignment/view.html:167
+#: agenda/templates/agenda/overview.html:47 assignment/models.py:302
+#: assignment/views.py:578 assignment/templates/assignment/view.html:185
 #: assignment/templates/projector/Assignment.html:79 motion/models.py:574
 #: motion/views.py:804 motion/views.py:856
 #: motion/templates/motion/view.html:80
@@ -271,7 +272,7 @@ msgstr "Eintrag"
 #: agenda/templates/agenda/overview.html:68
 #: assignment/templates/assignment/overview.html:28
 #: motion/templates/motion/overview.html:43
-#: participant/templates/participant/group_overview.html:13
+#: participant/templates/participant/group_overview.html:14
 #: participant/templates/participant/overview.html:74
 msgid "Actions"
 msgstr "Aktionen"
@@ -286,23 +287,29 @@ msgstr "Keine Einträge vorhanden."
 #: agenda/templates/agenda/widget.html:29
 #: assignment/templates/assignment/widget.html:17
 #: motion/templates/motion/widget.html:17
+#: participant/templates/participant/group_widget.html:17
+#: participant/templates/participant/user_widget.html:16
 #: projector/templates/projector/custom_slide_widget.html:11
 #: projector/templates/projector/custom_slide_widget.html:30
 msgid "Preview"
 msgstr "Vorschau"
 
 #: agenda/templates/agenda/widget.html:23
-#: assignment/templates/assignment/view.html:130
+#: assignment/templates/assignment/view.html:148
 #: assignment/templates/assignment/widget.html:11
 #: motion/templates/motion/widget.html:11
+#: participant/templates/participant/group_widget.html:11
+#: participant/templates/participant/user_widget.html:10
 #: projector/templates/projector/custom_slide_widget.html:24
 msgid "Delete"
 msgstr "Löschen"
 
 #: agenda/templates/agenda/widget.html:26
-#: assignment/templates/assignment/view.html:129
+#: assignment/templates/assignment/view.html:147
 #: assignment/templates/assignment/widget.html:14
 #: motion/templates/motion/widget.html:14
+#: participant/templates/participant/group_widget.html:14
+#: participant/templates/participant/user_widget.html:13
 #: projector/templates/projector/custom_slide_widget.html:27
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -385,7 +392,7 @@ msgstr "Abgeschlossen"
 msgid "Name"
 msgstr "Name"
 
-#: assignment/models.py:55 participant/models.py:114
+#: assignment/models.py:55 participant/models.py:120
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -422,36 +429,36 @@ msgstr "%s möchte nicht kandidieren."
 msgid "%s is no candidate"
 msgstr "%s ist kein/e Kandidat/in"
 
-#: assignment/models.py:253
+#: assignment/models.py:255
 msgid "Can see assignment"
 msgstr "Darf Wahlen sehen"
 
-#: assignment/models.py:255
+#: assignment/models.py:257
 msgid "Can nominate another person"
 msgstr "Darf andere Personen für Wahlen vorschlagen"
 
-#: assignment/models.py:256
+#: assignment/models.py:258
 msgid "Can nominate themselves"
 msgstr "Darf selbst für Wahlen kandidieren"
 
-#: assignment/models.py:257
+#: assignment/models.py:259
 msgid "Can manage assignment"
 msgstr "Darf Wahlen verwalten"
 
-#: assignment/models.py:301 motion/models.py:575
+#: assignment/models.py:303 motion/models.py:575
 msgid "Abstain"
 msgstr "Enthaltung"
 
-#: assignment/models.py:303 motion/templates/motion/poll_view.html:22
+#: assignment/models.py:305 motion/templates/motion/poll_view.html:22
 msgid "Votes"
 msgstr "Stimmen"
 
-#: assignment/models.py:320
+#: assignment/models.py:322
 #, python-format
 msgid "Ballot %d"
 msgstr "Wahlgang %d"
 
-#: assignment/models.py:329 assignment/views.py:340 assignment/views.py:663
+#: assignment/models.py:331 assignment/views.py:340 assignment/views.py:664
 #: assignment/templates/assignment/base_assignment.html:14
 #: assignment/templates/assignment/overview.html:6
 #: assignment/templates/assignment/overview.html:9
@@ -472,7 +479,7 @@ msgid "Election was successfully modified."
 msgstr "Wahl wurde erfolgreich geändert."
 
 #: assignment/views.py:138 motion/views.py:257 motion/views.py:663
-#: participant/views.py:457 participant/views.py:480 utils/views.py:225
+#: participant/views.py:492 participant/views.py:515 utils/views.py:225
 #: utils/views.py:243 utils/views.py:267
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
@@ -541,6 +548,7 @@ msgid "not elected"
 msgstr "nicht gewählt"
 
 #: assignment/views.py:298 assignment/views.py:481
+#: assignment/templates/assignment/overview.html:35
 msgid "elected"
 msgstr "gewählt"
 
@@ -552,7 +560,7 @@ msgstr "Abstimmung wurde erfolgreich gelöscht."
 msgid "Assignment"
 msgstr "Wahl"
 
-#: assignment/views.py:358 assignment/templates/assignment/overview.html:53
+#: assignment/views.py:358 assignment/templates/assignment/overview.html:58
 #: assignment/templates/assignment/widget.html:23
 msgid "No assignments available."
 msgstr "Keine Wahlen vorhanden."
@@ -566,7 +574,7 @@ msgstr "Wahlen: %s"
 #: assignment/templates/assignment/overview.html:26
 #: assignment/templates/assignment/poll_view.html:18
 #: assignment/templates/assignment/view.html:36
-#: assignment/templates/assignment/view.html:118
+#: assignment/templates/assignment/view.html:136
 #: assignment/templates/projector/Assignment.html:38
 #: assignment/templates/projector/Assignment.html:56
 msgid "Candidates"
@@ -581,8 +589,8 @@ msgstr "Abstimmungsergebnis"
 #: assignment/templates/assignment/base_assignment.html:71
 #: assignment/templates/assignment/poll_view.html:5
 #: assignment/templates/assignment/poll_view.html:8
-#: assignment/templates/assignment/view.html:112
-#: assignment/templates/assignment/view.html:121
+#: assignment/templates/assignment/view.html:130
+#: assignment/templates/assignment/view.html:139
 #: assignment/templates/projector/Assignment.html:59
 msgid "ballot"
 msgstr "Wahlgang"
@@ -603,15 +611,15 @@ msgstr ""
 "E: %(ABSTAIN)s"
 
 #: assignment/views.py:454 assignment/templates/assignment/poll_view.html:35
-#: assignment/templates/assignment/view.html:185
+#: assignment/templates/assignment/view.html:203
 #: assignment/templates/projector/Assignment.html:97
 #: motion/templates/motion/poll_view.html:31
 msgid "Invalid votes"
 msgstr "Ungültige Stimmen"
 
 #: assignment/views.py:461 assignment/templates/assignment/poll_view.html:45
-#: assignment/templates/assignment/view.html:202
-#: assignment/templates/assignment/view.html:207
+#: assignment/templates/assignment/view.html:220
+#: assignment/templates/assignment/view.html:225
 #: assignment/templates/projector/Assignment.html:111
 #: assignment/templates/projector/Assignment.html:117 motion/views.py:804
 #: motion/templates/motion/poll_view.html:35
@@ -641,22 +649,24 @@ msgstr[0] "%d Kandidat/in"
 msgstr[1] "%d Kandidaten/innen"
 
 #: assignment/views.py:545
-#, python-format
-msgid "%d available posts"
-msgstr "%d verfügbare Posten"
+#, fuzzy, python-format
+msgid "%d available post"
+msgid_plural "%d available posts"
+msgstr[0] "%d verfügbare Posten"
+msgstr[1] "%d verfügbare Posten"
 
-#: assignment/views.py:577 assignment/templates/assignment/view.html:168
+#: assignment/views.py:578 assignment/templates/assignment/view.html:186
 #: assignment/templates/projector/Assignment.html:80 motion/views.py:804
 #: motion/views.py:857 motion/templates/motion/view.html:81
 #: motion/templates/projector/Motion.html:39
 msgid "Abstention"
 msgstr "Enthaltung"
 
-#: assignment/views.py:656
+#: assignment/views.py:657
 msgid "Election settings successfully saved."
 msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert."
 
-#: assignment/views.py:676
+#: assignment/views.py:677
 msgid "Assignments"
 msgstr "Wahlen"
 
@@ -681,17 +691,17 @@ msgstr "Wahl anzeigen"
 #: assignment/templates/assignment/base_assignment.html:39
 #: assignment/templates/assignment/edit.html:8
 #: assignment/templates/assignment/edit.html:17
-#: assignment/templates/assignment/overview.html:44
+#: assignment/templates/assignment/overview.html:49
 msgid "Edit election"
 msgstr "Wahl bearbeiten"
 
 #: assignment/templates/assignment/base_assignment.html:44
-#: assignment/templates/assignment/overview.html:45
+#: assignment/templates/assignment/overview.html:50
 msgid "Delete election"
 msgstr "Wahl löschen"
 
 #: assignment/templates/assignment/base_assignment.html:50
-#: assignment/templates/assignment/overview.html:47
+#: assignment/templates/assignment/overview.html:52
 msgid "Election as PDF"
 msgstr "Wahl als PDF"
 
@@ -727,7 +737,15 @@ msgid_plural "elections"
 msgstr[0] "Wahl"
 msgstr[1] "Wahlen"
 
-#: assignment/templates/assignment/overview.html:39
+#: assignment/templates/assignment/overview.html:35
+msgid "posts"
+msgstr "Posten"
+
+#: assignment/templates/assignment/overview.html:37
+msgid "candidates"
+msgstr "Kandidaten/innen"
+
+#: assignment/templates/assignment/overview.html:44
 msgid "Activate election"
 msgstr "Wahl projizieren"
 
@@ -761,7 +779,8 @@ msgid "Change status"
 msgstr "Status ändern"
 
 #: assignment/templates/assignment/view.html:43
-#: assignment/templates/assignment/view.html:96
+#: assignment/templates/assignment/view.html:99
+#: assignment/templates/assignment/view.html:113
 msgid "Remove candidate"
 msgstr "Kandidate/in entfernen"
 
@@ -783,49 +802,61 @@ msgid "Add new participant"
 msgstr "Neue/n Teilnehmer/in hinzufügen"
 
 #: assignment/templates/assignment/view.html:92
+msgid "Elected Candidates"
+msgstr "Gewählte Kandidaten/innen"
+
+#: assignment/templates/assignment/view.html:104
+msgid "No elected candidates available."
+msgstr "Keine gewählten Kandidaten/innen vorhanden."
+
+#: assignment/templates/assignment/view.html:109
 msgid "Blocked Candidates"
 msgstr "Blockierte Kandidaten/innen"
 
-#: assignment/templates/assignment/view.html:99
-msgid "There are no blocked candidates."
-msgstr "Keine blockierten Kandidaten verfügbar."
+#: assignment/templates/assignment/view.html:116
+msgid "No blocked candidates available."
+msgstr "Keine blockierten Kandidaten/innen vorhanden."
 
-#: assignment/templates/assignment/view.html:103
+#: assignment/templates/assignment/view.html:121
 #: assignment/templates/projector/Assignment.html:52
 msgid "Election results"
 msgstr "Wahlergebnisse"
 
-#: assignment/templates/assignment/view.html:126
+#: assignment/templates/assignment/view.html:144
 msgid "Publish/unpublish results"
 msgstr "Ergebnisse veröffentlichen/unveröffentlichen"
 
-#: assignment/templates/assignment/view.html:138
-#: assignment/templates/assignment/view.html:226
+#: assignment/templates/assignment/view.html:156
+#: assignment/templates/assignment/view.html:244
 msgid "New ballot"
 msgstr "Neuer Wahlgang"
 
-#: assignment/templates/assignment/view.html:153
+#: assignment/templates/assignment/view.html:171
 #: assignment/templates/projector/Assignment.html:69
 msgid "Candidate is elected"
 msgstr "Kandidat/in ist gewählt"
 
-#: assignment/templates/assignment/view.html:172
+#: assignment/templates/assignment/view.html:190
 #: assignment/templates/projector/Assignment.html:84
 msgid "was not a <br> candidate"
 msgstr "war kein Kandidat"
 
-#: assignment/templates/assignment/view.html:190
+#: assignment/templates/assignment/view.html:208
 #: assignment/templates/projector/Assignment.html:101 motion/views.py:804
 #: motion/templates/motion/view.html:82
 #: motion/templates/projector/Motion.html:40
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: assignment/templates/assignment/view.html:221
-#: assignment/templates/projector/Assignment.html:126
+#: assignment/templates/assignment/view.html:239
+#: assignment/templates/projector/Assignment.html:128
 msgid "No ballots available."
 msgstr "Keine Wahlgänge vorhanden."
 
+#: assignment/templates/projector/Assignment.html:126
+msgid "Vote results are not published yet."
+msgstr "Wahlergebnisse sind noch nicht veröffentlicht."
+
 #: config/forms.py:24
 msgid "Event name"
 msgstr "Veranstaltungsname"
@@ -1118,11 +1149,15 @@ msgstr "von"
 #: motion/models.py:454 motion/templates/motion/view.html:210
 #: motion/templates/motion/widget.html:27
 #: motion/templates/projector/Motion.html:65
+#: participant/templates/participant/personal_info_widget.html:13
+#: participant/templates/participant/personal_info_widget.html:32
 msgid "no number"
 msgstr "ohne Nummer"
 
 #: motion/models.py:455 motion/templates/motion/overview.html:32
 #: motion/templates/motion/widget.html:23
+#: participant/templates/participant/personal_info_widget.html:9
+#: participant/templates/participant/personal_info_widget.html:28
 msgid "motion"
 msgstr "Antrag"
 
@@ -1652,15 +1687,15 @@ msgstr "Abstimmungsergebnis"
 
 #: motion/templates/projector/Motion.html:47
 msgid "No poll results available."
-msgstr "Keine Abstimmungen vorhanden."
+msgstr "Keine Abstimmungsergebnisse vorhanden."
 
 #: participant/__init__.py:3
 msgid "Participant"
 msgstr "Teilnehmer"
 
 #: participant/forms.py:26
-#: participant/templates/participant/group_overview.html:6
-#: participant/templates/participant/group_overview.html:9
+#: participant/templates/participant/group_overview.html:7
+#: participant/templates/participant/group_overview.html:10
 msgid "User groups"
 msgstr "Benutzerrollen"
 
@@ -1668,7 +1703,7 @@ msgstr "Benutzerrollen"
 msgid "Permissions"
 msgstr "Rechte"
 
-#: participant/forms.py:47 participant/views.py:495
+#: participant/forms.py:47 participant/views.py:530
 #: participant/templates/participant/base_participant.html:12
 #: participant/templates/participant/overview.html:7
 #: participant/templates/participant/overview.html:18
@@ -1735,6 +1770,7 @@ msgid "Will be shown after the name."
 msgstr "Wird nach dem Namen angezeigt."
 
 #: participant/models.py:45 participant/templates/participant/overview.html:24
+#: participant/templates/participant/user_detail.html:24
 msgid "Gender"
 msgstr "Geschlecht"
 
@@ -1746,112 +1782,123 @@ msgstr "Nur zum Filtern der Teilnehmerliste."
 msgid "Typ"
 msgstr "Typ"
 
-#: participant/models.py:50 participant/views.py:217
+#: participant/models.py:50 participant/views.py:245
 #: participant/templates/participant/overview.html:45
 #: participant/templates/participant/overview.html:70
+#: participant/templates/participant/user_detail.html:34
 msgid "Committee"
 msgstr "Amt"
 
+#: participant/models.py:53
+#: participant/templates/participant/user_detail.html:39
+msgid "About me"
+msgstr "Über mich"
+
 #: participant/models.py:54
+msgid "Your profile text"
+msgstr "Ihr Profiltext"
+
+#: participant/models.py:57
 msgid "Only for notes."
 msgstr "Nur für Notizen."
 
-#: participant/models.py:57
+#: participant/models.py:60
 msgid "Default password"
 msgstr "Vorgegebenes Passwort"
 
-#: participant/models.py:102
+#: participant/models.py:108
 msgid "Can see participant"
 msgstr "Darf die Teilnehmer/inen sehen"
 
-#: participant/models.py:104
+#: participant/models.py:110
 msgid "Can manage participant"
 msgstr "Darf die Teilnehmer/inen verwalten"
 
-#: participant/models.py:113
+#: participant/models.py:119
 msgid "Use this user group as participant"
 msgstr "Verwende diese Benutzerrolle als Teilnehmer/in"
 
-#: participant/models.py:113
+#: participant/models.py:119
 msgid "For example as submitter of a motion."
 msgstr "Zum Beispiel als Antragsteller."
 
-#: participant/models.py:192
+#: participant/models.py:201
 msgid "Welcome to OpenSlides!"
 msgstr "Willkommen bei OpenSlides!"
 
-#: participant/views.py:212
+#: participant/views.py:240
 msgid "Participant-list"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:213
+#: participant/views.py:241
 msgid "List of Participants"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:216 participant/templates/participant/overview.html:67
+#: participant/views.py:244 participant/templates/participant/overview.html:67
 msgid "Last Name"
 msgstr "Nachname"
 
-#: participant/views.py:216 participant/templates/participant/overview.html:66
+#: participant/views.py:244 participant/templates/participant/overview.html:66
 msgid "First Name"
 msgstr "Vorname"
 
-#: participant/views.py:216
+#: participant/views.py:244
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/views.py:216 participant/templates/participant/overview.html:37
+#: participant/views.py:244 participant/templates/participant/overview.html:37
 #: participant/templates/participant/overview.html:69
+#: participant/templates/participant/user_detail.html:29
 msgid "Type"
 msgstr "Typ"
 
-#: participant/views.py:245
+#: participant/views.py:276
 msgid "Participant-passwords"
 msgstr "Teilnehmer-Passwoerter"
 
-#: participant/views.py:263
+#: participant/views.py:298
 msgid "Account for OpenSlides"
 msgstr "Zugang für OpenSlides"
 
-#: participant/views.py:265
+#: participant/views.py:300
 #, python-format
 msgid "for %s"
 msgstr "für %s"
 
-#: participant/views.py:268
+#: participant/views.py:303
 #, python-format
 msgid "User: %s"
 msgstr "Nutzername: %s"
 
-#: participant/views.py:272
+#: participant/views.py:307
 #, python-format
 msgid "Password: %s"
 msgstr "Passwort: %s"
 
-#: participant/views.py:277
+#: participant/views.py:312
 #, python-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: participant/views.py:319
+#: participant/views.py:354
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert."
 
-#: participant/views.py:330
+#: participant/views.py:365
 msgid "Do you really want to reset the password?"
 msgstr "Soll das Passwort wirklich zurückgesetzt werden?"
 
-#: participant/views.py:343
+#: participant/views.py:378
 #, python-format
 msgid "The Password for %s was successfully reset."
 msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:422
+#: participant/views.py:457
 msgid "Participants settings successfully saved."
 msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:432
+#: participant/views.py:467
 #, python-format
 msgid ""
 "Installation was successfully! Use %(user)s (password: %(password)s) for "
@@ -1864,14 +1911,27 @@ msgstr ""
 "Sie das Passwort nach der ersten Anmeldung! Anderenfalls erscheint diese "
 "Meldung weiterhin für alle und ist ein Sicherheitsrisiko."
 
-#: participant/views.py:455
+#: participant/views.py:490
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:477
+#: participant/views.py:512
 msgid "Password successfully changed."
 msgstr "Passwort wurde erfolgreich geändert."
 
+#: participant/views.py:562
+msgid "My motions and elections"
+msgstr "Meine Anträge und Wahlen"
+
+#: participant/views.py:576
+msgid "Users"
+msgstr "Benutzer"
+
+#: participant/views.py:590
+#: participant/templates/participant/user_detail.html:14
+msgid "Groups"
+msgstr "Gruppen"
+
 #: participant/templates/participant/base_participant.html:15
 msgid "All participants"
 msgstr "Alle Teilnehmer/innen"
@@ -1906,42 +1966,70 @@ msgstr "Teilnehmerliste als PDF"
 msgid "First time passwords as PDF"
 msgstr "Erst-Passwörter als PDF"
 
-#: participant/templates/participant/config.html:5
-#: participant/templates/participant/config.html:8
-msgid "Participant settings"
-msgstr "Teilnehmer/innen-Einstellungen"
+#: participant/templates/participant/base_participant.html:38
+msgid "View participant"
+msgstr "Teilnehmer/in anzeigen"
 
+#: participant/templates/participant/base_participant.html:45
 #: participant/templates/participant/edit.html:8
 #: participant/templates/participant/edit.html:17
 #: participant/templates/participant/overview.html:94
 msgid "Edit participant"
 msgstr "Teilnehmer/in bearbeiten"
 
+#: participant/templates/participant/base_participant.html:50
+#: participant/templates/participant/overview.html:97
+msgid "Delete participant"
+msgstr "Teilnehmer/in löschen"
+
+#: participant/templates/participant/base_participant.html:60
+msgid "View group"
+msgstr "Benutzerrolle anzeigen"
+
+#: participant/templates/participant/base_participant.html:65
+#: participant/templates/participant/group_overview.html:19
+msgid "Edit group"
+msgstr "Benutzerrolle bearbeiten"
+
+#: participant/templates/participant/base_participant.html:71
+#: participant/templates/participant/group_overview.html:21
+msgid "Delete group"
+msgstr "Benutzerrolle löschen"
+
+#: participant/templates/participant/config.html:5
+#: participant/templates/participant/config.html:8
+msgid "Participant settings"
+msgstr "Teilnehmer/innen-Einstellungen"
+
 #: participant/templates/participant/edit.html:26
 msgid "Reset to First Password"
 msgstr "Auf Erst-Passwort zurücksetzen"
 
+#: participant/templates/participant/group_detail.html:14
+msgid "Members"
+msgstr "Mitglieder"
+
+#: participant/templates/participant/group_detail.html:19
+msgid "No members available."
+msgstr "Keine Mitglieder vorhanden."
+
 #: participant/templates/participant/group_edit.html:8
 #: participant/templates/participant/group_edit.html:16
 msgid "Edit user group"
 msgstr "Benutzerrolle bearbeiten"
 
-#: participant/templates/participant/group_overview.html:12
+#: participant/templates/participant/group_overview.html:13
 msgid "User Group"
 msgstr "Benutzerrolle"
 
-#: participant/templates/participant/group_overview.html:18
-msgid "Edit group"
-msgstr "Benutzerrolle bearbeiten"
-
-#: participant/templates/participant/group_overview.html:20
-msgid "Delete group"
-msgstr "Benutzerrolle löschen"
-
-#: participant/templates/participant/group_overview.html:26
+#: participant/templates/participant/group_overview.html:27
 msgid "No user groups available."
 msgstr "Keine Benutzerrollen vorhanden."
 
+#: participant/templates/participant/group_widget.html:24
+msgid "No groups available."
+msgstr "Keine Gruppen vorhanden."
+
 #: participant/templates/participant/import.html:9
 msgid "Select a CSV file to import participants!"
 msgstr "Wählen Sie eine CSV-Datei zum Importieren von Teilnehmer/innen aus!"
@@ -2000,13 +2088,10 @@ msgid "of"
 msgstr "von"
 
 #: participant/templates/participant/overview.html:73
+#: participant/templates/participant/user_detail.html:49
 msgid "Last Login"
 msgstr "Letzer Login"
 
-#: participant/templates/participant/overview.html:97
-msgid "Delete participant"
-msgstr "Teilnehmer/in löschen"
-
 #: participant/templates/participant/overview.html:99
 msgid "Change status to inactive"
 msgstr "Status ändern auf inaktiv"
@@ -2016,6 +2101,7 @@ msgid "Change status to active"
 msgstr "Status ändern auf aktiv"
 
 #: participant/templates/participant/overview.html:111
+#: participant/templates/participant/user_widget.html:22
 msgid "No participants available."
 msgstr "Keine Teilnehmer/innen vorhanden."
 
@@ -2038,6 +2124,32 @@ msgstr "Benutzereinstellungen"
 msgid "Personal Settings"
 msgstr "Persönliche Einstellungen"
 
+#: participant/templates/participant/personal_info_widget.html:5
+msgid "I submitted the following motions:"
+msgstr "Ich habe folgende Anträge gestellt:"
+
+#: participant/templates/participant/personal_info_widget.html:17
+#: participant/templates/participant/personal_info_widget.html:36
+#: participant/templates/participant/personal_info_widget.html:47
+msgid "None"
+msgstr "Keine"
+
+#: participant/templates/participant/personal_info_widget.html:24
+msgid "I support the following motions:"
+msgstr "Ich unterstütze folgende Anträge:"
+
+#: participant/templates/participant/personal_info_widget.html:43
+msgid "I am candidate for the following elections:"
+msgstr "Ich bin Kandidat/in bei folgenden Wahlen:"
+
+#: participant/templates/participant/user_detail.html:19
+msgid "The participant is not member of any group."
+msgstr "Teilnehmer/in ist kein Mitglieder einer Gruppe."
+
+#: participant/templates/participant/user_detail.html:53
+msgid "The participant has not logged in yet."
+msgstr "Teilnehmer/in hat sich noch nicht angemeldet."
+
 #: poll/models.py:95
 msgid "Votes invalid"
 msgstr "Ungültige Stimmen"
@@ -2058,23 +2170,23 @@ msgstr "Darf den Projektor sehen"
 msgid "Can see the dashboard"
 msgstr "Darf das Dashboard sehen"
 
-#: projector/views.py:202
+#: projector/views.py:204
 msgid "Errors in the form"
 msgstr "Fehler im Formular"
 
-#: projector/views.py:378 projector/templates/projector/dashboard.html:17
+#: projector/views.py:383 projector/templates/projector/dashboard.html:17
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: projector/views.py:406
+#: projector/views.py:411
 msgid "Projector live view"
 msgstr "Projektor-Live-Ansicht"
 
-#: projector/views.py:432
+#: projector/views.py:437
 msgid "Overlays"
 msgstr "Einblendungen"
 
-#: projector/views.py:445
+#: projector/views.py:450
 msgid "Custom Slides"
 msgstr "Benutzerdefinierte Folien"
 
@@ -2242,6 +2354,3 @@ msgstr "undefinierter-dateiname"
 #: utils/jsonfield/fields.py:21
 msgid "Enter valid JSON"
 msgstr "Gebe valides JSON ein"
-
-#~ msgid "Users"
-#~ msgstr "Benutzer"

openslides/participant/forms.py

@@ -28,14 +28,14 @@ class UserCreateForm(forms.ModelForm, CssClassMixin):
     class Meta:
         model = User
         fields = ('first_name', 'last_name', 'is_active', 'groups', 'detail',
-                  'gender', 'type', 'committee', 'comment', 'default_password')
+                  'gender', 'type', 'committee', 'about_me', 'comment', 'default_password')
 
 
 class UserUpdateForm(UserCreateForm):
     class Meta:
         model = User
         fields = ('username', 'first_name', 'last_name', 'is_active', 'groups',
-                  'detail', 'gender', 'type', 'committee', 'comment',
+                  'detail', 'gender', 'type', 'committee', 'about_me', 'comment',
                   'default_password')
 
 
@@ -94,7 +94,7 @@ class GroupForm(forms.ModelForm, CssClassMixin):
 class UsersettingsForm(forms.ModelForm, CssClassMixin):
     class Meta:
         model = User
-        fields = ('username', 'first_name', 'last_name', 'email', 'gender')
+        fields = ('username', 'first_name', 'last_name', 'gender', 'email', 'committee', 'about_me' )
 
 
 class UserImportForm(forms.Form, CssClassMixin):

openslides/participant/models.py

@@ -49,6 +49,9 @@ class User(DjangoUser, PersonMixin, Person):
     committee = models.CharField(
         max_length=100, blank=True, default='', verbose_name=_("Committee"),
         help_text=_('Only for filtering the participant list.'))
+    about_me = models.TextField(
+        blank=True, default='', verbose_name=_('About me'),
+        help_text=_('Your profile text'))
     comment = models.TextField(
         blank=True, default='', verbose_name=_('Comment'),
         help_text=_('Only for notes.'))

openslides/participant/templates/participant/group_detail.html

@@ -16,7 +16,7 @@
 {% for member in group.user_set.all %}
     <p>{{ member }}</p>
 {% empty %}
-    <p>{% trans "This group has not any members." %}</p>
+    <p>{% trans "No members available." %}</p>
 {% endfor %}
 
 {% endblock %}

openslides/participant/templates/participant/personal_info_widget.html

@@ -2,7 +2,7 @@
 {% load tags %}
 
 <ul style="line-height: 180%">
-    {% trans "You submitted the following motions:" %}
+    {% trans "I submitted the following motions:" %}
     {% for motion in submitted_motions %}
         <li>
             <a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a>
@@ -14,14 +14,14 @@
             {% endif %}
         </li>
     {% empty %}
-        <li>{% trans "Currently none" %}</li>
+        <li>{% trans "None" %}</li>
     {% endfor %}
 </ul>
 
 {% if config_motion_min_supporters %}
 <hr />
 <ul>
-    {% trans "You support the following motions:" %}
+    {% trans "I support the following motions:" %}
     {% for motion in supported_motions %}
         <li>
             <a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a>
@@ -33,17 +33,17 @@
             {% endif %}
         </li>
     {% empty %}
-        <li>{% trans "Currently none" %}</li>
+        <li>{% trans "None" %}</li>
     {% endfor %}
 </ul>
 {% endif %}
 
 <hr />
 <ul style="line-height: 180%">
-    {% trans "You are candidate in the following assignments:" %}
+    {% trans "I am candidate for the following elections:" %}
     {% for assignment in assignments %}
         <li><a href="{% model_url assignment 'view' %}">{{ assignment }}</a></li>
     {% empty %}
-        <li>{% trans "Currently none" %}</li>
+        <li>{% trans "None" %}</li>
     {% endfor %}
 </ul>

openslides/participant/templates/participant/user_detail.html

@@ -35,6 +35,11 @@
 <p>{{ shown_user.committee }}</p>
 {% endif %}
 
+{% if shown_user.about_me %}
+    <h2>{% trans "About me" %}</h2>
+    <p>{{ shown_user.about_me }}</p>
+{% endif %}
+
 {% if perms.participant.can_manage_participant %}
     {% if shown_user.comment %}
     <h2>{% trans "Comment" %}</h2>
@@ -45,7 +50,7 @@
     {% if shown_user.last_login > shown_user.date_joined %}
         <p>{{ shown_user.last_login }}</p>
     {% else %}
-        <p>{% trans "The participant was not logged in yet." %}</p>
+        <p>{% trans "The participant has not logged in yet." %}</p>
     {% endif %}
 {% endif %}
 

openslides/participant/templates/participant/user_widget.html

@@ -19,6 +19,6 @@
         <a href="{% model_url user 'view' %}">{{ user }}</a>
     </li>
 {% empty %}
-    <li>{% trans 'No users available.' %}</li>
+    <li>{% trans 'No participants available.' %}</li>
 {% endfor %}
 </ul>

openslides/participant/views.py

@@ -559,7 +559,7 @@ def get_personal_info_widget(request):
         assignmentcandidate__blocked=False),}
     return Widget(
         name='personal_info',
-        display_name=_('On You'),
+        display_name=_('My motions and elections'),
         template='participant/personal_info_widget.html',
         context=personal_info_context,
         permission_required=None,