From 8dca3b5321063d377d56e1a437c67bac69aca51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Thu, 14 Jun 2018 11:37:23 +0200 Subject: [PATCH] Updated German translations. Changed some strings in source. Fixed some regressions introduces by new sort-submitters and amendment features. --- openslides/locale/angular-gettext/de.po | 1283 ++++++++------- .../locale/angular-gettext/template-en.pot | 1392 ++++++++++------- .../static/js/motions/motion-services.js | 6 +- openslides/motions/static/js/motions/pdf.js | 10 +- openslides/motions/static/js/motions/site.js | 9 + .../amendment-paragraph-choose-form.html | 2 +- .../motions/motion-amendment-list.html | 9 +- .../amendment-paragraph-diff.html | 2 +- .../static/templates/motions/motion-form.html | 2 +- .../templates/motions/slide_motion.html | 9 - 10 files changed, 1556 insertions(+), 1168 deletions(-) diff --git a/openslides/locale/angular-gettext/de.po b/openslides/locale/angular-gettext/de.po index dfa5704f2..ea996c40d 100644 --- a/openslides/locale/angular-gettext/de.po +++ b/openslides/locale/angular-gettext/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides\n" -"PO-Revision-Date: 2018-05-23 14:21+0000\n" +"PO-Revision-Date: 2018-06-14 10:56+0000\n" "Last-Translator: Emanuel Schütze \n" "Language-Team: German (http://www.transifex.com/openslides/openslides/language/de/)\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,11 +14,21 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: motions/static/js/motions/base.js:959 +#: motions/static/templates/motions/motion-detail.html:47 +msgctxt "resolution" +msgid "Final version" +msgstr "Beschlussfassung" + +#: csv-import.html:16 +msgctxt "special filetypes in a file open dialog" +msgid "Accepted file types" +msgstr "Akzeptierte Dateitypen" + +#: motions/static/js/motions/base.js:1419 msgid "%TYPE% from line %FROM% to %TO%" msgstr "%TYPE% von Zeile %FROM% bis %TO%" -#: motions/static/js/motions/base.js:961 +#: motions/static/js/motions/base.js:1421 msgid "%TYPE% in line %FROM%" msgstr "%TYPE% in Zeile %FROM%" @@ -26,12 +36,14 @@ msgstr "%TYPE% in Zeile %FROM%" msgid "%num% emails were send sucessfully." msgstr "%num% E-Mails wurden erfolgreich versandt." -#: motions/static/templates/motions/motion-list.html:68 +#: motions/static/templates/motions/motion-amendment-list.html:115 +#: motions/static/templates/motions/motion-list.html:72 #: users/static/templates/users/user-list.html:81 msgid "--- Select action ---" msgstr "--- Aktion auswählen ---" -#: motions/static/templates/motions/motion-list.html:88 +#: motions/static/templates/motions/motion-amendment-list.html:135 +#: motions/static/templates/motions/motion-list.html:92 msgid "--- Select category ---" msgstr "--- Sachgebiet auswählen ---" @@ -39,7 +51,8 @@ msgstr "--- Sachgebiet auswählen ---" msgid "--- Select group ---" msgstr "--- Gruppe auswählen ---" -#: motions/static/templates/motions/motion-list.html:102 +#: motions/static/templates/motions/motion-amendment-list.html:149 +#: motions/static/templates/motions/motion-list.html:106 msgid "--- Select motion block ---" msgstr "--- Antragsblock auswählen ---" @@ -47,7 +60,8 @@ msgstr "--- Antragsblock auswählen ---" msgid "--- Select phase ---" msgstr "--- Status auswählen ---" -#: motions/static/templates/motions/motion-list.html:76 +#: motions/static/templates/motions/motion-amendment-list.html:123 +#: motions/static/templates/motions/motion-list.html:80 msgid "--- Select state ---" msgstr "--- Status auswählen ---" @@ -55,7 +69,7 @@ msgstr "--- Status auswählen ---" msgid "--- Set phase ---" msgstr "--- Phase auswählen ---" -#: core/static/js/core/site.js:2068 +#: core/static/js/core/site.js:2081 msgid "" "OpenSlides is a free web based " "presentation and assembly system for visualizing and controlling agenda, " @@ -70,7 +84,7 @@ msgstr "" msgid "A comment has been changed." msgstr "Ein Kommentar wurde geändert." -#: core/static/js/core/base.js:788 +#: core/static/js/core/base.js:798 msgid "A server error occurred (%%code%%). Please check the system logs." msgstr "Ein Serverfehler ist aufgetreten (%%code%%). Bitte überprüfen Sie die Systemprotokolle." @@ -82,29 +96,28 @@ msgstr "Über mich" #: assignments/static/js/assignments/pdf.js:348 #: assignments/static/js/assignments/site.js:616 #: assignments/static/js/assignments/site.js:753 -#: motions/static/js/motions/pdf.js:197 motions/static/js/motions/pdf.js:712 -#: motions/static/js/motions/site.js:664 -#: motions/static/templates/motions/motion-detail.html:409 +#: motions/static/js/motions/pdf.js:200 motions/static/js/motions/pdf.js:730 +#: motions/static/js/motions/site.js:761 +#: motions/static/templates/motions/motion-detail.html:426 #: motions/static/templates/motions/slide_motion.html:56 msgid "Abstain" msgstr "Enthaltung" -#: motions/static/js/motions/base.js:1003 -#: motions/static/js/motions/base.js:1018 +#: motions/static/js/motions/base.js:1541 +#: motions/static/js/motions/base.js:1556 msgid "Accept" msgstr "Annehmen" -#: motions/static/js/motions/base.js:1004 -#: motions/static/js/motions/base.js:1019 +#: motions/static/js/motions/base.js:1542 +#: motions/static/js/motions/base.js:1557 msgid "Acceptance" msgstr "Annahme" -#: csv-import.html:16 -msgctxt "special filetypes in a file open dialog" -msgid "Accepted file types" -msgstr "Akzeptierte Dateitypen" +#: motions/static/templates/motions/motion-detail/change-summary.html:46 +msgid "Accepted" +msgstr "Angenommen" -#: motions/static/js/motions/site.js:2640 +#: motions/static/js/motions/site.js:3182 msgid "Activate amendments" msgstr "Änderungsanträge aktivieren" @@ -113,7 +126,7 @@ msgid "Active" msgstr "Aktiv" #: assignments/static/templates/assignments/assignment-list.html:285 -#: motions/static/templates/motions/motion-list.html:731 +#: motions/static/templates/motions/motion-list.html:368 msgid "Add a tag" msgstr "Schlagwort hinzufügen" @@ -157,11 +170,11 @@ msgid "" "the import." msgstr "Zusätzliche Spalten nach den erforderlichen Spalten können vorhanden sein und haben keinen Einfluss auf den Import." -#: motions/static/js/motions/base.js:1026 +#: motions/static/js/motions/base.js:1564 msgid "Adjourn" msgstr "Vertagen" -#: motions/static/js/motions/base.js:1027 +#: motions/static/js/motions/base.js:1565 msgid "Adjournment" msgstr "Vertagung" @@ -181,17 +194,22 @@ msgstr "Administrative Daten" msgid "Agenda" msgstr "Tagesordnung" -#: motions/static/templates/motions/motion-list.html:415 +#: motions/static/templates/motions/motion-table-filters.html:247 msgid "All Filters" msgstr "Alle Filter" -#: assignments/static/js/assignments/site.js:871 -#: motions/static/js/motions/site.js:2664 +#: assignments/static/js/assignments/site.js:879 +#: motions/static/js/motions/site.js:3211 msgid "All casted ballots" msgstr "Alle abgegebenen Stimmzettel" -#: assignments/static/js/assignments/site.js:870 -#: motions/static/js/motions/site.js:2663 +#: motions/static/templates/motions/motion-amendment-list.html:28 +#: motions/static/templates/motions/motion-amendment-list.html:44 +msgid "All motions" +msgstr "Alle Anträge" + +#: assignments/static/js/assignments/site.js:878 +#: motions/static/js/motions/site.js:3210 msgid "All valid ballots" msgstr "Alle gültigen Stimmzettel" @@ -201,37 +219,60 @@ msgid "" "once you (or the users concerned) reload the page." msgstr "Alle Änderungen werden sofort gespeichert. Die Änderungen werden erst dann wirksam, wenn Sie (oder die betroffenen Nutzer) die Seite neu laden." -#: core/static/js/core/site.js:2084 +#: core/static/js/core/site.js:2097 msgid "Allow access for anonymous guest users" msgstr "Erlaube Zugriff für anonyme Gast-Nutzer" -#: motions/static/js/motions/site.js:2633 +#: motions/static/js/motions/site.js:3174 msgid "Allow to disable versioning" msgstr "Erlaubt Versionierung zu deaktiveren" -#: assignments/static/js/assignments/site.js:859 +#: assignments/static/js/assignments/site.js:867 msgid "Always Yes-No-Abstain per candidate" msgstr "Ja/Nein/Enthaltung pro Kandidat/in" -#: assignments/static/js/assignments/site.js:860 +#: assignments/static/js/assignments/site.js:868 msgid "Always Yes/No per candidate" msgstr "Ja/Nein pro Kandidat/in" -#: assignments/static/js/assignments/site.js:858 +#: assignments/static/js/assignments/site.js:866 msgid "Always one option per candidate" msgstr "Eine Stimme pro Kandidat/in" -#: motions/static/js/motions/pdf.js:515 motions/static/js/motions/pdf.js:74 -#: motions/static/templates/motions/motion-detail.html:83 -msgid "Amendment of motion" +#: motions/static/templates/motions/motion-amendment-list.html:96 +msgid "Amendment list PDF" +msgstr "Änderungsantragsübersicht" + +#: motions/static/js/motions/site.js:2207 +#: motions/static/js/motions/site.js:3186 +msgid "Amendment to" +msgstr "Änderungsantrag zu" + +#: motions/static/js/motions/pdf.js:533 motions/static/js/motions/pdf.js:75 +#: motions/static/js/motions/site.js:2210 +msgid "Amendment to motion" msgstr "Änderungsantrag zu Antrag" -#: motions/static/js/motions/site.js:2639 -#: motions/static/templates/motions/motion-detail.html:154 +#: motions/static/js/motions/site.js:2736 +#: motions/static/js/motions/site.js:3181 +#: motions/static/js/motions/site.js:877 +#: motions/static/templates/motions/motion-amendment-list.html:18 +#: motions/static/templates/motions/motion-detail.html:17 +#: motions/static/templates/motions/motion-detail.html:172 +#: motions/static/templates/motions/motion-detail.html:174 +#: motions/static/templates/motions/motion-list.html:10 msgid "Amendments" msgstr "Änderungsanträge" -#: motions/static/js/motions/site.js:2642 +#: motions/static/js/motions/site.js:2733 +msgid "Amendments to" +msgstr "Änderungsanträge zu" + +#: motions/static/js/motions/pdf.js:1079 +msgid "Amendments to motion" +msgstr "Änderungsanträge zu Antrag" + +#: motions/static/js/motions/site.js:3184 msgid "Apply text for new amendments" msgstr "Text für neuen Änderungsantrag übernehmen" @@ -247,11 +288,15 @@ msgstr "Soll der Chatverlauf wirklich gelöscht werden?" msgid "Are you sure you want to delete all selected agenda items?" msgstr "Sollen alle ausgewählten Tagesordnungspunkte wirklich gelöscht werden?" +#: motions/static/templates/motions/motion-amendment-list.html:162 +msgid "Are you sure you want to delete all selected amendments?" +msgstr "Sollen alle ausgewählten Änderungsanträge wirklich gelöscht werden?" + #: assignments/static/templates/assignments/assignment-list.html:54 msgid "Are you sure you want to delete all selected elections?" msgstr "Sollen alle ausgewählten Wahlen wirklich gelöscht werden?" -#: motions/static/templates/motions/motion-list.html:115 +#: motions/static/templates/motions/motion-list.html:119 msgid "Are you sure you want to delete all selected motions?" msgstr "Sollen alle ausgewählten Anträge wirklich gelöscht werden?" @@ -264,7 +309,7 @@ msgid "Are you sure you want to delete this ballot?" msgstr "Soll dieser Wahlgang wirklich gelöscht werden?" #: motions/static/templates/motions/motion-detail/view-diff.html:25 -#: motions/static/templates/motions/motion-detail/view-diff.html:72 +#: motions/static/templates/motions/motion-detail/view-diff.html:79 #: motions/static/templates/motions/motion-detail/view-original.html:34 msgid "Are you sure you want to delete this change recommendation?" msgstr "Soll diese Änderungsempfehlung wirklich gelöscht werden?" @@ -274,10 +319,11 @@ msgstr "Soll diese Änderungsempfehlung wirklich gelöscht werden?" #: core/static/templates/core/manage-projectors.html:52 #: core/static/templates/core/tag-list.html:46 #: motions/static/templates/motions/category-list.html:49 +#: motions/static/templates/motions/motion-amendment-list.html:338 #: motions/static/templates/motions/motion-block-list.html:45 -#: motions/static/templates/motions/motion-list.html:645 +#: motions/static/templates/motions/motion-list.html:282 #: users/static/templates/users/group-list.html:45 -#: users/static/templates/users/user-list.html:362 +#: users/static/templates/users/user-list.html:364 msgid "Are you sure you want to delete this entry?" msgstr "Soll dieser Eintrag wirklich gelöscht werden?" @@ -285,11 +331,11 @@ msgstr "Soll dieser Eintrag wirklich gelöscht werden?" msgid "Are you sure you want to delete this file?" msgstr "Soll diese Datei wirklich gelöscht werden?" -#: motions/static/templates/motions/motion-detail.html:362 +#: motions/static/templates/motions/motion-detail.html:379 msgid "Are you sure you want to delete this poll?" msgstr "Soll diese Abstimmung wirklich gelöscht werden?" -#: motions/static/templates/motions/motion-detail.html:583 +#: motions/static/templates/motions/motion-detail.html:614 msgid "Are you sure you want to delete this version?" msgstr "Soll diese Version wirklich gelöscht werden?" @@ -321,11 +367,18 @@ msgid "" " other fields are optional and may be empty." msgstr "Mindestens der Vorname oder der Nachname müssen angegeben sein. Alle übrigen Felder sind optional und dürfen leer sein." -#: motions/static/js/motions/site.js:501 topics/static/js/topics/site.js:113 +#: motions/static/templates/motions/motion-detail.html:548 +msgid "" +"At least two amendments or change recommendations affecting the same line are to be integrated.\n" +" This leads to undeterministic results.\n" +" Please resolve this conflict by not accepting multiple changes affecting the same line." +msgstr "Mindestens zwei Änderungsanträge oder Änderungsempfehlungen beziehen sich auf die gleiche Zeile. Dies führt zu unbestimmten Ergebnissen. Bitte lösen Sie diesen Konflikt auf durch Nicht-Annahme entsprechender Änderungen." + +#: motions/static/js/motions/site.js:570 topics/static/js/topics/site.js:113 msgid "Attachment" msgstr "Anhang" -#: motions/static/templates/motions/motion-detail.html:554 +#: motions/static/templates/motions/motion-detail.html:585 #: topics/static/templates/topics/topic-detail.html:31 msgid "Attachments" msgstr "Anhänge" @@ -334,10 +387,14 @@ msgstr "Anhänge" msgid "Autodetection" msgstr "Automatische Erkennung" -#: assignments/static/js/assignments/site.js:857 +#: assignments/static/js/assignments/site.js:865 msgid "Automatic assign of method" msgstr "Automatische Zuordnung der Methode" +#: motions/static/templates/motions/motion-submitters.html:6 +msgid "Back" +msgstr "Zurück" + #: topics/static/templates/topics/topic-import.html:130 #: topics/static/templates/topics/topic-import.html:35 msgid "Back to agenda" @@ -347,6 +404,7 @@ msgstr "Zurück zur Tagesordnung" msgid "Back to categories" msgstr "Zurück zur Sachgebietsübersicht" +#: motions/static/templates/motions/motion-amendment-list.html:8 #: motions/static/templates/motions/motion-import.html:139 msgid "Back to motions overview" msgstr "Zurück zur Antragsübersicht" @@ -358,7 +416,8 @@ msgstr "Zurück zur Antragsübersicht" #: motions/static/templates/motions/category-list.html:6 #: motions/static/templates/motions/motion-block-detail.html:6 #: motions/static/templates/motions/motion-block-list.html:6 -#: motions/static/templates/motions/motion-detail.html:6 +#: motions/static/templates/motions/motion-detail.html:12 +#: motions/static/templates/motions/motion-detail.html:7 #: motions/static/templates/motions/motion-import.html:6 #: topics/static/templates/topics/topic-detail.html:6 #: topics/static/templates/topics/topic-import.html:6 @@ -375,7 +434,7 @@ msgstr "Zurück zur Übersicht" msgid "Back to users overview" msgstr "Zurück zur Benutzerübersicht" -#: core/static/js/core/site.js:2101 +#: core/static/js/core/site.js:2114 msgid "Background color of projector header and footer" msgstr "Hintergrundfarbe des Projektor-Kopf- und Fußbereichs" @@ -387,7 +446,7 @@ msgstr "Hintergrundfarbe des Projektor-Kopf- und Fußbereichs" msgid "Ballot" msgstr "Wahlgang" -#: assignments/static/js/assignments/site.js:862 +#: assignments/static/js/assignments/site.js:870 msgid "Ballot and ballot papers" msgstr "Wahlgang und Stimmzettel" @@ -553,15 +612,17 @@ msgstr "Darf den Chat benutzen" #: assignments/static/templates/assignments/assignment-form.html:18 #: assignments/static/templates/assignments/assignmentpoll-form.html:18 -#: core/static/js/core/base.js:256 core/static/js/core/site.js:128 +#: core/static/js/core/base.js:264 core/static/js/core/site.js:128 #: core/static/js/core/site.js:129 #: core/static/templates/core/projector-controls.html:198 #: core/static/templates/core/projector-message-form.html:8 #: core/static/templates/core/tag-form.html:13 #: mediafiles/static/templates/mediafiles/mediafile-form.html:19 +#: motions/static/templates/motions/amendment-paragraph-choose-form.html:24 #: motions/static/templates/motions/category-form.html:13 #: motions/static/templates/motions/change-recommendation-form.html:13 #: motions/static/templates/motions/motion-block-form.html:13 +#: motions/static/templates/motions/motion-comment-form.html:12 #: motions/static/templates/motions/motion-export-form.html:10 #: motions/static/templates/motions/motion-form.html:19 #: motions/static/templates/motions/motion-poll-form.html:18 @@ -593,16 +654,16 @@ msgid "Cannot load image" msgstr "Konnte folgendes Bild nicht laden:" #: assignments/static/js/assignments/pdf.js:213 -#: assignments/static/js/assignments/site.js:802 +#: assignments/static/js/assignments/site.js:810 #: assignments/static/templates/assignments/assignment-detail.html:271 #: assignments/static/templates/assignments/slide_assignment.html:81 msgid "Casted ballots" msgstr "Abgegebene Stimmzettel" -#: motions/static/js/motions/docx.js:45 motions/static/js/motions/pdf.js:883 -#: motions/static/js/motions/site.js:102 +#: motions/static/js/motions/docx.js:46 motions/static/js/motions/pdf.js:901 +#: motions/static/js/motions/site.js:135 #: motions/static/templates/motions/category-list.html:13 -#: motions/static/templates/motions/motion-list.html:10 +#: motions/static/templates/motions/motion-list.html:14 msgid "Categories" msgstr "Sachgebiete" @@ -610,19 +671,19 @@ msgstr "Sachgebiete" msgid "Categories created" msgstr "Sachgebiete angelegt" -#: motions/static/js/motions/pdf.js:137 motions/static/js/motions/pdf.js:573 -#: motions/static/js/motions/site.js:1241 -#: motions/static/js/motions/site.js:515 +#: motions/static/js/motions/pdf.js:140 motions/static/js/motions/pdf.js:591 +#: motions/static/js/motions/site.js:1371 +#: motions/static/js/motions/site.js:584 #: motions/static/templates/motions/category-sort.html:9 -#: motions/static/templates/motions/motion-detail.html:277 -#: motions/static/templates/motions/motion-detail.html:281 +#: motions/static/templates/motions/motion-detail.html:293 +#: motions/static/templates/motions/motion-detail.html:297 #: motions/static/templates/motions/motion-import.html:27 #: motions/static/templates/motions/motion-import.html:50 -#: motions/static/templates/motions/motion-list.html:221 +#: motions/static/templates/motions/motion-table-filters.html:69 msgid "Category" msgstr "Sachgebiet" -#: core/static/js/core/site.js:2089 +#: core/static/js/core/site.js:2102 msgid "Center" msgstr "Mittig" @@ -631,7 +692,7 @@ msgid "Change item number ..." msgstr "Nummer ändern ..." #: index.html:106 users/static/templates/users/user-change-password.html:47 -#: users/static/templates/users/user-list.html:360 +#: users/static/templates/users/user-list.html:362 msgid "Change password" msgstr "Passwort ändern" @@ -643,15 +704,19 @@ msgstr "Passwort ändern für {{ user.get_short_name() }}" msgid "Change presence" msgstr "Anwesenheit ändern" -#: motions/static/js/motions/site.js:804 motions/static/js/motions/site.js:818 -#: motions/static/templates/motions/motion-detail/toolbar.html:102 -#: motions/static/templates/motions/motion-detail/toolbar.html:138 +#: motions/static/templates/motions/motion-detail/change-summary.html:34 +msgid "Change recommendation" +msgstr "Änderungsempfehlung" + +#: motions/static/js/motions/site.js:917 motions/static/js/motions/site.js:931 +#: motions/static/templates/motions/motion-detail/toolbar.html:59 +#: motions/static/templates/motions/motion-detail/toolbar.html:95 msgid "Change recommendations" msgstr "Änderungsempfehlungen" -#: motions/static/js/motions/site.js:807 motions/static/js/motions/site.js:821 -#: motions/static/templates/motions/motion-detail/toolbar.html:117 -#: motions/static/templates/motions/motion-detail/toolbar.html:150 +#: motions/static/js/motions/site.js:920 motions/static/js/motions/site.js:934 +#: motions/static/templates/motions/motion-detail/toolbar.html:107 +#: motions/static/templates/motions/motion-detail/toolbar.html:74 msgid "Changed version" msgstr "Geänderte Fassung" @@ -659,10 +724,14 @@ msgstr "Geänderte Fassung" msgid "Chat" msgstr "Chat" -#: motions/static/js/motions/site.js:2648 +#: motions/static/js/motions/site.js:3195 msgid "Choose 0 to disable the supporting system." msgstr "Zum Deaktivieren des Unterstützersystems '0' eingeben." +#: motions/static/templates/motions/amendment-paragraph-choose-form.html:1 +msgid "Choose the paragraph to amend!" +msgstr "Bitte einen zu ändernden Absatz auswählen!" + #: core/static/js/core/site.js:130 core/static/js/core/site.js:131 msgid "Clear" msgstr "Löschen" @@ -700,28 +769,28 @@ msgstr "Erledigte Einträge" msgid "Collapse all" msgstr "Alle zusammenklappen" -#: core/static/js/core/site.js:2105 +#: core/static/js/core/site.js:2118 msgid "Color for blanked projector" msgstr "Farbe für ausgeblendeten Projektor" -#: motions/static/templates/motions/motion-list.html:269 +#: motions/static/templates/motions/motion-table-filters.html:117 #: topics/static/templates/topics/topic-import.html:53 #: topics/static/templates/topics/topic-import.html:72 #: users/static/js/users/site.js:374 users/static/js/users/site.js:648 #: users/static/templates/users/user-detail.html:48 #: users/static/templates/users/user-import.html:56 #: users/static/templates/users/user-import.html:89 -#: users/static/templates/users/user-list.html:439 +#: users/static/templates/users/user-list.html:441 msgid "Comment" msgstr "Kommentar" -#: motions/static/js/motions/site.js:2654 +#: motions/static/js/motions/site.js:3201 msgid "Comment fields for motions" msgstr "Kommentarfelder für Anträge" -#: motions/static/js/motions/docx.js:96 motions/static/js/motions/site.js:1859 -#: motions/static/js/motions/site.js:2653 -#: motions/static/js/motions/site.js:863 +#: motions/static/js/motions/docx.js:97 motions/static/js/motions/site.js:1980 +#: motions/static/js/motions/site.js:3200 +#: motions/static/js/motions/site.js:976 msgid "Comments" msgstr "Kommentare" @@ -733,7 +802,7 @@ msgstr "Gremium" msgid "Committees" msgstr "Gremien" -#: motions/static/js/motions/base.js:1012 +#: motions/static/js/motions/base.js:1550 msgid "Complex Workflow" msgstr "Komplexer Arbeitsablauf" @@ -741,10 +810,14 @@ msgstr "Komplexer Arbeitsablauf" msgid "Confirm new password" msgstr "Neues Passwort bestätigen" -#: motions/static/js/motions/site.js:832 +#: motions/static/js/motions/site.js:945 msgid "Content" msgstr "Inhalt" +#: motions/static/templates/motions/amendment-paragraph-choose-form.html:21 +msgid "Continue" +msgstr "Weiter" + #: core/static/templates/core/login-form.html:23 msgid "Continue as guest" msgstr "Weiter als Gast" @@ -761,11 +834,11 @@ msgid "" " line." msgstr "Kopieren Sie die Titel Ihrer Themenpunkte in diese Textbox. Verwenden Sie eine Zeile pro Punkt." -#: core/static/js/core/base.js:1435 core/static/js/core/site.js:409 +#: core/static/js/core/base.js:1444 core/static/js/core/site.js:422 msgid "Countdown" msgstr "Countdown" -#: core/static/js/core/base.js:1436 +#: core/static/js/core/base.js:1445 #: core/static/templates/core/projector-controls.html:127 msgid "Countdowns" msgstr "Countdowns" @@ -774,15 +847,19 @@ msgstr "Countdowns" msgid "Couple countdown with the list of speakers" msgstr "Countdown mit der Redeliste verkoppeln" +#: motions/static/templates/motions/motion-amendment-list.html:377 +msgid "Create modified amendment" +msgstr "Modifizierte Übernahme" + #: users/static/templates/users/group-edit.html:2 msgid "Create new group" msgstr "Neue Gruppe anlegen" -#: motions/static/js/motions/site.js:1247 +#: motions/static/js/motions/site.js:1377 msgid "Creation date" msgstr "Erstellungsdatum" -#: core/static/js/core/site.js:2097 +#: core/static/js/core/site.js:2110 msgid "Current browser language" msgstr "Aktuelle Browsersprache" @@ -795,12 +872,12 @@ msgstr "Aktuelle Browsersprache" msgid "Current list of speakers" msgstr "Aktuelle Redeliste" -#: assignments/static/js/assignments/site.js:877 -#: motions/static/js/motions/site.js:2676 +#: assignments/static/js/assignments/site.js:885 +#: motions/static/js/motions/site.js:3223 msgid "Custom number of ballot papers" msgstr "Benutzerdefinierte Anzahl von Stimmzetteln" -#: core/static/js/core/site.js:2113 +#: core/static/js/core/site.js:2126 msgid "Custom translations" msgstr "Benutzerdefinierte Übersetzungen" @@ -823,7 +900,7 @@ msgstr "Hallo {name},\n\ndies ist Ihr OpenSlides-Zugang für die Veranstaltung { #: agenda/static/templates/agenda/item-list.html:55 #: core/static/templates/core/projector-controls.html:296 #: mediafiles/static/templates/mediafiles/mediafile-list.html:292 -#: motions/static/templates/motions/motion-detail.html:45 +#: motions/static/templates/motions/motion-detail.html:56 #: projector-button.html:23 users/static/js/users/base.js:171 msgid "Default" msgstr "Standard" @@ -832,26 +909,26 @@ msgstr "Standard" msgid "Default comment on the ballot paper" msgstr "Voreingestellter Hinweis auf Stimmzettel" -#: motions/static/js/motions/site.js:2620 +#: motions/static/js/motions/site.js:3161 msgid "Default line numbering" msgstr "Voreingestellte Zeilennummerierung" -#: assignments/static/js/assignments/site.js:879 +#: assignments/static/js/assignments/site.js:887 msgid "" "Default method to check whether a candidate has reached the required " "majority." msgstr "Voreingestellte Methode zur Überprüfung ob ein Kandidate die nötige Mehrheit erreicht hat." -#: motions/static/js/motions/site.js:2667 +#: motions/static/js/motions/site.js:3214 msgid "" "Default method to check whether a motion has reached the required majority." msgstr "Voreingestellte Methode zur Überprüfung ob ein Antrag die nötige Mehrheit erreicht hat." -#: core/static/js/core/site.js:2116 +#: core/static/js/core/site.js:2129 msgid "Default projector" msgstr "Standardprojektor" -#: motions/static/js/motions/site.js:2635 +#: motions/static/js/motions/site.js:3176 msgid "Default text version for change recommendations" msgstr "Voreingestellte Fassung für Änderungsempfehlungen" @@ -865,19 +942,25 @@ msgstr "Delegierte" #: core/static/templates/core/tag-list.html:45 #: mediafiles/static/templates/mediafiles/mediafile-list.html:319 #: motions/static/templates/motions/category-list.html:48 +#: motions/static/templates/motions/motion-amendment-list.html:116 +#: motions/static/templates/motions/motion-amendment-list.html:337 #: motions/static/templates/motions/motion-block-list.html:44 -#: motions/static/templates/motions/motion-detail.html:364 -#: motions/static/templates/motions/motion-detail.html:586 +#: motions/static/templates/motions/motion-detail.html:381 +#: motions/static/templates/motions/motion-detail.html:617 #: motions/static/templates/motions/motion-detail/view-diff.html:27 -#: motions/static/templates/motions/motion-detail/view-diff.html:74 +#: motions/static/templates/motions/motion-detail/view-diff.html:81 #: motions/static/templates/motions/motion-detail/view-original.html:36 -#: motions/static/templates/motions/motion-list.html:644 -#: motions/static/templates/motions/motion-list.html:69 -#: users/static/templates/users/user-list.html:361 +#: motions/static/templates/motions/motion-list.html:281 +#: motions/static/templates/motions/motion-list.html:73 +#: users/static/templates/users/user-list.html:363 #: users/static/templates/users/user-list.html:82 msgid "Delete" msgstr "Löschen" +#: motions/static/templates/motions/motion-amendment-list.html:166 +msgid "Delete selected amendments" +msgstr "Ausgewählte Änderungsanträge löschen" + #: assignments/static/templates/assignments/assignment-list.html:58 msgid "Delete selected elections" msgstr "Ausgewählte Wahlen löschen" @@ -890,7 +973,7 @@ msgstr "Ausgewählte Einträge löschen" msgid "Delete selected mediafiles" msgstr "Ausgewählte Dateien löschen" -#: motions/static/templates/motions/motion-list.html:119 +#: motions/static/templates/motions/motion-list.html:123 msgid "Delete selected motions" msgstr "Ausgewählte Anträge löschen" @@ -898,9 +981,9 @@ msgstr "Ausgewählte Anträge löschen" msgid "Delete selected participants" msgstr "Ausgewählte Teilnehmende löschen" -#: motions/static/js/motions/base.js:968 motions/static/js/motions/pdf.js:278 -#: motions/static/js/motions/site.js:320 -#: motions/static/templates/motions/motion-detail/change-summary.html:35 +#: motions/static/js/motions/base.js:1428 motions/static/js/motions/pdf.js:281 +#: motions/static/js/motions/site.js:353 +#: motions/static/templates/motions/motion-detail/change-summary.html:39 msgid "Deletion" msgstr "Streichung" @@ -908,7 +991,7 @@ msgstr "Streichung" #: assignments/static/js/assignments/site.js:136 #: assignments/static/templates/assignments/assignment-detail.html:81 #: core/static/templates/core/projector-controls.html:183 -#: motions/static/js/motions/site.js:329 +#: motions/static/js/motions/site.js:362 msgid "Description" msgstr "Beschreibung" @@ -934,19 +1017,19 @@ msgstr "Bestimmt, ob dieser Benutzer als aktiv behandelt werden soll. Sie könne msgid "Didn't get an email" msgstr "Bekam keine E-Mail" -#: motions/static/js/motions/site.js:808 motions/static/js/motions/site.js:822 -#: motions/static/templates/motions/motion-detail/toolbar.html:123 -#: motions/static/templates/motions/motion-detail/toolbar.html:155 +#: motions/static/js/motions/site.js:921 motions/static/js/motions/site.js:935 +#: motions/static/templates/motions/motion-detail/toolbar.html:112 +#: motions/static/templates/motions/motion-detail/toolbar.html:80 msgid "Diff version" msgstr "Änderungsdarstellung" -#: assignments/static/js/assignments/site.js:883 -#: motions/static/js/motions/site.js:2671 +#: assignments/static/js/assignments/site.js:891 +#: motions/static/js/motions/site.js:3218 msgid "Disabled" msgstr "Deaktiviert" -#: assignments/static/js/assignments/site.js:872 -#: motions/static/js/motions/site.js:2665 +#: assignments/static/js/assignments/site.js:880 +#: motions/static/js/motions/site.js:3212 msgid "Disabled (no percents)" msgstr "Deaktiviert (keine Prozente)" @@ -955,25 +1038,25 @@ msgid "" "Display an identifier message on all projectors with the id and the name." msgstr "Identifizierungsmitteilung auf allen Projektoren mit der ID und dem Namen anzeigen." -#: core/static/js/core/site.js:2099 +#: core/static/js/core/site.js:2112 msgid "Display header and footer" msgstr "Kopf- und Fußzeile anzeigen" -#: motions/static/js/motions/base.js:1029 +#: motions/static/js/motions/base.js:1567 msgid "Do not concern" msgstr "Nicht befassen" -#: motions/static/js/motions/base.js:1009 +#: motions/static/js/motions/base.js:1547 msgid "Do not decide" msgstr "Nicht entscheiden" -#: motions/static/templates/motions/motion-detail.html:518 -#: motions/static/templates/motions/motion-detail.html:533 +#: motions/static/templates/motions/motion-detail.html:536 +#: motions/static/templates/motions/motion-detail.html:560 msgid "" "Do you want to create a new version of this motion based on this changes?" msgstr "Wollen Sie eine neue Version des Antrags basierend auf diesen Änderungen erstellen?" -#: motions/static/js/motions/site.js:448 +#: motions/static/js/motions/site.js:516 msgid "Don't create a new version." msgstr "Keine neue Version erzeugen." @@ -1016,16 +1099,17 @@ msgstr "Dauer" #: core/static/templates/core/tag-list.html:44 #: mediafiles/static/templates/mediafiles/mediafile-list.html:318 #: motions/static/templates/motions/category-list.html:46 +#: motions/static/templates/motions/motion-amendment-list.html:330 #: motions/static/templates/motions/motion-block-detail.html:20 #: motions/static/templates/motions/motion-block-list.html:42 -#: motions/static/templates/motions/motion-detail.html:356 -#: motions/static/templates/motions/motion-detail.html:53 +#: motions/static/templates/motions/motion-detail.html:373 +#: motions/static/templates/motions/motion-detail.html:64 #: motions/static/templates/motions/motion-detail/view-diff.html:33 -#: motions/static/templates/motions/motion-detail/view-diff.html:79 -#: motions/static/templates/motions/motion-list.html:641 +#: motions/static/templates/motions/motion-detail/view-diff.html:87 +#: motions/static/templates/motions/motion-list.html:273 #: topics/static/templates/topics/topic-detail.html:20 #: users/static/templates/users/user-detail.html:15 -#: users/static/templates/users/user-list.html:358 +#: users/static/templates/users/user-list.html:359 msgid "Edit" msgstr "Bearbeiten" @@ -1041,6 +1125,11 @@ msgstr "Sachgebiet bearbeiten" msgid "Edit change recommendation" msgstr "Änderungsempfehlung bearbeiten" +#: motions/static/js/motions/site.js:2408 +#: motions/static/js/motions/site.js:3178 +msgid "Edit comment %%comment%% of motion %%motion%%" +msgstr "Kommentar %%comment%% von Antrag %%motion%% bearbeitet" + #: core/static/templates/core/projector-controls.html:143 msgid "Edit countdown" msgstr "Countdown bearbeiten" @@ -1079,10 +1168,19 @@ msgstr "Teilnehmer/in bearbeiten" msgid "Edit profile" msgstr "Profil bearbeiten" +#: motions/static/templates/motions/motion-amendment-list.html:332 +#: motions/static/templates/motions/motion-list.html:276 +msgid "Edit submitters" +msgstr "Antragsteller/in bearbeiten" + #: core/static/templates/core/tag-form.html:1 msgid "Edit tag" msgstr "Schlagwort bearbeiten" +#: motions/static/js/motions/site.js:3189 +msgid "Edit the whole motion text" +msgstr "Vollständigen Antragstext bearbeiten" + #: topics/static/templates/topics/topic-form.html:1 msgid "Edit topic" msgstr "Thema bearbeiten" @@ -1101,7 +1199,7 @@ msgstr "Die Bearbeitung des Textes ist nicht mehr möglich, sobald Änderungsemp msgid "Election" msgstr "Wahl" -#: assignments/static/js/assignments/site.js:856 +#: assignments/static/js/assignments/site.js:864 #: assignments/static/templates/assignments/assignment-detail.html:198 msgid "Election method" msgstr "Wahlmethode" @@ -1115,7 +1213,7 @@ msgstr "Wahlergebnis" #: assignments/static/js/assignments/site.js:19 #: assignments/static/js/assignments/site.js:31 #: assignments/static/js/assignments/site.js:49 -#: assignments/static/js/assignments/site.js:861 +#: assignments/static/js/assignments/site.js:869 #: assignments/static/templates/assignments/assignment-list.html:14 msgid "Elections" msgstr "Wahlen" @@ -1140,6 +1238,10 @@ msgstr "Absender" msgid "Email subject" msgstr "Betreff" +#: motions/static/js/motions/site.js:3188 +msgid "Empty text field" +msgstr "Leeres Textfeld" + #: agenda/static/js/agenda/site.js:774 msgid "Enable numbering for agenda items" msgstr "Nummerierung von Tagesordnungspunkten aktivieren" @@ -1172,15 +1274,15 @@ msgstr "Teilnehmernummer eingeben" msgid "Enter votes" msgstr "Stimmen eingeben" -#: core/static/js/core/base.js:781 +#: core/static/js/core/base.js:791 msgid "Error" msgstr "Fehler" -#: core/static/js/core/pdf.js:1261 core/static/js/core/pdf.js:99 +#: core/static/js/core/pdf.js:1264 core/static/js/core/pdf.js:99 msgid "Error while generating PDF file" msgstr "Fehler beim Erstellen der PDF-Datei" -#: motions/static/js/motions/pdf.js:1102 +#: motions/static/js/motions/pdf.js:1325 msgid "Error while generating ZIP file" msgstr "Fehler beim Erstellen der ZIP-Datei" @@ -1188,15 +1290,15 @@ msgstr "Fehler beim Erstellen der ZIP-Datei" msgid "Error: Given name or surname is required." msgstr "Fehler: Vor- oder Nachname ist erforderlich." -#: motions/static/js/motions/site.js:2250 +#: motions/static/js/motions/site.js:2792 msgid "Error: Identifier already exists." msgstr "Fehler: Bezeichner existiert bereits." -#: motions/static/js/motions/site.js:2261 +#: motions/static/js/motions/site.js:2803 msgid "Error: Text is required." msgstr "Fehler: Text ist erforderlich." -#: motions/static/js/motions/site.js:2256 topics/static/js/topics/site.js:303 +#: motions/static/js/motions/site.js:2798 topics/static/js/topics/site.js:303 msgid "Error: Title is required." msgstr "Fehler: Titel ist erforderlich." @@ -1204,30 +1306,38 @@ msgstr "Fehler: Titel ist erforderlich." msgid "Estimated end:" msgstr "Voraussichtliches Ende:" -#: core/static/js/core/site.js:2073 +#: core/static/js/core/site.js:2086 msgid "Event" msgstr "Veranstaltung" -#: core/static/js/core/site.js:2075 +#: core/static/js/core/site.js:2088 msgid "Event date" msgstr "Veranstaltungszeitraum" -#: core/static/js/core/site.js:2076 +#: core/static/js/core/site.js:2089 msgid "Event location" msgstr "Veranstaltungsort" -#: core/static/js/core/site.js:2067 +#: core/static/js/core/site.js:2080 msgid "Event name" msgstr "Veranstaltungsname" -#: core/static/js/core/site.js:2077 +#: core/static/js/core/site.js:2090 msgid "Event organizer" msgstr "Veranstalter" +#: motions/static/js/motions/site.js:880 +msgid "Exclude" +msgstr "Ausschließen" + #: users/static/templates/users/user-import.html:234 msgid "Exclude already imported users" msgstr "Bereits importierte Teilnehmende ausblenden" +#: motions/static/templates/motions/motion-amendment-list.html:14 +msgid "Expand" +msgstr "Maximieren" + #: agenda/static/templates/agenda/item-list.html:169 msgid "Expand all" msgstr "Alle ausklappen" @@ -1235,14 +1345,15 @@ msgstr "Alle ausklappen" #: agenda/static/templates/agenda/item-list.html:130 #: agenda/static/templates/agenda/item-list.html:93 #: assignments/static/templates/assignments/assignment-list.html:31 -#: motions/static/templates/motions/motion-list.html:44 -#: motions/static/templates/motions/motion-list.html:54 +#: motions/static/templates/motions/motion-amendment-list.html:70 +#: motions/static/templates/motions/motion-list.html:48 +#: motions/static/templates/motions/motion-list.html:58 #: users/static/templates/users/user-list.html:47 msgid "Export all" msgstr "Exportieren (alle)" #: assignments/static/templates/assignments/assignment-detail.html:26 -#: motions/static/templates/motions/motion-detail.html:58 +#: motions/static/templates/motions/motion-detail.html:69 msgid "Export as PDF" msgstr "Als PDF exportieren" @@ -1254,11 +1365,16 @@ msgstr "Exportieren als {{ params.format.toUpperCase() | translate }}" msgid "Export comments only" msgstr "Nur Kommentare exportieren" +#: motions/static/templates/motions/motion-amendment-list.html:83 +msgid "Export dialog" +msgstr "Exportdialog" + #: agenda/static/templates/agenda/item-list.html:133 #: agenda/static/templates/agenda/item-list.html:96 #: assignments/static/templates/assignments/assignment-list.html:34 -#: motions/static/templates/motions/motion-list.html:47 -#: motions/static/templates/motions/motion-list.html:57 +#: motions/static/templates/motions/motion-amendment-list.html:73 +#: motions/static/templates/motions/motion-list.html:51 +#: motions/static/templates/motions/motion-list.html:61 #: users/static/templates/users/user-list.html:50 msgid "Export filtered" msgstr "Exportieren (Auswahl)" @@ -1304,22 +1420,17 @@ msgstr "Dateien" msgid "Filter" msgstr "Filter" -#: motions/static/js/motions/site.js:809 motions/static/js/motions/site.js:823 -#: motions/static/templates/motions/motion-detail/toolbar.html:130 -#: motions/static/templates/motions/motion-detail/toolbar.html:160 +#: motions/static/js/motions/site.js:922 motions/static/js/motions/site.js:936 +#: motions/static/templates/motions/motion-detail/toolbar.html:117 +#: motions/static/templates/motions/motion-detail/toolbar.html:87 msgid "Final version" msgstr "Beschlussfassung" -#: motions/static/templates/motions/motion-detail.html:36 -msgctxt "resolution" -msgid "Final version" -msgstr "Beschlussfassung" - -#: assignments/static/js/assignments/site.js:890 +#: assignments/static/js/assignments/site.js:898 msgid "Finished" msgstr "Abgeschlossen" -#: motions/static/templates/motions/motion-detail.html:272 +#: motions/static/templates/motions/motion-detail.html:288 msgid "Follow recommendation" msgstr "Empfehlung folgen" @@ -1327,15 +1438,15 @@ msgstr "Empfehlung folgen" msgid "Follow recommendations for all motions" msgstr "Empfehlungen für alle Anträge folgen" -#: core/static/js/core/site.js:2102 +#: core/static/js/core/site.js:2115 msgid "Font color of projector header and footer" msgstr "Schriftfarbe des Projektor-Kopf- und Fußbereichs" -#: core/static/js/core/site.js:2103 +#: core/static/js/core/site.js:2116 msgid "Font color of projector headline" msgstr "Schriftfarbe der Projektor-Überschrift" -#: assignments/static/js/assignments/site.js:864 +#: assignments/static/js/assignments/site.js:872 msgid "" "For Yes/No/Abstain per candidate and Yes/No per candidate the 100-%-base " "depends on the election method: If there is only one option per candidate, " @@ -1343,23 +1454,23 @@ msgid "" "candidate the sum of all votes is 100 %." msgstr "Für Ja/Nein/Enthaltung pro Kandidat und Ja/Nein pro Kandidat hängt die 100%-Basis von der Wahlmethode ab: Wenn es nur eine Option pro Kandidat gibt, ist 100% die Summe aller Stimmen von allen Kandidaten. Andernfalls ist 100% die Summe aller Stimmen pro Kandidat." -#: motions/static/js/motions/site.js:761 +#: motions/static/js/motions/site.js:861 msgid "Format" msgstr "Format" -#: motions/static/js/motions/site.js:300 +#: motions/static/js/motions/site.js:333 msgid "From Line" msgstr "Von Zeile" -#: core/static/js/core/site.js:2082 +#: core/static/js/core/site.js:2095 msgid "Front page text" msgstr "Text der Startseite" -#: core/static/js/core/site.js:2080 +#: core/static/js/core/site.js:2093 msgid "Front page title" msgstr "Titel der Startseite" -#: core/static/js/core/site.js:2072 motions/static/js/motions/site.js:2612 +#: core/static/js/core/site.js:2085 motions/static/js/motions/site.js:3153 #: users/static/js/users/site.js:1498 users/static/js/users/site.js:1827 msgid "General" msgstr "Allgemein" @@ -1374,11 +1485,11 @@ msgstr "Generieren" msgid "Generate new passwords" msgstr "Neue Passwörter generieren" -#: core/static/js/core/pdf.js:1252 +#: core/static/js/core/pdf.js:1255 msgid "Generating PDF file" msgstr "PDF-Datei wird erstellt" -#: motions/static/js/motions/pdf.js:1057 +#: motions/static/js/motions/pdf.js:1280 msgid "Generating PDFs and ZIP archive" msgstr "PDF-Dokumente und ZIP-Archiv werden erstellt" @@ -1401,8 +1512,8 @@ msgstr "Bekam eine E-Mail" #: users/static/templates/users/user-import.html:88 #: users/static/templates/users/user-list.html:16 #: users/static/templates/users/user-list.html:209 -#: users/static/templates/users/user-list.html:376 -#: users/static/templates/users/user-list.html:405 +#: users/static/templates/users/user-list.html:378 +#: users/static/templates/users/user-list.html:407 msgid "Groups" msgstr "Gruppen" @@ -1432,15 +1543,15 @@ msgstr "Interne Einträge ausblenden" msgid "Hide internal items when projecting subitems" msgstr "Interne Einträge ausblenden bei der Projektion von Untereinträgen" -#: motions/static/js/motions/site.js:2630 +#: motions/static/js/motions/site.js:3171 msgid "Hide meta information box on projector" msgstr "Meta-Informations-Box auf dem Projektor ausblenden" -#: motions/static/js/motions/site.js:2629 +#: motions/static/js/motions/site.js:3170 msgid "Hide reason on projector" msgstr "Begründung auf dem Projektor ausblenden" -#: motions/static/js/motions/site.js:2631 +#: motions/static/js/motions/site.js:3172 msgid "Hide recommendation on projector" msgstr "Empfehlung auf dem Projektor ausblenden" @@ -1448,14 +1559,18 @@ msgstr "Empfehlung auf dem Projektor ausblenden" msgid "Hint on the ballot paper." msgstr "Hinweis auf dem Stimmzettel." -#: core/static/js/core/site.js:176 core/static/js/core/site.js:318 +#: core/static/js/core/site.js:189 core/static/js/core/site.js:331 msgid "Home" msgstr "Startseite" -#: motions/static/js/motions/site.js:1235 -#: motions/static/js/motions/site.js:207 -#: motions/static/js/motions/site.js:2614 -#: motions/static/js/motions/site.js:284 motions/static/js/motions/site.js:396 +#: motions/static/js/motions/site.js:3187 +msgid "How to create new amendments" +msgstr "Erstellung von Änderungsanträgen" + +#: motions/static/js/motions/site.js:1365 +#: motions/static/js/motions/site.js:240 +#: motions/static/js/motions/site.js:3155 +#: motions/static/js/motions/site.js:317 motions/static/js/motions/site.js:458 #: motions/static/templates/motions/motion-import.html:22 #: motions/static/templates/motions/motion-import.html:45 msgid "Identifier" @@ -1480,7 +1595,7 @@ msgstr "Wenn deaktiviert, erscheint es als interner Eintrag in der Tagesordnung. msgid "If deactivated the election appears as internal item on agenda." msgstr "Wenn deaktiviert, erscheint die Wahl als interner Eintrag in der Tagesordnung." -#: motions/static/js/motions/site.js:460 +#: motions/static/js/motions/site.js:529 msgid "If deactivated the motion appears as internal item on agenda." msgstr "Wenn deaktiviert, erscheint der Antrag als interner Eintrag in der Tagesordnung." @@ -1490,7 +1605,7 @@ msgid "Image browser" msgstr "Bildbrowser" #: agenda/static/templates/agenda/item-list.html:16 -#: motions/static/templates/motions/motion-list.html:22 +#: motions/static/templates/motions/motion-list.html:26 #: topics/static/templates/topics/topic-import.html:24 #: users/static/templates/users/user-import.html:29 #: users/static/templates/users/user-list.html:20 @@ -1531,11 +1646,15 @@ msgstr "{{ motionsWillBeImported }} Anträge importieren" msgid "Import {{ usersWillBeImported }} participants" msgstr "{{ usersWillBeImported }} Teilnemende importieren" +#: motions/static/js/motions/site.js:879 +msgid "Include" +msgstr "Einschließen" + #: agenda/static/templates/agenda/item-list.html:308 msgid "Include all sub items" msgstr "inkl. aller Untereinträge" -#: motions/static/js/motions/site.js:2682 +#: motions/static/js/motions/site.js:3229 msgid "Include the sequential number in PDF and DOCX" msgstr "Laufende Nummer im PDF und DOCX anzeigen" @@ -1552,7 +1671,7 @@ msgid "Initial password can not be changed." msgstr "Das initiale Passwort kann nicht geändert werden." #. Line numbering: Inline -#: motions/static/js/motions/site.js:2624 +#: motions/static/js/motions/site.js:3165 msgid "Inline" msgstr "innerhalb" @@ -1570,9 +1689,9 @@ msgstr "Inline-Bearbeitung" msgid "Input format: DD.MM.YYYY HH:MM" msgstr "Eingabeformat: TT.MM.JJJJ HH:MM" -#: motions/static/js/motions/base.js:965 motions/static/js/motions/pdf.js:276 -#: motions/static/js/motions/site.js:319 -#: motions/static/templates/motions/motion-detail/change-summary.html:34 +#: motions/static/js/motions/base.js:1425 motions/static/js/motions/pdf.js:279 +#: motions/static/js/motions/site.js:352 +#: motions/static/templates/motions/motion-detail/change-summary.html:38 msgid "Insertion" msgstr "Ergänzung" @@ -1595,7 +1714,7 @@ msgid "Internal items" msgstr "Interne Einträge" #: assignments/static/js/assignments/pdf.js:200 -#: assignments/static/js/assignments/site.js:793 +#: assignments/static/js/assignments/site.js:801 #: assignments/static/templates/assignments/assignment-detail.html:265 #: assignments/static/templates/assignments/slide_assignment.html:75 msgid "Invalid ballots" @@ -1605,8 +1724,8 @@ msgstr "Ungültige Stimmzettel" msgid "Invalid input." msgstr "Ungültige Eingabe." -#: motions/static/js/motions/pdf.js:210 motions/static/js/motions/site.js:681 -#: motions/static/templates/motions/motion-detail.html:430 +#: motions/static/js/motions/pdf.js:213 motions/static/js/motions/site.js:778 +#: motions/static/templates/motions/motion-detail.html:447 msgid "Invalid votes" msgstr "Ungültige Stimmen" @@ -1630,10 +1749,6 @@ msgstr "Ist ein Gremium" msgid "Is active" msgstr "Ist aktiv" -#: motions/static/js/motions/site.js:1171 -msgid "Is an amendment" -msgstr "Ist ein Änderungsantrag" - #: users/static/templates/users/user-import.html:59 #: users/static/templates/users/user-import.html:92 #: users/static/templates/users/user-list.html:129 @@ -1663,10 +1778,6 @@ msgstr "Ist kein Gremium" msgid "Is not active" msgstr "Ist nicht aktiv" -#: motions/static/js/motions/site.js:1172 -msgid "Is not an amendment" -msgstr "Ist kein Änderungsantrag" - #: mediafiles/static/js/mediafiles/list.js:76 msgid "Is not hidden" msgstr "Ist nicht versteckt" @@ -1693,7 +1804,7 @@ msgstr "Wird als Logo verwendet." #. short form of agenda item #: assignments/static/js/assignments/site.js:336 -#: motions/static/templates/motions/motion-list.html:375 +#: motions/static/templates/motions/motion-table-filters.html:209 msgid "Item" msgstr "TOP" @@ -1701,21 +1812,17 @@ msgstr "TOP" msgid "Items" msgstr "Einträge" -#: motions/static/templates/motions/motion-detail/toolbar.html:85 -msgid "Jump to a given line number" -msgstr "Zu einer bestimmten Zeilennummer springen" - #: users/static/js/users/site.js:611 users/static/js/users/site.js:650 #: users/static/templates/users/user-detail.html:38 msgid "Last email send" msgstr "Letzte gesendet E-Mail" -#: users/static/templates/users/user-list.html:446 +#: users/static/templates/users/user-list.html:448 msgid "Last email send to the user" msgstr "Letzte gesendete E-Mail an den Benutzer" -#: motions/static/js/motions/site.js:1249 -#: motions/static/templates/motions/motion-detail.html:589 +#: motions/static/js/motions/site.js:1379 +#: motions/static/templates/motions/motion-detail.html:620 msgid "Last modified" msgstr "Zuletzt geändert" @@ -1727,12 +1834,12 @@ msgstr "Letzte Redner/innen" msgid "Leave empty for autodetection of the separator." msgstr "Leer lassen, um den Feldtrenner automatisch zu erkennen." -#: core/static/js/core/site.js:2088 +#: core/static/js/core/site.js:2101 msgid "Left" msgstr "Links" -#: core/static/js/core/site.js:2078 core/static/js/core/site.js:358 -#: index.html:225 legalnotice.html:3 +#: core/static/js/core/site.js:2091 core/static/js/core/site.js:371 +#: index.html:227 legalnotice.html:3 msgid "Legal notice" msgstr "Impressum" @@ -1740,20 +1847,26 @@ msgstr "Impressum" msgid "License" msgstr "Lizenz" -#: motions/static/js/motions/pdf.js:269 -#: motions/static/templates/motions/motion-detail/change-summary.html:27 -#: motions/static/templates/motions/motion-detail/change-summary.html:30 -#: motions/static/templates/motions/motion-detail/toolbar.html:78 +#: motions/static/js/motions/pdf.js:1026 motions/static/js/motions/pdf.js:272 +#: motions/static/templates/motions/motion-amendment-list.html:238 +#: motions/static/templates/motions/motion-amendment-list.html:241 +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:28 +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:31 +#: motions/static/templates/motions/motion-detail/change-summary.html:28 +#: motions/static/templates/motions/motion-detail/change-summary.html:31 +#: motions/static/templates/motions/motion-detail/toolbar.html:29 +#: motions/static/templates/motions/slide_motion.html:80 +#: motions/static/templates/motions/slide_motion.html:83 msgid "Line" msgstr "Zeile" -#: motions/static/js/motions/site.js:2627 +#: motions/static/js/motions/site.js:3168 msgid "Line length" msgstr "Zeilenlänge" -#: motions/static/js/motions/site.js:778 motions/static/js/motions/site.js:791 -#: motions/static/templates/motions/motion-detail/toolbar.html:28 -#: motions/static/templates/motions/motion-detail/toolbar.html:53 +#: motions/static/js/motions/site.js:891 motions/static/js/motions/site.js:904 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:30 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:5 msgid "Line numbering" msgstr "Zeilennummerierung" @@ -1777,12 +1890,12 @@ msgstr "Teilnehmendenliste" #: assignments/static/templates/assignments/assignment-detail.html:12 #: core/static/templates/core/projector-controls.html:257 #: motions/static/templates/motions/motion-block-detail.html:11 -#: motions/static/templates/motions/motion-detail.html:12 +#: motions/static/templates/motions/motion-detail.html:23 #: topics/static/templates/topics/topic-detail.html:11 msgid "List of speakers" msgstr "Redeliste" -#: core/static/js/core/site.js:2106 +#: core/static/js/core/site.js:2119 msgid "List of speakers overlay" msgstr "Redelisten-Einblendung" @@ -1810,7 +1923,7 @@ msgstr "Schriftarten verwalten" msgid "Manage logos" msgstr "Logos verwalten" -#: core/static/js/core/site.js:343 +#: core/static/js/core/site.js:356 #: core/static/templates/core/manage-projectors.html:35 msgid "Manage projectors" msgstr "Projektoren verwalten" @@ -1839,66 +1952,66 @@ msgstr "Redner/in markieren" msgid "Marked" msgstr "Markiert" -#: motions/static/js/motions/site.js:1176 +#: motions/static/js/motions/site.js:1306 msgid "Marked as favorite" msgstr "Als persönlicher Favorit markiert" -#: core/static/js/core/base.js:1384 core/static/js/core/site.js:450 +#: core/static/js/core/base.js:1393 core/static/js/core/site.js:463 #: core/static/templates/core/projector-controls.html:224 msgid "Message" msgstr "Mitteilung" -#: core/static/js/core/base.js:1385 +#: core/static/js/core/base.js:1394 #: core/static/templates/core/projector-controls.html:218 msgid "Messages" msgstr "Mitteilungen" #: assignments/static/templates/assignments/assignment-detail.html:42 -#: motions/static/js/motions/site.js:843 motions/static/js/motions/site.js:852 -#: motions/static/templates/motions/motion-detail.html:118 +#: motions/static/js/motions/site.js:956 motions/static/js/motions/site.js:965 +#: motions/static/templates/motions/motion-detail.html:130 msgid "Meta information" msgstr "Metainformationen" -#: motions/static/templates/motions/motion-list.html:319 +#: motions/static/templates/motions/motion-table-filters.html:166 msgid "Misc" msgstr "Sonstiges" -#: motions/static/js/motions/base.js:237 motions/static/js/motions/base.js:268 -#: motions/static/js/motions/base.js:277 motions/static/js/motions/docx.js:91 -#: motions/static/js/motions/pdf.js:1066 motions/static/js/motions/pdf.js:1112 -#: motions/static/js/motions/pdf.js:507 motions/static/js/motions/pdf.js:67 -#: motions/static/js/motions/pdf.js:703 motions/static/js/motions/site.js:1478 -#: motions/static/js/motions/site.js:1847 -#: motions/static/js/motions/site.js:1860 -#: motions/static/js/motions/site.js:1866 -#: motions/static/js/motions/site.js:215 motions/static/js/motions/site.js:292 +#: motions/static/js/motions/base.js:258 motions/static/js/motions/base.js:293 +#: motions/static/js/motions/base.js:302 motions/static/js/motions/docx.js:92 +#: motions/static/js/motions/pdf.js:1019 motions/static/js/motions/pdf.js:1289 +#: motions/static/js/motions/pdf.js:1335 motions/static/js/motions/pdf.js:525 +#: motions/static/js/motions/pdf.js:68 motions/static/js/motions/pdf.js:721 +#: motions/static/js/motions/site.js:1573 +#: motions/static/js/motions/site.js:1968 +#: motions/static/js/motions/site.js:1981 +#: motions/static/js/motions/site.js:1987 +#: motions/static/js/motions/site.js:248 motions/static/js/motions/site.js:325 #: motions/static/templates/motions/motion-block-detail.html:51 -#: motions/static/templates/motions/motion-detail.html:101 -#: motions/static/templates/motions/motion-detail.html:105 -#: motions/static/templates/motions/motion-detail.html:157 -#: motions/static/templates/motions/motion-detail.html:252 -#: motions/static/templates/motions/motion-detail.html:81 +#: motions/static/templates/motions/motion-detail.html:113 +#: motions/static/templates/motions/motion-detail.html:117 +#: motions/static/templates/motions/motion-detail.html:268 +#: motions/static/templates/motions/motion-detail.html:97 #: motions/static/templates/motions/slide_motion.html:74 msgid "Motion" msgstr "Antrag" #: motions/static/js/motions/motion-block.js:163 #: motions/static/js/motions/motion-block.js:19 -#: motions/static/js/motions/pdf.js:150 motions/static/js/motions/site.js:1243 -#: motions/static/js/motions/site.js:529 motions/static/js/motions/site.js:734 +#: motions/static/js/motions/pdf.js:153 motions/static/js/motions/site.js:1373 +#: motions/static/js/motions/site.js:598 motions/static/js/motions/site.js:834 #: motions/static/templates/motions/motion-block-detail.html:25 -#: motions/static/templates/motions/motion-detail.html:299 -#: motions/static/templates/motions/motion-detail.html:303 +#: motions/static/templates/motions/motion-detail.html:315 +#: motions/static/templates/motions/motion-detail.html:319 #: motions/static/templates/motions/motion-import.html:29 #: motions/static/templates/motions/motion-import.html:52 -#: motions/static/templates/motions/motion-list.html:245 +#: motions/static/templates/motions/motion-table-filters.html:93 #: motions/static/templates/motions/slide_motion_block.html:5 msgid "Motion block" msgstr "Antragsblock" -#: motions/static/js/motions/site.js:122 +#: motions/static/js/motions/site.js:155 #: motions/static/templates/motions/motion-block-list.html:13 -#: motions/static/templates/motions/motion-list.html:14 +#: motions/static/templates/motions/motion-list.html:18 msgid "Motion blocks" msgstr "Antragsblöcke" @@ -1906,45 +2019,45 @@ msgstr "Antragsblöcke" msgid "Motion blocks created" msgstr "Antragsblock angelegt" -#: motions/static/js/motions/site.js:2618 +#: motions/static/js/motions/site.js:3159 msgid "Motion preamble" msgstr "Antragseinleitung" -#: motions/static/js/motions/base.js:238 motions/static/js/motions/site.js:22 -#: motions/static/js/motions/site.js:2609 motions/static/js/motions/site.js:34 +#: motions/static/js/motions/base.js:259 motions/static/js/motions/site.js:22 +#: motions/static/js/motions/site.js:3150 motions/static/js/motions/site.js:34 #: motions/static/js/motions/site.js:52 #: motions/static/templates/motions/motion-block-list.html:30 -#: motions/static/templates/motions/motion-list.html:26 +#: motions/static/templates/motions/motion-list.html:30 #: motions/static/templates/motions/slide_motion_block.html:5 msgid "Motions" msgstr "Anträge" -#: motions/static/js/motions/site.js:883 +#: motions/static/js/motions/site.js:996 msgid "Multiple PDFs in a zip arcive" msgstr "Mehrere PDFs in einem ZIP-Archiv" -#: core/static/js/core/site.js:484 +#: core/static/js/core/site.js:497 #: core/static/templates/core/manage-projectors.html:62 #: core/static/templates/core/tag-list.html:34 -#: motions/static/js/motions/site.js:626 +#: motions/static/js/motions/site.js:723 #: motions/static/templates/motions/category-list.html:29 #: motions/static/templates/motions/motion-block-list.html:29 #: users/static/js/users/pdf.js:65 msgid "Name" msgstr "Name" -#: motions/static/js/motions/site.js:2634 +#: motions/static/js/motions/site.js:3175 msgid "Name of recommender" msgstr "Name des Empfehlungsgebers" -#: motions/static/js/motions/base.js:1035 +#: motions/static/js/motions/base.js:1573 msgid "Needs review" msgstr "Benötigt Überprüfung" #: agenda/static/templates/agenda/item-list.html:8 #: assignments/static/templates/assignments/assignment-list.html:6 -#: core/static/js/core/site.js:1275 core/static/js/core/site.js:1288 -#: core/static/js/core/site.js:1289 +#: core/static/js/core/site.js:1288 core/static/js/core/site.js:1301 +#: core/static/js/core/site.js:1302 #: core/static/templates/core/manage-projectors.html:8 #: core/static/templates/core/tag-list.html:10 #: mediafiles/static/templates/mediafiles/mediafile-list.html:6 @@ -1956,13 +2069,13 @@ msgstr "Benötigt Überprüfung" msgid "New" msgstr "Neu" -#: motions/static/templates/motions/motion-detail.html:162 +#: motions/static/templates/motions/motion-detail.html:178 msgid "New amendment" msgstr "Neuer Änderungsantrag" #: motions/static/templates/motions/motion-form.html:3 -msgid "New amendment of motion" -msgstr "Neuer Änderungsantrag von Antrag" +msgid "New amendment to motion" +msgstr "Neuer Änderungsantrag zu Antrag" #: assignments/static/templates/assignments/assignment-detail.html:132 msgid "New ballot" @@ -1972,7 +2085,7 @@ msgstr "Neuer Wahlgang" msgid "New category" msgstr "Neues Sachgebiet" -#: motions/static/js/motions/site.js:2292 +#: motions/static/js/motions/site.js:2834 msgid "New category will be created." msgstr "Neues Sachgebiet wird angelegt." @@ -1992,7 +2105,7 @@ msgstr "Neuer Antrag" msgid "New motion block" msgstr "Neuer Antragsblock" -#: motions/static/js/motions/site.js:2305 +#: motions/static/js/motions/site.js:2847 msgid "New motion block will be created." msgstr "Neuer Antragsblock wird angelegt." @@ -2000,7 +2113,7 @@ msgstr "Neuer Antragsblock wird angelegt." msgid "New participant" msgstr "Neue/r Teilnehmer/in" -#: motions/static/js/motions/site.js:2279 +#: motions/static/js/motions/site.js:2821 msgid "New participant will be created." msgstr "Neue/r Teilnehmer/in wird angelegt." @@ -2013,9 +2126,9 @@ msgstr "Neues Passwort" msgid "New tag" msgstr "Neues Schlagwort" -#: motions/static/js/motions/pdf.js:355 motions/static/js/motions/site.js:223 +#: motions/static/js/motions/pdf.js:371 motions/static/js/motions/site.js:256 #: motions/static/templates/motions/motion-detail/view-diff.html:42 -#: motions/static/templates/motions/slide_motion.html:96 +#: motions/static/templates/motions/slide_motion.html:107 msgid "New title" msgstr "Neuer Titel" @@ -2023,12 +2136,12 @@ msgstr "Neuer Titel" msgid "New topic" msgstr "Neues Thema" -#: motions/static/templates/motions/motion-detail.html:521 -#: motions/static/templates/motions/motion-detail.html:536 +#: motions/static/templates/motions/motion-detail.html:539 +#: motions/static/templates/motions/motion-detail.html:563 msgid "New version on these changes" msgstr "Neue Version mit diesen Änderungen" -#: motions/static/templates/motions/motion-detail.html:475 +#: motions/static/templates/motions/motion-detail.html:492 msgid "New vote" msgstr "Neue Abstimmung" @@ -2039,40 +2152,47 @@ msgstr "Nächste Seite" #: assignments/static/js/assignments/pdf.js:339 #: assignments/static/js/assignments/site.js:615 #: assignments/static/js/assignments/site.js:739 -#: motions/static/js/motions/pdf.js:192 motions/static/js/motions/pdf.js:711 -#: motions/static/js/motions/site.js:655 -#: motions/static/templates/motions/motion-detail.html:397 +#: motions/static/js/motions/pdf.js:195 motions/static/js/motions/pdf.js:729 +#: motions/static/js/motions/site.js:752 +#: motions/static/templates/motions/motion-detail.html:414 #: motions/static/templates/motions/slide_motion.html:44 msgid "No" msgstr "Nein" -#: motions/static/js/motions/docx.js:47 +#: motions/static/js/motions/docx.js:48 msgid "No categories available." msgstr "Keine Sachgebiete vorhanden." -#: motions/static/templates/motions/motion-list.html:93 +#: motions/static/templates/motions/motion-amendment-list.html:140 +#: motions/static/templates/motions/motion-list.html:97 msgid "No category" msgstr "Kein Sachgebiet" -#: motions/static/templates/motions/motion-list.html:235 -#: motions/static/templates/motions/motion-list.html:454 +#: motions/static/templates/motions/motion-table-filters.html:286 +#: motions/static/templates/motions/motion-table-filters.html:83 msgid "No category set" msgstr "Kein Sachgebiet gesetzt" -#: motions/static/templates/motions/motion-detail/change-summary.html:48 +#: motions/static/templates/motions/motion-detail/change-summary.html:53 msgid "No change recommendations yet" msgstr "Bisher keine Änderungsempfehlungen" -#: motions/static/templates/motions/motion-list.html:283 -#: motions/static/templates/motions/motion-list.html:480 +#: motions/static/js/motions/pdf.js:1037 motions/static/js/motions/pdf.js:364 +#: motions/static/templates/motions/motion-amendment-list.html:349 +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:17 +msgid "No changes at the text." +msgstr "Keine Änderung am Text." + +#: motions/static/templates/motions/motion-table-filters.html:131 +#: motions/static/templates/motions/motion-table-filters.html:312 msgid "No comments set" msgstr "Keine Kommentare gesetzt" -#: motions/static/js/motions/base.js:1030 +#: motions/static/js/motions/base.js:1568 msgid "No concernment" msgstr "Nichtbefassung" -#: motions/static/js/motions/base.js:1010 +#: motions/static/js/motions/base.js:1548 msgid "No decision" msgstr "Keine Entscheidung" @@ -2097,20 +2217,26 @@ msgstr "Kein internen Einträge" msgid "No media file projected." msgstr "Keine Mediendatei projiziert." -#: motions/static/templates/motions/motion-list.html:106 +#: motions/static/templates/motions/motion-amendment-list.html:153 +#: motions/static/templates/motions/motion-list.html:110 msgid "No motion block" msgstr "Kein Antragsblock" -#: motions/static/templates/motions/motion-list.html:259 -#: motions/static/templates/motions/motion-list.html:496 +#: motions/static/templates/motions/motion-table-filters.html:107 +#: motions/static/templates/motions/motion-table-filters.html:328 msgid "No motion block set" msgstr "Kein Antragsblock gesetzt" -#: motions/static/js/motions/docx.js:53 +#: motions/static/js/motions/docx.js:54 msgid "No motions available." msgstr "Keine Anträge vorhanden." -#: motions/static/templates/motions/motion-list.html:211 +#: motions/static/templates/motions/motion-amendment-list.html:285 +#: motions/static/templates/motions/motion-amendment-list.html:296 +msgid "No recomendation set" +msgstr "Keine Empfehlung gesetzt" + +#: motions/static/templates/motions/motion-table-filters.html:59 msgid "No recommendation set" msgstr "Keine Empfehlung gesetzt" @@ -2119,6 +2245,7 @@ msgstr "Keine Empfehlung gesetzt" #: core/static/templates/core/select-multiple.html:2 #: core/static/templates/core/select-single.html:2 #: mediafiles/static/templates/mediafiles/mediafile-upload-form.html:64 +#: motions/static/templates/motions/motion-submitters.html:34 msgid "No results available ..." msgstr "Keine Ergebnisse vorhanden ..." @@ -2128,8 +2255,8 @@ msgstr "Keine Ergebnisse." #: assignments/static/templates/assignments/assignment-list.html:120 #: assignments/static/templates/assignments/assignment-list.html:192 -#: motions/static/templates/motions/motion-list.html:307 -#: motions/static/templates/motions/motion-list.html:512 +#: motions/static/templates/motions/motion-table-filters.html:155 +#: motions/static/templates/motions/motion-table-filters.html:344 msgid "No tag set" msgstr "Kein Schlagwort gesetzt" @@ -2141,16 +2268,16 @@ msgid "No." msgstr "Nr." #. Line numbering: None -#: motions/static/js/motions/site.js:2626 -#: motions/static/js/motions/site.js:780 motions/static/js/motions/site.js:793 +#: motions/static/js/motions/site.js:3167 +#: motions/static/js/motions/site.js:893 motions/static/js/motions/site.js:906 msgid "None" msgstr "aus" -#: motions/static/js/motions/site.js:1177 +#: motions/static/js/motions/site.js:1307 msgid "Not marked as favorite" msgstr "Nicht als persönlicher Favorit markiert" -#: motions/static/templates/motions/motion-detail/view-diff.html:58 +#: motions/static/templates/motions/motion-detail/view-diff.html:64 #: motions/static/templates/motions/motion-detail/view-diff.html:8 msgid "Not rejected" msgstr "Nicht abgelehnt" @@ -2158,7 +2285,7 @@ msgstr "Nicht abgelehnt" #: motions/static/templates/motions/motion-detail/change-summary.html:8 msgid "" "Note: You have to reject all change recommendations if the plenum does not " -"follow the recommendation." +"follow the recommendation. This does not affect amendments." msgstr "Wichtig: Sie müssen alle Änderungsempfehlungen ablehnen, wenn das Plenum der Empfehlung nicht folgt." #: motions/static/templates/motions/motion-detail/view-original.html:45 @@ -2169,22 +2296,22 @@ msgstr "Jetzt die letzte, zu ändernde Zeile anklicken" msgid "Number" msgstr "Nummer" -#: motions/static/js/motions/site.js:2647 +#: motions/static/js/motions/site.js:3194 msgid "Number of (minimum) required supporters for a motion" msgstr "Mindestanzahl erforderlicher Unterstützer/innen für einen Antrag" -#: assignments/static/js/assignments/site.js:874 -#: motions/static/js/motions/site.js:2673 +#: assignments/static/js/assignments/site.js:882 +#: motions/static/js/motions/site.js:3220 msgid "Number of all delegates" msgstr "Anzahl aller Delegierten" -#: assignments/static/js/assignments/site.js:875 -#: motions/static/js/motions/site.js:2674 +#: assignments/static/js/assignments/site.js:883 +#: motions/static/js/motions/site.js:3221 msgid "Number of all participants" msgstr "Anzahl aller Teilnehmenden" -#: assignments/static/js/assignments/site.js:873 -#: motions/static/js/motions/site.js:2672 +#: assignments/static/js/assignments/site.js:881 +#: motions/static/js/motions/site.js:3219 msgid "Number of ballot papers (selection)" msgstr "Anzahl der Stimmzettel (Vorauswahl)" @@ -2202,7 +2329,7 @@ msgstr "Anzahl der dargestellten letzten Redner auf dem Projektor" msgid "Number of persons to be elected" msgstr "Anzahl der zu wählenden Personen" -#: motions/static/js/motions/site.js:2615 +#: motions/static/js/motions/site.js:3156 msgid "Numbered per category" msgstr "Pro Sachgebiet nummerieren" @@ -2219,11 +2346,11 @@ msgstr "Präfix für Nummerierung von Tagesordnungspunkten" msgid "Numeral system for agenda items" msgstr "Nummerierungssystem für Tagesordnungspunkte" -#: core/static/js/core/base.js:255 core/static/js/core/base.js:257 +#: core/static/js/core/base.js:263 core/static/js/core/base.js:265 msgid "OK" msgstr "OK" -#: core/static/js/core/base.js:801 +#: core/static/js/core/base.js:811 msgid "Offline mode: You can use OpenSlides but changes are not saved." msgstr "Offlinemodus: Sie können OpenSlides weiter nutzen, aber Änderungen werden nicht gespeichert." @@ -2231,11 +2358,11 @@ msgstr "Offlinemodus: Sie können OpenSlides weiter nutzen, aber Änderungen wer msgid "Old password" msgstr "Altes Passwort" -#: motions/static/js/motions/site.js:882 +#: motions/static/js/motions/site.js:995 msgid "One PDF" msgstr "Ein PDF" -#: core/static/js/core/site.js:738 +#: core/static/js/core/site.js:751 msgid "One anonymous users is also editing this." msgstr "Ein anonymer Gast ist auch gerade in Bearbeitung." @@ -2261,6 +2388,10 @@ msgstr "Nur für interne Notizen." msgid "Only main agenda items" msgstr "Nur Haupt-Tagesordnungspunkte" +#: motions/static/templates/motions/motion-detail/view-diff.html:93 +msgid "Open amendment" +msgstr "Änderungsantrag öffnen" + #: core/static/templates/core/projector-controls.html:147 msgid "Open countdown in fullscreen" msgstr "Countdown in Vollbild öffnen" @@ -2289,12 +2420,12 @@ msgstr "Den Antrag nach dem Speichern öffnen." msgid "OpenSlides access data" msgstr "OpenSlides-Zugangsdaten" -#: motions/static/js/motions/pdf.js:163 motions/static/js/motions/site.js:542 -#: motions/static/js/motions/site.js:741 -#: motions/static/templates/motions/motion-detail.html:343 +#: motions/static/js/motions/pdf.js:166 motions/static/js/motions/site.js:611 +#: motions/static/js/motions/site.js:841 +#: motions/static/templates/motions/motion-detail.html:359 #: motions/static/templates/motions/motion-import.html:28 #: motions/static/templates/motions/motion-import.html:51 -#: motions/static/templates/motions/motion-list.html:765 +#: motions/static/templates/motions/motion-list.html:402 msgid "Origin" msgstr "Herkunft" @@ -2303,46 +2434,46 @@ msgstr "Herkunft" msgid "Original size" msgstr "Originalgröße" -#: motions/static/js/motions/site.js:806 motions/static/js/motions/site.js:820 -#: motions/static/templates/motions/motion-detail/toolbar.html:109 -#: motions/static/templates/motions/motion-detail/toolbar.html:145 +#: motions/static/js/motions/site.js:919 motions/static/js/motions/site.js:933 +#: motions/static/templates/motions/motion-detail/toolbar.html:102 +#: motions/static/templates/motions/motion-detail/toolbar.html:66 msgid "Original version" msgstr "Originalfassung" -#: motions/static/js/motions/site.js:321 +#: motions/static/js/motions/site.js:354 msgid "Other" msgstr "Sonstiges" #. Line numbering: Outside -#: motions/static/js/motions/site.js:2622 +#: motions/static/js/motions/site.js:3163 msgid "Outside" msgstr "außerhalb" #: assignments/static/templates/assignments/assignment-detail.html:28 -#: motions/static/templates/motions/motion-detail.html:60 +#: motions/static/templates/motions/motion-detail.html:71 #: motions/static/templates/motions/motion-detail/comments.html:9 #: motions/static/templates/motions/motion-detail/personal-note.html:9 #: users/static/js/users/site.js:1833 msgid "PDF" msgstr "PDF" -#: core/static/js/core/site.js:2112 +#: core/static/js/core/site.js:2125 msgid "PDF ballot paper logo" msgstr "PDF-Stimmzettel-Logo" -#: core/static/js/core/site.js:2110 +#: core/static/js/core/site.js:2123 msgid "PDF footer logo" msgstr "PDF-Logo Fußzeile" -#: motions/static/js/motions/site.js:880 +#: motions/static/js/motions/site.js:993 msgid "PDF format" msgstr "PDF-Format" -#: core/static/js/core/site.js:2109 +#: core/static/js/core/site.js:2122 msgid "PDF header logo" msgstr "PDF-Logo Kopfzeile" -#: core/static/js/core/pdf.js:1256 +#: core/static/js/core/pdf.js:1259 msgid "PDF successfully generated." msgstr "PDF erfolgreich erstellt." @@ -2350,22 +2481,31 @@ msgstr "PDF erfolgreich erstellt." #: assignments/static/templates/assignments/assignment-list.html:75 #: mediafiles/static/templates/mediafiles/mediafile-list.html:153 #: mediafiles/static/templates/mediafiles/mediafile-list.html:44 -#: motions/static/templates/motions/motion-list.html:136 +#: motions/static/templates/motions/motion-amendment-list.html:180 +#: motions/static/templates/motions/motion-list.html:141 #: users/static/templates/users/user-import.html:73 #: users/static/templates/users/user-list.html:160 msgid "Page" msgstr "Seite" -#: core/static/js/core/site.js:2087 +#: core/static/js/core/site.js:2100 msgid "Page number alignment in PDF" msgstr "Seitenzahl-Ausrichtung im PDF" +#: motions/static/js/motions/site.js:3190 +msgid "Paragraph-based, Diff-enabled" +msgstr "Absatzbasiert mit Änderungsdarstellung" + #: assignments/static/js/assignments/site.js:175 #: motions/static/js/motions/motion-block.js:98 -#: motions/static/js/motions/site.js:468 topics/static/js/topics/site.js:136 +#: motions/static/js/motions/site.js:537 topics/static/js/topics/site.js:136 msgid "Parent item" msgstr "Elternelement" +#: motions/static/js/motions/site.js:2692 +msgid "Parent motion and line number" +msgstr "Hauptantrag und Zeilennummer" + #: users/static/js/users/site.js:887 #: users/static/templates/users/user-detail.html:20 msgid "Participant" @@ -2397,7 +2537,7 @@ msgstr "Passwortbestätigung stimmt nicht überein." msgid "Pause" msgstr "Pause" -#: motions/static/js/motions/base.js:1016 +#: motions/static/js/motions/base.js:1554 msgid "Permission" msgstr "Zulassung" @@ -2405,11 +2545,11 @@ msgstr "Zulassung" msgid "Permissions" msgstr "Rechte" -#: motions/static/js/motions/base.js:1015 +#: motions/static/js/motions/base.js:1553 msgid "Permit" msgstr "Zulassen" -#: motions/static/templates/motions/motion-detail.html:577 +#: motions/static/templates/motions/motion-detail.html:608 msgid "Permit and activate" msgstr "Zulassen und aktivieren" @@ -2417,17 +2557,17 @@ msgstr "Zulassen und aktivieren" msgid "Personal data" msgstr "Persönliche Daten" -#: motions/static/js/motions/pdf.js:1123 -#: motions/static/templates/motions/motion-detail.html:480 +#: motions/static/js/motions/pdf.js:1346 +#: motions/static/templates/motions/motion-detail.html:497 #: motions/static/templates/motions/motion-detail/personal-note.html:25 msgid "Personal note" msgstr "Persönliche Notiz" -#: motions/static/js/motions/site.js:1182 +#: motions/static/js/motions/site.js:1312 msgid "Personal note not set" msgstr "Keine persönliche Notiz gesetzt" -#: motions/static/js/motions/site.js:1181 +#: motions/static/js/motions/site.js:1311 msgid "Personal note set" msgstr "Persönliche Notiz gesetzt" @@ -2459,24 +2599,24 @@ msgstr "Bitte beachten:" msgid "Please select" msgstr "Bitte auswählen" -#: motions/static/js/motions/site.js:2680 +#: motions/static/js/motions/site.js:3227 msgid "Preamble text for PDF and DOCX documents (all motions)" msgstr "Einleitungstext für PDF- und DOCX-Dokumente (alle Anträge) " -#: assignments/static/js/assignments/site.js:886 +#: assignments/static/js/assignments/site.js:894 msgid "Preamble text for PDF document (all elections)" msgstr "Einleitungstext für PDF-Dokument (alle Wahlen) " -#: core/static/js/core/site.js:2104 +#: core/static/js/core/site.js:2117 msgid "Predefined seconds of new countdowns" msgstr "Vorgegebene Sekunden für neue Countdowns" -#: motions/static/js/motions/site.js:619 +#: motions/static/js/motions/site.js:716 #: motions/static/templates/motions/category-list.html:34 msgid "Prefix" msgstr "Präfix" -#: motions/static/js/motions/site.js:2641 +#: motions/static/js/motions/site.js:3183 msgid "Prefix for the identifier for amendments" msgstr "Präfix für den Bezeichner von Änderungsanträgen" @@ -2486,12 +2626,12 @@ msgid "Presence" msgstr "Anwesenheit" #: users/static/js/users/site.js:591 users/static/js/users/site.js:638 -#: users/static/templates/users/user-list.html:458 -#: users/static/templates/users/user-list.html:464 +#: users/static/templates/users/user-list.html:460 +#: users/static/templates/users/user-list.html:466 msgid "Present" msgstr "Anwesend" -#: core/static/js/core/site.js:2066 +#: core/static/js/core/site.js:2079 msgid "Presentation and assembly system" msgstr "Präsentations- und Versammlungssystem" @@ -2510,22 +2650,22 @@ msgid "Previous page" msgstr "Vorherige Seite" #: assignments/static/templates/assignments/assignment-detail.html:162 -#: motions/static/templates/motions/motion-detail.html:370 +#: motions/static/templates/motions/motion-detail.html:387 msgid "Print ballot paper" msgstr "Stimmzettel drucken" -#: core/static/js/core/site.js:2079 core/static/js/core/site.js:367 -#: index.html:226 privacypolicy.html:3 +#: core/static/js/core/site.js:2092 core/static/js/core/site.js:380 +#: index.html:228 privacypolicy.html:3 msgid "Privacy policy" msgstr "Datenschutzerklärung" -#: motions/static/js/motions/site.js:2656 +#: motions/static/js/motions/site.js:3203 msgid "Private" msgstr "Privat" #: assignments/static/templates/assignments/assignment-detail.html:16 #: assignments/static/templates/assignments/assignment-detail.html:180 -#: motions/static/templates/motions/motion-detail.html:20 +#: motions/static/templates/motions/motion-detail.html:31 #: topics/static/templates/topics/topic-detail.html:15 #: users/static/templates/users/user-detail.html:10 msgid "Project" @@ -2561,28 +2701,28 @@ msgstr "Projektionsvorgaben" #: agenda/static/templates/agenda/item-detail.html:14 #: agenda/static/templates/agenda/item-list.html:27 #: agenda/static/templates/agenda/item-list.html:290 -#: core/static/js/core/projector.js:401 core/static/js/core/site.js:2095 -#: index.html:193 index.html:206 index.html:241 +#: core/static/js/core/projector.js:401 core/static/js/core/site.js:2108 +#: index.html:194 index.html:207 index.html:244 #: mediafiles/static/templates/mediafiles/mediafile-list.html:273 -#: motions/static/templates/motions/motion-detail.html:16 +#: motions/static/templates/motions/motion-detail.html:27 #: projector-button.html:2 projector-container.html:7 #: users/static/js/users/site.js:1496 msgid "Projector" msgstr "Projektor" -#: core/static/js/core/site.js:2108 +#: core/static/js/core/site.js:2121 msgid "Projector header image" msgstr "Projektor-Kopfgrafik" -#: core/static/js/core/site.js:2096 +#: core/static/js/core/site.js:2109 msgid "Projector language" msgstr "Projektorsprache" -#: core/static/js/core/site.js:2107 +#: core/static/js/core/site.js:2120 msgid "Projector logo" msgstr "Projektor-Logo" -#: motions/static/js/motions/site.js:2655 +#: motions/static/js/motions/site.js:3202 msgid "Public" msgstr "Öffentlich" @@ -2590,7 +2730,7 @@ msgstr "Öffentlich" msgid "Publish" msgstr "Veröffentlichen" -#: assignments/static/js/assignments/site.js:884 +#: assignments/static/js/assignments/site.js:892 msgid "Put all candidates on the list of speakers" msgstr "Alle Kandidaten auf die Redeliste setzen" @@ -2607,30 +2747,35 @@ msgstr "Quorum ({{ option.getVoteYes() - option.majorityReached }}) nicht erreic msgid "Quorum ({{ option.getVoteYes() - option.majorityReached }}) reached." msgstr "Quorum ({{ option.getVoteYes() - option.majorityReached }}) erreicht." -#: motions/static/templates/motions/motion-detail.html:464 +#: motions/static/templates/motions/motion-detail.html:481 msgid "Quorum ({{ voteYes.value - isReached() }}) not reached." msgstr "Quorum ({{ voteYes.value - isReached() }}) nicht erreicht." -#: motions/static/templates/motions/motion-detail.html:461 +#: motions/static/templates/motions/motion-detail.html:478 msgid "Quorum ({{ voteYes.value - isReached() }}) reached." msgstr "Quorum ({{ voteYes.value - isReached() }}) erreicht." -#: motions/static/js/motions/docx.js:95 motions/static/js/motions/pdf.js:369 -#: motions/static/js/motions/site.js:437 motions/static/js/motions/site.js:835 -#: motions/static/templates/motions/motion-detail.html:547 +#: motions/static/js/motions/docx.js:96 motions/static/js/motions/pdf.js:387 +#: motions/static/js/motions/site.js:505 motions/static/js/motions/site.js:948 +#: motions/static/templates/motions/motion-detail.html:578 #: motions/static/templates/motions/motion-import.html:25 #: motions/static/templates/motions/motion-import.html:48 -#: motions/static/templates/motions/slide_motion.html:134 +#: motions/static/templates/motions/slide_motion.html:145 +#: motions/static/templates/motions/slide_motion.html:160 msgid "Reason" msgstr "Begründung" -#: motions/static/js/motions/site.js:748 +#: motions/static/js/motions/site.js:848 #: motions/static/templates/motions/motion-block-detail.html:53 -#: motions/static/templates/motions/motion-list.html:193 +#: motions/static/templates/motions/motion-table-filters.html:41 msgid "Recommendation" msgstr "Empfehlung" -#: motions/static/js/motions/base.js:1032 +#: motions/static/templates/motions/motion-amendment-list.html:15 +msgid "Reduce" +msgstr "Minimieren" + +#: motions/static/js/motions/base.js:1570 msgid "Refer to committee" msgstr "In Ausschuss verweisen" @@ -2638,16 +2783,16 @@ msgstr "In Ausschuss verweisen" msgid "Reference for current list of speakers" msgstr "Referenz für aktuelle Redeliste" -#: motions/static/js/motions/base.js:1033 +#: motions/static/js/motions/base.js:1571 msgid "Referral to committee" msgstr "Verweisung in Ausschuss" -#: motions/static/js/motions/base.js:1006 -#: motions/static/js/motions/base.js:1021 +#: motions/static/js/motions/base.js:1544 +#: motions/static/js/motions/base.js:1559 msgid "Reject" msgstr "Ablehnen" -#: motions/static/js/motions/base.js:1037 +#: motions/static/js/motions/base.js:1575 msgid "Reject (not authorized)" msgstr "Verwerfen (nicht zulässig)" @@ -2656,20 +2801,20 @@ msgid "Reject all change recommendations" msgstr "Alle Änderungsempfehlungen ablehnen" #: motions/static/templates/motions/motion-detail/change-summary.html:20 -#: motions/static/templates/motions/motion-detail/change-summary.html:41 +#: motions/static/templates/motions/motion-detail/change-summary.html:45 +#: motions/static/templates/motions/motion-detail/view-diff.html:100 #: motions/static/templates/motions/motion-detail/view-diff.html:16 #: motions/static/templates/motions/motion-detail/view-diff.html:38 -#: motions/static/templates/motions/motion-detail/view-diff.html:64 -#: motions/static/templates/motions/motion-detail/view-diff.html:84 +#: motions/static/templates/motions/motion-detail/view-diff.html:71 msgid "Rejected" msgstr "Abgelehnt" -#: motions/static/js/motions/base.js:1007 -#: motions/static/js/motions/base.js:1022 +#: motions/static/js/motions/base.js:1545 +#: motions/static/js/motions/base.js:1560 msgid "Rejection" msgstr "Ablehnung" -#: motions/static/js/motions/base.js:1038 +#: motions/static/js/motions/base.js:1576 msgid "Rejection (not authorized)" msgstr "Verwerfung (nicht berechtigt)" @@ -2677,6 +2822,7 @@ msgstr "Verwerfung (nicht berechtigt)" #: agenda/static/templates/agenda/list-of-speakers-partial-management.html:73 #: agenda/static/templates/agenda/list-of-speakers-partial-management.html:99 #: config-form-field.html:123 config-form-field.html:42 +#: motions/static/templates/motions/motion-submitters.html:23 msgid "Remove" msgstr "Entfernen" @@ -2684,7 +2830,7 @@ msgstr "Entfernen" msgid "Remove all speakers" msgstr "Alle Redner/innen entfernen" -#: motions/static/js/motions/site.js:2649 +#: motions/static/js/motions/site.js:3196 msgid "" "Remove all supporters of a motion if a submitter edits his motion in early " "state" @@ -2712,10 +2858,10 @@ msgstr "Entferne mich" msgid "Remove message" msgstr "Mitteilung entfernen" -#: motions/static/js/motions/base.js:971 motions/static/js/motions/pdf.js:274 -#: motions/static/js/motions/site.js:318 +#: motions/static/js/motions/base.js:1431 motions/static/js/motions/pdf.js:277 +#: motions/static/js/motions/site.js:351 #: motions/static/templates/motions/motion-detail/change-summary.html:18 -#: motions/static/templates/motions/motion-detail/change-summary.html:33 +#: motions/static/templates/motions/motion-detail/change-summary.html:37 msgid "Replacement" msgstr "Ersetzung" @@ -2727,10 +2873,10 @@ msgid "" "in the first row" msgstr "Erforderliche Komma- oder Semikolon-separierte Werte mit diesen Spaltennamen in der ersten Zeile" -#: assignments/static/js/assignments/site.js:878 +#: assignments/static/js/assignments/site.js:886 #: assignments/static/templates/assignments/assignment-detail.html:207 -#: motions/static/js/motions/site.js:2666 -#: motions/static/templates/motions/motion-detail.html:452 +#: motions/static/js/motions/site.js:3213 +#: motions/static/templates/motions/motion-detail.html:469 msgid "Required majority" msgstr "Erforderliche Mehrheit" @@ -2742,8 +2888,9 @@ msgstr "Zurücksetzen" msgid "Reset countdown" msgstr "Countdown zurücksetzen" -#: motions/static/templates/motions/motion-detail.html:227 -#: motions/static/templates/motions/motion-list.html:620 +#: motions/static/templates/motions/motion-amendment-list.html:311 +#: motions/static/templates/motions/motion-detail.html:243 +#: motions/static/templates/motions/motion-list.html:252 msgid "Reset recommendation" msgstr "Empfehlung zurücksetzen" @@ -2757,8 +2904,9 @@ msgstr "Skalierung zurücksetzen" msgid "Reset scrolling" msgstr "Scrollen zurücksetzen" -#: motions/static/templates/motions/motion-detail.html:185 -#: motions/static/templates/motions/motion-list.html:594 +#: motions/static/templates/motions/motion-amendment-list.html:272 +#: motions/static/templates/motions/motion-detail.html:201 +#: motions/static/templates/motions/motion-list.html:226 msgid "Reset state" msgstr "Status zurücksetzen" @@ -2772,7 +2920,7 @@ msgstr "Zoom zurücksetzen" msgid "Revert" msgstr "Zurücksetzen" -#: core/static/js/core/site.js:2090 +#: core/static/js/core/site.js:2103 msgid "Right" msgstr "Rechts" @@ -2794,6 +2942,7 @@ msgstr "Im Uhrzeigersinn drehen" #: motions/static/templates/motions/category-form.html:10 #: motions/static/templates/motions/change-recommendation-form.html:10 #: motions/static/templates/motions/motion-block-form.html:10 +#: motions/static/templates/motions/motion-comment-form.html:9 #: motions/static/templates/motions/motion-detail/comments.html:39 #: motions/static/templates/motions/motion-detail/personal-note.html:35 #: motions/static/templates/motions/motion-detail/view-original.html:9 @@ -2835,10 +2984,10 @@ msgstr "Nach oben scrollen" #: agenda/static/templates/agenda/item-list.html:248 #: assignments/static/templates/assignments/assignment-list.html:172 -#: core/static/js/core/site.js:387 index.html:164 +#: core/static/js/core/site.js:400 index.html:164 #: mediafiles/static/templates/mediafiles/mediafile-list.html:230 -#: motions/static/templates/motions/motion-list.html:403 search.html:11 -#: users/static/templates/users/user-list.html:280 +#: motions/static/templates/motions/motion-table-filters.html:235 +#: search.html:11 users/static/templates/users/user-list.html:280 msgid "Search" msgstr "Suche" @@ -2846,14 +2995,15 @@ msgstr "Suche" msgid "Search results" msgstr "Suchergebnisse" -#: assignments/static/js/assignments/site.js:888 +#: assignments/static/js/assignments/site.js:896 msgid "Searching for candidates" msgstr "Auf Kandidatensuche" #: agenda/static/templates/agenda/item-list.html:73 #: assignments/static/templates/assignments/assignment-list.html:26 #: mediafiles/static/templates/mediafiles/mediafile-list.html:123 -#: motions/static/templates/motions/motion-list.html:38 +#: motions/static/templates/motions/motion-amendment-list.html:64 +#: motions/static/templates/motions/motion-list.html:42 #: users/static/templates/users/user-list.html:39 msgid "Select ..." msgstr "Auswählen ..." @@ -2870,11 +3020,11 @@ msgstr "Datei auswählen" #: assignments/static/js/assignments/site.js:178 #: motions/static/js/motions/motion-block.js:101 -#: motions/static/js/motions/site.js:471 topics/static/js/topics/site.js:139 +#: motions/static/js/motions/site.js:540 topics/static/js/topics/site.js:139 msgid "Select a parent item ..." msgstr "Elternelement auswählen oder suchen ..." -#: motions/static/js/motions/site.js:518 +#: motions/static/js/motions/site.js:587 msgid "Select or search a category ..." msgstr "Sachgebiet auswählen oder suchen ..." @@ -2882,7 +3032,7 @@ msgstr "Sachgebiet auswählen oder suchen ..." msgid "Select or search a group ..." msgstr "Gruppe auswählen oder suchen ..." -#: motions/static/js/motions/site.js:532 +#: motions/static/js/motions/site.js:601 msgid "Select or search a motion block ..." msgstr "Antragsblock auswählen oder suchen ..." @@ -2890,27 +3040,28 @@ msgstr "Antragsblock auswählen oder suchen ..." #: assignments/static/templates/assignments/assignment-detail.html:107 #: mediafiles/static/js/mediafiles/forms.js:62 #: mediafiles/static/templates/mediafiles/mediafile-upload-form.html:64 +#: motions/static/templates/motions/motion-submitters.html:34 msgid "Select or search a participant ..." msgstr "Teilnehmer/in auswählen oder suchen ..." -#: motions/static/js/motions/site.js:407 +#: motions/static/js/motions/site.js:471 msgid "Select or search a submitter ..." msgstr "Antragsteller/in auswählen oder suchen ..." -#: motions/static/js/motions/site.js:569 +#: motions/static/js/motions/site.js:638 msgid "Select or search a supporter ..." msgstr "Unterstützer/in auswählen oder suchen ..." #: assignments/static/js/assignments/site.js:205 -#: motions/static/js/motions/site.js:555 +#: motions/static/js/motions/site.js:624 msgid "Select or search a tag ..." msgstr "Schlagwort auswählen oder suchen ..." -#: motions/static/js/motions/site.js:584 +#: motions/static/js/motions/site.js:653 msgid "Select or search a workflow ..." msgstr "Arbeitsablauf auswählen oder suchen ..." -#: motions/static/js/motions/site.js:504 topics/static/js/topics/site.js:116 +#: motions/static/js/motions/site.js:573 topics/static/js/topics/site.js:116 msgid "Select or search an attachment ..." msgstr "Anhang auswählen oder suchen ..." @@ -2927,40 +3078,43 @@ msgstr "Einladungs-E-Mails senden" msgid "Separator" msgstr "Feldtrenner" -#: core/static/js/core/site.js:2086 +#: core/static/js/core/site.js:2099 msgid "Separator used for all csv exports and examples" msgstr "Feldtrenner für alle CSV-Exporte und -Beispiele" -#: motions/static/js/motions/docx.js:92 motions/static/js/motions/pdf.js:520 -#: motions/static/js/motions/pdf.js:79 -#: motions/static/templates/motions/motion-detail.html:92 +#: motions/static/js/motions/docx.js:93 motions/static/js/motions/pdf.js:538 +#: motions/static/js/motions/pdf.js:80 +#: motions/static/templates/motions/motion-detail.html:104 msgid "Sequential number" msgstr "Laufende Nummer" -#: motions/static/js/motions/site.js:2616 +#: motions/static/js/motions/site.js:3157 msgid "Serially numbered" msgstr "Fortlaufend nummerieren" -#: motions/static/templates/motions/motion-list.html:663 +#: motions/static/templates/motions/motion-list.html:300 msgid "Set a category" msgstr "Sachgebiet setzen" -#: motions/static/templates/motions/motion-list.html:697 +#: motions/static/templates/motions/motion-list.html:334 msgid "Set a motion block" msgstr "Antragsblock setzen" -#: motions/static/templates/motions/motion-detail.html:75 -#: motions/static/templates/motions/motion-list.html:573 +#: motions/static/templates/motions/motion-amendment-list.html:248 +#: motions/static/templates/motions/motion-detail.html:91 +#: motions/static/templates/motions/motion-list.html:205 msgid "Set as favorite" msgstr "Als Favoriten setzen" -#: motions/static/templates/motions/motion-list.html:71 -#: motions/static/templates/motions/motion-list.html:98 +#: motions/static/templates/motions/motion-amendment-list.html:118 +#: motions/static/templates/motions/motion-amendment-list.html:145 +#: motions/static/templates/motions/motion-list.html:102 +#: motions/static/templates/motions/motion-list.html:75 msgid "Set category" msgstr "Sachgebiet setzen" #: agenda/static/templates/agenda/item-list.html:389 -#: users/static/templates/users/user-list.html:433 +#: users/static/templates/users/user-list.html:435 msgid "Set comment ..." msgstr "Kommentar setzen ..." @@ -2976,7 +3130,7 @@ msgstr "Globale Aktion setzen" msgid "Set hint for ballot paper ..." msgstr "Stimmzettel-Hinweis setzen ..." -#: motions/static/js/motions/site.js:2617 +#: motions/static/js/motions/site.js:3158 msgid "Set it manually" msgstr "Manuell setzen" @@ -2984,17 +3138,21 @@ msgstr "Manuell setzen" msgid "Set item number ..." msgstr "Nummer setzen ..." -#: motions/static/templates/motions/motion-list.html:111 -#: motions/static/templates/motions/motion-list.html:72 +#: motions/static/templates/motions/motion-amendment-list.html:119 +#: motions/static/templates/motions/motion-amendment-list.html:158 +#: motions/static/templates/motions/motion-list.html:115 +#: motions/static/templates/motions/motion-list.html:76 msgid "Set motion block" msgstr "Antragsblock setzen" -#: motions/static/templates/motions/motion-list.html:70 -#: motions/static/templates/motions/motion-list.html:84 +#: motions/static/templates/motions/motion-amendment-list.html:117 +#: motions/static/templates/motions/motion-amendment-list.html:131 +#: motions/static/templates/motions/motion-list.html:74 +#: motions/static/templates/motions/motion-list.html:88 msgid "Set status" msgstr "Status setzen" -#: users/static/templates/users/user-list.html:417 +#: users/static/templates/users/user-list.html:419 msgid "Set structure level ..." msgstr "Gliederungsebene setzen ..." @@ -3010,27 +3168,35 @@ msgstr "'Ist aktiv' setzen/entfernen" msgid "Set/Unset 'is present'" msgstr "'Ist anwesend' setzen/entfernen" -#: config.html:3 core/static/js/core/site.js:184 -#: core/static/js/core/site.js:376 +#: config.html:3 core/static/js/core/site.js:197 +#: core/static/js/core/site.js:389 msgid "Settings" msgstr "Einstellungen" -#: core/static/js/core/site.js:2074 +#: core/static/js/core/site.js:2087 msgid "Short description of event" msgstr "Kurzbeschreibung der Veranstaltung" #: assignments/static/js/assignments/site.js:166 #: motions/static/js/motions/motion-block.js:89 -#: motions/static/js/motions/site.js:459 topics/static/js/topics/site.js:127 +#: motions/static/js/motions/site.js:528 topics/static/js/topics/site.js:127 msgid "Show as agenda item" msgstr "Als Tagesordnungspunkt anzeigen" +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:6 +msgid "Show entire motion text" +msgstr "Vollständigen Antragstext anzeigen" + #: assignments/static/js/assignments/site.js:190 -#: motions/static/js/motions/site.js:486 users/static/js/users/site.js:382 +#: motions/static/js/motions/site.js:555 users/static/js/users/site.js:382 msgid "Show extended fields" msgstr "Erweiterte Felder anzeigen" -#: motions/static/templates/motions/motion-detail.html:595 +#: motions/static/templates/motions/motion-detail/toolbar.html:42 +msgid "Show highlighted line also on projector." +msgstr "Hervorgehobene Zeile auch auf dem Projektor anzeigen." + +#: motions/static/templates/motions/motion-detail.html:626 msgid "Show history" msgstr "Verlauf anzeigen" @@ -3038,7 +3204,7 @@ msgstr "Verlauf anzeigen" msgid "Show internal items" msgstr "Interne Einträge anzeigen" -#: core/static/js/core/site.js:2092 +#: core/static/js/core/site.js:2105 msgid "Show logo on projector" msgstr "Logo auf dem Projektor anzeigen" @@ -3050,24 +3216,24 @@ msgstr "Countdown in den letzten x Sekunden der Redezeit orange darstellen" msgid "Show password" msgstr "Passwort anzeigen" -#: core/static/js/core/site.js:2100 +#: core/static/js/core/site.js:2113 msgid "Show the clock on projector" msgstr "Uhr auf dem Projektor anzeigen" -#: core/static/js/core/site.js:2085 +#: core/static/js/core/site.js:2098 msgid "Show this text on the login page" msgstr "Diesen Text auf der Login-Seite anzeigen" -#: core/static/js/core/site.js:2098 +#: core/static/js/core/site.js:2111 msgid "Show title and description of event on projector" msgstr "Titel und Kurzbeschreibung der Veranstaltung auf dem Projektor anzeigen" -#: motions/static/js/motions/base.js:1000 +#: motions/static/js/motions/base.js:1538 msgid "Simple Workflow" msgstr "Einfacher Arbeitsablauf" -#: assignments/static/js/assignments/site.js:880 -#: motions/static/js/motions/site.js:2668 +#: assignments/static/js/assignments/site.js:888 +#: motions/static/js/motions/site.js:3215 msgid "Simple majority" msgstr "Einfache Mehrheit" @@ -3084,7 +3250,7 @@ msgstr "Einige Dateien konnten nicht hochgeladen werden" #: assignments/static/templates/assignments/assignment-list.html:148 #: mediafiles/static/templates/mediafiles/mediafile-list.html:207 #: motions/static/templates/motions/category-list.html:44 -#: motions/static/templates/motions/motion-list.html:368 +#: motions/static/templates/motions/motion-table-filters.html:202 #: users/static/templates/users/user-list.html:257 msgid "Sort" msgstr "Sortieren" @@ -3097,7 +3263,7 @@ msgstr "Sortieren ..." msgid "Sort agenda" msgstr "Tagesordnung sortieren" -#: motions/static/js/motions/site.js:2681 +#: motions/static/js/motions/site.js:3228 msgid "Sort categories by" msgstr "Sachgebiete sortieren nach" @@ -3105,6 +3271,11 @@ msgstr "Sachgebiete sortieren nach" msgid "Sort name of participants by" msgstr "Namen der Teilnehmenden sortieren nach" +#: motions/static/templates/motions/motion-detail.html:143 +#: motions/static/templates/motions/motion-submitters.html:10 +msgid "Sort submitters" +msgstr "Antragsteller/in sortieren" + #: assignments/static/templates/assignments/assignmentpoll-form.html:8 #: motions/static/templates/motions/motion-poll-form.html:8 msgid "Special values" @@ -3114,7 +3285,7 @@ msgstr "Spezielle Werte" msgid "Staff" msgstr "Mitarbeitende" -#: core/static/js/core/site.js:2091 +#: core/static/js/core/site.js:2104 msgid "Standard font size in PDF" msgstr "Standard-Schriftgröße im PDF" @@ -3132,18 +3303,18 @@ msgstr "Startzeit" msgid "Start/stop video" msgstr "Video starten/stoppen" -#: motions/static/js/motions/pdf.js:109 motions/static/js/motions/pdf.js:546 -#: motions/static/js/motions/site.js:1245 -#: motions/static/js/motions/site.js:728 +#: motions/static/js/motions/pdf.js:1058 motions/static/js/motions/pdf.js:112 +#: motions/static/js/motions/pdf.js:564 motions/static/js/motions/site.js:1375 +#: motions/static/js/motions/site.js:828 #: motions/static/templates/motions/motion-block-detail.html:52 -#: motions/static/templates/motions/motion-detail.html:168 -#: motions/static/templates/motions/motion-detail.html:172 -#: motions/static/templates/motions/motion-list.html:159 +#: motions/static/templates/motions/motion-detail.html:184 +#: motions/static/templates/motions/motion-detail.html:188 +#: motions/static/templates/motions/motion-table-filters.html:7 #: motions/static/templates/motions/slide_motion.html:4 msgid "State" msgstr "Status" -#: motions/static/js/motions/docx.js:94 +#: motions/static/js/motions/docx.js:95 msgid "Status" msgstr "Status" @@ -3151,7 +3322,7 @@ msgstr "Status" msgid "Stop" msgstr "Stopp" -#: motions/static/js/motions/site.js:2632 +#: motions/static/js/motions/site.js:3173 msgid "Stop submitting new motions by non-staff users" msgstr "Einreichen von neuen Anträgen stoppen für Nutzer ohne Verwaltungsrechte" @@ -3160,7 +3331,7 @@ msgstr "Einreichen von neuen Anträgen stoppen für Nutzer ohne Verwaltungsrecht #: users/static/templates/users/user-detail.html:28 #: users/static/templates/users/user-import.html:53 #: users/static/templates/users/user-import.html:86 -#: users/static/templates/users/user-list.html:423 +#: users/static/templates/users/user-list.html:425 msgid "Structure level" msgstr "Gliederungsebene" @@ -3173,27 +3344,34 @@ msgstr "Absenden" msgid "Submitter" msgstr "Antragsteller/in" -#: motions/static/js/motions/docx.js:93 motions/static/js/motions/pdf.js:534 -#: motions/static/js/motions/pdf.js:95 motions/static/js/motions/site.js:1239 -#: motions/static/js/motions/site.js:404 motions/static/js/motions/site.js:729 -#: motions/static/templates/motions/motion-detail.html:128 +#: motions/static/js/motions/docx.js:94 motions/static/js/motions/pdf.js:1053 +#: motions/static/js/motions/pdf.js:552 motions/static/js/motions/pdf.js:98 +#: motions/static/js/motions/site.js:101 +#: motions/static/js/motions/site.js:1369 +#: motions/static/js/motions/site.js:468 motions/static/js/motions/site.js:829 +#: motions/static/templates/motions/motion-detail.html:140 +#: motions/static/templates/motions/motion-detail.html:142 #: motions/static/templates/motions/slide_motion.html:14 msgid "Submitters" msgstr "Antragsteller/in" -#: motions/static/js/motions/pdf.js:285 -#: motions/static/templates/motions/motion-detail/change-summary.html:4 +#: motions/static/js/motions/pdf.js:288 msgid "Summary of change recommendations" msgstr "Zusammenfassung der Änderungsempfehlungen" -#: motions/static/templates/motions/motion-detail.html:143 +#: motions/static/templates/motions/motion-detail/change-summary.html:4 +msgid "Summary of changes" +msgstr "Zusammenfassung der Änderungen" + +#: motions/static/templates/motions/motion-detail.html:161 msgid "Support motion" msgstr "Antrag unterstützen" -#: motions/static/js/motions/site.js:2646 -#: motions/static/js/motions/site.js:566 -#: motions/static/templates/motions/motion-detail.html:135 -#: motions/static/templates/motions/motion-list.html:777 +#: motions/static/js/motions/site.js:3193 +#: motions/static/js/motions/site.js:635 +#: motions/static/templates/motions/motion-amendment-list.html:384 +#: motions/static/templates/motions/motion-detail.html:153 +#: motions/static/templates/motions/motion-list.html:414 msgid "Supporters" msgstr "Unterstützer/innen" @@ -3209,27 +3387,27 @@ msgid "System URL" msgstr "System-URL" #: assignments/static/js/assignments/pdf.js:563 -#: motions/static/js/motions/docx.js:51 motions/static/js/motions/pdf.js:839 +#: motions/static/js/motions/docx.js:52 motions/static/js/motions/pdf.js:857 msgid "Table of contents" msgstr "Inhaltsverzeichnis" #: assignments/static/templates/assignments/assignment-list.html:105 -#: motions/static/templates/motions/motion-list.html:293 +#: motions/static/templates/motions/motion-table-filters.html:141 msgid "Tag" msgstr "Schlagwort" #: assignments/static/js/assignments/site.js:202 #: assignments/static/templates/assignments/assignment-detail.html:55 #: assignments/static/templates/assignments/assignment-list.html:10 -#: core/static/js/core/site.js:397 core/static/templates/core/tag-list.html:13 -#: motions/static/js/motions/site.js:552 -#: motions/static/templates/motions/motion-detail.html:321 -#: motions/static/templates/motions/motion-detail.html:325 -#: motions/static/templates/motions/motion-list.html:18 +#: core/static/js/core/site.js:410 core/static/templates/core/tag-list.html:13 +#: motions/static/js/motions/site.js:621 +#: motions/static/templates/motions/motion-detail.html:337 +#: motions/static/templates/motions/motion-detail.html:341 +#: motions/static/templates/motions/motion-list.html:22 msgid "Tags" msgstr "Schlagwörter" -#: motions/static/js/motions/site.js:426 motions/static/js/motions/site.js:834 +#: motions/static/js/motions/site.js:494 motions/static/js/motions/site.js:947 #: motions/static/templates/motions/motion-import.html:24 #: motions/static/templates/motions/motion-import.html:47 #: topics/static/js/topics/site.js:101 @@ -3238,27 +3416,27 @@ msgstr "Schlagwörter" msgid "Text" msgstr "Text" -#: motions/static/js/motions/site.js:340 +#: motions/static/js/motions/site.js:373 msgid "Text from line %from% to %to%" msgstr "Text von Zeile %from% bis %to%" -#: motions/static/js/motions/site.js:339 +#: motions/static/js/motions/site.js:372 msgid "Text in line %from%" msgstr "Text in Zeile %from%" -#: motions/static/js/motions/site.js:2660 +#: motions/static/js/motions/site.js:3207 msgid "The 100 % base of a voting result consists of" msgstr "Die 100%-Basis eines Abstimmungsergebnisses besteht aus" -#: assignments/static/js/assignments/site.js:863 +#: assignments/static/js/assignments/site.js:871 msgid "The 100-%-base of an election result consists of" msgstr "Die 100%-Basis eines Wahlergebnisses besteht aus" -#: motions/static/js/motions/site.js:2619 +#: motions/static/js/motions/site.js:3160 msgid "The assembly may decide:" msgstr "Die Versammlung möge beschließen:" -#: core/static/js/core/site.js:1834 +#: core/static/js/core/site.js:1847 msgid "The delete was successful." msgstr "Die Löschung war erfolgreich." @@ -3266,7 +3444,7 @@ msgstr "Die Löschung war erfolgreich." msgid "The list of speakers is empty." msgstr "Die Redeliste ist leer." -#: motions/static/js/motions/site.js:2628 +#: motions/static/js/motions/site.js:3169 msgid "" "The maximum number of characters per line. Relevant when line numbering is " "enabled. Min: 40" @@ -3282,7 +3460,7 @@ msgid "" "image width if you change the projector resolution." msgstr "Die Projektor-Kopfgrafik sollte eine Standardgröße von 1024x70px haben. Passen Sie die Grafikbreite an, wenn Sie die Projektorauflösung ändern." -#: core/static/js/core/base.js:784 +#: core/static/js/core/base.js:794 msgid "The server didn't respond." msgstr "Der Server antwortet nicht." @@ -3290,7 +3468,7 @@ msgstr "Der Server antwortet nicht." msgid "The text or reason have been changed." msgstr "Text oder Begründung wurde geändert." -#: motions/static/js/motions/site.js:2643 +#: motions/static/js/motions/site.js:3185 msgid "The title of the motion is always applied." msgstr "Der Antragstitel wird immer übernommen." @@ -3308,7 +3486,11 @@ msgstr "%user% besitzen keine E-Mail-Adressen; E-Mails konnte daher nicht gesend msgid "There are more than one duplicates of this user!" msgstr "Es gibt mehr als ein Duplikat von diesem Nutzer!" -#: motions/static/templates/motions/motion-detail.html:573 +#: motions/static/templates/motions/motion-detail/view-diff.html:57 +msgid "This change collides with another one." +msgstr "Diese Änderung kollidiert mit einer anderen." + +#: motions/static/templates/motions/motion-detail.html:604 msgid "This is the last active version." msgstr "Dies ist die letzte aktive Version." @@ -3316,12 +3498,12 @@ msgstr "Dies ist die letzte aktive Version." msgid "This prefix will be set if you run the automatic agenda numbering." msgstr "Dieses Präfix wird gesetzt, wenn die automatische Nummerierung der Tagesordnung durchgeführt wird." -#: motions/static/templates/motions/motion-detail.html:89 +#: motions/static/templates/motions/motion-detail.html:101 msgid "This version is not permitted." msgstr "Diese Version ist nicht zugelassen." -#: assignments/static/js/assignments/site.js:882 -#: motions/static/js/motions/site.js:2670 +#: assignments/static/js/assignments/site.js:890 +#: motions/static/js/motions/site.js:3217 msgid "Three-quarters majority" msgstr "Dreiviertelmehrheit" @@ -3331,8 +3513,8 @@ msgstr "Dreiviertelmehrheit" #: mediafiles/static/js/mediafiles/list.js:100 #: mediafiles/static/templates/mediafiles/mediafile-upload-form.html:24 #: motions/static/js/motions/motion-block.js:78 -#: motions/static/js/motions/pdf.js:258 motions/static/js/motions/site.js:1237 -#: motions/static/js/motions/site.js:415 +#: motions/static/js/motions/pdf.js:261 motions/static/js/motions/site.js:1367 +#: motions/static/js/motions/site.js:482 #: motions/static/templates/motions/motion-detail/change-summary.html:17 #: motions/static/templates/motions/motion-import.html:23 #: motions/static/templates/motions/motion-import.html:46 @@ -3345,11 +3527,11 @@ msgstr "Dreiviertelmehrheit" msgid "Title" msgstr "Titel" -#: motions/static/js/motions/site.js:2679 +#: motions/static/js/motions/site.js:3226 msgid "Title for PDF and DOCX documents (all motions)" msgstr "Titel für PDF- und DOCX-Dokumente (alle Anträge) " -#: assignments/static/js/assignments/site.js:885 +#: assignments/static/js/assignments/site.js:893 msgid "Title for PDF document (all elections)" msgstr "Titel für PDF-Dokument (alle Wahlen)" @@ -3361,7 +3543,7 @@ msgstr "Titel für das Zugangsdaten- und Begrüßungs-PDF" msgid "Title is required. All other fields are optional and may be empty." msgstr "Titel ist erforderlich. Alle übrigen Felder sind optional und dürfen leer sein." -#: motions/static/js/motions/site.js:308 +#: motions/static/js/motions/site.js:341 msgid "To Line" msgstr "Bis Zeile" @@ -3379,13 +3561,13 @@ msgstr "Thema" msgid "Topics" msgstr "Themen" -#: motions/static/js/motions/site.js:447 +#: motions/static/js/motions/site.js:515 #: motions/static/templates/motions/motion-detail/view-original.html:17 msgid "Trivial change" msgstr "Triviale Änderung" -#: assignments/static/js/assignments/site.js:881 -#: motions/static/js/motions/site.js:2669 +#: assignments/static/js/assignments/site.js:889 +#: motions/static/js/motions/site.js:3216 msgid "Two-thirds majority" msgstr "Zweidrittelmehrheit" @@ -3393,7 +3575,7 @@ msgstr "Zweidrittelmehrheit" msgid "Type" msgstr "Typ" -#: motions/static/templates/motions/motion-detail.html:148 +#: motions/static/templates/motions/motion-detail.html:166 msgid "Unsupport motion" msgstr "Unterstützung zurückziehen" @@ -3422,8 +3604,8 @@ msgstr "Hochgeladen durch" msgid "Uploader" msgstr "Hochgeladen durch" -#: assignments/static/js/assignments/site.js:876 -#: motions/static/js/motions/site.js:2675 +#: assignments/static/js/assignments/site.js:884 +#: motions/static/js/motions/site.js:3222 msgid "Use the following custom number" msgstr "Verwende die folgende benutzerdefinierte Anzahl" @@ -3458,29 +3640,29 @@ msgid "Users without any assigned group gain the permissions from this group." msgstr "Benutzer ohne einer speziell zugewiesenen Gruppe bekommen die Rechte von dieser Gruppe." #: assignments/static/js/assignments/pdf.js:187 -#: assignments/static/js/assignments/site.js:784 +#: assignments/static/js/assignments/site.js:792 #: assignments/static/templates/assignments/assignment-detail.html:259 #: assignments/static/templates/assignments/slide_assignment.html:69 msgid "Valid ballots" msgstr "Gültige Stimmzettel" -#: motions/static/js/motions/pdf.js:203 motions/static/js/motions/site.js:673 -#: motions/static/templates/motions/motion-detail.html:421 +#: motions/static/js/motions/pdf.js:206 motions/static/js/motions/site.js:770 +#: motions/static/templates/motions/motion-detail.html:438 msgid "Valid votes" msgstr "Gültige Stimmen" -#: motions/static/templates/motions/motion-detail.html:566 -#: motions/static/templates/motions/motion-detail.html:569 +#: motions/static/templates/motions/motion-detail.html:597 +#: motions/static/templates/motions/motion-detail.html:600 msgid "Version" msgstr "Version" -#: motions/static/templates/motions/motion-detail.html:562 +#: motions/static/templates/motions/motion-detail.html:593 msgid "Version history" msgstr "Versionshistorie" #. ballot of a motion -#: motions/static/js/motions/pdf.js:181 -#: motions/static/templates/motions/motion-detail.html:352 +#: motions/static/js/motions/pdf.js:184 +#: motions/static/templates/motions/motion-detail.html:369 #: motions/static/templates/motions/motion-poll-form.html:1 #: motions/static/templates/motions/slide_motion.html:24 msgid "Vote" @@ -3492,21 +3674,21 @@ msgstr "Abstimmung" msgid "Votes" msgstr "Stimmen" -#: motions/static/js/motions/pdf.js:217 motions/static/js/motions/site.js:689 -#: motions/static/templates/motions/motion-detail.html:439 +#: motions/static/js/motions/pdf.js:220 motions/static/js/motions/site.js:786 +#: motions/static/templates/motions/motion-detail.html:456 msgid "Votes cast" msgstr "Abgegebene Stimmen" -#: assignments/static/js/assignments/site.js:889 +#: assignments/static/js/assignments/site.js:897 msgid "Voting" msgstr "Im Wahlvorgang" -#: motions/static/js/motions/site.js:2659 +#: motions/static/js/motions/site.js:3206 msgid "Voting and ballot papers" msgstr "Abstimmung und Stimmzettel" -#: motions/static/js/motions/pdf.js:225 motions/static/js/motions/site.js:730 -#: motions/static/templates/motions/motion-detail.html:348 +#: motions/static/js/motions/pdf.js:228 motions/static/js/motions/site.js:830 +#: motions/static/templates/motions/motion-detail.html:364 #: motions/static/templates/motions/slide_motion.html:20 msgid "Voting result" msgstr "Abstimmungsergebnis" @@ -3539,60 +3721,60 @@ msgstr "WPA/WPA2" msgid "Waiting for results ..." msgstr "Auf Ergebnisse wartend ..." -#: core/static/js/core/site.js:734 +#: core/static/js/core/site.js:747 msgid "Warning" msgstr "Warnung" -#: core/static/js/core/site.js:2111 +#: core/static/js/core/site.js:2124 msgid "Web interface header logo" msgstr "Web-Interface-Kopfzeilen-Logo" -#: core/static/js/core/site.js:2081 users/static/js/users/site.js:1834 +#: core/static/js/core/site.js:2094 users/static/js/users/site.js:1834 msgid "Welcome to OpenSlides" msgstr "Willkommen bei OpenSlides" -#: motions/static/js/motions/site.js:2636 +#: motions/static/js/motions/site.js:3177 msgid "" "Will be displayed as label before selected recommendation. Use an empty " "value to disable the recommendation system." msgstr "Wird als Beschriftung vor der ausgewählten Empfehlung angezeigt. Verwenden Sie eine leere Eingabe, um das Empfehlungssystem zu deaktivieren." -#: motions/static/js/motions/base.js:1024 +#: motions/static/js/motions/base.js:1562 msgid "Withdraw" msgstr "Zurückziehen" -#: motions/static/js/motions/site.js:580 +#: motions/static/js/motions/site.js:649 msgid "Workflow" msgstr "Arbeitsablauf" -#: motions/static/js/motions/site.js:2613 +#: motions/static/js/motions/site.js:3154 msgid "Workflow of new motions" msgstr "Arbeitsablauf von neuen Anträgen" #: assignments/static/js/assignments/pdf.js:333 #: assignments/static/js/assignments/site.js:614 -#: assignments/static/js/assignments/site.js:728 -#: motions/static/js/motions/pdf.js:187 motions/static/js/motions/pdf.js:710 -#: motions/static/js/motions/site.js:646 -#: motions/static/templates/motions/motion-detail.html:385 +#: assignments/static/js/assignments/site.js:726 +#: motions/static/js/motions/pdf.js:190 motions/static/js/motions/pdf.js:728 +#: motions/static/js/motions/site.js:743 +#: motions/static/templates/motions/motion-detail.html:402 #: motions/static/templates/motions/slide_motion.html:32 msgid "Yes" msgstr "Ja" -#: motions/static/js/motions/site.js:2662 +#: motions/static/js/motions/site.js:3209 msgid "Yes/No" msgstr "Ja/Nein" -#: assignments/static/js/assignments/site.js:869 +#: assignments/static/js/assignments/site.js:877 #: assignments/static/templates/assignments/assignment-detail.html:201 msgid "Yes/No per candidate" msgstr "Ja/Nein pro Kandidat" -#: motions/static/js/motions/site.js:2661 +#: motions/static/js/motions/site.js:3208 msgid "Yes/No/Abstain" msgstr "Ja/Nein/Enthaltung" -#: assignments/static/js/assignments/site.js:868 +#: assignments/static/js/assignments/site.js:876 #: assignments/static/templates/assignments/assignment-detail.html:200 msgid "Yes/No/Abstain per candidate" msgstr "Ja/Nein/Enthaltung pro Kandidat" @@ -3601,7 +3783,7 @@ msgstr "Ja/Nein/Enthaltung pro Kandidat" msgid "You are not allowed to lock yourself out of the configuration!" msgstr "Sie sind nicht berechtigt sich selbst aus der Konfiguration zu sperren!" -#: core/static/js/core/site.js:2093 +#: core/static/js/core/site.js:2106 msgid "" "You can replace the logo by uploading an image and set it as the \"Projector" " logo\" in \"files\"." @@ -3623,7 +3805,7 @@ msgstr "Sie überschreiben hiermit das persönlich gesetzte Passwort von" msgid "Your login for {event_name}" msgstr "Zugangsdaten für {event_name}" -#: motions/static/js/motions/pdf.js:1096 +#: motions/static/js/motions/pdf.js:1319 msgid "ZIP successfully generated." msgstr "ZIP-Archiv erfolgreich erstellt." @@ -3643,16 +3825,16 @@ msgstr "[Rede beginnen] startet den Countdown, [Rede beenden] stoppt den Countdo msgid "[Place for your welcome and help text.]" msgstr "[Platz für Ihren Begrüßungs- und Hilfetext.]" -#: core/static/js/core/site.js:2083 +#: core/static/js/core/site.js:2096 msgid "[Space for your welcome text.]" msgstr "[Platz für Ihren Begrüßungstext.]" -#: motions/static/js/motions/base.js:1002 -#: motions/static/js/motions/base.js:1017 +#: motions/static/js/motions/base.js:1540 +#: motions/static/js/motions/base.js:1555 msgid "accepted" msgstr "angenommen" -#: motions/static/js/motions/base.js:1025 +#: motions/static/js/motions/base.js:1563 msgid "adjourned" msgstr "vertagt" @@ -3664,23 +3846,29 @@ msgstr "Tagesordnung-Beispiel" msgid "already exists." msgstr "existiert bereits." +#: motions/static/templates/motions/motion-amendment-list.html:175 +#: motions/static/templates/motions/motion-list.html:433 +msgid "amendments" +msgstr "Änderungsanträge" + #: users/static/js/users/site.js:852 msgid "and" msgstr "und" -#: core/static/js/core/site.js:740 +#: core/static/js/core/site.js:753 msgid "anonymous users are also editing this." msgstr "Gäste sind auch gerade in Bearbeitung." -#: core/static/js/core/site.js:757 +#: core/static/js/core/site.js:770 msgid "are also editing this." msgstr "sind auch gerade in Bearbeitung." -#: motions/static/js/motions/pdf.js:1112 +#: motions/static/js/motions/pdf.js:1335 msgid "ballot-paper" msgstr "stimmzettel" -#: motions/static/templates/motions/motion-list.html:630 +#: motions/static/templates/motions/motion-amendment-list.html:320 +#: motions/static/templates/motions/motion-list.html:262 msgid "by" msgstr "von" @@ -3700,8 +3888,8 @@ msgstr "Duplikat erstellen" msgid "date" msgstr "Datum" -#: motions/static/templates/motions/motion-list.html:177 -#: motions/static/templates/motions/motion-list.html:431 +#: motions/static/templates/motions/motion-table-filters.html:25 +#: motions/static/templates/motions/motion-table-filters.html:263 msgid "done" msgstr "erledigt" @@ -3722,7 +3910,7 @@ msgstr "Wahlen" msgid "files" msgstr "Dateien" -#: motions/static/templates/motions/motion-detail/toolbar.html:88 +#: motions/static/templates/motions/motion-detail/toolbar.html:36 msgid "go" msgstr "gehe zu" @@ -3736,19 +3924,19 @@ msgstr "h" msgid "imported" msgstr "Importiert" -#: motions/static/js/motions/site.js:781 motions/static/js/motions/site.js:794 -#: motions/static/templates/motions/motion-detail/toolbar.html:40 -#: motions/static/templates/motions/motion-detail/toolbar.html:65 +#: motions/static/js/motions/site.js:894 motions/static/js/motions/site.js:907 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:17 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:43 msgid "inline" msgstr "innerhalb" -#: motions/static/js/motions/docx.js:165 motions/static/js/motions/pdf.js:1141 -#: motions/static/js/motions/pdf.js:401 +#: motions/static/js/motions/docx.js:168 motions/static/js/motions/pdf.js:1364 +#: motions/static/js/motions/pdf.js:419 #: motions/static/templates/motions/motion-detail/comments.html:25 msgid "internal" msgstr "intern" -#: core/static/js/core/site.js:755 +#: core/static/js/core/site.js:768 msgid "is also editing this." msgstr "ist auch gerade in Bearbeitung." @@ -3768,7 +3956,7 @@ msgstr "nicht gewählt" msgid "is now" msgstr "ist jetzt" -#: motions/static/templates/motions/motion-list.html:276 +#: motions/static/templates/motions/motion-table-filters.html:124 msgid "is set" msgstr "ist gesetzt" @@ -3792,10 +3980,10 @@ msgstr "Mehrheit" msgid "minutes" msgstr "Minuten" -#: motions/static/js/motions/csv.js:41 motions/static/js/motions/docx.js:185 -#: motions/static/js/motions/pdf.js:1045 motions/static/js/motions/pdf.js:1058 +#: motions/static/js/motions/csv.js:42 motions/static/js/motions/docx.js:188 +#: motions/static/js/motions/pdf.js:1268 motions/static/js/motions/pdf.js:1281 #: motions/static/templates/motions/motion-block-detail.html:44 -#: motions/static/templates/motions/motion-list.html:127 +#: motions/static/templates/motions/motion-list.html:132 msgid "motions" msgstr "Anträge" @@ -3811,28 +3999,28 @@ msgstr "Anträge werden importiert." msgid "motions will be not imported." msgstr "Anträge werden nicht importiert." -#: motions/static/js/motions/csv.js:121 +#: motions/static/js/motions/csv.js:126 msgid "motions-example" msgstr "Anträge-Beispiel" -#: motions/static/js/motions/site.js:2685 +#: motions/static/js/motions/site.js:3232 msgid "needed" msgstr "erforderlich" -#: motions/static/js/motions/base.js:1034 +#: motions/static/js/motions/base.js:1572 msgid "needs review" msgstr "benötigt Überprüfung" -#: motions/static/templates/motions/motion-detail/toolbar.html:34 -#: motions/static/templates/motions/motion-detail/toolbar.html:60 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:11 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:37 msgid "none" msgstr "aus" -#: motions/static/js/motions/base.js:1028 +#: motions/static/js/motions/base.js:1566 msgid "not concerned" msgstr "nicht befasst" -#: motions/static/js/motions/base.js:1008 +#: motions/static/js/motions/base.js:1546 msgid "not decided" msgstr "nicht entschieden" @@ -3845,9 +4033,9 @@ msgstr "jetzt" msgid "of" msgstr "von" -#: motions/static/js/motions/site.js:782 motions/static/js/motions/site.js:795 -#: motions/static/templates/motions/motion-detail/toolbar.html:46 -#: motions/static/templates/motions/motion-detail/toolbar.html:70 +#: motions/static/js/motions/site.js:895 motions/static/js/motions/site.js:908 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:23 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:49 msgid "outside" msgstr "außerhalb" @@ -3876,28 +4064,28 @@ msgstr "Teilnehmende werden nicht importiert. " msgid "participants-example" msgstr "Teilnehmende-Beispiel" -#: motions/static/js/motions/base.js:1014 +#: motions/static/js/motions/base.js:1552 msgid "permitted" msgstr "zugelassen" -#: motions/static/js/motions/site.js:1865 +#: motions/static/js/motions/site.js:1986 msgid "personal note" msgstr "Persönliche Notiz" -#: motions/static/js/motions/base.js:1013 +#: motions/static/js/motions/base.js:1551 msgid "published" msgstr "veröffentlicht" -#: motions/static/js/motions/base.js:1031 +#: motions/static/js/motions/base.js:1569 msgid "refered to committee" msgstr "in Ausschuss verwiesen" -#: motions/static/js/motions/base.js:1005 -#: motions/static/js/motions/base.js:1020 +#: motions/static/js/motions/base.js:1543 +#: motions/static/js/motions/base.js:1558 msgid "rejected" msgstr "abgelehnt" -#: motions/static/js/motions/base.js:1036 +#: motions/static/js/motions/base.js:1574 msgid "rejected (not authorized)" msgstr "verworfen (nicht zulässig)" @@ -3912,18 +4100,19 @@ msgstr "Dateien auswählen" #: agenda/static/templates/agenda/item-list.html:156 #: assignments/static/templates/assignments/assignment-list.html:67 #: mediafiles/static/templates/mediafiles/mediafile-list.html:145 -#: motions/static/templates/motions/motion-list.html:128 +#: motions/static/templates/motions/motion-amendment-list.html:176 +#: motions/static/templates/motions/motion-list.html:133 #: users/static/templates/users/user-list.html:151 msgid "selected" msgstr "ausgewählt" #: agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html:8 #: agenda/static/templates/agenda/slide-list-of-speakers.html:9 -#: motions/static/templates/motions/motion-list.html:788 +#: motions/static/templates/motions/motion-list.html:425 msgid "speakers" msgstr "Redner/innen" -#: motions/static/js/motions/base.js:1001 +#: motions/static/js/motions/base.js:1539 msgid "submitted" msgstr "eingereicht" @@ -3959,11 +4148,11 @@ msgstr "unbekannt" msgid "undocumented" msgstr "nicht erfasst" -#: motions/static/templates/motions/motion-list.html:183 -#: motions/static/templates/motions/motion-list.html:437 +#: motions/static/templates/motions/motion-table-filters.html:269 +#: motions/static/templates/motions/motion-table-filters.html:31 msgid "undone" msgstr "unerledigt" -#: motions/static/js/motions/base.js:1023 +#: motions/static/js/motions/base.js:1561 msgid "withdrawed" msgstr "zurückgezogen" diff --git a/openslides/locale/angular-gettext/template-en.pot b/openslides/locale/angular-gettext/template-en.pot index f0da6d409..5d05ef3f9 100644 --- a/openslides/locale/angular-gettext/template-en.pot +++ b/openslides/locale/angular-gettext/template-en.pot @@ -4,11 +4,21 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id-Version: \n" -#: motions/static/js/motions/base.js:959 +#: motions/static/templates/motions/motion-detail.html:47 +msgctxt "resolution" +msgid "Final version" +msgstr "" + +#: csv-import.html:16 +msgctxt "special filetypes in a file open dialog" +msgid "Accepted file types" +msgstr "" + +#: motions/static/js/motions/base.js:1419 msgid "%TYPE% from line %FROM% to %TO%" msgstr "" -#: motions/static/js/motions/base.js:961 +#: motions/static/js/motions/base.js:1421 msgid "%TYPE% in line %FROM%" msgstr "" @@ -16,12 +26,14 @@ msgstr "" msgid "%num% emails were send sucessfully." msgstr "" -#: motions/static/templates/motions/motion-list.html:68 +#: motions/static/templates/motions/motion-amendment-list.html:115 +#: motions/static/templates/motions/motion-list.html:72 #: users/static/templates/users/user-list.html:81 msgid "--- Select action ---" msgstr "" -#: motions/static/templates/motions/motion-list.html:88 +#: motions/static/templates/motions/motion-amendment-list.html:135 +#: motions/static/templates/motions/motion-list.html:92 msgid "--- Select category ---" msgstr "" @@ -29,7 +41,8 @@ msgstr "" msgid "--- Select group ---" msgstr "" -#: motions/static/templates/motions/motion-list.html:102 +#: motions/static/templates/motions/motion-amendment-list.html:149 +#: motions/static/templates/motions/motion-list.html:106 msgid "--- Select motion block ---" msgstr "" @@ -37,7 +50,8 @@ msgstr "" msgid "--- Select phase ---" msgstr "" -#: motions/static/templates/motions/motion-list.html:76 +#: motions/static/templates/motions/motion-amendment-list.html:123 +#: motions/static/templates/motions/motion-list.html:80 msgid "--- Select state ---" msgstr "" @@ -45,7 +59,7 @@ msgstr "" msgid "--- Set phase ---" msgstr "" -#: core/static/js/core/site.js:2068 +#: core/static/js/core/site.js:2081 msgid "OpenSlides is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly." msgstr "" @@ -57,7 +71,7 @@ msgstr "" msgid "A comment has been changed." msgstr "" -#: core/static/js/core/base.js:788 +#: core/static/js/core/base.js:798 msgid "A server error occurred (%%code%%). Please check the system logs." msgstr "" @@ -70,30 +84,29 @@ msgstr "" #: assignments/static/js/assignments/pdf.js:348 #: assignments/static/js/assignments/site.js:616 #: assignments/static/js/assignments/site.js:753 -#: motions/static/js/motions/pdf.js:197 -#: motions/static/js/motions/pdf.js:712 -#: motions/static/js/motions/site.js:664 -#: motions/static/templates/motions/motion-detail.html:409 +#: motions/static/js/motions/pdf.js:200 +#: motions/static/js/motions/pdf.js:730 +#: motions/static/js/motions/site.js:761 +#: motions/static/templates/motions/motion-detail.html:426 #: motions/static/templates/motions/slide_motion.html:56 msgid "Abstain" msgstr "" -#: motions/static/js/motions/base.js:1003 -#: motions/static/js/motions/base.js:1018 +#: motions/static/js/motions/base.js:1541 +#: motions/static/js/motions/base.js:1556 msgid "Accept" msgstr "" -#: motions/static/js/motions/base.js:1004 -#: motions/static/js/motions/base.js:1019 +#: motions/static/js/motions/base.js:1542 +#: motions/static/js/motions/base.js:1557 msgid "Acceptance" msgstr "" -#: csv-import.html:16 -msgctxt "special filetypes in a file open dialog" -msgid "Accepted file types" +#: motions/static/templates/motions/motion-detail/change-summary.html:46 +msgid "Accepted" msgstr "" -#: motions/static/js/motions/site.js:2640 +#: motions/static/js/motions/site.js:3182 msgid "Activate amendments" msgstr "" @@ -103,7 +116,7 @@ msgid "Active" msgstr "" #: assignments/static/templates/assignments/assignment-list.html:285 -#: motions/static/templates/motions/motion-list.html:731 +#: motions/static/templates/motions/motion-list.html:368 msgid "Add a tag" msgstr "" @@ -145,11 +158,11 @@ msgstr "" msgid "Additional columns after the required ones may be present and won't affect the import." msgstr "" -#: motions/static/js/motions/base.js:1026 +#: motions/static/js/motions/base.js:1564 msgid "Adjourn" msgstr "" -#: motions/static/js/motions/base.js:1027 +#: motions/static/js/motions/base.js:1565 msgid "Adjournment" msgstr "" @@ -174,17 +187,22 @@ msgstr "" msgid "Agenda" msgstr "" -#: motions/static/templates/motions/motion-list.html:415 +#: motions/static/templates/motions/motion-table-filters.html:247 msgid "All Filters" msgstr "" -#: assignments/static/js/assignments/site.js:871 -#: motions/static/js/motions/site.js:2664 +#: assignments/static/js/assignments/site.js:879 +#: motions/static/js/motions/site.js:3211 msgid "All casted ballots" msgstr "" -#: assignments/static/js/assignments/site.js:870 -#: motions/static/js/motions/site.js:2663 +#: motions/static/templates/motions/motion-amendment-list.html:28 +#: motions/static/templates/motions/motion-amendment-list.html:44 +msgid "All motions" +msgstr "" + +#: assignments/static/js/assignments/site.js:878 +#: motions/static/js/motions/site.js:3210 msgid "All valid ballots" msgstr "" @@ -192,38 +210,61 @@ msgstr "" msgid "All your changes are saved immediately. Changes you make are only effective once you (or the users concerned) reload the page." msgstr "" -#: core/static/js/core/site.js:2084 +#: core/static/js/core/site.js:2097 msgid "Allow access for anonymous guest users" msgstr "" -#: motions/static/js/motions/site.js:2633 +#: motions/static/js/motions/site.js:3174 msgid "Allow to disable versioning" msgstr "" -#: assignments/static/js/assignments/site.js:859 +#: assignments/static/js/assignments/site.js:867 msgid "Always Yes-No-Abstain per candidate" msgstr "" -#: assignments/static/js/assignments/site.js:860 +#: assignments/static/js/assignments/site.js:868 msgid "Always Yes/No per candidate" msgstr "" -#: assignments/static/js/assignments/site.js:858 +#: assignments/static/js/assignments/site.js:866 msgid "Always one option per candidate" msgstr "" -#: motions/static/js/motions/pdf.js:515 -#: motions/static/js/motions/pdf.js:74 -#: motions/static/templates/motions/motion-detail.html:83 -msgid "Amendment of motion" +#: motions/static/templates/motions/motion-amendment-list.html:96 +msgid "Amendment list PDF" msgstr "" -#: motions/static/js/motions/site.js:2639 -#: motions/static/templates/motions/motion-detail.html:154 +#: motions/static/js/motions/site.js:2207 +#: motions/static/js/motions/site.js:3186 +msgid "Amendment to" +msgstr "" + +#: motions/static/js/motions/pdf.js:533 +#: motions/static/js/motions/pdf.js:75 +#: motions/static/js/motions/site.js:2210 +msgid "Amendment to motion" +msgstr "" + +#: motions/static/js/motions/site.js:2736 +#: motions/static/js/motions/site.js:3181 +#: motions/static/js/motions/site.js:877 +#: motions/static/templates/motions/motion-amendment-list.html:18 +#: motions/static/templates/motions/motion-detail.html:17 +#: motions/static/templates/motions/motion-detail.html:172 +#: motions/static/templates/motions/motion-detail.html:174 +#: motions/static/templates/motions/motion-list.html:10 msgid "Amendments" msgstr "" -#: motions/static/js/motions/site.js:2642 +#: motions/static/js/motions/site.js:2733 +msgid "Amendments to" +msgstr "" + +#: motions/static/js/motions/pdf.js:1079 +msgid "Amendments to motion" +msgstr "" + +#: motions/static/js/motions/site.js:3184 msgid "Apply text for new amendments" msgstr "" @@ -239,11 +280,15 @@ msgstr "" msgid "Are you sure you want to delete all selected agenda items?" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:162 +msgid "Are you sure you want to delete all selected amendments?" +msgstr "" + #: assignments/static/templates/assignments/assignment-list.html:54 msgid "Are you sure you want to delete all selected elections?" msgstr "" -#: motions/static/templates/motions/motion-list.html:115 +#: motions/static/templates/motions/motion-list.html:119 msgid "Are you sure you want to delete all selected motions?" msgstr "" @@ -256,7 +301,7 @@ msgid "Are you sure you want to delete this ballot?" msgstr "" #: motions/static/templates/motions/motion-detail/view-diff.html:25 -#: motions/static/templates/motions/motion-detail/view-diff.html:72 +#: motions/static/templates/motions/motion-detail/view-diff.html:79 #: motions/static/templates/motions/motion-detail/view-original.html:34 msgid "Are you sure you want to delete this change recommendation?" msgstr "" @@ -266,10 +311,11 @@ msgstr "" #: core/static/templates/core/manage-projectors.html:52 #: core/static/templates/core/tag-list.html:46 #: motions/static/templates/motions/category-list.html:49 +#: motions/static/templates/motions/motion-amendment-list.html:338 #: motions/static/templates/motions/motion-block-list.html:45 -#: motions/static/templates/motions/motion-list.html:645 +#: motions/static/templates/motions/motion-list.html:282 #: users/static/templates/users/group-list.html:45 -#: users/static/templates/users/user-list.html:362 +#: users/static/templates/users/user-list.html:364 msgid "Are you sure you want to delete this entry?" msgstr "" @@ -277,11 +323,11 @@ msgstr "" msgid "Are you sure you want to delete this file?" msgstr "" -#: motions/static/templates/motions/motion-detail.html:362 +#: motions/static/templates/motions/motion-detail.html:379 msgid "Are you sure you want to delete this poll?" msgstr "" -#: motions/static/templates/motions/motion-detail.html:583 +#: motions/static/templates/motions/motion-detail.html:614 msgid "Are you sure you want to delete this version?" msgstr "" @@ -311,12 +357,19 @@ msgid "" " other fields are optional and may be empty." msgstr "" -#: motions/static/js/motions/site.js:501 +#: motions/static/templates/motions/motion-detail.html:548 +msgid "" +"At least two amendments or change recommendations affecting the same line are to be integrated.\n" +" This leads to undeterministic results.\n" +" Please resolve this conflict by not accepting multiple changes affecting the same line." +msgstr "" + +#: motions/static/js/motions/site.js:570 #: topics/static/js/topics/site.js:113 msgid "Attachment" msgstr "" -#: motions/static/templates/motions/motion-detail.html:554 +#: motions/static/templates/motions/motion-detail.html:585 #: topics/static/templates/topics/topic-detail.html:31 msgid "Attachments" msgstr "" @@ -325,10 +378,14 @@ msgstr "" msgid "Autodetection" msgstr "" -#: assignments/static/js/assignments/site.js:857 +#: assignments/static/js/assignments/site.js:865 msgid "Automatic assign of method" msgstr "" +#: motions/static/templates/motions/motion-submitters.html:6 +msgid "Back" +msgstr "" + #: topics/static/templates/topics/topic-import.html:130 #: topics/static/templates/topics/topic-import.html:35 msgid "Back to agenda" @@ -338,6 +395,7 @@ msgstr "" msgid "Back to categories" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:8 #: motions/static/templates/motions/motion-import.html:139 msgid "Back to motions overview" msgstr "" @@ -349,7 +407,8 @@ msgstr "" #: motions/static/templates/motions/category-list.html:6 #: motions/static/templates/motions/motion-block-detail.html:6 #: motions/static/templates/motions/motion-block-list.html:6 -#: motions/static/templates/motions/motion-detail.html:6 +#: motions/static/templates/motions/motion-detail.html:12 +#: motions/static/templates/motions/motion-detail.html:7 #: motions/static/templates/motions/motion-import.html:6 #: topics/static/templates/topics/topic-detail.html:6 #: topics/static/templates/topics/topic-import.html:6 @@ -366,7 +425,7 @@ msgstr "" msgid "Back to users overview" msgstr "" -#: core/static/js/core/site.js:2101 +#: core/static/js/core/site.js:2114 msgid "Background color of projector header and footer" msgstr "" @@ -378,7 +437,7 @@ msgstr "" msgid "Ballot" msgstr "" -#: assignments/static/js/assignments/site.js:862 +#: assignments/static/js/assignments/site.js:870 msgid "Ballot and ballot papers" msgstr "" @@ -544,16 +603,18 @@ msgstr "" #: assignments/static/templates/assignments/assignment-form.html:18 #: assignments/static/templates/assignments/assignmentpoll-form.html:18 -#: core/static/js/core/base.js:256 +#: core/static/js/core/base.js:264 #: core/static/js/core/site.js:128 #: core/static/js/core/site.js:129 #: core/static/templates/core/projector-controls.html:198 #: core/static/templates/core/projector-message-form.html:8 #: core/static/templates/core/tag-form.html:13 #: mediafiles/static/templates/mediafiles/mediafile-form.html:19 +#: motions/static/templates/motions/amendment-paragraph-choose-form.html:24 #: motions/static/templates/motions/category-form.html:13 #: motions/static/templates/motions/change-recommendation-form.html:13 #: motions/static/templates/motions/motion-block-form.html:13 +#: motions/static/templates/motions/motion-comment-form.html:12 #: motions/static/templates/motions/motion-export-form.html:10 #: motions/static/templates/motions/motion-form.html:19 #: motions/static/templates/motions/motion-poll-form.html:18 @@ -585,17 +646,17 @@ msgid "Cannot load image" msgstr "" #: assignments/static/js/assignments/pdf.js:213 -#: assignments/static/js/assignments/site.js:802 +#: assignments/static/js/assignments/site.js:810 #: assignments/static/templates/assignments/assignment-detail.html:271 #: assignments/static/templates/assignments/slide_assignment.html:81 msgid "Casted ballots" msgstr "" -#: motions/static/js/motions/docx.js:45 -#: motions/static/js/motions/pdf.js:883 -#: motions/static/js/motions/site.js:102 +#: motions/static/js/motions/docx.js:46 +#: motions/static/js/motions/pdf.js:901 +#: motions/static/js/motions/site.js:135 #: motions/static/templates/motions/category-list.html:13 -#: motions/static/templates/motions/motion-list.html:10 +#: motions/static/templates/motions/motion-list.html:14 msgid "Categories" msgstr "" @@ -603,20 +664,20 @@ msgstr "" msgid "Categories created" msgstr "" -#: motions/static/js/motions/pdf.js:137 -#: motions/static/js/motions/pdf.js:573 -#: motions/static/js/motions/site.js:1241 -#: motions/static/js/motions/site.js:515 +#: motions/static/js/motions/pdf.js:140 +#: motions/static/js/motions/pdf.js:591 +#: motions/static/js/motions/site.js:1371 +#: motions/static/js/motions/site.js:584 #: motions/static/templates/motions/category-sort.html:9 -#: motions/static/templates/motions/motion-detail.html:277 -#: motions/static/templates/motions/motion-detail.html:281 +#: motions/static/templates/motions/motion-detail.html:293 +#: motions/static/templates/motions/motion-detail.html:297 #: motions/static/templates/motions/motion-import.html:27 #: motions/static/templates/motions/motion-import.html:50 -#: motions/static/templates/motions/motion-list.html:221 +#: motions/static/templates/motions/motion-table-filters.html:69 msgid "Category" msgstr "" -#: core/static/js/core/site.js:2089 +#: core/static/js/core/site.js:2102 msgid "Center" msgstr "" @@ -626,7 +687,7 @@ msgstr "" #: index.html:106 #: users/static/templates/users/user-change-password.html:47 -#: users/static/templates/users/user-list.html:360 +#: users/static/templates/users/user-list.html:362 msgid "Change password" msgstr "" @@ -638,17 +699,21 @@ msgstr "" msgid "Change presence" msgstr "" -#: motions/static/js/motions/site.js:804 -#: motions/static/js/motions/site.js:818 -#: motions/static/templates/motions/motion-detail/toolbar.html:102 -#: motions/static/templates/motions/motion-detail/toolbar.html:138 +#: motions/static/templates/motions/motion-detail/change-summary.html:34 +msgid "Change recommendation" +msgstr "" + +#: motions/static/js/motions/site.js:917 +#: motions/static/js/motions/site.js:931 +#: motions/static/templates/motions/motion-detail/toolbar.html:59 +#: motions/static/templates/motions/motion-detail/toolbar.html:95 msgid "Change recommendations" msgstr "" -#: motions/static/js/motions/site.js:807 -#: motions/static/js/motions/site.js:821 -#: motions/static/templates/motions/motion-detail/toolbar.html:117 -#: motions/static/templates/motions/motion-detail/toolbar.html:150 +#: motions/static/js/motions/site.js:920 +#: motions/static/js/motions/site.js:934 +#: motions/static/templates/motions/motion-detail/toolbar.html:107 +#: motions/static/templates/motions/motion-detail/toolbar.html:74 msgid "Changed version" msgstr "" @@ -656,10 +721,14 @@ msgstr "" msgid "Chat" msgstr "" -#: motions/static/js/motions/site.js:2648 +#: motions/static/js/motions/site.js:3195 msgid "Choose 0 to disable the supporting system." msgstr "" +#: motions/static/templates/motions/amendment-paragraph-choose-form.html:1 +msgid "Choose the paragraph to amend!" +msgstr "" + #: core/static/js/core/site.js:130 #: core/static/js/core/site.js:131 msgid "Clear" @@ -699,11 +768,11 @@ msgstr "" msgid "Collapse all" msgstr "" -#: core/static/js/core/site.js:2105 +#: core/static/js/core/site.js:2118 msgid "Color for blanked projector" msgstr "" -#: motions/static/templates/motions/motion-list.html:269 +#: motions/static/templates/motions/motion-table-filters.html:117 #: topics/static/templates/topics/topic-import.html:53 #: topics/static/templates/topics/topic-import.html:72 #: users/static/js/users/site.js:374 @@ -711,18 +780,18 @@ msgstr "" #: users/static/templates/users/user-detail.html:48 #: users/static/templates/users/user-import.html:56 #: users/static/templates/users/user-import.html:89 -#: users/static/templates/users/user-list.html:439 +#: users/static/templates/users/user-list.html:441 msgid "Comment" msgstr "" -#: motions/static/js/motions/site.js:2654 +#: motions/static/js/motions/site.js:3201 msgid "Comment fields for motions" msgstr "" -#: motions/static/js/motions/docx.js:96 -#: motions/static/js/motions/site.js:1859 -#: motions/static/js/motions/site.js:2653 -#: motions/static/js/motions/site.js:863 +#: motions/static/js/motions/docx.js:97 +#: motions/static/js/motions/site.js:1980 +#: motions/static/js/motions/site.js:3200 +#: motions/static/js/motions/site.js:976 msgid "Comments" msgstr "" @@ -735,7 +804,7 @@ msgstr "" msgid "Committees" msgstr "" -#: motions/static/js/motions/base.js:1012 +#: motions/static/js/motions/base.js:1550 msgid "Complex Workflow" msgstr "" @@ -743,10 +812,14 @@ msgstr "" msgid "Confirm new password" msgstr "" -#: motions/static/js/motions/site.js:832 +#: motions/static/js/motions/site.js:945 msgid "Content" msgstr "" +#: motions/static/templates/motions/amendment-paragraph-choose-form.html:21 +msgid "Continue" +msgstr "" + #: core/static/templates/core/login-form.html:23 msgid "Continue as guest" msgstr "" @@ -761,12 +834,12 @@ msgstr "" msgid "Copy and paste your topic titles in this textbox. Keep each item in a single line." msgstr "" -#: core/static/js/core/base.js:1435 -#: core/static/js/core/site.js:409 +#: core/static/js/core/base.js:1444 +#: core/static/js/core/site.js:422 msgid "Countdown" msgstr "" -#: core/static/js/core/base.js:1436 +#: core/static/js/core/base.js:1445 #: core/static/templates/core/projector-controls.html:127 msgid "Countdowns" msgstr "" @@ -775,15 +848,19 @@ msgstr "" msgid "Couple countdown with the list of speakers" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:377 +msgid "Create modified amendment" +msgstr "" + #: users/static/templates/users/group-edit.html:2 msgid "Create new group" msgstr "" -#: motions/static/js/motions/site.js:1247 +#: motions/static/js/motions/site.js:1377 msgid "Creation date" msgstr "" -#: core/static/js/core/site.js:2097 +#: core/static/js/core/site.js:2110 msgid "Current browser language" msgstr "" @@ -797,12 +874,12 @@ msgstr "" msgid "Current list of speakers" msgstr "" -#: assignments/static/js/assignments/site.js:877 -#: motions/static/js/motions/site.js:2676 +#: assignments/static/js/assignments/site.js:885 +#: motions/static/js/motions/site.js:3223 msgid "Custom number of ballot papers" msgstr "" -#: core/static/js/core/site.js:2113 +#: core/static/js/core/site.js:2126 msgid "Custom translations" msgstr "" @@ -825,7 +902,7 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:55 #: core/static/templates/core/projector-controls.html:296 #: mediafiles/static/templates/mediafiles/mediafile-list.html:292 -#: motions/static/templates/motions/motion-detail.html:45 +#: motions/static/templates/motions/motion-detail.html:56 #: projector-button.html:23 #: users/static/js/users/base.js:171 msgid "Default" @@ -835,23 +912,23 @@ msgstr "" msgid "Default comment on the ballot paper" msgstr "" -#: motions/static/js/motions/site.js:2620 +#: motions/static/js/motions/site.js:3161 msgid "Default line numbering" msgstr "" -#: assignments/static/js/assignments/site.js:879 +#: assignments/static/js/assignments/site.js:887 msgid "Default method to check whether a candidate has reached the required majority." msgstr "" -#: motions/static/js/motions/site.js:2667 +#: motions/static/js/motions/site.js:3214 msgid "Default method to check whether a motion has reached the required majority." msgstr "" -#: core/static/js/core/site.js:2116 +#: core/static/js/core/site.js:2129 msgid "Default projector" msgstr "" -#: motions/static/js/motions/site.js:2635 +#: motions/static/js/motions/site.js:3176 msgid "Default text version for change recommendations" msgstr "" @@ -865,19 +942,25 @@ msgstr "" #: core/static/templates/core/tag-list.html:45 #: mediafiles/static/templates/mediafiles/mediafile-list.html:319 #: motions/static/templates/motions/category-list.html:48 +#: motions/static/templates/motions/motion-amendment-list.html:116 +#: motions/static/templates/motions/motion-amendment-list.html:337 #: motions/static/templates/motions/motion-block-list.html:44 -#: motions/static/templates/motions/motion-detail.html:364 -#: motions/static/templates/motions/motion-detail.html:586 +#: motions/static/templates/motions/motion-detail.html:381 +#: motions/static/templates/motions/motion-detail.html:617 #: motions/static/templates/motions/motion-detail/view-diff.html:27 -#: motions/static/templates/motions/motion-detail/view-diff.html:74 +#: motions/static/templates/motions/motion-detail/view-diff.html:81 #: motions/static/templates/motions/motion-detail/view-original.html:36 -#: motions/static/templates/motions/motion-list.html:644 -#: motions/static/templates/motions/motion-list.html:69 -#: users/static/templates/users/user-list.html:361 +#: motions/static/templates/motions/motion-list.html:281 +#: motions/static/templates/motions/motion-list.html:73 +#: users/static/templates/users/user-list.html:363 #: users/static/templates/users/user-list.html:82 msgid "Delete" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:166 +msgid "Delete selected amendments" +msgstr "" + #: assignments/static/templates/assignments/assignment-list.html:58 msgid "Delete selected elections" msgstr "" @@ -890,7 +973,7 @@ msgstr "" msgid "Delete selected mediafiles" msgstr "" -#: motions/static/templates/motions/motion-list.html:119 +#: motions/static/templates/motions/motion-list.html:123 msgid "Delete selected motions" msgstr "" @@ -898,10 +981,10 @@ msgstr "" msgid "Delete selected participants" msgstr "" -#: motions/static/js/motions/base.js:968 -#: motions/static/js/motions/pdf.js:278 -#: motions/static/js/motions/site.js:320 -#: motions/static/templates/motions/motion-detail/change-summary.html:35 +#: motions/static/js/motions/base.js:1428 +#: motions/static/js/motions/pdf.js:281 +#: motions/static/js/motions/site.js:353 +#: motions/static/templates/motions/motion-detail/change-summary.html:39 msgid "Deletion" msgstr "" @@ -909,7 +992,7 @@ msgstr "" #: assignments/static/js/assignments/site.js:136 #: assignments/static/templates/assignments/assignment-detail.html:81 #: core/static/templates/core/projector-controls.html:183 -#: motions/static/js/motions/site.js:329 +#: motions/static/js/motions/site.js:362 msgid "Description" msgstr "" @@ -933,20 +1016,20 @@ msgstr "" msgid "Didn't get an email" msgstr "" -#: motions/static/js/motions/site.js:808 -#: motions/static/js/motions/site.js:822 -#: motions/static/templates/motions/motion-detail/toolbar.html:123 -#: motions/static/templates/motions/motion-detail/toolbar.html:155 +#: motions/static/js/motions/site.js:921 +#: motions/static/js/motions/site.js:935 +#: motions/static/templates/motions/motion-detail/toolbar.html:112 +#: motions/static/templates/motions/motion-detail/toolbar.html:80 msgid "Diff version" msgstr "" -#: assignments/static/js/assignments/site.js:883 -#: motions/static/js/motions/site.js:2671 +#: assignments/static/js/assignments/site.js:891 +#: motions/static/js/motions/site.js:3218 msgid "Disabled" msgstr "" -#: assignments/static/js/assignments/site.js:872 -#: motions/static/js/motions/site.js:2665 +#: assignments/static/js/assignments/site.js:880 +#: motions/static/js/motions/site.js:3212 msgid "Disabled (no percents)" msgstr "" @@ -954,24 +1037,24 @@ msgstr "" msgid "Display an identifier message on all projectors with the id and the name." msgstr "" -#: core/static/js/core/site.js:2099 +#: core/static/js/core/site.js:2112 msgid "Display header and footer" msgstr "" -#: motions/static/js/motions/base.js:1029 +#: motions/static/js/motions/base.js:1567 msgid "Do not concern" msgstr "" -#: motions/static/js/motions/base.js:1009 +#: motions/static/js/motions/base.js:1547 msgid "Do not decide" msgstr "" -#: motions/static/templates/motions/motion-detail.html:518 -#: motions/static/templates/motions/motion-detail.html:533 +#: motions/static/templates/motions/motion-detail.html:536 +#: motions/static/templates/motions/motion-detail.html:560 msgid "Do you want to create a new version of this motion based on this changes?" msgstr "" -#: motions/static/js/motions/site.js:448 +#: motions/static/js/motions/site.js:516 msgid "Don't create a new version." msgstr "" @@ -1010,16 +1093,17 @@ msgstr "" #: core/static/templates/core/tag-list.html:44 #: mediafiles/static/templates/mediafiles/mediafile-list.html:318 #: motions/static/templates/motions/category-list.html:46 +#: motions/static/templates/motions/motion-amendment-list.html:330 #: motions/static/templates/motions/motion-block-detail.html:20 #: motions/static/templates/motions/motion-block-list.html:42 -#: motions/static/templates/motions/motion-detail.html:356 -#: motions/static/templates/motions/motion-detail.html:53 +#: motions/static/templates/motions/motion-detail.html:373 +#: motions/static/templates/motions/motion-detail.html:64 #: motions/static/templates/motions/motion-detail/view-diff.html:33 -#: motions/static/templates/motions/motion-detail/view-diff.html:79 -#: motions/static/templates/motions/motion-list.html:641 +#: motions/static/templates/motions/motion-detail/view-diff.html:87 +#: motions/static/templates/motions/motion-list.html:273 #: topics/static/templates/topics/topic-detail.html:20 #: users/static/templates/users/user-detail.html:15 -#: users/static/templates/users/user-list.html:358 +#: users/static/templates/users/user-list.html:359 msgid "Edit" msgstr "" @@ -1035,6 +1119,11 @@ msgstr "" msgid "Edit change recommendation" msgstr "" +#: motions/static/js/motions/site.js:2408 +#: motions/static/js/motions/site.js:3178 +msgid "Edit comment %%comment%% of motion %%motion%%" +msgstr "" + #: core/static/templates/core/projector-controls.html:143 msgid "Edit countdown" msgstr "" @@ -1074,10 +1163,19 @@ msgstr "" msgid "Edit profile" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:332 +#: motions/static/templates/motions/motion-list.html:276 +msgid "Edit submitters" +msgstr "" + #: core/static/templates/core/tag-form.html:1 msgid "Edit tag" msgstr "" +#: motions/static/js/motions/site.js:3189 +msgid "Edit the whole motion text" +msgstr "" + #: topics/static/templates/topics/topic-form.html:1 msgid "Edit topic" msgstr "" @@ -1094,7 +1192,7 @@ msgstr "" msgid "Election" msgstr "" -#: assignments/static/js/assignments/site.js:856 +#: assignments/static/js/assignments/site.js:864 #: assignments/static/templates/assignments/assignment-detail.html:198 msgid "Election method" msgstr "" @@ -1108,7 +1206,7 @@ msgstr "" #: assignments/static/js/assignments/site.js:19 #: assignments/static/js/assignments/site.js:31 #: assignments/static/js/assignments/site.js:49 -#: assignments/static/js/assignments/site.js:861 +#: assignments/static/js/assignments/site.js:869 #: assignments/static/templates/assignments/assignment-list.html:14 msgid "Elections" msgstr "" @@ -1134,6 +1232,10 @@ msgstr "" msgid "Email subject" msgstr "" +#: motions/static/js/motions/site.js:3188 +msgid "Empty text field" +msgstr "" + #: agenda/static/js/agenda/site.js:774 msgid "Enable numbering for agenda items" msgstr "" @@ -1166,16 +1268,16 @@ msgstr "" msgid "Enter votes" msgstr "" -#: core/static/js/core/base.js:781 +#: core/static/js/core/base.js:791 msgid "Error" msgstr "" -#: core/static/js/core/pdf.js:1261 +#: core/static/js/core/pdf.js:1264 #: core/static/js/core/pdf.js:99 msgid "Error while generating PDF file" msgstr "" -#: motions/static/js/motions/pdf.js:1102 +#: motions/static/js/motions/pdf.js:1325 msgid "Error while generating ZIP file" msgstr "" @@ -1183,15 +1285,15 @@ msgstr "" msgid "Error: Given name or surname is required." msgstr "" -#: motions/static/js/motions/site.js:2250 +#: motions/static/js/motions/site.js:2792 msgid "Error: Identifier already exists." msgstr "" -#: motions/static/js/motions/site.js:2261 +#: motions/static/js/motions/site.js:2803 msgid "Error: Text is required." msgstr "" -#: motions/static/js/motions/site.js:2256 +#: motions/static/js/motions/site.js:2798 #: topics/static/js/topics/site.js:303 msgid "Error: Title is required." msgstr "" @@ -1200,30 +1302,38 @@ msgstr "" msgid "Estimated end:" msgstr "" -#: core/static/js/core/site.js:2073 +#: core/static/js/core/site.js:2086 msgid "Event" msgstr "" -#: core/static/js/core/site.js:2075 +#: core/static/js/core/site.js:2088 msgid "Event date" msgstr "" -#: core/static/js/core/site.js:2076 +#: core/static/js/core/site.js:2089 msgid "Event location" msgstr "" -#: core/static/js/core/site.js:2067 +#: core/static/js/core/site.js:2080 msgid "Event name" msgstr "" -#: core/static/js/core/site.js:2077 +#: core/static/js/core/site.js:2090 msgid "Event organizer" msgstr "" +#: motions/static/js/motions/site.js:880 +msgid "Exclude" +msgstr "" + #: users/static/templates/users/user-import.html:234 msgid "Exclude already imported users" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:14 +msgid "Expand" +msgstr "" + #: agenda/static/templates/agenda/item-list.html:169 msgid "Expand all" msgstr "" @@ -1231,14 +1341,15 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:130 #: agenda/static/templates/agenda/item-list.html:93 #: assignments/static/templates/assignments/assignment-list.html:31 -#: motions/static/templates/motions/motion-list.html:44 -#: motions/static/templates/motions/motion-list.html:54 +#: motions/static/templates/motions/motion-amendment-list.html:70 +#: motions/static/templates/motions/motion-list.html:48 +#: motions/static/templates/motions/motion-list.html:58 #: users/static/templates/users/user-list.html:47 msgid "Export all" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:26 -#: motions/static/templates/motions/motion-detail.html:58 +#: motions/static/templates/motions/motion-detail.html:69 msgid "Export as PDF" msgstr "" @@ -1250,11 +1361,16 @@ msgstr "" msgid "Export comments only" msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:83 +msgid "Export dialog" +msgstr "" + #: agenda/static/templates/agenda/item-list.html:133 #: agenda/static/templates/agenda/item-list.html:96 #: assignments/static/templates/assignments/assignment-list.html:34 -#: motions/static/templates/motions/motion-list.html:47 -#: motions/static/templates/motions/motion-list.html:57 +#: motions/static/templates/motions/motion-amendment-list.html:73 +#: motions/static/templates/motions/motion-list.html:51 +#: motions/static/templates/motions/motion-list.html:61 #: users/static/templates/users/user-list.html:50 msgid "Export filtered" msgstr "" @@ -1300,23 +1416,18 @@ msgstr "" msgid "Filter" msgstr "" -#: motions/static/js/motions/site.js:809 -#: motions/static/js/motions/site.js:823 -#: motions/static/templates/motions/motion-detail/toolbar.html:130 -#: motions/static/templates/motions/motion-detail/toolbar.html:160 +#: motions/static/js/motions/site.js:922 +#: motions/static/js/motions/site.js:936 +#: motions/static/templates/motions/motion-detail/toolbar.html:117 +#: motions/static/templates/motions/motion-detail/toolbar.html:87 msgid "Final version" msgstr "" -#: motions/static/templates/motions/motion-detail.html:36 -msgctxt "resolution" -msgid "Final version" -msgstr "" - -#: assignments/static/js/assignments/site.js:890 +#: assignments/static/js/assignments/site.js:898 msgid "Finished" msgstr "" -#: motions/static/templates/motions/motion-detail.html:272 +#: motions/static/templates/motions/motion-detail.html:288 msgid "Follow recommendation" msgstr "" @@ -1324,36 +1435,36 @@ msgstr "" msgid "Follow recommendations for all motions" msgstr "" -#: core/static/js/core/site.js:2102 +#: core/static/js/core/site.js:2115 msgid "Font color of projector header and footer" msgstr "" -#: core/static/js/core/site.js:2103 +#: core/static/js/core/site.js:2116 msgid "Font color of projector headline" msgstr "" -#: assignments/static/js/assignments/site.js:864 +#: assignments/static/js/assignments/site.js:872 msgid "For Yes/No/Abstain per candidate and Yes/No per candidate the 100-%-base depends on the election method: If there is only one option per candidate, the sum of all votes of all candidates is 100 %. Otherwise for each candidate the sum of all votes is 100 %." msgstr "" -#: motions/static/js/motions/site.js:761 +#: motions/static/js/motions/site.js:861 msgid "Format" msgstr "" -#: motions/static/js/motions/site.js:300 +#: motions/static/js/motions/site.js:333 msgid "From Line" msgstr "" -#: core/static/js/core/site.js:2082 +#: core/static/js/core/site.js:2095 msgid "Front page text" msgstr "" -#: core/static/js/core/site.js:2080 +#: core/static/js/core/site.js:2093 msgid "Front page title" msgstr "" -#: core/static/js/core/site.js:2072 -#: motions/static/js/motions/site.js:2612 +#: core/static/js/core/site.js:2085 +#: motions/static/js/motions/site.js:3153 #: users/static/js/users/site.js:1498 #: users/static/js/users/site.js:1827 msgid "General" @@ -1369,11 +1480,11 @@ msgstr "" msgid "Generate new passwords" msgstr "" -#: core/static/js/core/pdf.js:1252 +#: core/static/js/core/pdf.js:1255 msgid "Generating PDF file" msgstr "" -#: motions/static/js/motions/pdf.js:1057 +#: motions/static/js/motions/pdf.js:1280 msgid "Generating PDFs and ZIP archive" msgstr "" @@ -1398,8 +1509,8 @@ msgstr "" #: users/static/templates/users/user-import.html:88 #: users/static/templates/users/user-list.html:16 #: users/static/templates/users/user-list.html:209 -#: users/static/templates/users/user-list.html:376 -#: users/static/templates/users/user-list.html:405 +#: users/static/templates/users/user-list.html:378 +#: users/static/templates/users/user-list.html:407 msgid "Groups" msgstr "" @@ -1429,15 +1540,15 @@ msgstr "" msgid "Hide internal items when projecting subitems" msgstr "" -#: motions/static/js/motions/site.js:2630 +#: motions/static/js/motions/site.js:3171 msgid "Hide meta information box on projector" msgstr "" -#: motions/static/js/motions/site.js:2629 +#: motions/static/js/motions/site.js:3170 msgid "Hide reason on projector" msgstr "" -#: motions/static/js/motions/site.js:2631 +#: motions/static/js/motions/site.js:3172 msgid "Hide recommendation on projector" msgstr "" @@ -1445,16 +1556,20 @@ msgstr "" msgid "Hint on the ballot paper." msgstr "" -#: core/static/js/core/site.js:176 -#: core/static/js/core/site.js:318 +#: core/static/js/core/site.js:189 +#: core/static/js/core/site.js:331 msgid "Home" msgstr "" -#: motions/static/js/motions/site.js:1235 -#: motions/static/js/motions/site.js:207 -#: motions/static/js/motions/site.js:2614 -#: motions/static/js/motions/site.js:284 -#: motions/static/js/motions/site.js:396 +#: motions/static/js/motions/site.js:3187 +msgid "How to create new amendments" +msgstr "" + +#: motions/static/js/motions/site.js:1365 +#: motions/static/js/motions/site.js:240 +#: motions/static/js/motions/site.js:3155 +#: motions/static/js/motions/site.js:317 +#: motions/static/js/motions/site.js:458 #: motions/static/templates/motions/motion-import.html:22 #: motions/static/templates/motions/motion-import.html:45 msgid "Identifier" @@ -1477,7 +1592,7 @@ msgstr "" msgid "If deactivated the election appears as internal item on agenda." msgstr "" -#: motions/static/js/motions/site.js:460 +#: motions/static/js/motions/site.js:529 msgid "If deactivated the motion appears as internal item on agenda." msgstr "" @@ -1487,7 +1602,7 @@ msgid "Image browser" msgstr "" #: agenda/static/templates/agenda/item-list.html:16 -#: motions/static/templates/motions/motion-list.html:22 +#: motions/static/templates/motions/motion-list.html:26 #: topics/static/templates/topics/topic-import.html:24 #: users/static/templates/users/user-import.html:29 #: users/static/templates/users/user-list.html:20 @@ -1528,11 +1643,15 @@ msgstr "" msgid "Import {{ usersWillBeImported }} participants" msgstr "" +#: motions/static/js/motions/site.js:879 +msgid "Include" +msgstr "" + #: agenda/static/templates/agenda/item-list.html:308 msgid "Include all sub items" msgstr "" -#: motions/static/js/motions/site.js:2682 +#: motions/static/js/motions/site.js:3229 msgid "Include the sequential number in PDF and DOCX" msgstr "" @@ -1550,7 +1669,7 @@ msgid "Initial password can not be changed." msgstr "" #. Line numbering: Inline -#: motions/static/js/motions/site.js:2624 +#: motions/static/js/motions/site.js:3165 msgid "Inline" msgstr "" @@ -1568,10 +1687,10 @@ msgstr "" msgid "Input format: DD.MM.YYYY HH:MM" msgstr "" -#: motions/static/js/motions/base.js:965 -#: motions/static/js/motions/pdf.js:276 -#: motions/static/js/motions/site.js:319 -#: motions/static/templates/motions/motion-detail/change-summary.html:34 +#: motions/static/js/motions/base.js:1425 +#: motions/static/js/motions/pdf.js:279 +#: motions/static/js/motions/site.js:352 +#: motions/static/templates/motions/motion-detail/change-summary.html:38 msgid "Insertion" msgstr "" @@ -1595,7 +1714,7 @@ msgid "Internal items" msgstr "" #: assignments/static/js/assignments/pdf.js:200 -#: assignments/static/js/assignments/site.js:793 +#: assignments/static/js/assignments/site.js:801 #: assignments/static/templates/assignments/assignment-detail.html:265 #: assignments/static/templates/assignments/slide_assignment.html:75 msgid "Invalid ballots" @@ -1605,9 +1724,9 @@ msgstr "" msgid "Invalid input." msgstr "" -#: motions/static/js/motions/pdf.js:210 -#: motions/static/js/motions/site.js:681 -#: motions/static/templates/motions/motion-detail.html:430 +#: motions/static/js/motions/pdf.js:213 +#: motions/static/js/motions/site.js:778 +#: motions/static/templates/motions/motion-detail.html:447 msgid "Invalid votes" msgstr "" @@ -1633,10 +1752,6 @@ msgstr "" msgid "Is active" msgstr "" -#: motions/static/js/motions/site.js:1171 -msgid "Is an amendment" -msgstr "" - #: users/static/templates/users/user-import.html:59 #: users/static/templates/users/user-import.html:92 #: users/static/templates/users/user-list.html:129 @@ -1666,10 +1781,6 @@ msgstr "" msgid "Is not active" msgstr "" -#: motions/static/js/motions/site.js:1172 -msgid "Is not an amendment" -msgstr "" - #: mediafiles/static/js/mediafiles/list.js:76 msgid "Is not hidden" msgstr "" @@ -1697,7 +1808,7 @@ msgstr "" #. short form of agenda item #: assignments/static/js/assignments/site.js:336 -#: motions/static/templates/motions/motion-list.html:375 +#: motions/static/templates/motions/motion-table-filters.html:209 msgid "Item" msgstr "" @@ -1705,22 +1816,18 @@ msgstr "" msgid "Items" msgstr "" -#: motions/static/templates/motions/motion-detail/toolbar.html:85 -msgid "Jump to a given line number" -msgstr "" - #: users/static/js/users/site.js:611 #: users/static/js/users/site.js:650 #: users/static/templates/users/user-detail.html:38 msgid "Last email send" msgstr "" -#: users/static/templates/users/user-list.html:446 +#: users/static/templates/users/user-list.html:448 msgid "Last email send to the user" msgstr "" -#: motions/static/js/motions/site.js:1249 -#: motions/static/templates/motions/motion-detail.html:589 +#: motions/static/js/motions/site.js:1379 +#: motions/static/templates/motions/motion-detail.html:620 msgid "Last modified" msgstr "" @@ -1732,13 +1839,13 @@ msgstr "" msgid "Leave empty for autodetection of the separator." msgstr "" -#: core/static/js/core/site.js:2088 +#: core/static/js/core/site.js:2101 msgid "Left" msgstr "" -#: core/static/js/core/site.js:2078 -#: core/static/js/core/site.js:358 -#: index.html:225 +#: core/static/js/core/site.js:2091 +#: core/static/js/core/site.js:371 +#: index.html:227 #: legalnotice.html:3 msgid "Legal notice" msgstr "" @@ -1748,21 +1855,28 @@ msgstr "" msgid "License" msgstr "" -#: motions/static/js/motions/pdf.js:269 -#: motions/static/templates/motions/motion-detail/change-summary.html:27 -#: motions/static/templates/motions/motion-detail/change-summary.html:30 -#: motions/static/templates/motions/motion-detail/toolbar.html:78 +#: motions/static/js/motions/pdf.js:1026 +#: motions/static/js/motions/pdf.js:272 +#: motions/static/templates/motions/motion-amendment-list.html:238 +#: motions/static/templates/motions/motion-amendment-list.html:241 +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:28 +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:31 +#: motions/static/templates/motions/motion-detail/change-summary.html:28 +#: motions/static/templates/motions/motion-detail/change-summary.html:31 +#: motions/static/templates/motions/motion-detail/toolbar.html:29 +#: motions/static/templates/motions/slide_motion.html:80 +#: motions/static/templates/motions/slide_motion.html:83 msgid "Line" msgstr "" -#: motions/static/js/motions/site.js:2627 +#: motions/static/js/motions/site.js:3168 msgid "Line length" msgstr "" -#: motions/static/js/motions/site.js:778 -#: motions/static/js/motions/site.js:791 -#: motions/static/templates/motions/motion-detail/toolbar.html:28 -#: motions/static/templates/motions/motion-detail/toolbar.html:53 +#: motions/static/js/motions/site.js:891 +#: motions/static/js/motions/site.js:904 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:30 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:5 msgid "Line numbering" msgstr "" @@ -1788,12 +1902,12 @@ msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:12 #: core/static/templates/core/projector-controls.html:257 #: motions/static/templates/motions/motion-block-detail.html:11 -#: motions/static/templates/motions/motion-detail.html:12 +#: motions/static/templates/motions/motion-detail.html:23 #: topics/static/templates/topics/topic-detail.html:11 msgid "List of speakers" msgstr "" -#: core/static/js/core/site.js:2106 +#: core/static/js/core/site.js:2119 msgid "List of speakers overlay" msgstr "" @@ -1822,7 +1936,7 @@ msgstr "" msgid "Manage logos" msgstr "" -#: core/static/js/core/site.js:343 +#: core/static/js/core/site.js:356 #: core/static/templates/core/manage-projectors.html:35 msgid "Manage projectors" msgstr "" @@ -1851,76 +1965,76 @@ msgstr "" msgid "Marked" msgstr "" -#: motions/static/js/motions/site.js:1176 +#: motions/static/js/motions/site.js:1306 msgid "Marked as favorite" msgstr "" -#: core/static/js/core/base.js:1384 -#: core/static/js/core/site.js:450 +#: core/static/js/core/base.js:1393 +#: core/static/js/core/site.js:463 #: core/static/templates/core/projector-controls.html:224 msgid "Message" msgstr "" -#: core/static/js/core/base.js:1385 +#: core/static/js/core/base.js:1394 #: core/static/templates/core/projector-controls.html:218 msgid "Messages" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:42 -#: motions/static/js/motions/site.js:843 -#: motions/static/js/motions/site.js:852 -#: motions/static/templates/motions/motion-detail.html:118 +#: motions/static/js/motions/site.js:956 +#: motions/static/js/motions/site.js:965 +#: motions/static/templates/motions/motion-detail.html:130 msgid "Meta information" msgstr "" -#: motions/static/templates/motions/motion-list.html:319 +#: motions/static/templates/motions/motion-table-filters.html:166 msgid "Misc" msgstr "" -#: motions/static/js/motions/base.js:237 -#: motions/static/js/motions/base.js:268 -#: motions/static/js/motions/base.js:277 -#: motions/static/js/motions/docx.js:91 -#: motions/static/js/motions/pdf.js:1066 -#: motions/static/js/motions/pdf.js:1112 -#: motions/static/js/motions/pdf.js:507 -#: motions/static/js/motions/pdf.js:67 -#: motions/static/js/motions/pdf.js:703 -#: motions/static/js/motions/site.js:1478 -#: motions/static/js/motions/site.js:1847 -#: motions/static/js/motions/site.js:1860 -#: motions/static/js/motions/site.js:1866 -#: motions/static/js/motions/site.js:215 -#: motions/static/js/motions/site.js:292 +#: motions/static/js/motions/base.js:258 +#: motions/static/js/motions/base.js:293 +#: motions/static/js/motions/base.js:302 +#: motions/static/js/motions/docx.js:92 +#: motions/static/js/motions/pdf.js:1019 +#: motions/static/js/motions/pdf.js:1289 +#: motions/static/js/motions/pdf.js:1335 +#: motions/static/js/motions/pdf.js:525 +#: motions/static/js/motions/pdf.js:68 +#: motions/static/js/motions/pdf.js:721 +#: motions/static/js/motions/site.js:1573 +#: motions/static/js/motions/site.js:1968 +#: motions/static/js/motions/site.js:1981 +#: motions/static/js/motions/site.js:1987 +#: motions/static/js/motions/site.js:248 +#: motions/static/js/motions/site.js:325 #: motions/static/templates/motions/motion-block-detail.html:51 -#: motions/static/templates/motions/motion-detail.html:101 -#: motions/static/templates/motions/motion-detail.html:105 -#: motions/static/templates/motions/motion-detail.html:157 -#: motions/static/templates/motions/motion-detail.html:252 -#: motions/static/templates/motions/motion-detail.html:81 +#: motions/static/templates/motions/motion-detail.html:113 +#: motions/static/templates/motions/motion-detail.html:117 +#: motions/static/templates/motions/motion-detail.html:268 +#: motions/static/templates/motions/motion-detail.html:97 #: motions/static/templates/motions/slide_motion.html:74 msgid "Motion" msgstr "" #: motions/static/js/motions/motion-block.js:163 #: motions/static/js/motions/motion-block.js:19 -#: motions/static/js/motions/pdf.js:150 -#: motions/static/js/motions/site.js:1243 -#: motions/static/js/motions/site.js:529 -#: motions/static/js/motions/site.js:734 +#: motions/static/js/motions/pdf.js:153 +#: motions/static/js/motions/site.js:1373 +#: motions/static/js/motions/site.js:598 +#: motions/static/js/motions/site.js:834 #: motions/static/templates/motions/motion-block-detail.html:25 -#: motions/static/templates/motions/motion-detail.html:299 -#: motions/static/templates/motions/motion-detail.html:303 +#: motions/static/templates/motions/motion-detail.html:315 +#: motions/static/templates/motions/motion-detail.html:319 #: motions/static/templates/motions/motion-import.html:29 #: motions/static/templates/motions/motion-import.html:52 -#: motions/static/templates/motions/motion-list.html:245 +#: motions/static/templates/motions/motion-table-filters.html:93 #: motions/static/templates/motions/slide_motion_block.html:5 msgid "Motion block" msgstr "" -#: motions/static/js/motions/site.js:122 +#: motions/static/js/motions/site.js:155 #: motions/static/templates/motions/motion-block-list.html:13 -#: motions/static/templates/motions/motion-list.html:14 +#: motions/static/templates/motions/motion-list.html:18 msgid "Motion blocks" msgstr "" @@ -1928,48 +2042,48 @@ msgstr "" msgid "Motion blocks created" msgstr "" -#: motions/static/js/motions/site.js:2618 +#: motions/static/js/motions/site.js:3159 msgid "Motion preamble" msgstr "" -#: motions/static/js/motions/base.js:238 +#: motions/static/js/motions/base.js:259 #: motions/static/js/motions/site.js:22 -#: motions/static/js/motions/site.js:2609 +#: motions/static/js/motions/site.js:3150 #: motions/static/js/motions/site.js:34 #: motions/static/js/motions/site.js:52 #: motions/static/templates/motions/motion-block-list.html:30 -#: motions/static/templates/motions/motion-list.html:26 +#: motions/static/templates/motions/motion-list.html:30 #: motions/static/templates/motions/slide_motion_block.html:5 msgid "Motions" msgstr "" -#: motions/static/js/motions/site.js:883 +#: motions/static/js/motions/site.js:996 msgid "Multiple PDFs in a zip arcive" msgstr "" -#: core/static/js/core/site.js:484 +#: core/static/js/core/site.js:497 #: core/static/templates/core/manage-projectors.html:62 #: core/static/templates/core/tag-list.html:34 -#: motions/static/js/motions/site.js:626 +#: motions/static/js/motions/site.js:723 #: motions/static/templates/motions/category-list.html:29 #: motions/static/templates/motions/motion-block-list.html:29 #: users/static/js/users/pdf.js:65 msgid "Name" msgstr "" -#: motions/static/js/motions/site.js:2634 +#: motions/static/js/motions/site.js:3175 msgid "Name of recommender" msgstr "" -#: motions/static/js/motions/base.js:1035 +#: motions/static/js/motions/base.js:1573 msgid "Needs review" msgstr "" #: agenda/static/templates/agenda/item-list.html:8 #: assignments/static/templates/assignments/assignment-list.html:6 -#: core/static/js/core/site.js:1275 #: core/static/js/core/site.js:1288 -#: core/static/js/core/site.js:1289 +#: core/static/js/core/site.js:1301 +#: core/static/js/core/site.js:1302 #: core/static/templates/core/manage-projectors.html:8 #: core/static/templates/core/tag-list.html:10 #: mediafiles/static/templates/mediafiles/mediafile-list.html:6 @@ -1981,12 +2095,12 @@ msgstr "" msgid "New" msgstr "" -#: motions/static/templates/motions/motion-detail.html:162 +#: motions/static/templates/motions/motion-detail.html:178 msgid "New amendment" msgstr "" #: motions/static/templates/motions/motion-form.html:3 -msgid "New amendment of motion" +msgid "New amendment to motion" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:132 @@ -1997,7 +2111,7 @@ msgstr "" msgid "New category" msgstr "" -#: motions/static/js/motions/site.js:2292 +#: motions/static/js/motions/site.js:2834 msgid "New category will be created." msgstr "" @@ -2017,7 +2131,7 @@ msgstr "" msgid "New motion block" msgstr "" -#: motions/static/js/motions/site.js:2305 +#: motions/static/js/motions/site.js:2847 msgid "New motion block will be created." msgstr "" @@ -2025,7 +2139,7 @@ msgstr "" msgid "New participant" msgstr "" -#: motions/static/js/motions/site.js:2279 +#: motions/static/js/motions/site.js:2821 msgid "New participant will be created." msgstr "" @@ -2038,10 +2152,10 @@ msgstr "" msgid "New tag" msgstr "" -#: motions/static/js/motions/pdf.js:355 -#: motions/static/js/motions/site.js:223 +#: motions/static/js/motions/pdf.js:371 +#: motions/static/js/motions/site.js:256 #: motions/static/templates/motions/motion-detail/view-diff.html:42 -#: motions/static/templates/motions/slide_motion.html:96 +#: motions/static/templates/motions/slide_motion.html:107 msgid "New title" msgstr "" @@ -2049,12 +2163,12 @@ msgstr "" msgid "New topic" msgstr "" -#: motions/static/templates/motions/motion-detail.html:521 -#: motions/static/templates/motions/motion-detail.html:536 +#: motions/static/templates/motions/motion-detail.html:539 +#: motions/static/templates/motions/motion-detail.html:563 msgid "New version on these changes" msgstr "" -#: motions/static/templates/motions/motion-detail.html:475 +#: motions/static/templates/motions/motion-detail.html:492 msgid "New vote" msgstr "" @@ -2065,41 +2179,49 @@ msgstr "" #: assignments/static/js/assignments/pdf.js:339 #: assignments/static/js/assignments/site.js:615 #: assignments/static/js/assignments/site.js:739 -#: motions/static/js/motions/pdf.js:192 -#: motions/static/js/motions/pdf.js:711 -#: motions/static/js/motions/site.js:655 -#: motions/static/templates/motions/motion-detail.html:397 +#: motions/static/js/motions/pdf.js:195 +#: motions/static/js/motions/pdf.js:729 +#: motions/static/js/motions/site.js:752 +#: motions/static/templates/motions/motion-detail.html:414 #: motions/static/templates/motions/slide_motion.html:44 msgid "No" msgstr "" -#: motions/static/js/motions/docx.js:47 +#: motions/static/js/motions/docx.js:48 msgid "No categories available." msgstr "" -#: motions/static/templates/motions/motion-list.html:93 +#: motions/static/templates/motions/motion-amendment-list.html:140 +#: motions/static/templates/motions/motion-list.html:97 msgid "No category" msgstr "" -#: motions/static/templates/motions/motion-list.html:235 -#: motions/static/templates/motions/motion-list.html:454 +#: motions/static/templates/motions/motion-table-filters.html:286 +#: motions/static/templates/motions/motion-table-filters.html:83 msgid "No category set" msgstr "" -#: motions/static/templates/motions/motion-detail/change-summary.html:48 +#: motions/static/templates/motions/motion-detail/change-summary.html:53 msgid "No change recommendations yet" msgstr "" -#: motions/static/templates/motions/motion-list.html:283 -#: motions/static/templates/motions/motion-list.html:480 +#: motions/static/js/motions/pdf.js:1037 +#: motions/static/js/motions/pdf.js:364 +#: motions/static/templates/motions/motion-amendment-list.html:349 +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:17 +msgid "No changes at the text." +msgstr "" + +#: motions/static/templates/motions/motion-table-filters.html:131 +#: motions/static/templates/motions/motion-table-filters.html:312 msgid "No comments set" msgstr "" -#: motions/static/js/motions/base.js:1030 +#: motions/static/js/motions/base.js:1568 msgid "No concernment" msgstr "" -#: motions/static/js/motions/base.js:1010 +#: motions/static/js/motions/base.js:1548 msgid "No decision" msgstr "" @@ -2124,20 +2246,26 @@ msgstr "" msgid "No media file projected." msgstr "" -#: motions/static/templates/motions/motion-list.html:106 +#: motions/static/templates/motions/motion-amendment-list.html:153 +#: motions/static/templates/motions/motion-list.html:110 msgid "No motion block" msgstr "" -#: motions/static/templates/motions/motion-list.html:259 -#: motions/static/templates/motions/motion-list.html:496 +#: motions/static/templates/motions/motion-table-filters.html:107 +#: motions/static/templates/motions/motion-table-filters.html:328 msgid "No motion block set" msgstr "" -#: motions/static/js/motions/docx.js:53 +#: motions/static/js/motions/docx.js:54 msgid "No motions available." msgstr "" -#: motions/static/templates/motions/motion-list.html:211 +#: motions/static/templates/motions/motion-amendment-list.html:285 +#: motions/static/templates/motions/motion-amendment-list.html:296 +msgid "No recomendation set" +msgstr "" + +#: motions/static/templates/motions/motion-table-filters.html:59 msgid "No recommendation set" msgstr "" @@ -2146,6 +2274,7 @@ msgstr "" #: core/static/templates/core/select-multiple.html:2 #: core/static/templates/core/select-single.html:2 #: mediafiles/static/templates/mediafiles/mediafile-upload-form.html:64 +#: motions/static/templates/motions/motion-submitters.html:34 msgid "No results available ..." msgstr "" @@ -2155,8 +2284,8 @@ msgstr "" #: assignments/static/templates/assignments/assignment-list.html:120 #: assignments/static/templates/assignments/assignment-list.html:192 -#: motions/static/templates/motions/motion-list.html:307 -#: motions/static/templates/motions/motion-list.html:512 +#: motions/static/templates/motions/motion-table-filters.html:155 +#: motions/static/templates/motions/motion-table-filters.html:344 msgid "No tag set" msgstr "" @@ -2168,23 +2297,23 @@ msgid "No." msgstr "" #. Line numbering: None -#: motions/static/js/motions/site.js:2626 -#: motions/static/js/motions/site.js:780 -#: motions/static/js/motions/site.js:793 +#: motions/static/js/motions/site.js:3167 +#: motions/static/js/motions/site.js:893 +#: motions/static/js/motions/site.js:906 msgid "None" msgstr "" -#: motions/static/js/motions/site.js:1177 +#: motions/static/js/motions/site.js:1307 msgid "Not marked as favorite" msgstr "" -#: motions/static/templates/motions/motion-detail/view-diff.html:58 +#: motions/static/templates/motions/motion-detail/view-diff.html:64 #: motions/static/templates/motions/motion-detail/view-diff.html:8 msgid "Not rejected" msgstr "" #: motions/static/templates/motions/motion-detail/change-summary.html:8 -msgid "Note: You have to reject all change recommendations if the plenum does not follow the recommendation." +msgid "Note: You have to reject all change recommendations if the plenum does not follow the recommendation. This does not affect amendments." msgstr "" #: motions/static/templates/motions/motion-detail/view-original.html:45 @@ -2196,22 +2325,22 @@ msgstr "" msgid "Number" msgstr "" -#: motions/static/js/motions/site.js:2647 +#: motions/static/js/motions/site.js:3194 msgid "Number of (minimum) required supporters for a motion" msgstr "" -#: assignments/static/js/assignments/site.js:874 -#: motions/static/js/motions/site.js:2673 +#: assignments/static/js/assignments/site.js:882 +#: motions/static/js/motions/site.js:3220 msgid "Number of all delegates" msgstr "" -#: assignments/static/js/assignments/site.js:875 -#: motions/static/js/motions/site.js:2674 +#: assignments/static/js/assignments/site.js:883 +#: motions/static/js/motions/site.js:3221 msgid "Number of all participants" msgstr "" -#: assignments/static/js/assignments/site.js:873 -#: motions/static/js/motions/site.js:2672 +#: assignments/static/js/assignments/site.js:881 +#: motions/static/js/motions/site.js:3219 msgid "Number of ballot papers (selection)" msgstr "" @@ -2229,7 +2358,7 @@ msgstr "" msgid "Number of persons to be elected" msgstr "" -#: motions/static/js/motions/site.js:2615 +#: motions/static/js/motions/site.js:3156 msgid "Numbered per category" msgstr "" @@ -2246,12 +2375,12 @@ msgstr "" msgid "Numeral system for agenda items" msgstr "" -#: core/static/js/core/base.js:255 -#: core/static/js/core/base.js:257 +#: core/static/js/core/base.js:263 +#: core/static/js/core/base.js:265 msgid "OK" msgstr "" -#: core/static/js/core/base.js:801 +#: core/static/js/core/base.js:811 msgid "Offline mode: You can use OpenSlides but changes are not saved." msgstr "" @@ -2259,11 +2388,11 @@ msgstr "" msgid "Old password" msgstr "" -#: motions/static/js/motions/site.js:882 +#: motions/static/js/motions/site.js:995 msgid "One PDF" msgstr "" -#: core/static/js/core/site.js:738 +#: core/static/js/core/site.js:751 msgid "One anonymous users is also editing this." msgstr "" @@ -2289,6 +2418,10 @@ msgstr "" msgid "Only main agenda items" msgstr "" +#: motions/static/templates/motions/motion-detail/view-diff.html:93 +msgid "Open amendment" +msgstr "" + #: core/static/templates/core/projector-controls.html:147 msgid "Open countdown in fullscreen" msgstr "" @@ -2317,13 +2450,13 @@ msgstr "" msgid "OpenSlides access data" msgstr "" -#: motions/static/js/motions/pdf.js:163 -#: motions/static/js/motions/site.js:542 -#: motions/static/js/motions/site.js:741 -#: motions/static/templates/motions/motion-detail.html:343 +#: motions/static/js/motions/pdf.js:166 +#: motions/static/js/motions/site.js:611 +#: motions/static/js/motions/site.js:841 +#: motions/static/templates/motions/motion-detail.html:359 #: motions/static/templates/motions/motion-import.html:28 #: motions/static/templates/motions/motion-import.html:51 -#: motions/static/templates/motions/motion-list.html:765 +#: motions/static/templates/motions/motion-list.html:402 msgid "Origin" msgstr "" @@ -2332,47 +2465,47 @@ msgstr "" msgid "Original size" msgstr "" -#: motions/static/js/motions/site.js:806 -#: motions/static/js/motions/site.js:820 -#: motions/static/templates/motions/motion-detail/toolbar.html:109 -#: motions/static/templates/motions/motion-detail/toolbar.html:145 +#: motions/static/js/motions/site.js:919 +#: motions/static/js/motions/site.js:933 +#: motions/static/templates/motions/motion-detail/toolbar.html:102 +#: motions/static/templates/motions/motion-detail/toolbar.html:66 msgid "Original version" msgstr "" -#: motions/static/js/motions/site.js:321 +#: motions/static/js/motions/site.js:354 msgid "Other" msgstr "" #. Line numbering: Outside -#: motions/static/js/motions/site.js:2622 +#: motions/static/js/motions/site.js:3163 msgid "Outside" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:28 -#: motions/static/templates/motions/motion-detail.html:60 +#: motions/static/templates/motions/motion-detail.html:71 #: motions/static/templates/motions/motion-detail/comments.html:9 #: motions/static/templates/motions/motion-detail/personal-note.html:9 #: users/static/js/users/site.js:1833 msgid "PDF" msgstr "" -#: core/static/js/core/site.js:2112 +#: core/static/js/core/site.js:2125 msgid "PDF ballot paper logo" msgstr "" -#: core/static/js/core/site.js:2110 +#: core/static/js/core/site.js:2123 msgid "PDF footer logo" msgstr "" -#: motions/static/js/motions/site.js:880 +#: motions/static/js/motions/site.js:993 msgid "PDF format" msgstr "" -#: core/static/js/core/site.js:2109 +#: core/static/js/core/site.js:2122 msgid "PDF header logo" msgstr "" -#: core/static/js/core/pdf.js:1256 +#: core/static/js/core/pdf.js:1259 msgid "PDF successfully generated." msgstr "" @@ -2380,23 +2513,32 @@ msgstr "" #: assignments/static/templates/assignments/assignment-list.html:75 #: mediafiles/static/templates/mediafiles/mediafile-list.html:153 #: mediafiles/static/templates/mediafiles/mediafile-list.html:44 -#: motions/static/templates/motions/motion-list.html:136 +#: motions/static/templates/motions/motion-amendment-list.html:180 +#: motions/static/templates/motions/motion-list.html:141 #: users/static/templates/users/user-import.html:73 #: users/static/templates/users/user-list.html:160 msgid "Page" msgstr "" -#: core/static/js/core/site.js:2087 +#: core/static/js/core/site.js:2100 msgid "Page number alignment in PDF" msgstr "" +#: motions/static/js/motions/site.js:3190 +msgid "Paragraph-based, Diff-enabled" +msgstr "" + #: assignments/static/js/assignments/site.js:175 #: motions/static/js/motions/motion-block.js:98 -#: motions/static/js/motions/site.js:468 +#: motions/static/js/motions/site.js:537 #: topics/static/js/topics/site.js:136 msgid "Parent item" msgstr "" +#: motions/static/js/motions/site.js:2692 +msgid "Parent motion and line number" +msgstr "" + #: users/static/js/users/site.js:887 #: users/static/templates/users/user-detail.html:20 msgid "Participant" @@ -2431,7 +2573,7 @@ msgstr "" msgid "Pause" msgstr "" -#: motions/static/js/motions/base.js:1016 +#: motions/static/js/motions/base.js:1554 msgid "Permission" msgstr "" @@ -2439,11 +2581,11 @@ msgstr "" msgid "Permissions" msgstr "" -#: motions/static/js/motions/base.js:1015 +#: motions/static/js/motions/base.js:1553 msgid "Permit" msgstr "" -#: motions/static/templates/motions/motion-detail.html:577 +#: motions/static/templates/motions/motion-detail.html:608 msgid "Permit and activate" msgstr "" @@ -2451,17 +2593,17 @@ msgstr "" msgid "Personal data" msgstr "" -#: motions/static/js/motions/pdf.js:1123 -#: motions/static/templates/motions/motion-detail.html:480 +#: motions/static/js/motions/pdf.js:1346 +#: motions/static/templates/motions/motion-detail.html:497 #: motions/static/templates/motions/motion-detail/personal-note.html:25 msgid "Personal note" msgstr "" -#: motions/static/js/motions/site.js:1182 +#: motions/static/js/motions/site.js:1312 msgid "Personal note not set" msgstr "" -#: motions/static/js/motions/site.js:1181 +#: motions/static/js/motions/site.js:1311 msgid "Personal note set" msgstr "" @@ -2493,24 +2635,24 @@ msgstr "" msgid "Please select" msgstr "" -#: motions/static/js/motions/site.js:2680 +#: motions/static/js/motions/site.js:3227 msgid "Preamble text for PDF and DOCX documents (all motions)" msgstr "" -#: assignments/static/js/assignments/site.js:886 +#: assignments/static/js/assignments/site.js:894 msgid "Preamble text for PDF document (all elections)" msgstr "" -#: core/static/js/core/site.js:2104 +#: core/static/js/core/site.js:2117 msgid "Predefined seconds of new countdowns" msgstr "" -#: motions/static/js/motions/site.js:619 +#: motions/static/js/motions/site.js:716 #: motions/static/templates/motions/category-list.html:34 msgid "Prefix" msgstr "" -#: motions/static/js/motions/site.js:2641 +#: motions/static/js/motions/site.js:3183 msgid "Prefix for the identifier for amendments" msgstr "" @@ -2521,12 +2663,12 @@ msgstr "" #: users/static/js/users/site.js:591 #: users/static/js/users/site.js:638 -#: users/static/templates/users/user-list.html:458 -#: users/static/templates/users/user-list.html:464 +#: users/static/templates/users/user-list.html:460 +#: users/static/templates/users/user-list.html:466 msgid "Present" msgstr "" -#: core/static/js/core/site.js:2066 +#: core/static/js/core/site.js:2079 msgid "Presentation and assembly system" msgstr "" @@ -2545,24 +2687,24 @@ msgid "Previous page" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:162 -#: motions/static/templates/motions/motion-detail.html:370 +#: motions/static/templates/motions/motion-detail.html:387 msgid "Print ballot paper" msgstr "" -#: core/static/js/core/site.js:2079 -#: core/static/js/core/site.js:367 -#: index.html:226 +#: core/static/js/core/site.js:2092 +#: core/static/js/core/site.js:380 +#: index.html:228 #: privacypolicy.html:3 msgid "Privacy policy" msgstr "" -#: motions/static/js/motions/site.js:2656 +#: motions/static/js/motions/site.js:3203 msgid "Private" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:16 #: assignments/static/templates/assignments/assignment-detail.html:180 -#: motions/static/templates/motions/motion-detail.html:20 +#: motions/static/templates/motions/motion-detail.html:31 #: topics/static/templates/topics/topic-detail.html:15 #: users/static/templates/users/user-detail.html:10 msgid "Project" @@ -2599,31 +2741,31 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:27 #: agenda/static/templates/agenda/item-list.html:290 #: core/static/js/core/projector.js:401 -#: core/static/js/core/site.js:2095 -#: index.html:193 -#: index.html:206 -#: index.html:241 +#: core/static/js/core/site.js:2108 +#: index.html:194 +#: index.html:207 +#: index.html:244 #: mediafiles/static/templates/mediafiles/mediafile-list.html:273 -#: motions/static/templates/motions/motion-detail.html:16 +#: motions/static/templates/motions/motion-detail.html:27 #: projector-button.html:2 #: projector-container.html:7 #: users/static/js/users/site.js:1496 msgid "Projector" msgstr "" -#: core/static/js/core/site.js:2108 +#: core/static/js/core/site.js:2121 msgid "Projector header image" msgstr "" -#: core/static/js/core/site.js:2096 +#: core/static/js/core/site.js:2109 msgid "Projector language" msgstr "" -#: core/static/js/core/site.js:2107 +#: core/static/js/core/site.js:2120 msgid "Projector logo" msgstr "" -#: motions/static/js/motions/site.js:2655 +#: motions/static/js/motions/site.js:3202 msgid "Public" msgstr "" @@ -2631,7 +2773,7 @@ msgstr "" msgid "Publish" msgstr "" -#: assignments/static/js/assignments/site.js:884 +#: assignments/static/js/assignments/site.js:892 msgid "Put all candidates on the list of speakers" msgstr "" @@ -2647,32 +2789,37 @@ msgstr "" msgid "Quorum ({{ option.getVoteYes() - option.majorityReached }}) reached." msgstr "" -#: motions/static/templates/motions/motion-detail.html:464 +#: motions/static/templates/motions/motion-detail.html:481 msgid "Quorum ({{ voteYes.value - isReached() }}) not reached." msgstr "" -#: motions/static/templates/motions/motion-detail.html:461 +#: motions/static/templates/motions/motion-detail.html:478 msgid "Quorum ({{ voteYes.value - isReached() }}) reached." msgstr "" -#: motions/static/js/motions/docx.js:95 -#: motions/static/js/motions/pdf.js:369 -#: motions/static/js/motions/site.js:437 -#: motions/static/js/motions/site.js:835 -#: motions/static/templates/motions/motion-detail.html:547 +#: motions/static/js/motions/docx.js:96 +#: motions/static/js/motions/pdf.js:387 +#: motions/static/js/motions/site.js:505 +#: motions/static/js/motions/site.js:948 +#: motions/static/templates/motions/motion-detail.html:578 #: motions/static/templates/motions/motion-import.html:25 #: motions/static/templates/motions/motion-import.html:48 -#: motions/static/templates/motions/slide_motion.html:134 +#: motions/static/templates/motions/slide_motion.html:145 +#: motions/static/templates/motions/slide_motion.html:160 msgid "Reason" msgstr "" -#: motions/static/js/motions/site.js:748 +#: motions/static/js/motions/site.js:848 #: motions/static/templates/motions/motion-block-detail.html:53 -#: motions/static/templates/motions/motion-list.html:193 +#: motions/static/templates/motions/motion-table-filters.html:41 msgid "Recommendation" msgstr "" -#: motions/static/js/motions/base.js:1032 +#: motions/static/templates/motions/motion-amendment-list.html:15 +msgid "Reduce" +msgstr "" + +#: motions/static/js/motions/base.js:1570 msgid "Refer to committee" msgstr "" @@ -2680,16 +2827,16 @@ msgstr "" msgid "Reference for current list of speakers" msgstr "" -#: motions/static/js/motions/base.js:1033 +#: motions/static/js/motions/base.js:1571 msgid "Referral to committee" msgstr "" -#: motions/static/js/motions/base.js:1006 -#: motions/static/js/motions/base.js:1021 +#: motions/static/js/motions/base.js:1544 +#: motions/static/js/motions/base.js:1559 msgid "Reject" msgstr "" -#: motions/static/js/motions/base.js:1037 +#: motions/static/js/motions/base.js:1575 msgid "Reject (not authorized)" msgstr "" @@ -2698,20 +2845,20 @@ msgid "Reject all change recommendations" msgstr "" #: motions/static/templates/motions/motion-detail/change-summary.html:20 -#: motions/static/templates/motions/motion-detail/change-summary.html:41 +#: motions/static/templates/motions/motion-detail/change-summary.html:45 +#: motions/static/templates/motions/motion-detail/view-diff.html:100 #: motions/static/templates/motions/motion-detail/view-diff.html:16 #: motions/static/templates/motions/motion-detail/view-diff.html:38 -#: motions/static/templates/motions/motion-detail/view-diff.html:64 -#: motions/static/templates/motions/motion-detail/view-diff.html:84 +#: motions/static/templates/motions/motion-detail/view-diff.html:71 msgid "Rejected" msgstr "" -#: motions/static/js/motions/base.js:1007 -#: motions/static/js/motions/base.js:1022 +#: motions/static/js/motions/base.js:1545 +#: motions/static/js/motions/base.js:1560 msgid "Rejection" msgstr "" -#: motions/static/js/motions/base.js:1038 +#: motions/static/js/motions/base.js:1576 msgid "Rejection (not authorized)" msgstr "" @@ -2720,6 +2867,7 @@ msgstr "" #: agenda/static/templates/agenda/list-of-speakers-partial-management.html:99 #: config-form-field.html:123 #: config-form-field.html:42 +#: motions/static/templates/motions/motion-submitters.html:23 msgid "Remove" msgstr "" @@ -2727,7 +2875,7 @@ msgstr "" msgid "Remove all speakers" msgstr "" -#: motions/static/js/motions/site.js:2649 +#: motions/static/js/motions/site.js:3196 msgid "Remove all supporters of a motion if a submitter edits his motion in early state" msgstr "" @@ -2753,11 +2901,11 @@ msgstr "" msgid "Remove message" msgstr "" -#: motions/static/js/motions/base.js:971 -#: motions/static/js/motions/pdf.js:274 -#: motions/static/js/motions/site.js:318 +#: motions/static/js/motions/base.js:1431 +#: motions/static/js/motions/pdf.js:277 +#: motions/static/js/motions/site.js:351 #: motions/static/templates/motions/motion-detail/change-summary.html:18 -#: motions/static/templates/motions/motion-detail/change-summary.html:33 +#: motions/static/templates/motions/motion-detail/change-summary.html:37 msgid "Replacement" msgstr "" @@ -2767,10 +2915,10 @@ msgstr "" msgid "Required comma or semicolon separated values with these column header names in the first row" msgstr "" -#: assignments/static/js/assignments/site.js:878 +#: assignments/static/js/assignments/site.js:886 #: assignments/static/templates/assignments/assignment-detail.html:207 -#: motions/static/js/motions/site.js:2666 -#: motions/static/templates/motions/motion-detail.html:452 +#: motions/static/js/motions/site.js:3213 +#: motions/static/templates/motions/motion-detail.html:469 msgid "Required majority" msgstr "" @@ -2782,8 +2930,9 @@ msgstr "" msgid "Reset countdown" msgstr "" -#: motions/static/templates/motions/motion-detail.html:227 -#: motions/static/templates/motions/motion-list.html:620 +#: motions/static/templates/motions/motion-amendment-list.html:311 +#: motions/static/templates/motions/motion-detail.html:243 +#: motions/static/templates/motions/motion-list.html:252 msgid "Reset recommendation" msgstr "" @@ -2797,8 +2946,9 @@ msgstr "" msgid "Reset scrolling" msgstr "" -#: motions/static/templates/motions/motion-detail.html:185 -#: motions/static/templates/motions/motion-list.html:594 +#: motions/static/templates/motions/motion-amendment-list.html:272 +#: motions/static/templates/motions/motion-detail.html:201 +#: motions/static/templates/motions/motion-list.html:226 msgid "Reset state" msgstr "" @@ -2812,7 +2962,7 @@ msgstr "" msgid "Revert" msgstr "" -#: core/static/js/core/site.js:2090 +#: core/static/js/core/site.js:2103 msgid "Right" msgstr "" @@ -2834,6 +2984,7 @@ msgstr "" #: motions/static/templates/motions/category-form.html:10 #: motions/static/templates/motions/change-recommendation-form.html:10 #: motions/static/templates/motions/motion-block-form.html:10 +#: motions/static/templates/motions/motion-comment-form.html:9 #: motions/static/templates/motions/motion-detail/comments.html:39 #: motions/static/templates/motions/motion-detail/personal-note.html:35 #: motions/static/templates/motions/motion-detail/view-original.html:9 @@ -2875,10 +3026,10 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:248 #: assignments/static/templates/assignments/assignment-list.html:172 -#: core/static/js/core/site.js:387 +#: core/static/js/core/site.js:400 #: index.html:164 #: mediafiles/static/templates/mediafiles/mediafile-list.html:230 -#: motions/static/templates/motions/motion-list.html:403 +#: motions/static/templates/motions/motion-table-filters.html:235 #: search.html:11 #: users/static/templates/users/user-list.html:280 msgid "Search" @@ -2888,14 +3039,15 @@ msgstr "" msgid "Search results" msgstr "" -#: assignments/static/js/assignments/site.js:888 +#: assignments/static/js/assignments/site.js:896 msgid "Searching for candidates" msgstr "" #: agenda/static/templates/agenda/item-list.html:73 #: assignments/static/templates/assignments/assignment-list.html:26 #: mediafiles/static/templates/mediafiles/mediafile-list.html:123 -#: motions/static/templates/motions/motion-list.html:38 +#: motions/static/templates/motions/motion-amendment-list.html:64 +#: motions/static/templates/motions/motion-list.html:42 #: users/static/templates/users/user-list.html:39 msgid "Select ..." msgstr "" @@ -2912,12 +3064,12 @@ msgstr "" #: assignments/static/js/assignments/site.js:178 #: motions/static/js/motions/motion-block.js:101 -#: motions/static/js/motions/site.js:471 +#: motions/static/js/motions/site.js:540 #: topics/static/js/topics/site.js:139 msgid "Select a parent item ..." msgstr "" -#: motions/static/js/motions/site.js:518 +#: motions/static/js/motions/site.js:587 msgid "Select or search a category ..." msgstr "" @@ -2925,7 +3077,7 @@ msgstr "" msgid "Select or search a group ..." msgstr "" -#: motions/static/js/motions/site.js:532 +#: motions/static/js/motions/site.js:601 msgid "Select or search a motion block ..." msgstr "" @@ -2933,27 +3085,28 @@ msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:107 #: mediafiles/static/js/mediafiles/forms.js:62 #: mediafiles/static/templates/mediafiles/mediafile-upload-form.html:64 +#: motions/static/templates/motions/motion-submitters.html:34 msgid "Select or search a participant ..." msgstr "" -#: motions/static/js/motions/site.js:407 +#: motions/static/js/motions/site.js:471 msgid "Select or search a submitter ..." msgstr "" -#: motions/static/js/motions/site.js:569 +#: motions/static/js/motions/site.js:638 msgid "Select or search a supporter ..." msgstr "" #: assignments/static/js/assignments/site.js:205 -#: motions/static/js/motions/site.js:555 +#: motions/static/js/motions/site.js:624 msgid "Select or search a tag ..." msgstr "" -#: motions/static/js/motions/site.js:584 +#: motions/static/js/motions/site.js:653 msgid "Select or search a workflow ..." msgstr "" -#: motions/static/js/motions/site.js:504 +#: motions/static/js/motions/site.js:573 #: topics/static/js/topics/site.js:116 msgid "Select or search an attachment ..." msgstr "" @@ -2971,41 +3124,44 @@ msgstr "" msgid "Separator" msgstr "" -#: core/static/js/core/site.js:2086 +#: core/static/js/core/site.js:2099 msgid "Separator used for all csv exports and examples" msgstr "" -#: motions/static/js/motions/docx.js:92 -#: motions/static/js/motions/pdf.js:520 -#: motions/static/js/motions/pdf.js:79 -#: motions/static/templates/motions/motion-detail.html:92 +#: motions/static/js/motions/docx.js:93 +#: motions/static/js/motions/pdf.js:538 +#: motions/static/js/motions/pdf.js:80 +#: motions/static/templates/motions/motion-detail.html:104 msgid "Sequential number" msgstr "" -#: motions/static/js/motions/site.js:2616 +#: motions/static/js/motions/site.js:3157 msgid "Serially numbered" msgstr "" -#: motions/static/templates/motions/motion-list.html:663 +#: motions/static/templates/motions/motion-list.html:300 msgid "Set a category" msgstr "" -#: motions/static/templates/motions/motion-list.html:697 +#: motions/static/templates/motions/motion-list.html:334 msgid "Set a motion block" msgstr "" -#: motions/static/templates/motions/motion-detail.html:75 -#: motions/static/templates/motions/motion-list.html:573 +#: motions/static/templates/motions/motion-amendment-list.html:248 +#: motions/static/templates/motions/motion-detail.html:91 +#: motions/static/templates/motions/motion-list.html:205 msgid "Set as favorite" msgstr "" -#: motions/static/templates/motions/motion-list.html:71 -#: motions/static/templates/motions/motion-list.html:98 +#: motions/static/templates/motions/motion-amendment-list.html:118 +#: motions/static/templates/motions/motion-amendment-list.html:145 +#: motions/static/templates/motions/motion-list.html:102 +#: motions/static/templates/motions/motion-list.html:75 msgid "Set category" msgstr "" #: agenda/static/templates/agenda/item-list.html:389 -#: users/static/templates/users/user-list.html:433 +#: users/static/templates/users/user-list.html:435 msgid "Set comment ..." msgstr "" @@ -3021,7 +3177,7 @@ msgstr "" msgid "Set hint for ballot paper ..." msgstr "" -#: motions/static/js/motions/site.js:2617 +#: motions/static/js/motions/site.js:3158 msgid "Set it manually" msgstr "" @@ -3029,17 +3185,21 @@ msgstr "" msgid "Set item number ..." msgstr "" -#: motions/static/templates/motions/motion-list.html:111 -#: motions/static/templates/motions/motion-list.html:72 +#: motions/static/templates/motions/motion-amendment-list.html:119 +#: motions/static/templates/motions/motion-amendment-list.html:158 +#: motions/static/templates/motions/motion-list.html:115 +#: motions/static/templates/motions/motion-list.html:76 msgid "Set motion block" msgstr "" -#: motions/static/templates/motions/motion-list.html:70 -#: motions/static/templates/motions/motion-list.html:84 +#: motions/static/templates/motions/motion-amendment-list.html:117 +#: motions/static/templates/motions/motion-amendment-list.html:131 +#: motions/static/templates/motions/motion-list.html:74 +#: motions/static/templates/motions/motion-list.html:88 msgid "Set status" msgstr "" -#: users/static/templates/users/user-list.html:417 +#: users/static/templates/users/user-list.html:419 msgid "Set structure level ..." msgstr "" @@ -3056,29 +3216,37 @@ msgid "Set/Unset 'is present'" msgstr "" #: config.html:3 -#: core/static/js/core/site.js:184 -#: core/static/js/core/site.js:376 +#: core/static/js/core/site.js:197 +#: core/static/js/core/site.js:389 msgid "Settings" msgstr "" -#: core/static/js/core/site.js:2074 +#: core/static/js/core/site.js:2087 msgid "Short description of event" msgstr "" #: assignments/static/js/assignments/site.js:166 #: motions/static/js/motions/motion-block.js:89 -#: motions/static/js/motions/site.js:459 +#: motions/static/js/motions/site.js:528 #: topics/static/js/topics/site.js:127 msgid "Show as agenda item" msgstr "" +#: motions/static/templates/motions/motion-detail/amendment-paragraph-diff.html:6 +msgid "Show entire motion text" +msgstr "" + #: assignments/static/js/assignments/site.js:190 -#: motions/static/js/motions/site.js:486 +#: motions/static/js/motions/site.js:555 #: users/static/js/users/site.js:382 msgid "Show extended fields" msgstr "" -#: motions/static/templates/motions/motion-detail.html:595 +#: motions/static/templates/motions/motion-detail/toolbar.html:42 +msgid "Show highlighted line also on projector." +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:626 msgid "Show history" msgstr "" @@ -3086,7 +3254,7 @@ msgstr "" msgid "Show internal items" msgstr "" -#: core/static/js/core/site.js:2092 +#: core/static/js/core/site.js:2105 msgid "Show logo on projector" msgstr "" @@ -3098,24 +3266,24 @@ msgstr "" msgid "Show password" msgstr "" -#: core/static/js/core/site.js:2100 +#: core/static/js/core/site.js:2113 msgid "Show the clock on projector" msgstr "" -#: core/static/js/core/site.js:2085 +#: core/static/js/core/site.js:2098 msgid "Show this text on the login page" msgstr "" -#: core/static/js/core/site.js:2098 +#: core/static/js/core/site.js:2111 msgid "Show title and description of event on projector" msgstr "" -#: motions/static/js/motions/base.js:1000 +#: motions/static/js/motions/base.js:1538 msgid "Simple Workflow" msgstr "" -#: assignments/static/js/assignments/site.js:880 -#: motions/static/js/motions/site.js:2668 +#: assignments/static/js/assignments/site.js:888 +#: motions/static/js/motions/site.js:3215 msgid "Simple majority" msgstr "" @@ -3132,7 +3300,7 @@ msgstr "" #: assignments/static/templates/assignments/assignment-list.html:148 #: mediafiles/static/templates/mediafiles/mediafile-list.html:207 #: motions/static/templates/motions/category-list.html:44 -#: motions/static/templates/motions/motion-list.html:368 +#: motions/static/templates/motions/motion-table-filters.html:202 #: users/static/templates/users/user-list.html:257 msgid "Sort" msgstr "" @@ -3145,7 +3313,7 @@ msgstr "" msgid "Sort agenda" msgstr "" -#: motions/static/js/motions/site.js:2681 +#: motions/static/js/motions/site.js:3228 msgid "Sort categories by" msgstr "" @@ -3153,6 +3321,11 @@ msgstr "" msgid "Sort name of participants by" msgstr "" +#: motions/static/templates/motions/motion-detail.html:143 +#: motions/static/templates/motions/motion-submitters.html:10 +msgid "Sort submitters" +msgstr "" + #: assignments/static/templates/assignments/assignmentpoll-form.html:8 #: motions/static/templates/motions/motion-poll-form.html:8 msgid "Special values" @@ -3162,7 +3335,7 @@ msgstr "" msgid "Staff" msgstr "" -#: core/static/js/core/site.js:2091 +#: core/static/js/core/site.js:2104 msgid "Standard font size in PDF" msgstr "" @@ -3180,19 +3353,20 @@ msgstr "" msgid "Start/stop video" msgstr "" -#: motions/static/js/motions/pdf.js:109 -#: motions/static/js/motions/pdf.js:546 -#: motions/static/js/motions/site.js:1245 -#: motions/static/js/motions/site.js:728 +#: motions/static/js/motions/pdf.js:1058 +#: motions/static/js/motions/pdf.js:112 +#: motions/static/js/motions/pdf.js:564 +#: motions/static/js/motions/site.js:1375 +#: motions/static/js/motions/site.js:828 #: motions/static/templates/motions/motion-block-detail.html:52 -#: motions/static/templates/motions/motion-detail.html:168 -#: motions/static/templates/motions/motion-detail.html:172 -#: motions/static/templates/motions/motion-list.html:159 +#: motions/static/templates/motions/motion-detail.html:184 +#: motions/static/templates/motions/motion-detail.html:188 +#: motions/static/templates/motions/motion-table-filters.html:7 #: motions/static/templates/motions/slide_motion.html:4 msgid "State" msgstr "" -#: motions/static/js/motions/docx.js:94 +#: motions/static/js/motions/docx.js:95 msgid "Status" msgstr "" @@ -3200,7 +3374,7 @@ msgstr "" msgid "Stop" msgstr "" -#: motions/static/js/motions/site.js:2632 +#: motions/static/js/motions/site.js:3173 msgid "Stop submitting new motions by non-staff users" msgstr "" @@ -3211,7 +3385,7 @@ msgstr "" #: users/static/templates/users/user-detail.html:28 #: users/static/templates/users/user-import.html:53 #: users/static/templates/users/user-import.html:86 -#: users/static/templates/users/user-list.html:423 +#: users/static/templates/users/user-list.html:425 msgid "Structure level" msgstr "" @@ -3225,30 +3399,37 @@ msgstr "" msgid "Submitter" msgstr "" -#: motions/static/js/motions/docx.js:93 -#: motions/static/js/motions/pdf.js:534 -#: motions/static/js/motions/pdf.js:95 -#: motions/static/js/motions/site.js:1239 -#: motions/static/js/motions/site.js:404 -#: motions/static/js/motions/site.js:729 -#: motions/static/templates/motions/motion-detail.html:128 +#: motions/static/js/motions/docx.js:94 +#: motions/static/js/motions/pdf.js:1053 +#: motions/static/js/motions/pdf.js:552 +#: motions/static/js/motions/pdf.js:98 +#: motions/static/js/motions/site.js:101 +#: motions/static/js/motions/site.js:1369 +#: motions/static/js/motions/site.js:468 +#: motions/static/js/motions/site.js:829 +#: motions/static/templates/motions/motion-detail.html:140 +#: motions/static/templates/motions/motion-detail.html:142 #: motions/static/templates/motions/slide_motion.html:14 msgid "Submitters" msgstr "" -#: motions/static/js/motions/pdf.js:285 -#: motions/static/templates/motions/motion-detail/change-summary.html:4 +#: motions/static/js/motions/pdf.js:288 msgid "Summary of change recommendations" msgstr "" -#: motions/static/templates/motions/motion-detail.html:143 +#: motions/static/templates/motions/motion-detail/change-summary.html:4 +msgid "Summary of changes" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:161 msgid "Support motion" msgstr "" -#: motions/static/js/motions/site.js:2646 -#: motions/static/js/motions/site.js:566 -#: motions/static/templates/motions/motion-detail.html:135 -#: motions/static/templates/motions/motion-list.html:777 +#: motions/static/js/motions/site.js:3193 +#: motions/static/js/motions/site.js:635 +#: motions/static/templates/motions/motion-amendment-list.html:384 +#: motions/static/templates/motions/motion-detail.html:153 +#: motions/static/templates/motions/motion-list.html:414 msgid "Supporters" msgstr "" @@ -3265,30 +3446,30 @@ msgid "System URL" msgstr "" #: assignments/static/js/assignments/pdf.js:563 -#: motions/static/js/motions/docx.js:51 -#: motions/static/js/motions/pdf.js:839 +#: motions/static/js/motions/docx.js:52 +#: motions/static/js/motions/pdf.js:857 msgid "Table of contents" msgstr "" #: assignments/static/templates/assignments/assignment-list.html:105 -#: motions/static/templates/motions/motion-list.html:293 +#: motions/static/templates/motions/motion-table-filters.html:141 msgid "Tag" msgstr "" #: assignments/static/js/assignments/site.js:202 #: assignments/static/templates/assignments/assignment-detail.html:55 #: assignments/static/templates/assignments/assignment-list.html:10 -#: core/static/js/core/site.js:397 +#: core/static/js/core/site.js:410 #: core/static/templates/core/tag-list.html:13 -#: motions/static/js/motions/site.js:552 -#: motions/static/templates/motions/motion-detail.html:321 -#: motions/static/templates/motions/motion-detail.html:325 -#: motions/static/templates/motions/motion-list.html:18 +#: motions/static/js/motions/site.js:621 +#: motions/static/templates/motions/motion-detail.html:337 +#: motions/static/templates/motions/motion-detail.html:341 +#: motions/static/templates/motions/motion-list.html:22 msgid "Tags" msgstr "" -#: motions/static/js/motions/site.js:426 -#: motions/static/js/motions/site.js:834 +#: motions/static/js/motions/site.js:494 +#: motions/static/js/motions/site.js:947 #: motions/static/templates/motions/motion-import.html:24 #: motions/static/templates/motions/motion-import.html:47 #: topics/static/js/topics/site.js:101 @@ -3297,27 +3478,27 @@ msgstr "" msgid "Text" msgstr "" -#: motions/static/js/motions/site.js:340 +#: motions/static/js/motions/site.js:373 msgid "Text from line %from% to %to%" msgstr "" -#: motions/static/js/motions/site.js:339 +#: motions/static/js/motions/site.js:372 msgid "Text in line %from%" msgstr "" -#: motions/static/js/motions/site.js:2660 +#: motions/static/js/motions/site.js:3207 msgid "The 100 % base of a voting result consists of" msgstr "" -#: assignments/static/js/assignments/site.js:863 +#: assignments/static/js/assignments/site.js:871 msgid "The 100-%-base of an election result consists of" msgstr "" -#: motions/static/js/motions/site.js:2619 +#: motions/static/js/motions/site.js:3160 msgid "The assembly may decide:" msgstr "" -#: core/static/js/core/site.js:1834 +#: core/static/js/core/site.js:1847 msgid "The delete was successful." msgstr "" @@ -3325,7 +3506,7 @@ msgstr "" msgid "The list of speakers is empty." msgstr "" -#: motions/static/js/motions/site.js:2628 +#: motions/static/js/motions/site.js:3169 msgid "The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40" msgstr "" @@ -3337,7 +3518,7 @@ msgstr "" msgid "The projector header should have a default size of 1024x70px. Adapt the image width if you change the projector resolution." msgstr "" -#: core/static/js/core/base.js:784 +#: core/static/js/core/base.js:794 msgid "The server didn't respond." msgstr "" @@ -3345,7 +3526,7 @@ msgstr "" msgid "The text or reason have been changed." msgstr "" -#: motions/static/js/motions/site.js:2643 +#: motions/static/js/motions/site.js:3185 msgid "The title of the motion is always applied." msgstr "" @@ -3361,7 +3542,11 @@ msgstr "" msgid "There are more than one duplicates of this user!" msgstr "" -#: motions/static/templates/motions/motion-detail.html:573 +#: motions/static/templates/motions/motion-detail/view-diff.html:57 +msgid "This change collides with another one." +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:604 msgid "This is the last active version." msgstr "" @@ -3369,12 +3554,12 @@ msgstr "" msgid "This prefix will be set if you run the automatic agenda numbering." msgstr "" -#: motions/static/templates/motions/motion-detail.html:89 +#: motions/static/templates/motions/motion-detail.html:101 msgid "This version is not permitted." msgstr "" -#: assignments/static/js/assignments/site.js:882 -#: motions/static/js/motions/site.js:2670 +#: assignments/static/js/assignments/site.js:890 +#: motions/static/js/motions/site.js:3217 msgid "Three-quarters majority" msgstr "" @@ -3384,9 +3569,9 @@ msgstr "" #: mediafiles/static/js/mediafiles/list.js:100 #: mediafiles/static/templates/mediafiles/mediafile-upload-form.html:24 #: motions/static/js/motions/motion-block.js:78 -#: motions/static/js/motions/pdf.js:258 -#: motions/static/js/motions/site.js:1237 -#: motions/static/js/motions/site.js:415 +#: motions/static/js/motions/pdf.js:261 +#: motions/static/js/motions/site.js:1367 +#: motions/static/js/motions/site.js:482 #: motions/static/templates/motions/motion-detail/change-summary.html:17 #: motions/static/templates/motions/motion-import.html:23 #: motions/static/templates/motions/motion-import.html:46 @@ -3399,11 +3584,11 @@ msgstr "" msgid "Title" msgstr "" -#: motions/static/js/motions/site.js:2679 +#: motions/static/js/motions/site.js:3226 msgid "Title for PDF and DOCX documents (all motions)" msgstr "" -#: assignments/static/js/assignments/site.js:885 +#: assignments/static/js/assignments/site.js:893 msgid "Title for PDF document (all elections)" msgstr "" @@ -3415,7 +3600,7 @@ msgstr "" msgid "Title is required. All other fields are optional and may be empty." msgstr "" -#: motions/static/js/motions/site.js:308 +#: motions/static/js/motions/site.js:341 msgid "To Line" msgstr "" @@ -3434,13 +3619,13 @@ msgstr "" msgid "Topics" msgstr "" -#: motions/static/js/motions/site.js:447 +#: motions/static/js/motions/site.js:515 #: motions/static/templates/motions/motion-detail/view-original.html:17 msgid "Trivial change" msgstr "" -#: assignments/static/js/assignments/site.js:881 -#: motions/static/js/motions/site.js:2669 +#: assignments/static/js/assignments/site.js:889 +#: motions/static/js/motions/site.js:3216 msgid "Two-thirds majority" msgstr "" @@ -3448,7 +3633,7 @@ msgstr "" msgid "Type" msgstr "" -#: motions/static/templates/motions/motion-detail.html:148 +#: motions/static/templates/motions/motion-detail.html:166 msgid "Unsupport motion" msgstr "" @@ -3477,8 +3662,8 @@ msgstr "" msgid "Uploader" msgstr "" -#: assignments/static/js/assignments/site.js:876 -#: motions/static/js/motions/site.js:2675 +#: assignments/static/js/assignments/site.js:884 +#: motions/static/js/motions/site.js:3222 msgid "Use the following custom number" msgstr "" @@ -3514,30 +3699,30 @@ msgid "Users without any assigned group gain the permissions from this group." msgstr "" #: assignments/static/js/assignments/pdf.js:187 -#: assignments/static/js/assignments/site.js:784 +#: assignments/static/js/assignments/site.js:792 #: assignments/static/templates/assignments/assignment-detail.html:259 #: assignments/static/templates/assignments/slide_assignment.html:69 msgid "Valid ballots" msgstr "" -#: motions/static/js/motions/pdf.js:203 -#: motions/static/js/motions/site.js:673 -#: motions/static/templates/motions/motion-detail.html:421 +#: motions/static/js/motions/pdf.js:206 +#: motions/static/js/motions/site.js:770 +#: motions/static/templates/motions/motion-detail.html:438 msgid "Valid votes" msgstr "" -#: motions/static/templates/motions/motion-detail.html:566 -#: motions/static/templates/motions/motion-detail.html:569 +#: motions/static/templates/motions/motion-detail.html:597 +#: motions/static/templates/motions/motion-detail.html:600 msgid "Version" msgstr "" -#: motions/static/templates/motions/motion-detail.html:562 +#: motions/static/templates/motions/motion-detail.html:593 msgid "Version history" msgstr "" #. ballot of a motion -#: motions/static/js/motions/pdf.js:181 -#: motions/static/templates/motions/motion-detail.html:352 +#: motions/static/js/motions/pdf.js:184 +#: motions/static/templates/motions/motion-detail.html:369 #: motions/static/templates/motions/motion-poll-form.html:1 #: motions/static/templates/motions/slide_motion.html:24 msgid "Vote" @@ -3549,23 +3734,23 @@ msgstr "" msgid "Votes" msgstr "" -#: motions/static/js/motions/pdf.js:217 -#: motions/static/js/motions/site.js:689 -#: motions/static/templates/motions/motion-detail.html:439 +#: motions/static/js/motions/pdf.js:220 +#: motions/static/js/motions/site.js:786 +#: motions/static/templates/motions/motion-detail.html:456 msgid "Votes cast" msgstr "" -#: assignments/static/js/assignments/site.js:889 +#: assignments/static/js/assignments/site.js:897 msgid "Voting" msgstr "" -#: motions/static/js/motions/site.js:2659 +#: motions/static/js/motions/site.js:3206 msgid "Voting and ballot papers" msgstr "" -#: motions/static/js/motions/pdf.js:225 -#: motions/static/js/motions/site.js:730 -#: motions/static/templates/motions/motion-detail.html:348 +#: motions/static/js/motions/pdf.js:228 +#: motions/static/js/motions/site.js:830 +#: motions/static/templates/motions/motion-detail.html:364 #: motions/static/templates/motions/slide_motion.html:20 msgid "Voting result" msgstr "" @@ -3601,60 +3786,60 @@ msgstr "" msgid "Waiting for results ..." msgstr "" -#: core/static/js/core/site.js:734 +#: core/static/js/core/site.js:747 msgid "Warning" msgstr "" -#: core/static/js/core/site.js:2111 +#: core/static/js/core/site.js:2124 msgid "Web interface header logo" msgstr "" -#: core/static/js/core/site.js:2081 +#: core/static/js/core/site.js:2094 #: users/static/js/users/site.js:1834 msgid "Welcome to OpenSlides" msgstr "" -#: motions/static/js/motions/site.js:2636 +#: motions/static/js/motions/site.js:3177 msgid "Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system." msgstr "" -#: motions/static/js/motions/base.js:1024 +#: motions/static/js/motions/base.js:1562 msgid "Withdraw" msgstr "" -#: motions/static/js/motions/site.js:580 +#: motions/static/js/motions/site.js:649 msgid "Workflow" msgstr "" -#: motions/static/js/motions/site.js:2613 +#: motions/static/js/motions/site.js:3154 msgid "Workflow of new motions" msgstr "" #: assignments/static/js/assignments/pdf.js:333 #: assignments/static/js/assignments/site.js:614 -#: assignments/static/js/assignments/site.js:728 -#: motions/static/js/motions/pdf.js:187 -#: motions/static/js/motions/pdf.js:710 -#: motions/static/js/motions/site.js:646 -#: motions/static/templates/motions/motion-detail.html:385 +#: assignments/static/js/assignments/site.js:726 +#: motions/static/js/motions/pdf.js:190 +#: motions/static/js/motions/pdf.js:728 +#: motions/static/js/motions/site.js:743 +#: motions/static/templates/motions/motion-detail.html:402 #: motions/static/templates/motions/slide_motion.html:32 msgid "Yes" msgstr "" -#: motions/static/js/motions/site.js:2662 +#: motions/static/js/motions/site.js:3209 msgid "Yes/No" msgstr "" -#: assignments/static/js/assignments/site.js:869 +#: assignments/static/js/assignments/site.js:877 #: assignments/static/templates/assignments/assignment-detail.html:201 msgid "Yes/No per candidate" msgstr "" -#: motions/static/js/motions/site.js:2661 +#: motions/static/js/motions/site.js:3208 msgid "Yes/No/Abstain" msgstr "" -#: assignments/static/js/assignments/site.js:868 +#: assignments/static/js/assignments/site.js:876 #: assignments/static/templates/assignments/assignment-detail.html:200 msgid "Yes/No/Abstain per candidate" msgstr "" @@ -3663,7 +3848,7 @@ msgstr "" msgid "You are not allowed to lock yourself out of the configuration!" msgstr "" -#: core/static/js/core/site.js:2093 +#: core/static/js/core/site.js:2106 msgid "You can replace the logo by uploading an image and set it as the \"Projector logo\" in \"files\"." msgstr "" @@ -3683,7 +3868,7 @@ msgstr "" msgid "Your login for {event_name}" msgstr "" -#: motions/static/js/motions/pdf.js:1096 +#: motions/static/js/motions/pdf.js:1319 msgid "ZIP successfully generated." msgstr "" @@ -3703,16 +3888,16 @@ msgstr "" msgid "[Place for your welcome and help text.]" msgstr "" -#: core/static/js/core/site.js:2083 +#: core/static/js/core/site.js:2096 msgid "[Space for your welcome text.]" msgstr "" -#: motions/static/js/motions/base.js:1002 -#: motions/static/js/motions/base.js:1017 +#: motions/static/js/motions/base.js:1540 +#: motions/static/js/motions/base.js:1555 msgid "accepted" msgstr "" -#: motions/static/js/motions/base.js:1025 +#: motions/static/js/motions/base.js:1563 msgid "adjourned" msgstr "" @@ -3724,23 +3909,29 @@ msgstr "" msgid "already exists." msgstr "" +#: motions/static/templates/motions/motion-amendment-list.html:175 +#: motions/static/templates/motions/motion-list.html:433 +msgid "amendments" +msgstr "" + #: users/static/js/users/site.js:852 msgid "and" msgstr "" -#: core/static/js/core/site.js:740 +#: core/static/js/core/site.js:753 msgid "anonymous users are also editing this." msgstr "" -#: core/static/js/core/site.js:757 +#: core/static/js/core/site.js:770 msgid "are also editing this." msgstr "" -#: motions/static/js/motions/pdf.js:1112 +#: motions/static/js/motions/pdf.js:1335 msgid "ballot-paper" msgstr "" -#: motions/static/templates/motions/motion-list.html:630 +#: motions/static/templates/motions/motion-amendment-list.html:320 +#: motions/static/templates/motions/motion-list.html:262 msgid "by" msgstr "" @@ -3760,8 +3951,8 @@ msgstr "" msgid "date" msgstr "" -#: motions/static/templates/motions/motion-list.html:177 -#: motions/static/templates/motions/motion-list.html:431 +#: motions/static/templates/motions/motion-table-filters.html:25 +#: motions/static/templates/motions/motion-table-filters.html:263 msgid "done" msgstr "" @@ -3782,7 +3973,7 @@ msgstr "" msgid "files" msgstr "" -#: motions/static/templates/motions/motion-detail/toolbar.html:88 +#: motions/static/templates/motions/motion-detail/toolbar.html:36 msgid "go" msgstr "" @@ -3796,21 +3987,21 @@ msgstr "" msgid "imported" msgstr "" -#: motions/static/js/motions/site.js:781 -#: motions/static/js/motions/site.js:794 -#: motions/static/templates/motions/motion-detail/toolbar.html:40 -#: motions/static/templates/motions/motion-detail/toolbar.html:65 +#: motions/static/js/motions/site.js:894 +#: motions/static/js/motions/site.js:907 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:17 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:43 msgid "inline" msgstr "" -#: motions/static/js/motions/docx.js:165 -#: motions/static/js/motions/pdf.js:1141 -#: motions/static/js/motions/pdf.js:401 +#: motions/static/js/motions/docx.js:168 +#: motions/static/js/motions/pdf.js:1364 +#: motions/static/js/motions/pdf.js:419 #: motions/static/templates/motions/motion-detail/comments.html:25 msgid "internal" msgstr "" -#: core/static/js/core/site.js:755 +#: core/static/js/core/site.js:768 msgid "is also editing this." msgstr "" @@ -3830,7 +4021,7 @@ msgstr "" msgid "is now" msgstr "" -#: motions/static/templates/motions/motion-list.html:276 +#: motions/static/templates/motions/motion-table-filters.html:124 msgid "is set" msgstr "" @@ -3854,12 +4045,12 @@ msgstr "" msgid "minutes" msgstr "" -#: motions/static/js/motions/csv.js:41 -#: motions/static/js/motions/docx.js:185 -#: motions/static/js/motions/pdf.js:1045 -#: motions/static/js/motions/pdf.js:1058 +#: motions/static/js/motions/csv.js:42 +#: motions/static/js/motions/docx.js:188 +#: motions/static/js/motions/pdf.js:1268 +#: motions/static/js/motions/pdf.js:1281 #: motions/static/templates/motions/motion-block-detail.html:44 -#: motions/static/templates/motions/motion-list.html:127 +#: motions/static/templates/motions/motion-list.html:132 msgid "motions" msgstr "" @@ -3875,28 +4066,28 @@ msgstr "" msgid "motions will be not imported." msgstr "" -#: motions/static/js/motions/csv.js:121 +#: motions/static/js/motions/csv.js:126 msgid "motions-example" msgstr "" -#: motions/static/js/motions/site.js:2685 +#: motions/static/js/motions/site.js:3232 msgid "needed" msgstr "" -#: motions/static/js/motions/base.js:1034 +#: motions/static/js/motions/base.js:1572 msgid "needs review" msgstr "" -#: motions/static/templates/motions/motion-detail/toolbar.html:34 -#: motions/static/templates/motions/motion-detail/toolbar.html:60 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:11 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:37 msgid "none" msgstr "" -#: motions/static/js/motions/base.js:1028 +#: motions/static/js/motions/base.js:1566 msgid "not concerned" msgstr "" -#: motions/static/js/motions/base.js:1008 +#: motions/static/js/motions/base.js:1546 msgid "not decided" msgstr "" @@ -3910,10 +4101,10 @@ msgstr "" msgid "of" msgstr "" -#: motions/static/js/motions/site.js:782 -#: motions/static/js/motions/site.js:795 -#: motions/static/templates/motions/motion-detail/toolbar.html:46 -#: motions/static/templates/motions/motion-detail/toolbar.html:70 +#: motions/static/js/motions/site.js:895 +#: motions/static/js/motions/site.js:908 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:23 +#: motions/static/templates/motions/motion-detail/toolbar-line-numbering.html:49 msgid "outside" msgstr "" @@ -3942,28 +4133,28 @@ msgstr "" msgid "participants-example" msgstr "" -#: motions/static/js/motions/base.js:1014 +#: motions/static/js/motions/base.js:1552 msgid "permitted" msgstr "" -#: motions/static/js/motions/site.js:1865 +#: motions/static/js/motions/site.js:1986 msgid "personal note" msgstr "" -#: motions/static/js/motions/base.js:1013 +#: motions/static/js/motions/base.js:1551 msgid "published" msgstr "" -#: motions/static/js/motions/base.js:1031 +#: motions/static/js/motions/base.js:1569 msgid "refered to committee" msgstr "" -#: motions/static/js/motions/base.js:1005 -#: motions/static/js/motions/base.js:1020 +#: motions/static/js/motions/base.js:1543 +#: motions/static/js/motions/base.js:1558 msgid "rejected" msgstr "" -#: motions/static/js/motions/base.js:1036 +#: motions/static/js/motions/base.js:1574 msgid "rejected (not authorized)" msgstr "" @@ -3978,18 +4169,19 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:156 #: assignments/static/templates/assignments/assignment-list.html:67 #: mediafiles/static/templates/mediafiles/mediafile-list.html:145 -#: motions/static/templates/motions/motion-list.html:128 +#: motions/static/templates/motions/motion-amendment-list.html:176 +#: motions/static/templates/motions/motion-list.html:133 #: users/static/templates/users/user-list.html:151 msgid "selected" msgstr "" #: agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html:8 #: agenda/static/templates/agenda/slide-list-of-speakers.html:9 -#: motions/static/templates/motions/motion-list.html:788 +#: motions/static/templates/motions/motion-list.html:425 msgid "speakers" msgstr "" -#: motions/static/js/motions/base.js:1001 +#: motions/static/js/motions/base.js:1539 msgid "submitted" msgstr "" @@ -4025,11 +4217,11 @@ msgstr "" msgid "undocumented" msgstr "" -#: motions/static/templates/motions/motion-list.html:183 -#: motions/static/templates/motions/motion-list.html:437 +#: motions/static/templates/motions/motion-table-filters.html:269 +#: motions/static/templates/motions/motion-table-filters.html:31 msgid "undone" msgstr "" -#: motions/static/js/motions/base.js:1023 +#: motions/static/js/motions/base.js:1561 msgid "withdrawed" msgstr "" diff --git a/openslides/motions/static/js/motions/motion-services.js b/openslides/motions/static/js/motions/motion-services.js index 953df9bc4..c0e58e611 100644 --- a/openslides/motions/static/js/motions/motion-services.js +++ b/openslides/motions/static/js/motions/motion-services.js @@ -577,8 +577,10 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', $scope.$watch(function () { return Motion.lastModified(); }, function () { - $scope.paragraph_amendments = motion.getParagraphBasedAmendmentsForDiffView(); - rebuild_amendments_crs(); + if (motion) { + $scope.paragraph_amendments = motion.getParagraphBasedAmendmentsForDiffView(); + rebuild_amendments_crs(); + } }); }; diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index 5ac12c5c2..a06a03bef 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -72,7 +72,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) if (motion.parent_id) { var parentMotion = Motion.get(motion.parent_id); subtitleLines.push( - gettextCatalog.getString('Amendment of motion') + ': ' + + gettextCatalog.getString('Amendment to motion') + ': ' + (parentMotion.identifier ? parentMotion.identifier : parentMotion.getTitle()) ); } @@ -530,7 +530,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) if (motion.parent_id) { var parentMotion = Motion.get(motion.parent_id); subtitleLines.push( - gettextCatalog.getString('Amendment of motion') + ': ' + + gettextCatalog.getString('Amendment to motion') + ': ' + (parentMotion.identifier ? parentMotion.identifier : parentMotion.getTitle()) ); } @@ -545,7 +545,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) // submitters var submitters = _.map(motion.submitters, function (submitter) { - return submitter.get_full_name(); + return submitter.user.get_full_name(); }).join(', '); metaTableBody.push([ { @@ -1047,7 +1047,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) // submitters var submitters = _.map(motion.submitters, function (submitter) { - return submitter.get_full_name(); + return submitter.user.get_full_name(); }).join(', '); content.push({ text: gettextCatalog.getString('Submitters') + ': ' + submitters, @@ -1076,7 +1076,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) // title var title = leadMotion.identifier ? ' ' + leadMotion.identifier : ''; title += ': ' + leadMotion.getTitle(); - title = PDFLayout.createTitle(gettextCatalog.getString('Amendments of motion') + title); + title = PDFLayout.createTitle(gettextCatalog.getString('Amendments to motion') + title); var content = [title], foundAmendments = []; diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 3a94dbdbb..2971c2d06 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -108,6 +108,11 @@ angular.module('OpenSlidesApp.motions.site', [ params: { motionId: null, }, + resolve: { + motionId: ['$stateParams', function($stateParams) { + return $stateParams.id; + }], + } }) .state('motions.motion.allamendments', { url: '/amendments', @@ -3179,6 +3184,10 @@ angular.module('OpenSlidesApp.motions.site', [ gettext('Apply text for new amendments'); gettext('The title of the motion is always applied.'); gettext('Amendment to'); + gettext('How to create new amendments'); + gettext('Empty text field'); + gettext('Edit the whole motion text'); + gettext('Paragraph-based, Diff-enabled'); // subgroup Supporters gettext('Supporters'); diff --git a/openslides/motions/static/templates/motions/amendment-paragraph-choose-form.html b/openslides/motions/static/templates/motions/amendment-paragraph-choose-form.html index 5e273a825..b5279b7fd 100644 --- a/openslides/motions/static/templates/motions/amendment-paragraph-choose-form.html +++ b/openslides/motions/static/templates/motions/amendment-paragraph-choose-form.html @@ -1,4 +1,4 @@ -

Choose the paragraph to amend

+

Choose the paragraph to amend!

{{ alert.msg }} diff --git a/openslides/motions/static/templates/motions/motion-amendment-list.html b/openslides/motions/static/templates/motions/motion-amendment-list.html index b9482f382..25232beba 100644 --- a/openslides/motions/static/templates/motions/motion-amendment-list.html +++ b/openslides/motions/static/templates/motions/motion-amendment-list.html @@ -318,8 +318,8 @@
by - - {{ submitter.get_full_name() }},, + + {{ submitter.user.get_full_name() }},, ... [+{{ amendment.submitters.length - 1 }}] @@ -328,6 +328,11 @@
Edit + · + + Edit submitters + + ·
- No changes at the text + No changes at the text.
diff --git a/openslides/motions/static/templates/motions/motion-form.html b/openslides/motions/static/templates/motions/motion-form.html index 4129515ca..32f862997 100644 --- a/openslides/motions/static/templates/motions/motion-form.html +++ b/openslides/motions/static/templates/motions/motion-form.html @@ -1,6 +1,6 @@

Edit motion

New motion

-

New amendment of motion {{ parent.identifier || parent.getTitle() }}

+

New amendment to motion {{ parent.identifier || parent.getTitle() }}

{{ alert.msg }} diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html index 87622a889..9dc60ab3a 100644 --- a/openslides/motions/static/templates/motions/slide_motion.html +++ b/openslides/motions/static/templates/motions/slide_motion.html @@ -136,15 +136,6 @@
-
- - - At least two amendments or change recommendations affecting the same line are to be integrated. - This leads to undeterministic results. - Please resolve this conflict by not accepting multiple changes affecting the same line. - -
-