From 2ad0754f884aed7e7a5061ea503a80d4044da686 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 3 Sep 2011 19:25:05 +0200 Subject: [PATCH] Added and fixed apply buttons. Updated translation. --- openslides/application/views.py | 6 +- openslides/assignment/views.py | 8 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 20761 -> 21485 bytes openslides/locale/de/LC_MESSAGES/django.po | 351 +++++++----------- .../participant/base_participant.html | 2 +- .../templates/participant/edit.html | 3 + .../templates/participant/group_edit.html | 3 + openslides/participant/views.py | 21 +- 8 files changed, 170 insertions(+), 224 deletions(-) diff --git a/openslides/application/views.py b/openslides/application/views.py index eab3c152d..69fc77ea8 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -128,7 +128,11 @@ def edit(request, application_id=None): messages.success(request, _('New application was successfully created.')) else: messages.success(request, _('Application was successfully modified.')) - return redirect(reverse('application_view', args=[application.id])) + + if not 'apply' in request.POST: + return redirect(reverse('application_view', args=[application.id])) + if application_id is None: + return redirect(reverse('application_edit', args=[application.id])) else: if application_id is None: initial = {'text': config_get('application_preamble')} diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index 4a41cae92..d34c9a8b9 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -103,13 +103,15 @@ def edit(request, assignment_id=None): if request.method == 'POST': form = AssignmentForm(request.POST, instance=assignment) if form.is_valid(): - form.save() + assignment = form.save() if assignment_id is None: messages.success(request, _('New election was successfully created.')) else: messages.success(request, _('Election was successfully modified.')) - if not 'apply' in request.POST: - return redirect(reverse("assignment_overview")) + if not 'apply' in request.POST: + return redirect(reverse("assignment_overview")) + if assignment_id is None: + return redirect(reverse('assignment_edit', args=[assignment.id])) else: form = AssignmentForm(instance=assignment) return { diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 05bee261aa249c35ce85105cc0e34a54b3b252ff..d75b8bd90a861a31bdd2f20b5095d5df98f7693d 100644 GIT binary patch delta 7337 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 J z3~(|Ki`t?bTOWWr)FV(6F17VXP-o@|WGmg~SqkcKH7Z5hP<#Fv>U}+hI)sgioS8?U zI!HjRARRSuFXY8B!%)vJMs3Xo)bqQnHK=ipVuarRvlO)FS1}P2ZgKXuFY@JRMxs_y zh04%M)E=)z9kLHm9Uig%V7-KzfZssJ7O4BuQ4{Wl{)}&KqoCK~PITd1%*3ZK4y$eZ zLG+_ui;eJv^%N=-XHZ*o4VCh+LCzM%qRvPs48~H_{pIM^>okvo_Hwzsq1xW?5eCqH z5JT}8#^YJk%EF4B4&zbvbkqcT+V*1Woft;@7;J-+Q1>k;CjadyyiS8s|1pMO9s1%$ z)ET&h85lL#InBM1?3yWfD{jXuj2PnB3wu(35WCAb1(=iY6G^E~0A-+wzzW;wEJ-s=~Bt{{|I zcSn9`g{O#%M8lQI!>x$tXh^|D_&bqD>?4wCdj$VOEGBd{qiq%5PwY~|4Ob|i-FU60 z!fWa_vnhlT=LmfhK2A&{1`^qXt{vW=#@u7oYp3fK;#DGy&VR%Eh{p(Bvxv8ej&@)V z*Z(PeK|DhhXRpLTp^|q4Hs{V*-yM_ z8wzj>kw9D}))NHHh{*U; z2mhdLGI2YRNNgk8bI(8Vf5eSfFqIdHp+qA0q!SU818twVlwTvFh#ABZO{xy?49XngTX{J9fTt!W$mPn-@6^R}wDXw2%IF?VD;M<`>*?F`luu=T t!5q(#f^wgbeiI&?Qa-wL@|5WlJ%bAO2YR{=Jm*_^&*1BxXNHV+{Q(_@zwQ74 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 75535402e..c1644c169 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-03 16:35+0200\n" +"POT-Creation-Date: 2011-09-03 19:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,8 @@ msgstr "Ja, mit allen Kindelementen." msgid "No" msgstr "Nein" -#: agenda/api.py:67 participant/views.py:133 utils/utils.py:40 +#: agenda/api.py:67 participant/views.py:129 participant/views.py:207 +#: utils/utils.py:40 #, python-format msgid "Do you really want to delete %s?" msgstr "Soll %s wirklich gelöscht werden?" @@ -87,7 +88,7 @@ msgstr "Kein Formular für Eintrag %s" msgid "Text" msgstr "Text" -#: agenda/models.py:199 agenda/templates/agenda/overview.html:106 +#: agenda/models.py:199 agenda/templates/agenda/overview.html:105 #: agenda/templates/beamer/ItemApplication.html:5 #: application/templates/application/edit.html:2 #: application/templates/application/poll_view.html:8 @@ -100,7 +101,7 @@ msgstr "Text" msgid "Application" msgstr "Antrag" -#: agenda/models.py:206 agenda/templates/agenda/overview.html:119 +#: agenda/models.py:206 agenda/templates/agenda/overview.html:118 #: agenda/templates/beamer/ItemAssignment.html:4 #: assignment/templates/assignment/edit.html:2 poll/models.py:24 #: utils/pdf.py:346 utils/pdf.py:354 @@ -116,7 +117,7 @@ msgstr "Abstimmung" #: agenda/views.py:74 agenda/templates/agenda/base_agenda.html:7 #: agenda/templates/agenda/overview.html:3 #: agenda/templates/agenda/overview.html:38 -#: agenda/templates/agenda/overview.html:69 +#: agenda/templates/agenda/overview.html:67 #: agenda/templates/beamer/overview.html:3 #: agenda/templates/beamer/overview.html:10 templates/403.html:8 #: templates/404.html:8 templates/500.html:8 templates/base.html:48 @@ -145,18 +146,18 @@ msgstr "Eintrag wurde erfolgreich geändert." msgid "Agenda item modified" msgstr "Tagesordnungseintrag geändert" -#: agenda/views.py:221 participant/views.py:110 participant/views.py:192 -#: participant/views.py:222 participant/views.py:270 system/views.py:31 +#: agenda/views.py:223 participant/views.py:108 participant/views.py:192 +#: participant/views.py:221 participant/views.py:269 system/views.py:31 #: system/views.py:57 msgid "Please check the form for errors." msgstr "Bitte kontrollieren Sie das Formular nach Fehlern." -#: agenda/views.py:255 +#: agenda/views.py:257 #, python-format msgid "Item %s and his children were successfully deleted." msgstr "Eintrag %s und seine Kindelemente wurde erfolgreich gelöscht." -#: agenda/views.py:261 +#: agenda/views.py:263 #, python-format msgid "Item %s was successfully deleted." msgstr "Eintrag %s wurde erfolgreich gelöscht." @@ -180,7 +181,7 @@ msgid "Item" msgstr "Eintrag" #: agenda/templates/agenda/edit.html:6 -#: agenda/templates/agenda/overview.html:131 +#: agenda/templates/agenda/overview.html:130 msgid "Edit item" msgstr "Eintrag bearbeiten" @@ -219,6 +220,8 @@ msgstr "Speichern" #: assignment/templates/assignment/edit.html:18 #: assignment/templates/assignment/poll_view.html:58 #: assignment/templates/assignment/view.html:101 +#: participant/templates/participant/edit.html:21 +#: participant/templates/participant/group_edit.html:17 msgid "Apply" msgstr "Übernehmen" @@ -227,8 +230,8 @@ msgstr "Übernehmen" #: application/templates/application/poll_view.html:57 #: assignment/templates/assignment/edit.html:22 #: assignment/templates/assignment/poll_view.html:62 -#: participant/templates/participant/edit.html:22 -#: participant/templates/participant/group_edit.html:18 +#: participant/templates/participant/edit.html:25 +#: participant/templates/participant/group_edit.html:21 #: participant/templates/participant/import.html:16 #: participant/templates/participant/settings.html:18 #: system/templates/system/general.html:23 @@ -245,8 +248,10 @@ msgid "Beamer" msgstr "Beamer" #: agenda/templates/agenda/overview.html:54 -msgid "Item Type" -msgstr "Eintragstyp" +#: participant/templates/participant/overview.html:23 +#: participant/templates/participant/overview.html:45 utils/pdf.py:230 +msgid "Type" +msgstr "Typ" #: agenda/templates/agenda/overview.html:56 #: assignment/templates/assignment/overview.html:24 @@ -254,7 +259,7 @@ msgstr "Eintragstyp" msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:69 +#: agenda/templates/agenda/overview.html:67 msgid "items" msgstr "Einträge" @@ -262,27 +267,27 @@ msgstr "Einträge" msgid "Print agenda" msgstr "Tagesordnung drucken" -#: agenda/templates/agenda/overview.html:111 +#: agenda/templates/agenda/overview.html:110 msgid "Poll of Application" msgstr "Antragsabstimmung" -#: agenda/templates/agenda/overview.html:114 +#: agenda/templates/agenda/overview.html:113 msgid "Poll of Election" msgstr "Wahlen" -#: agenda/templates/agenda/overview.html:128 +#: agenda/templates/agenda/overview.html:127 msgid "Show beamer preview" msgstr "Beamer-Vorschau anzeigen" -#: agenda/templates/agenda/overview.html:132 +#: agenda/templates/agenda/overview.html:131 msgid "Delete item" msgstr "Eintrag löschen" -#: agenda/templates/agenda/overview.html:139 +#: agenda/templates/agenda/overview.html:138 msgid "Select item overview" msgstr "Wähle Eintragsübersicht" -#: agenda/templates/agenda/overview.html:159 +#: agenda/templates/agenda/overview.html:158 msgid "No items available." msgstr "Keine Einträge vorhanden." @@ -408,78 +413,78 @@ msgstr "Antragsteller" msgid "Supporters" msgstr "Unterstützer" -#: application/models.py:89 +#: application/models.py:106 msgid "Searching for supporters." msgstr "Auf Unterstützersuche." -#: application/models.py:91 +#: application/models.py:108 msgid "Not yet permitted." msgstr "Noch nicht zugelassen." -#: application/models.py:93 +#: application/models.py:110 msgid "Not yet permitted changes." msgstr "Noch nicht zugelassene Änderungen." -#: application/models.py:137 +#: application/models.py:154 #, python-format msgid "Version %s created" msgstr "Version %s erstellt" -#: application/models.py:146 +#: application/models.py:163 msgid "Supporters removed" msgstr "Unterstützer gelöscht" -#: application/models.py:155 +#: application/models.py:172 #, python-format msgid "Status reseted to: %s" msgstr "Status zurückgesetzt auf: %s" -#: application/models.py:168 +#: application/models.py:185 #, python-format msgid "Supporter: +%s" msgstr "Unterstützer: +%s" -#: application/models.py:178 +#: application/models.py:195 #, python-format msgid "Supporter: -%s" msgstr "Unterstützer: -%s" -#: application/models.py:194 +#: application/models.py:211 #, python-format msgid "Number set: %s" msgstr "Nummer gesetzt: %s" -#: application/models.py:207 +#: application/models.py:224 #, python-format msgid "Version %s permitted" msgstr "Version %s zugelassen" -#: application/models.py:221 +#: application/models.py:238 #, python-format msgid "Version %s not permitted" msgstr "Version %s nicht zugelassen" -#: application/models.py:247 +#: application/models.py:264 msgid "Status modified" msgstr "Status geändert" -#: application/models.py:358 +#: application/models.py:375 msgid "Poll created" msgstr "Abstimmung erstellt" -#: application/models.py:376 +#: application/models.py:393 msgid "Can see applications" msgstr "Anträge anzeigen" -#: application/models.py:377 +#: application/models.py:394 msgid "Can insert new applications" msgstr "Anträge anlegen" -#: application/models.py:378 +#: application/models.py:395 msgid "Can support applications" msgstr "Anträge unterstützen" -#: application/models.py:379 +#: application/models.py:396 msgid "Can manage applications" msgstr "Anträge verwalten" @@ -501,7 +506,7 @@ msgstr "Neuer Antrag wurde erfolgreich angelegt." msgid "Application was successfully modified." msgstr "Antrag wurde erfolgreich geändert." -#: application/views.py:138 +#: application/views.py:142 msgid "" "Attention: Do you really want to edit this application? The supporters will " "not be removed automatically. Please check if the supports are valid after " @@ -511,7 +516,7 @@ msgstr "" "nicht automatisch entfernt. Prüfen Sie, ob die Unterstützungen noch gültig " "sind." -#: application/views.py:140 +#: application/views.py:144 #, python-format msgid "" "Attention: Do you really want to edit this application? All %s " @@ -520,62 +525,78 @@ msgstr "" "Wollen Sie den Antrag wirklich ändern? Alle %s Unterstützer werden " "automatisch entfernt. Versuchen Sie diese erneut zu gewinnen." -#: application/views.py:170 +#: application/views.py:174 #, python-format msgid "You can not delete application %s." msgstr "Sie können Antrag %s nicht löschen." -#: application/views.py:176 +#: application/views.py:180 #, python-format msgid "Application %s was successfully deleted." msgstr "Antrag %s wurde erfolgreich gelöscht." -#: application/views.py:192 +#: application/views.py:196 msgid "Application number was successfully set." msgstr "Antragsnummer wurde erfolgreich gesetzt." -#: application/views.py:208 +#: application/views.py:212 msgid "Application was successfully permitted." msgstr "Antrag wurde erfolgreich zugelassen." -#: application/views.py:221 +#: application/views.py:225 msgid "Application was successfully rejected." msgstr "Antrag wurde erfolgreich verworfen." -#: application/views.py:235 +#: application/views.py:239 #, python-format msgid "Application status was set to: %s." msgstr "Antragsstatus wurde gesetzt auf: %s" -#: application/views.py:249 +#: application/views.py:253 msgid "Application status was reset." msgstr "Antragsstatus wurde zurückgesetzt." -#: application/views.py:263 +#: application/views.py:267 msgid "You have support the application successfully." msgstr "Sie haben den Antrag erfolgreich unterstützt." -#: application/views.py:277 +#: application/views.py:281 msgid "You have unsupport the application successfully." msgstr "Sie haben dem Antrag erfolgreich Ihre Unterstützung entzogen." -#: application/views.py:291 +#: application/views.py:295 msgid "New vote was successfully created." msgstr "Neue Abstimmung erfolgreich angelegt." -#: application/views.py:307 +#: application/views.py:311 msgid "Poll was successfully deleted." msgstr "Abstimmung wurde erfolgreich gelöscht." -#: application/views.py:309 +#: application/views.py:313 #, python-format msgid "the %s. poll" msgstr "die %s. Abstimmung" -#: application/views.py:339 assignment/views.py:217 +#: application/views.py:343 assignment/views.py:219 msgid "Votes are successfully saved." msgstr "Stimmen erfolgreich gespeichert." +#: application/views.py:366 +msgid "Version accepted" +msgstr "Version akzeptiert" + +#: application/views.py:368 +msgid "ERROR by accepting the Version" +msgstr "FEHLER beim Akzeptieren der Version" + +#: application/views.py:377 +msgid "Version rejected" +msgstr "Version zurückgewiesen" + +#: application/views.py:379 +msgid "ERROR by rejecting the Version" +msgstr "FEHLER beim Zurückweisen der Version" + #: application/templates/application/base_application.html:6 #: application/templates/application/overview.html:2 #: application/templates/application/overview.html:6 templates/403.html:12 @@ -799,13 +820,13 @@ msgstr "Überarbeitungen" msgid "Time" msgstr "Zeit" -#: application/templates/application/view.html:248 -#: application/templates/application/view.html:255 -#: application/templates/application/view.html:262 +#: application/templates/application/view.html:259 +#: application/templates/application/view.html:266 +#: application/templates/application/view.html:273 msgid "unchanged" msgstr "unverändert" -#: application/templates/application/view.html:271 +#: application/templates/application/view.html:282 msgid "Log" msgstr "Log" @@ -872,58 +893,58 @@ msgstr "Neue Wahl wurde erfolgreich angelegt." msgid "Election was successfully modified." msgstr "Wahl wurde erfolgreich geändert." -#: assignment/views.py:126 +#: assignment/views.py:128 #, python-format msgid "Election %s was successfully deleted." msgstr "Wahl %s wurde erfolgreich gelöscht." -#: assignment/views.py:139 +#: assignment/views.py:141 #, python-format msgid "Election status was set to: %s." msgstr "Wahlstatus wurde gesetzt auf: %s." -#: assignment/views.py:150 +#: assignment/views.py:152 msgid "You have set your candidature successfully." msgstr "Sie haben Ihre Kandidatur erfolgreich gesetzt." -#: assignment/views.py:155 +#: assignment/views.py:157 msgid "You can't candidate. Your user account is only for administration." msgstr "" "Sie können nicht kandidieren. Ihr Nutzerkonto ist nur zur Administration." -#: assignment/views.py:163 +#: assignment/views.py:165 msgid "You have withdrawn your candidature successfully." msgstr "Sie haben Ihre Kandidatur erfolgreich zurückgezogen." -#: assignment/views.py:174 +#: assignment/views.py:176 #, python-format msgid "Candidate %s was withdrawn successfully." msgstr "Die Kandidatur von %s wurde erfolgreich zurückgezogen." -#: assignment/views.py:177 +#: assignment/views.py:179 #, python-format msgid "Do you really want to withdraw %s from the election?" msgstr "Soll %s wirklich von der Wahl zurückgezogen werden?" -#: assignment/views.py:186 +#: assignment/views.py:188 msgid "New ballot was successfully created." msgstr "Neuer Wahlgang erfolgreich angelegt." -#: assignment/views.py:243 +#: assignment/views.py:245 #, python-format msgid "The %s. ballot was successfully deleted." msgstr "Der %s. Wahlgang wurde erfolgreich gelöscht." -#: assignment/views.py:245 +#: assignment/views.py:247 #, python-format msgid "the %s. ballot" msgstr "der %s. Wahlgang" -#: assignment/views.py:257 assignment/templates/assignment/view.html:150 +#: assignment/views.py:259 assignment/templates/assignment/view.html:150 msgid "not elected" msgstr "nicht gewählt" -#: assignment/views.py:260 assignment/templates/assignment/view.html:152 +#: assignment/views.py:262 assignment/templates/assignment/view.html:152 msgid "elected" msgstr "gewählt" @@ -1015,123 +1036,127 @@ msgstr "Abstimmung löschen" msgid "New ballot" msgstr "Neuer Wahlgang" -#: participant/forms.py:22 +#: participant/forms.py:23 msgid "First name" msgstr "Vorname" -#: participant/forms.py:23 +#: participant/forms.py:24 msgid "Last name" msgstr "Nachname" -#: participant/forms.py:63 +#: participant/forms.py:64 msgid "CSV File" msgstr "CSV-Datei" -#: participant/models.py:19 participant/templates/participant/overview.html:13 +#: participant/models.py:21 participant/templates/participant/overview.html:13 msgid "Not specified" msgstr "Nicht angegeben" -#: participant/models.py:20 participant/templates/participant/overview.html:11 +#: participant/models.py:22 participant/templates/participant/overview.html:11 #: participant/templates/participant/overview.html:60 msgid "Male" msgstr "Männlich" -#: participant/models.py:21 participant/templates/participant/overview.html:12 +#: participant/models.py:23 participant/templates/participant/overview.html:12 #: participant/templates/participant/overview.html:62 msgid "Female" msgstr "Weiblich" -#: participant/models.py:24 participant/templates/participant/overview.html:24 +#: participant/models.py:26 participant/templates/participant/overview.html:24 msgid "Delegate" msgstr "Delegierter" -#: participant/models.py:25 +#: participant/models.py:27 msgid "Guest" msgstr "Gast" -#: participant/models.py:26 participant/templates/participant/overview.html:25 +#: participant/models.py:28 participant/templates/participant/overview.html:25 msgid "Observer" msgstr "Beobachter" -#: participant/models.py:27 +#: participant/models.py:29 msgid "Staff" msgstr "Mitarbeiter" -#: participant/models.py:31 participant/templates/participant/overview.html:10 +#: participant/models.py:33 participant/templates/participant/overview.html:10 #: participant/templates/participant/overview.html:43 msgid "Gender" msgstr "Geschlecht" -#: participant/models.py:32 participant/templates/participant/overview.html:16 +#: participant/models.py:34 participant/templates/participant/overview.html:16 #: participant/templates/participant/overview.html:44 utils/pdf.py:230 msgid "Group" msgstr "Gruppe" -#: participant/models.py:33 +#: participant/models.py:35 msgid "Typ" msgstr "Typ" -#: participant/models.py:34 participant/templates/participant/overview.html:30 +#: participant/models.py:36 participant/templates/participant/overview.html:30 #: participant/templates/participant/overview.html:46 utils/pdf.py:230 msgid "Committee" msgstr "Amt" -#: participant/views.py:106 +#: participant/models.py:37 +msgid "First Password" +msgstr "Erstes Passwort" + +#: participant/views.py:100 msgid "New participant was successfully created." msgstr "Neuer Teilnehmer wurde erfolgreich angelegt." -#: participant/views.py:108 +#: participant/views.py:102 msgid "Participant was successfully modified." msgstr "Teilnehmer wurde erfolgreich geändert." -#: participant/views.py:131 +#: participant/views.py:127 #, python-format msgid "Participant %s was successfully deleted." msgstr "Teilnehmer %s wurde erfolgreich gelöscht." -#: participant/views.py:143 +#: participant/views.py:139 #, python-format msgid "Participant %s is now a normal user." msgstr "Teilnehmer %s ist jetzt ein normaler Nutzer." -#: participant/views.py:147 +#: participant/views.py:143 #, python-format msgid "Participant %s is now administrator." msgstr "Teilnehmer %s ist jetzt ein Administrator." -#: participant/views.py:157 +#: participant/views.py:153 #, python-format msgid "Participant %s was successfully deactivated." msgstr "Teilnehmer %s wurde erfolgreich deaktiviert." -#: participant/views.py:161 +#: participant/views.py:157 #, python-format msgid "Participant %s was successfully activated." msgstr "Teilnehmer %s wurde erfolgreich aktiviert." -#: participant/views.py:188 +#: participant/views.py:184 msgid "New group was successfully created." msgstr "Neue Gruppe wurde erfolgreich angelegt." -#: participant/views.py:190 +#: participant/views.py:186 msgid "Group was successfully modified." msgstr "Gruppe wurde erfolgreich geändert." -#: participant/views.py:206 +#: participant/views.py:205 #, python-format msgid "Group %s was successfully deleted." msgstr "Gruppe %s wurde erfolgreich gelöscht." -#: participant/views.py:220 +#: participant/views.py:219 msgid "User settings successfully saved." msgstr "Nutzereinstellungen wurden erfolgreich gespeichert." -#: participant/views.py:268 +#: participant/views.py:267 #, python-format msgid "%d new participants were successfully imported." msgstr "%d neue Teilnehmer wurden erfolgreich importiert." -#: participant/views.py:272 +#: participant/views.py:271 msgid "" "Attention: All existing participants will be removed if you import new " "participants." @@ -1139,6 +1164,16 @@ msgstr "" "Achtung: Alle existierenden Teilnehmer werden gelöscht, wenn Sie neue " "Teilnehmer importieren." +#: participant/views.py:290 +#, python-format +msgid "The Password for %s was successfully reset." +msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt." + +#: participant/views.py:292 +#, python-format +msgid "Do you really want to reset the password for %s?" +msgstr "Soll das Passwort für %s wirklich zurückgesetzt werden?" + #: participant/templates/participant/base_participant.html:6 #: participant/templates/participant/overview.html:2 #: participant/templates/participant/overview.html:5 templates/403.html:20 @@ -1173,6 +1208,10 @@ msgstr "Teilnehmerliste drucken" msgid "Import" msgstr "Import" +#: participant/templates/participant/base_participant.html:17 +msgid "Generate first passwords" +msgstr "Erste Passwörter generieren" + #: participant/templates/participant/edit.html:2 poll/models.py:109 msgid "Participant" msgstr "Teilnehmer" @@ -1182,6 +1221,10 @@ msgstr "Teilnehmer" msgid "Edit participant" msgstr "Teilnehmer bearbeiten" +#: participant/templates/participant/edit.html:15 +msgid "Reset Password" +msgstr "Passwort zurücksetzen" + #: participant/templates/participant/group_edit.html:2 #: participant/templates/participant/group_overview.html:8 msgid "User Group" @@ -1247,11 +1290,6 @@ msgid "Your username and password didn't match. Please try again." msgstr "" "Benutzername und Passwort stimmen nicht überein. Bitte noch einmal versuchen." -#: participant/templates/participant/overview.html:23 -#: participant/templates/participant/overview.html:45 utils/pdf.py:230 -msgid "Type" -msgstr "Typ" - #: participant/templates/participant/overview.html:26 msgid "staff" msgstr "Mitarbeiter" @@ -1451,114 +1489,3 @@ msgstr "verfügbare Posten" #: utils/utils.py:72 msgid "Sorry, you have no rights to see this page." msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." - -#~ msgid "with children" -#~ msgstr "mit Kindelementen" - -#~ msgid "Agenda selected" -#~ msgstr "Tagesordnung ausgewählt" - -#~ msgid "Select agenda" -#~ msgstr "Tagesordnung auswählen" - -#~ msgid "Print reduced agenda (only first parent items)" -#~ msgstr "Reduzierte Tagesordnung drucken (nur erste Elterneinträge)" - -#~ msgid "Print full agenda (all items)" -#~ msgstr "Vollständige Tagesordnung drucken (alle Einträge)" - -#~ msgid "Select item" -#~ msgstr "Eintrag auswählen" - -#~ msgid "Click to open item" -#~ msgstr "Zum Öffnen klicken" - -#~ msgid "Click to close item" -#~ msgstr "Zum Schließen klicken" - -#~ msgid "%s. poll" -#~ msgstr "%s. Abstimmung" - -#~ msgid "Vote on application #%s" -#~ msgstr "Abstimmung über Antrag #%s" - -#~ msgid "New poll was successfully created." -#~ msgstr "Neue Abstimmung wurde erfolgreich angelegt." - -#~ msgid "Print Poll" -#~ msgstr "Abstimmung drucken" - -#~ msgid "Back to application" -#~ msgstr "Zurück zum Antrag" - -#~ msgid "Not (yet) available." -#~ msgstr "Liegt (noch) nicht vor." - -#~ msgid "New poll" -#~ msgstr "Neue Abstimmung" - -#~ msgid "Election for %s" -#~ msgstr "Wahl zum %s" - -#~ msgid "Back to election" -#~ msgstr "Zurück zur Wahl" - -#~ msgid "You have to change your Password." -#~ msgstr "Sie müssen Ihr Passwort ändern." - -#~ msgid "Poll was successfully modified." -#~ msgstr "Abstimmung wurde erfolgreich geändert." - -#~ msgid "Poll %s was successfully deleted." -#~ msgstr "Abstimmung %s wurde erfolgreich gelöscht." - -#~ msgid "New option was successfully created." -#~ msgstr "Neue Wahlmöglichkeit wurde erfolgreich angelegt." - -#~ msgid "Option was successfully modified." -#~ msgstr "Wahlmöglichkeit wurde erfolgreich geändert." - -#~ msgid "Option %s was successfully deleted." -#~ msgstr "Wahlmöglichkeit %s wurde erfolgreich gelöscht." - -#~ msgid "Do you really want to delete the option %s?" -#~ msgstr "Soll die Wahlmöglichkeit %s wirklich gelöscht werden?" - -#~ msgid "Polls" -#~ msgstr "Abstimmungen" - -#~ msgid "All polls" -#~ msgstr "Alle Abstimmungen" - -#~ msgid "Edit poll" -#~ msgstr "Abstimmung bearbeiten" - -#~ msgid "Options" -#~ msgstr "Wahlmöglichkeiten" - -#~ msgid "Edit option" -#~ msgstr "Wahlmöglichkeit bearbeiten" - -#~ msgid "Delete option" -#~ msgstr "Wahlmöglichkeit löschen" - -#~ msgid "Add new Option" -#~ msgstr "Neue Wahlmöglichkeit hinzufügen" - -#~ msgid "Edit Poll Option" -#~ msgstr "Abstimmgunsmöglichkeit bearbeiten" - -#~ msgid "New Poll Option" -#~ msgstr "Neue Abstimmungsmöglichkeit" - -#~ msgid "Delete poll" -#~ msgstr "Abstimmung löschen" - -#~ msgid "No polls available." -#~ msgstr "Keine Abstimmungen vorhanden." - -#~ msgid "full" -#~ msgstr "vollständig" - -#~ msgid "abridged" -#~ msgstr "verkürzt" diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html index 39b63bc06..764562e37 100644 --- a/openslides/participant/templates/participant/base_participant.html +++ b/openslides/participant/templates/participant/base_participant.html @@ -14,7 +14,7 @@
  • {%trans "New user group" %}
  • {%trans 'Print participant list' %}
  • {%trans 'Import' %}
    • -
  • {% trans 'Set Default Passwords' %}
    • +
  • {% trans 'Generate first passwords' %}
    • {% endif %} {% endblock %} diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html index bfa14ff8f..5e29e22f6 100644 --- a/openslides/participant/templates/participant/edit.html +++ b/openslides/participant/templates/participant/edit.html @@ -17,6 +17,9 @@ + +