From f84b8f29ac9aa1a36d10c8bb4f9d438940505cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 30 Nov 2015 14:55:41 +0100 Subject: [PATCH] Template and translation changes. Updated English language files. --- .../static/templates/agenda/item-sort.html | 2 +- openslides/assignments/models.py | 4 - .../assignments/assignmentpoll-form.html | 2 +- openslides/assignments/views.py | 4 +- .../locale/angular-gettext/template-en.pot | 908 ++++++++++-------- openslides/locale/en/LC_MESSAGES/django.po | 175 ++-- .../static/templates/users/user-import.html | 2 +- 7 files changed, 611 insertions(+), 486 deletions(-) diff --git a/openslides/agenda/static/templates/agenda/item-sort.html b/openslides/agenda/static/templates/agenda/item-sort.html index 56bf4ac57..b7a57d033 100644 --- a/openslides/agenda/static/templates/agenda/item-sort.html +++ b/openslides/agenda/static/templates/agenda/item-sort.html @@ -11,7 +11,7 @@
-

Drag and drop items to change the order of the agenda. Your modification will be saved directly.

+

Drag and drop items to change the order of the agenda. Your modification will be saved immediately.

    diff --git a/openslides/assignments/models.py b/openslides/assignments/models.py index f2e978b04..de70092fc 100644 --- a/openslides/assignments/models.py +++ b/openslides/assignments/models.py @@ -2,7 +2,6 @@ from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.db import models from django.utils.datastructures import SortedDict -from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy, ugettext_noop from openslides.agenda.models import Item, Speaker @@ -355,9 +354,6 @@ class AssignmentPoll(RESTModelMixin, CollectDefaultVotesMixin, blank=True, verbose_name=ugettext_lazy("Comment on the ballot paper")) - def __str__(self): - return _("Ballot %d") % self.get_ballot() - def get_assignment(self): return self.assignment diff --git a/openslides/assignments/static/templates/assignments/assignmentpoll-form.html b/openslides/assignments/static/templates/assignments/assignmentpoll-form.html index af4c08e23..48f4c6e00 100644 --- a/openslides/assignments/static/templates/assignments/assignmentpoll-form.html +++ b/openslides/assignments/static/templates/assignments/assignmentpoll-form.html @@ -1,4 +1,4 @@ -

    Ballot {{ ballot }}

    +

    Ballot {{ ballot }}

    diff --git a/openslides/assignments/views.py b/openslides/assignments/views.py index b2318b6a1..3ef769ea0 100644 --- a/openslides/assignments/views.py +++ b/openslides/assignments/views.py @@ -248,7 +248,7 @@ class AssignmentPDF(PDFView): try: assignment = Assignment.objects.get(pk=self.kwargs['pk']) filename = u'%s-%s' % ( - _("Assignment"), + _("Election"), assignment.title.replace(' ', '_')) except: filename = _("Elections") @@ -272,7 +272,7 @@ class AssignmentPDF(PDFView): assignments = Assignment.objects.all() if not assignments: # No assignments existing story.append(Paragraph( - _("No assignments available."), stylesheet['Heading3'])) + _("No elections available."), stylesheet['Heading3'])) else: # Print all assignments # List of assignments for assignment in assignments: diff --git a/openslides/locale/angular-gettext/template-en.pot b/openslides/locale/angular-gettext/template-en.pot index 3cee152a9..90258a413 100644 --- a/openslides/locale/angular-gettext/template-en.pot +++ b/openslides/locale/angular-gettext/template-en.pot @@ -4,306 +4,330 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id-Version: \n" -#: users/static/templates/users/user-import.html:37 +#: users/static/templates/users/user-import.html:41 msgid "'title, first_name, last_name, structure level, groups, comment, is active'" msgstr "" -#: agenda/static/templates/agenda/item-import.html:37 -msgid "'title, text, duration'" +#: agenda/static/templates/agenda/item-import.html:41 +msgid "'title, text'" msgstr "" -#: motions/static/templates/motions/motion-list.html:43 +#: assignments/static/templates/assignments/assignment-list.html:54 +msgid "--- Select phase ---" +msgstr "" + +#: motions/static/templates/motions/motion-list.html:56 msgid "--- Select state ---" msgstr "" -#: users/static/templates/users/user-detail-profile.html:34 -#: users/static/templates/users/user-detail.html:32 -#: users/static/templates/users/user-form.html:63 +#: users/static/js/users/site.js:322 +#: users/static/templates/users/user-detail-profile.html:39 +#: users/static/templates/users/user-detail.html:37 msgid "About me" msgstr "" -#: motions/static/templates/motions/motion-detail.html:145 -#: motions/static/templates/motions/motion-detail.html:146 -#: motions/static/templates/motions/motion-detail.html:196 +#: assignments/static/js/assignments/site.js:436 +#: motions/static/templates/motions/motion-detail.html:135 +#: motions/static/templates/motions/motion-detail.html:136 +#: motions/static/templates/motions/motion-detail.html:186 msgid "Abstain" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:47 -#: core/static/templates/core/customslide-list.html:25 -#: core/static/templates/core/tag-list.html:27 -#: mediafiles/static/templates/mediafiles/mediafile-list.html:47 -#: motions/static/templates/motions/category-list.html:32 -#: users/static/templates/users/group-list.html:32 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:50 +#: motions/static/templates/motions/category-list.html:36 +#: users/static/templates/users/group-list.html:41 msgid "Actions" msgstr "" -#: core/static/templates/core/projector-controls.html:128 +#: core/static/templates/core/projector-controls.html:143 msgid "Add countdown" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:118 +#: agenda/static/templates/agenda/item-detail.html:103 +#: assignments/static/templates/assignments/assignment-detail.html:72 msgid "Add me" msgstr "" -#: core/static/templates/core/projector-controls.html:173 +#: core/static/templates/core/projector-controls.html:194 msgid "Add message" msgstr "" -#: core/static/templates/core/projector-controls.html:129 +#: core/static/templates/core/projector-controls.html:144 msgid "Add new countdown" msgstr "" -#: core/static/templates/core/projector-controls.html:174 +#: core/static/templates/core/projector-controls.html:195 msgid "Add new message" msgstr "" -#: users/static/templates/users/user-detail.html:37 +#: users/static/templates/users/user-detail.html:42 msgid "Administrative data" msgstr "" -#: agenda/static/templates/agenda/item-list.html:1 +#: agenda/static/templates/agenda/item-list.html:25 +#: agenda/static/templates/agenda/item-list.html:47 #: agenda/static/templates/agenda/slide-item-list.html:2 msgid "Agenda" msgstr "" -#: agenda/static/templates/agenda/item-list.html:81 +#: agenda/static/templates/agenda/item-list.html:112 +#: core/static/templates/core/customslide-detail.html:22 msgid "Agenda item" msgstr "" -#: users/static/templates/users/user-import.html:41 +#: users/static/templates/users/user-import.html:45 msgid "" -"At least first name or lastname have to be filled in. All\n" -" other fields are optional and may be empty." +"At least first name or last name have to be filled in. All\n" +" other fields are optional and may be empty." msgstr "" -#: motions/static/js/motions/motions.js:370 +#: motions/static/js/motions/site.js:183 msgid "Attachment" msgstr "" -#: agenda/static/templates/agenda/item-import.html:79 -msgid "Back to agenda overview" +#: agenda/static/templates/agenda/item-list.html:54 +msgid "Auto numbering" msgstr "" #: agenda/static/templates/agenda/item-detail.html:6 -#: agenda/static/templates/agenda/item-form.html:7 +msgid "Back to agenda" +msgstr "" + +#: agenda/static/templates/agenda/item-import.html:83 +msgid "Back to agenda overview" +msgstr "" + #: agenda/static/templates/agenda/item-import.html:6 #: agenda/static/templates/agenda/item-sort.html:6 #: assignments/static/templates/assignments/assignment-detail.html:6 -#: assignments/static/templates/assignments/assignment-form.html:7 #: core/static/templates/core/customslide-detail.html:6 -#: core/static/templates/core/customslide-form.html:7 -#: core/static/templates/core/tag-form.html:7 -#: mediafiles/static/templates/mediafiles/mediafile-form.html:7 +#: core/static/templates/core/tag-form.html:6 +#: mediafiles/static/templates/mediafiles/mediafile-form.html:6 #: motions/static/templates/motions/category-detail.html:6 -#: motions/static/templates/motions/category-form.html:7 +#: motions/static/templates/motions/category-form.html:6 #: motions/static/templates/motions/category-list.html:10 -#: motions/static/templates/motions/motion-detail.html:14 -#: motions/static/templates/motions/motion-form.html:7 +#: motions/static/templates/motions/motion-detail.html:7 #: users/static/templates/users/group-detail.html:6 -#: users/static/templates/users/group-form.html:7 +#: users/static/templates/users/group-form.html:6 #: users/static/templates/users/group-list.html:10 #: users/static/templates/users/user-detail.html:6 -#: users/static/templates/users/user-form.html:7 #: users/static/templates/users/user-import.html:6 msgid "Back to overview" msgstr "" -#: users/static/templates/users/user-import.html:89 +#: users/static/templates/users/user-import.html:93 msgid "Back to users overview" msgstr "" -#: core/static/templates/core/projector-controls.html:26 +#: assignments/static/templates/assignments/assignmentpoll-form.html:1 +msgid "Ballot" +msgstr "" + +#: core/static/templates/core/projector-controls.html:33 msgid "Bigger" msgstr "" -#: agenda/static/templates/agenda/item-form.html:48 -#: assignments/static/templates/assignments/assignment-form.html:28 -#: core/static/templates/core/customslide-form.html:24 -#: core/static/templates/core/projector-controls.html:118 -#: core/static/templates/core/tag-form.html:20 -#: mediafiles/static/templates/mediafiles/mediafile-form.html:35 -#: motions/static/templates/motions/category-form.html:24 -#: motions/static/templates/motions/motion-detail.html:168 -#: motions/static/templates/motions/motion-form.html:16 -#: motions/static/templates/motions/motion-list.html:193 -#: users/static/templates/users/group-form.html:26 -#: users/static/templates/users/user-detail-password.html:34 -#: users/static/templates/users/user-detail-profile.html:41 -#: users/static/templates/users/user-form.html:82 +#: agenda/static/templates/agenda/item-list.html:200 +#: assignments/static/templates/assignments/assignment-form.html:9 +#: assignments/static/templates/assignments/assignment-list.html:158 +#: assignments/static/templates/assignments/assignmentpoll-form.html:8 +#: core/static/templates/core/customslide-form.html:9 +#: core/static/templates/core/projector-controls.html:133 +#: core/static/templates/core/tag-form.html:24 +#: mediafiles/static/templates/mediafiles/mediafile-form.html:39 +#: motions/static/templates/motions/category-form.html:28 +#: motions/static/templates/motions/motion-detail.html:158 +#: motions/static/templates/motions/motion-form.html:9 +#: motions/static/templates/motions/motion-list.html:213 +#: users/static/templates/users/group-form.html:30 +#: users/static/templates/users/user-detail-password.html:39 +#: users/static/templates/users/user-detail-profile.html:46 +#: users/static/templates/users/user-form.html:9 msgid "Cancel" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:32 +#: assignments/static/templates/assignments/assignment-detail.html:40 +#: assignments/static/templates/assignments/assignment-list.html:89 msgid "Candidates" msgstr "" -#: motions/static/templates/motions/category-list.html:1 +#: motions/static/templates/motions/category-list.html:13 #: motions/static/templates/motions/motion-list.html:10 msgid "Categories" msgstr "" -#: motions/static/js/motions/motions.js:384 -#: motions/static/templates/motions/motion-detail.html:235 -#: motions/static/templates/motions/motion-list.html:147 -#: motions/static/templates/motions/motion-list.html:81 +#: motions/static/js/motions/site.js:197 +#: motions/static/templates/motions/motion-detail.html:72 +#: motions/static/templates/motions/motion-list.html:101 +#: motions/static/templates/motions/motion-list.html:167 msgid "Category" msgstr "" -#: agenda/static/templates/agenda/item-import.html:84 -#: users/static/templates/users/user-import.html:94 +#: agenda/static/templates/agenda/item-import.html:88 +#: users/static/templates/users/user-import.html:98 msgid "Clear" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:38 +#: agenda/static/templates/agenda/item-detail.html:34 +msgid "Close" +msgstr "" + #: agenda/static/templates/agenda/slide-item-detail.html:6 msgid "Closed" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:31 -#: agenda/static/templates/agenda/item-form.html:25 -#: users/static/templates/users/user-detail.html:40 -#: users/static/templates/users/user-form.html:59 -#: users/static/templates/users/user-import.html:68 +#: agenda/static/templates/agenda/item-list.html:174 +#: users/static/js/users/site.js:315 +#: users/static/templates/users/user-detail.html:45 +#: users/static/templates/users/user-import.html:72 msgid "Comment" msgstr "" -#: users/static/templates/users/user-detail-password.html:24 +#: assignments/static/js/assignments/site.js:119 +#: assignments/static/js/assignments/site.js:486 +msgid "Comment on the ballot paper" +msgstr "" + +#: users/static/templates/users/user-detail-password.html:29 msgid "Confirm new password" msgstr "" -#: agenda/static/templates/agenda/item-import.html:11 +#: core/static/templates/core/login-form.html:23 +msgid "Continue as guest" +msgstr "" + +#: agenda/static/templates/agenda/item-import.html:15 msgid "" "Copy and paste your agenda item titles in this textbox.\n" "Keep each item in a single line." msgstr "" -#: users/static/templates/users/user-import.html:11 +#: users/static/templates/users/user-import.html:15 msgid "" "Copy and paste your participant names in this textbox.\n" -"Keep each person in a single line." +" Keep each person in a single line." msgstr "" -#: agenda/static/templates/agenda/item-detail.html:77 +#: core/static/templates/core/projector-controls.html:62 +msgid "Countdowns" +msgstr "" + +#: agenda/static/templates/agenda/item-detail.html:62 msgid "Current speaker:" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-form.html:15 +#: mediafiles/static/templates/mediafiles/mediafile-form.html:19 msgid "Current value:" msgstr "" -#: core/static/templates/core/customslide-list.html:1 -msgid "Custom slides" +#: assignments/static/js/assignments/site.js:100 +#: assignments/static/js/assignments/site.js:135 +msgid "Default comment on the ballot paper" msgstr "" -#: users/static/templates/users/user-import.html:38 +#: users/static/templates/users/user-import.html:42 msgid "Default groups" msgstr "" -#: users/static/templates/users/user-form.html:46 +#: users/static/js/users/site.js:303 msgid "Default password" msgstr "" -#: users/static/templates/users/user-import.html:39 +#: users/static/templates/users/user-import.html:43 msgid "Delegate" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:77 -#: core/static/templates/core/customslide-list.html:45 -#: core/static/templates/core/tag-list.html:41 -#: mediafiles/static/templates/mediafiles/mediafile-list.html:73 -#: motions/static/templates/motions/category-list.html:53 -#: motions/static/templates/motions/motion-list.html:119 -#: users/static/templates/users/group-list.html:48 +#: agenda/static/templates/agenda/item-list.html:151 +#: assignments/static/templates/assignments/assignment-detail.html:112 +#: assignments/static/templates/assignments/assignment-list.html:121 +#: core/static/templates/core/tag-list.html:38 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:76 +#: motions/static/templates/motions/category-list.html:57 +#: motions/static/templates/motions/motion-list.html:139 +#: users/static/templates/users/group-list.html:57 +#: users/static/templates/users/user-list.html:142 msgid "Delete" msgstr "" -#: agenda/static/templates/agenda/item-list.html:32 -#: motions/static/templates/motions/motion-list.html:27 -#: users/static/templates/users/user-list.html:44 -msgid "Delete mode" +#: assignments/static/templates/assignments/assignment-list.html:66 +msgid "Delete selected elections" msgstr "" -#: agenda/static/templates/agenda/item-list.html:52 +#: agenda/static/templates/agenda/item-list.html:92 +#: motions/static/templates/motions/motion-list.html:68 +#: users/static/templates/users/user-list.html:80 msgid "Delete selected items" msgstr "" -#: motions/static/templates/motions/motion-list.html:38 -msgid "Delete selected motions" -msgstr "" - -#: users/static/templates/users/user-list.html:55 -msgid "Delete selected users" -msgstr "" - -#: assignments/static/templates/assignments/assignment-detail.html:29 -#: assignments/static/templates/assignments/assignment-form.html:17 -#: core/static/templates/core/projector-controls.html:105 +#: assignments/static/js/assignments/site.js:84 +#: assignments/static/templates/assignments/assignment-detail.html:37 +#: core/static/templates/core/projector-controls.html:120 msgid "Description" msgstr "" -#: agenda/static/templates/agenda/item-list.html:85 +#: agenda/static/templates/agenda/item-list.html:116 msgid "Done" msgstr "" -#: agenda/static/templates/agenda/item-sort.html:10 -msgid "Drag and drop items to change the order of the agenda. Your modification will be saved directly." +#: agenda/static/templates/agenda/item-sort.html:14 +msgid "Drag and drop items to change the order of the agenda. Your modification will be saved immediately." msgstr "" -#: agenda/static/templates/agenda/item-detail.html:26 -#: agenda/static/templates/agenda/item-form.html:29 -#: agenda/static/templates/agenda/item-import.html:61 -#: agenda/static/templates/agenda/item-list.html:83 +#: agenda/static/templates/agenda/item-import.html:65 +#: agenda/static/templates/agenda/item-list.html:114 +#: agenda/static/templates/agenda/item-list.html:184 msgid "Duration" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:18 -#: assignments/static/templates/assignments/assignment-detail.html:22 -#: assignments/static/templates/assignments/assignment-list.html:70 -#: core/static/templates/core/customslide-detail.html:16 -#: core/static/templates/core/customslide-list.html:40 +#: agenda/static/templates/agenda/item-list.html:148 +#: agenda/static/templates/agenda/item-list.html:206 +#: assignments/static/templates/assignments/assignment-detail.html:27 +#: assignments/static/templates/assignments/assignment-detail.html:92 +#: assignments/static/templates/assignments/assignment-list.html:118 #: core/static/templates/core/tag-list.html:36 -#: mediafiles/static/templates/mediafiles/mediafile-list.html:68 -#: motions/static/templates/motions/category-list.html:46 -#: motions/static/templates/motions/motion-detail.html:30 -#: motions/static/templates/motions/motion-list.html:112 -#: users/static/templates/users/group-list.html:41 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:71 +#: motions/static/templates/motions/category-list.html:50 +#: motions/static/templates/motions/motion-detail.html:28 +#: motions/static/templates/motions/motion-list.html:132 +#: users/static/templates/users/group-list.html:50 #: users/static/templates/users/user-detail.html:18 +#: users/static/templates/users/user-list.html:140 msgid "Edit" msgstr "" -#: agenda/static/templates/agenda/item-form.html:1 +#: core/static/templates/core/customslide-form.html:1 msgid "Edit agenda item" msgstr "" -#: motions/static/templates/motions/category-form.html:1 +#: motions/static/templates/motions/category-form.html:9 msgid "Edit category" msgstr "" -#: core/static/templates/core/projector-controls.html:65 +#: core/static/templates/core/projector-controls.html:80 msgid "Edit countdown" msgstr "" -#: core/static/templates/core/projector-controls.html:15 +#: core/static/templates/core/projector-controls.html:22 msgid "Edit current slide" msgstr "" -#: core/static/templates/core/customslide-form.html:1 -msgid "Edit custom slide" -msgstr "" - #: assignments/static/templates/assignments/assignment-form.html:1 msgid "Edit election" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-form.html:1 +#: assignments/static/templates/assignments/assignment-list.html:164 +msgid "Edit election..." +msgstr "" + +#: mediafiles/static/templates/mediafiles/mediafile-form.html:9 msgid "Edit file" msgstr "" -#: users/static/templates/users/group-form.html:1 +#: users/static/templates/users/group-form.html:9 msgid "Edit group" msgstr "" -#: core/static/templates/core/projector-controls.html:157 +#: core/static/templates/core/projector-controls.html:178 msgid "Edit message" msgstr "" @@ -311,7 +335,7 @@ msgstr "" msgid "Edit motion" msgstr "" -#: motions/static/templates/motions/motion-list.html:199 +#: motions/static/templates/motions/motion-list.html:219 msgid "Edit motion..." msgstr "" @@ -319,155 +343,203 @@ msgstr "" msgid "Edit participant" msgstr "" -#: core/static/templates/core/tag-form.html:1 +#: users/static/templates/users/user-detail-profile.html:3 +msgid "Edit profil" +msgstr "" + +#: core/static/templates/core/tag-form.html:9 msgid "Edit tag" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:35 +#: assignments/static/js/assignments/base.js:80 +#: assignments/static/templates/assignments/assignment-detail.html:32 +msgid "Election" +msgstr "" + +#: assignments/static/templates/assignments/assignment-detail.html:80 msgid "Election result" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:1 +#: assignments/static/templates/assignments/assignment-list.html:17 msgid "Elections" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-list.html:1 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:9 msgid "Files" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-list.html:32 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:35 msgid "Filesize" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-list.html:27 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:30 msgid "Filetype" msgstr "" -#: agenda/static/templates/agenda/item-list.html:61 -#: assignments/static/templates/assignments/assignment-list.html:24 -#: core/static/templates/core/customslide-list.html:15 -#: core/static/templates/core/tag-list.html:14 -#: mediafiles/static/templates/mediafiles/mediafile-list.html:14 -#: motions/static/templates/motions/category-list.html:17 -#: motions/static/templates/motions/motion-list.html:52 -#: users/static/templates/users/group-list.html:17 -#: users/static/templates/users/user-list.html:66 +#: agenda/static/templates/agenda/item-list.html:70 +#: assignments/static/templates/assignments/assignment-list.html:44 +#: core/static/templates/core/tag-list.html:18 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:18 +#: motions/static/templates/motions/category-list.html:21 +#: motions/static/templates/motions/motion-list.html:46 +#: users/static/templates/users/user-list.html:60 msgid "Filter" msgstr "" -#: users/static/templates/users/user-detail-profile.html:21 -#: users/static/templates/users/user-form.html:26 -#: users/static/templates/users/user-import.html:64 +#: users/static/js/users/site.js:269 +#: users/static/templates/users/user-detail-profile.html:26 +#: users/static/templates/users/user-import.html:68 msgid "First name" msgstr "" -#: users/static/templates/users/group-list.html:1 -#: users/static/templates/users/user-detail.html:28 -#: users/static/templates/users/user-form.html:39 -#: users/static/templates/users/user-import.html:67 +#: users/static/templates/users/group-detail.html:10 +msgid "Group" +msgstr "" + +#: users/static/js/users/site.js:290 +#: users/static/templates/users/group-list.html:13 +#: users/static/templates/users/user-detail.html:33 +#: users/static/templates/users/user-import.html:71 #: users/static/templates/users/user-list.html:10 -#: users/static/templates/users/user-list.html:92 +#: users/static/templates/users/user-list.html:109 msgid "Groups" msgstr "" -#: users/static/templates/users/group-list.html:25 +#: agenda/static/templates/agenda/item-list.html:135 +#: agenda/static/templates/agenda/item-list.html:193 +msgid "Hidden agenda item" +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:82 +msgid "Hide closed items" +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:79 +msgid "Hide internal agenda items" +msgstr "" + +#: users/static/templates/users/group-list.html:34 msgid "ID" msgstr "" -#: motions/static/js/motions/motions.js:317 -#: motions/static/templates/motions/motion-list.html:142 -#: motions/static/templates/motions/motion-list.html:66 +#: motions/static/js/motions/site.js:128 +#: motions/static/templates/motions/motion-list.html:162 +#: motions/static/templates/motions/motion-list.html:86 msgid "Identifier" msgstr "" -#: agenda/static/templates/agenda/item-import.html:21 -#: agenda/static/templates/agenda/item-import.html:71 +#: agenda/static/templates/agenda/item-import.html:25 +#: agenda/static/templates/agenda/item-import.html:75 #: agenda/static/templates/agenda/item-list.html:14 -#: users/static/templates/users/user-import.html:21 -#: users/static/templates/users/user-import.html:81 +#: users/static/templates/users/user-import.html:25 +#: users/static/templates/users/user-import.html:85 #: users/static/templates/users/user-list.html:14 msgid "Import" msgstr "" -#: agenda/static/templates/agenda/item-import.html:1 +#: agenda/static/templates/agenda/item-import.html:9 msgid "Import agenda items" msgstr "" -#: agenda/static/templates/agenda/item-import.html:31 -#: users/static/templates/users/user-import.html:31 +#: agenda/static/templates/agenda/item-import.html:35 +#: users/static/templates/users/user-import.html:35 msgid "Import by CSV file" msgstr "" -#: agenda/static/templates/agenda/item-import.html:10 -#: users/static/templates/users/user-import.html:10 +#: agenda/static/templates/agenda/item-import.html:14 +#: users/static/templates/users/user-import.html:14 msgid "Import by copy/paste" msgstr "" -#: users/static/templates/users/user-import.html:1 +#: users/static/templates/users/user-import.html:9 msgid "Import participants" msgstr "" -#: motions/static/templates/motions/motion-detail.html:155 -#: motions/static/templates/motions/motion-detail.html:156 -#: motions/static/templates/motions/motion-detail.html:215 +#: users/static/js/users/site.js:722 +msgid "Important: Please change your password!" +msgstr "" + +#: users/static/js/users/site.js:720 +msgid "Installation was successfully." +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:145 +#: motions/static/templates/motions/motion-detail.html:146 +#: motions/static/templates/motions/motion-detail.html:205 msgid "Invalid votes" msgstr "" -#: users/static/templates/users/user-form.html:75 +#: users/static/js/users/site.js:337 msgid "Is active" msgstr "" -#: users/static/templates/users/user-form.html:69 -#: users/static/templates/users/user-list.html:59 +#: users/static/js/users/site.js:330 +#: users/static/templates/users/user-list.html:70 msgid "Is present" msgstr "" -#: users/static/templates/users/user-detail-profile.html:25 -#: users/static/templates/users/user-form.html:30 -#: users/static/templates/users/user-import.html:65 +#: agenda/static/templates/agenda/item-list.html:180 +msgid "Item number" +msgstr "" + +#: users/static/js/users/site.js:276 +#: users/static/templates/users/user-detail-profile.html:30 +#: users/static/templates/users/user-import.html:69 msgid "Last name" msgstr "" -#: users/static/templates/users/user-list.html:33 +#: users/static/templates/users/user-list.html:30 msgid "List of access data" msgstr "" -#: users/static/templates/users/user-list.html:28 +#: users/static/templates/users/user-list.html:25 msgid "List of participants" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:36 +#: agenda/static/templates/agenda/item-detail.html:13 +#: agenda/static/templates/agenda/item-detail.html:24 +#: agenda/static/templates/agenda/item-list.html:146 #: agenda/static/templates/agenda/slide-item-detail.html:5 +#: assignments/static/templates/assignments/assignment-detail.html:15 +#: core/static/templates/core/customslide-detail.html:11 +#: motions/static/templates/motions/motion-detail.html:16 msgid "List of speakers" msgstr "" -#: core/static/templates/core/projector-controls.html:135 +#: core/static/templates/core/projector-controls.html:9 +msgid "Live view" +msgstr "" + +#: core/static/templates/core/login-form.html:20 +msgid "Login" +msgstr "" + +#: core/static/templates/core/projector-controls.html:154 msgid "Messages" msgstr "" -#: motions/static/js/motions/motions.js:169 -#: motions/static/templates/motions/motion-detail.html:4 +#: motions/static/js/motions/base.js:171 +#: motions/static/templates/motions/motion-detail.html:34 msgid "Motion" msgstr "" -#: motions/static/js/motions/motions.js:458 -#: motions/static/templates/motions/motion-list.html:1 +#: motions/static/js/motions/site.js:14 +#: motions/static/templates/motions/motion-list.html:21 msgid "Motions" msgstr "" -#: core/static/templates/core/tag-form.html:13 -#: core/static/templates/core/tag-list.html:22 -#: motions/static/templates/motions/category-form.html:17 -#: motions/static/templates/motions/category-list.html:29 -#: users/static/templates/users/group-form.html:13 -#: users/static/templates/users/group-list.html:29 -#: users/static/templates/users/user-list.html:81 +#: core/static/templates/core/tag-form.html:17 +#: core/static/templates/core/tag-list.html:26 +#: motions/static/templates/motions/category-form.html:21 +#: motions/static/templates/motions/category-list.html:33 +#: users/static/templates/users/group-form.html:17 +#: users/static/templates/users/group-list.html:38 +#: users/static/templates/users/user-list.html:98 msgid "Name" msgstr "" #: agenda/static/templates/agenda/item-list.html:6 #: assignments/static/templates/assignments/assignment-list.html:6 -#: core/static/templates/core/customslide-list.html:6 #: core/static/templates/core/tag-list.html:6 #: mediafiles/static/templates/mediafiles/mediafile-list.html:6 #: motions/static/templates/motions/category-list.html:6 @@ -477,27 +549,27 @@ msgstr "" msgid "New" msgstr "" -#: agenda/static/templates/agenda/item-form.html:2 +#: core/static/templates/core/customslide-form.html:2 msgid "New agenda item" msgstr "" -#: motions/static/templates/motions/category-form.html:2 -msgid "New category" +#: assignments/static/templates/assignments/assignment-detail.html:83 +msgid "New ballot" msgstr "" -#: core/static/templates/core/customslide-form.html:2 -msgid "New custom slide" +#: motions/static/templates/motions/category-form.html:10 +msgid "New category" msgstr "" #: assignments/static/templates/assignments/assignment-form.html:2 msgid "New election" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-form.html:2 +#: mediafiles/static/templates/mediafiles/mediafile-form.html:10 msgid "New file" msgstr "" -#: users/static/templates/users/group-form.html:2 +#: users/static/templates/users/group-form.html:10 msgid "New group" msgstr "" @@ -509,474 +581,530 @@ msgstr "" msgid "New participant" msgstr "" -#: users/static/templates/users/user-detail-password.html:16 +#: users/static/templates/users/user-detail-password.html:21 msgid "New password" msgstr "" -#: motions/static/templates/motions/motion-detail.html:232 +#: motions/static/templates/motions/motion-detail.html:222 msgid "New poll" msgstr "" -#: core/static/templates/core/tag-form.html:2 +#: core/static/templates/core/tag-form.html:10 msgid "New tag" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:82 +#: agenda/static/templates/agenda/item-detail.html:67 msgid "Next speakers:" msgstr "" -#: motions/static/templates/motions/motion-detail.html:140 -#: motions/static/templates/motions/motion-detail.html:141 -#: motions/static/templates/motions/motion-detail.html:187 +#: assignments/static/js/assignments/site.js:427 +#: motions/static/templates/motions/motion-detail.html:130 +#: motions/static/templates/motions/motion-detail.html:131 +#: motions/static/templates/motions/motion-detail.html:177 msgid "No" msgstr "" -#: agenda/static/templates/agenda/item-form.html:13 -msgid "Number" -msgstr "" - -#: assignments/static/templates/assignments/assignment-form.html:21 +#: assignments/static/js/assignments/site.js:91 +#: assignments/static/templates/assignments/assignment-list.html:144 msgid "Number of members to be elected" msgstr "" -#: agenda/static/templates/agenda/item-list.html:34 -#: motions/static/templates/motions/motion-list.html:29 -#: users/static/templates/users/user-list.html:46 -msgid "Off" -msgstr "" - -#: users/static/templates/users/user-detail-password.html:8 +#: users/static/templates/users/user-detail-password.html:13 msgid "Old password" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:66 +#: agenda/static/templates/agenda/item-detail.html:51 msgid "Old speakers:" msgstr "" -#: agenda/static/templates/agenda/item-list.html:34 -#: motions/static/templates/motions/motion-list.html:29 -#: users/static/templates/users/user-list.html:46 -msgid "On" -msgstr "" - -#: agenda/static/templates/agenda/item-detail.html:42 -msgid "Opened" +#: agenda/static/templates/agenda/item-detail.html:39 +msgid "Open" msgstr "" #: agenda/static/templates/agenda/item-list.html:22 #: assignments/static/templates/assignments/assignment-detail.html:10 #: assignments/static/templates/assignments/assignment-list.html:14 -#: motions/static/templates/motions/motion-detail.html:18 +#: motions/static/templates/motions/motion-detail.html:11 #: motions/static/templates/motions/motion-list.html:18 #: users/static/templates/users/user-list.html:19 msgid "PDF" msgstr "" -#: users/static/templates/users/user-list.html:1 +#: users/static/templates/users/user-detail.html:23 +msgid "Participant" +msgstr "" + +#: users/static/templates/users/user-list.html:35 msgid "Participants" msgstr "" -#: core/static/templates/core/projector-controls.html:95 +#: core/static/templates/core/login-form.html:17 +msgid "Password" +msgstr "" + +#: core/static/templates/core/projector-controls.html:110 msgid "Pause" msgstr "" -#: users/static/templates/users/group-form.html:17 +#: users/static/templates/users/group-form.html:21 msgid "Permissions" msgstr "" -#: users/static/templates/users/group-detail.html:11 +#: users/static/templates/users/group-detail.html:15 msgid "Permissions:" msgstr "" -#: users/static/templates/users/user-detail.html:25 +#: users/static/templates/users/user-detail.html:30 msgid "Personal data" msgstr "" -#: agenda/static/templates/agenda/item-import.html:34 -#: users/static/templates/users/user-import.html:34 +#: assignments/static/templates/assignments/assignment-list.html:150 +#: assignments/static/templates/assignments/assignment-list.html:94 +msgid "Phase" +msgstr "" + +#: agenda/static/templates/agenda/item-import.html:38 +#: users/static/templates/users/user-import.html:38 msgid "Please note:" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:37 +#: assignments/static/templates/assignments/assignment-list.html:89 msgid "Posts" msgstr "" -#: motions/static/templates/motions/category-form.html:13 -#: motions/static/templates/motions/category-list.html:25 +#: motions/static/templates/motions/category-form.html:17 +#: motions/static/templates/motions/category-list.html:29 msgid "Prefix" msgstr "" -#: motions/static/templates/motions/category-detail.html:11 +#: motions/static/templates/motions/category-detail.html:14 msgid "Prefix:" msgstr "" -#: users/static/templates/users/user-list.html:97 +#: users/static/templates/users/user-list.html:114 msgid "Present" msgstr "" -#: agenda/static/templates/agenda/item-import.html:54 -#: users/static/templates/users/user-import.html:58 +#: agenda/static/templates/agenda/item-import.html:58 +#: users/static/templates/users/user-import.html:62 msgid "Preview" msgstr "" -#: agenda/static/templates/agenda/item-list.html:45 +#: agenda/static/templates/agenda/item-list.html:41 msgid "Project agenda" msgstr "" -#: core/static/templates/core/projector-controls.html:76 +#: core/static/templates/core/customslide-detail.html:17 +msgid "Project agenda item" +msgstr "" + +#: assignments/static/templates/assignments/assignment-list.html:108 +msgid "Project assignment" +msgstr "" + +#: core/static/templates/core/projector-controls.html:91 msgid "Project countdown" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:16 -#: assignments/static/templates/assignments/assignment-list.html:64 +#: assignments/static/templates/assignments/assignment-detail.html:21 msgid "Project election" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:12 -#: agenda/static/templates/agenda/item-list.html:96 +#: agenda/static/templates/agenda/item-detail.html:19 +#: agenda/static/templates/agenda/item-list.html:127 msgid "Project item" msgstr "" -#: core/static/templates/core/projector-controls.html:144 +#: core/static/templates/core/projector-controls.html:165 msgid "Project message" msgstr "" -#: motions/static/templates/motions/motion-detail.html:24 -#: motions/static/templates/motions/motion-list.html:100 +#: motions/static/templates/motions/motion-detail.html:22 +#: motions/static/templates/motions/motion-list.html:120 msgid "Project motion" msgstr "" -#: core/static/templates/core/customslide-list.html:34 #: users/static/templates/users/user-detail.html:12 -#: users/static/templates/users/user-list.html:112 +#: users/static/templates/users/user-list.html:127 msgid "Project user" msgstr "" -#: core/static/templates/core/projector-controls.html:2 -msgid "Projector" +#: assignments/static/templates/assignments/assignment-detail.html:103 +msgid "Publish result" msgstr "" -#: motions/static/templates/motions/motion-list.html:115 +#: agenda/static/templates/agenda/item-list.html:147 +#: assignments/static/templates/assignments/assignment-list.html:119 +#: motions/static/templates/motions/motion-list.html:135 msgid "QuickEdit" msgstr "" -#: motions/static/js/motions/motions.js:355 -#: motions/static/templates/motions/motion-detail.html:42 +#: motions/static/js/motions/site.js:167 +#: motions/static/templates/motions/motion-detail.html:237 msgid "Reason" msgstr "" -#: core/static/templates/core/projector-controls.html:58 +#: core/static/templates/core/projector-controls.html:73 msgid "Remove countdown" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:122 +#: agenda/static/templates/agenda/item-detail.html:107 +#: assignments/static/templates/assignments/assignment-detail.html:76 msgid "Remove me" msgstr "" -#: core/static/templates/core/projector-controls.html:152 +#: core/static/templates/core/projector-controls.html:173 msgid "Remove message" msgstr "" -#: agenda/static/templates/agenda/item-import.html:40 -#: users/static/templates/users/user-import.html:44 +#: agenda/static/templates/agenda/item-import.html:44 +#: users/static/templates/users/user-import.html:48 msgid "Required CSV file encoding is UTF-8." msgstr "" -#: agenda/static/templates/agenda/item-import.html:36 -#: users/static/templates/users/user-import.html:36 +#: agenda/static/templates/agenda/item-import.html:40 +#: users/static/templates/users/user-import.html:40 msgid "Required comma separated values" msgstr "" -#: users/static/templates/users/user-form.html:52 -msgid "Reset" -msgstr "" - -#: core/static/templates/core/projector-controls.html:84 +#: core/static/templates/core/projector-controls.html:99 msgid "Reset countdown" msgstr "" -#: core/static/templates/core/projector-controls.html:43 +#: core/static/templates/core/projector-controls.html:50 msgid "Reset scrolling" msgstr "" -#: motions/static/templates/motions/motion-detail.html:106 +#: motions/static/templates/motions/motion-detail.html:95 msgid "Reset state" msgstr "" -#: agenda/static/templates/agenda/item-form.html:45 -#: assignments/static/templates/assignments/assignment-form.html:25 -#: core/static/templates/core/customslide-form.html:21 -#: core/static/templates/core/projector-controls.html:113 -#: core/static/templates/core/projector-controls.html:163 -#: core/static/templates/core/tag-form.html:17 -#: mediafiles/static/templates/mediafiles/mediafile-form.html:32 -#: motions/static/templates/motions/category-form.html:21 -#: motions/static/templates/motions/motion-detail.html:165 -#: users/static/templates/users/group-form.html:23 -#: users/static/templates/users/user-detail-password.html:31 -#: users/static/templates/users/user-detail-profile.html:38 -#: users/static/templates/users/user-form.html:79 +#: core/static/templates/core/projector-controls.html:128 +#: core/static/templates/core/projector-controls.html:184 +#: core/static/templates/core/tag-form.html:21 +#: mediafiles/static/templates/mediafiles/mediafile-form.html:36 +#: motions/static/templates/motions/category-form.html:25 +#: motions/static/templates/motions/motion-detail.html:155 +#: users/static/templates/users/group-form.html:27 +#: users/static/templates/users/user-detail-password.html:36 +#: users/static/templates/users/user-detail-profile.html:43 msgid "Save" msgstr "" -#: core/static/templates/core/projector-controls.html:38 +#: core/static/templates/core/projector-controls.html:45 msgid "Scroll down" msgstr "" -#: core/static/templates/core/projector-controls.html:33 +#: core/static/templates/core/projector-controls.html:40 msgid "Scroll up" msgstr "" -#: agenda/static/templates/agenda/item-import.html:32 +#: agenda/static/templates/agenda/item-list.html:65 +#: assignments/static/templates/assignments/assignment-list.html:39 +#: motions/static/templates/motions/motion-list.html:41 +#: users/static/templates/users/group-list.html:24 +#: users/static/templates/users/user-list.html:55 +msgid "Search" +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:37 +#: assignments/static/templates/assignments/assignment-list.html:29 +#: motions/static/templates/motions/motion-list.html:32 +#: users/static/templates/users/user-list.html:46 +msgid "Select" +msgstr "" + +#: agenda/static/templates/agenda/item-import.html:36 msgid "Select a CSV file to import agenda items!" msgstr "" -#: users/static/templates/users/user-import.html:32 +#: users/static/templates/users/user-import.html:36 msgid "Select a CSV file to import users!" msgstr "" -#: motions/static/js/motions/motions.js:390 +#: motions/static/js/motions/site.js:203 msgid "Select or search a category..." msgstr "" -#: agenda/static/templates/agenda/item-detail.html:102 +#: users/static/js/users/site.js:296 +msgid "Select or search a group..." +msgstr "" + +#: agenda/static/templates/agenda/item-detail.html:87 +#: assignments/static/templates/assignments/assignment-detail.html:56 msgid "Select or search a participant..." msgstr "" -#: motions/static/js/motions/motions.js:331 -#: motions/static/templates/motions/motion-list.html:157 +#: motions/static/js/motions/site.js:142 +#: motions/static/templates/motions/motion-list.html:177 msgid "Select or search a submitter..." msgstr "" -#: motions/static/js/motions/motions.js:418 -#: motions/static/templates/motions/motion-list.html:182 +#: motions/static/js/motions/site.js:231 +#: motions/static/templates/motions/motion-list.html:202 msgid "Select or search a supporter..." msgstr "" -#: motions/static/js/motions/motions.js:404 -#: motions/static/templates/motions/motion-list.html:168 +#: motions/static/js/motions/site.js:217 +#: motions/static/templates/motions/motion-list.html:188 msgid "Select or search a tag..." msgstr "" -#: motions/static/js/motions/motions.js:432 +#: motions/static/js/motions/site.js:245 msgid "Select or search a workflow..." msgstr "" -#: motions/static/js/motions/motions.js:376 +#: motions/static/js/motions/site.js:189 msgid "Select or search an attachment..." msgstr "" -#: core/static/templates/core/customslide-detail.html:10 -#: mediafiles/static/templates/mediafiles/mediafile-list.html:62 -#: motions/static/templates/motions/category-list.html:40 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:65 +#: motions/static/templates/motions/category-list.html:44 msgid "Show" msgstr "" -#: motions/static/js/motions/motions.js:362 +#: motions/static/js/motions/site.js:175 msgid "Show extended fields" msgstr "" -#: motions/static/templates/motions/motion-detail.html:54 +#: motions/static/templates/motions/motion-detail.html:249 msgid "Show log" msgstr "" -#: core/static/templates/core/projector-controls.html:21 +#: core/static/templates/core/projector-controls.html:28 msgid "Smaller" msgstr "" #: agenda/static/templates/agenda/item-list.html:10 -#: agenda/static/templates/agenda/item-sort.html:1 +#: agenda/static/templates/agenda/item-sort.html:9 msgid "Sort agenda" msgstr "" -#: motions/static/templates/motions/motion-detail.html:126 +#: motions/static/templates/motions/motion-detail.html:116 msgid "Special values" msgstr "" -#: users/static/templates/users/user-import.html:40 +#: users/static/templates/users/user-import.html:44 msgid "Staff" msgstr "" -#: core/static/templates/core/projector-controls.html:89 +#: core/static/templates/core/projector-controls.html:104 msgid "Start" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:128 +#: agenda/static/templates/agenda/item-detail.html:113 msgid "Start next speaker" msgstr "" -#: core/static/templates/core/projector-controls.html:109 +#: core/static/templates/core/projector-controls.html:124 msgid "Start time" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:42 -#: motions/static/templates/motions/motion-detail.html:93 -#: motions/static/templates/motions/motion-list.html:86 +#: motions/static/templates/motions/motion-detail.html:82 +#: motions/static/templates/motions/motion-list.html:106 msgid "State" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:133 +#: agenda/static/templates/agenda/item-detail.html:118 msgid "Stop current speaker" msgstr "" -#: users/static/templates/users/user-detail-profile.html:30 -#: users/static/templates/users/user-detail.html:26 -#: users/static/templates/users/user-form.html:35 -#: users/static/templates/users/user-import.html:66 -#: users/static/templates/users/user-list.html:87 +#: users/static/js/users/site.js:283 +#: users/static/templates/users/user-detail-profile.html:35 +#: users/static/templates/users/user-detail.html:31 +#: users/static/templates/users/user-import.html:70 +#: users/static/templates/users/user-list.html:104 msgid "Structure level" msgstr "" -#: motions/static/templates/motions/motion-form.html:13 +#: assignments/static/templates/assignments/assignment-form.html:6 +#: assignments/static/templates/assignments/assignmentpoll-form.html:5 +#: core/static/templates/core/customslide-form.html:6 +#: motions/static/templates/motions/motion-form.html:6 +#: users/static/templates/users/user-form.html:6 msgid "Submit" msgstr "" -#: motions/static/js/motions/motions.js:325 -#: motions/static/templates/motions/motion-detail.html:69 -#: motions/static/templates/motions/motion-list.html:155 -#: motions/static/templates/motions/motion-list.html:76 +#: motions/static/js/motions/site.js:136 +#: motions/static/templates/motions/motion-detail.html:46 +#: motions/static/templates/motions/motion-list.html:175 +#: motions/static/templates/motions/motion-list.html:96 msgid "Submitters" msgstr "" -#: motions/static/templates/motions/motion-detail.html:84 +#: motions/static/templates/motions/motion-detail.html:61 msgid "Support motion" msgstr "" -#: motions/static/js/motions/motions.js:412 -#: motions/static/templates/motions/motion-detail.html:76 -#: motions/static/templates/motions/motion-list.html:180 +#: motions/static/js/motions/site.js:225 +#: motions/static/templates/motions/motion-detail.html:53 +#: motions/static/templates/motions/motion-list.html:200 msgid "Supporters" msgstr "" -#: agenda/static/templates/agenda/item-form.html:39 #: agenda/static/templates/agenda/item-list.html:18 #: assignments/static/templates/assignments/assignment-list.html:10 -#: core/static/templates/core/tag-list.html:1 -#: motions/static/js/motions/motions.js:398 -#: motions/static/templates/motions/motion-detail.html:238 +#: core/static/templates/core/tag-list.html:9 +#: motions/static/js/motions/site.js:211 +#: motions/static/templates/motions/motion-detail.html:76 #: motions/static/templates/motions/motion-list.html:14 -#: motions/static/templates/motions/motion-list.html:166 +#: motions/static/templates/motions/motion-list.html:186 msgid "Tags" msgstr "" -#: agenda/static/templates/agenda/item-form.html:21 -#: agenda/static/templates/agenda/item-import.html:60 -#: core/static/templates/core/customslide-form.html:17 -#: motions/static/js/motions/motions.js:347 -#: motions/static/templates/motions/motion-detail.html:37 +#: agenda/static/templates/agenda/item-import.html:64 +#: core/static/js/core/site.js:413 +#: motions/static/js/motions/site.js:158 +#: motions/static/templates/motions/motion-detail.html:232 msgid "Text" msgstr "" -#: agenda/static/templates/agenda/item-import.html:38 +#: agenda/static/templates/agenda/item-import.html:42 msgid "Text and duration are optional and may be empty." msgstr "" -#: agenda/static/templates/agenda/item-import.html:39 -#: users/static/templates/users/user-import.html:43 +#: agenda/static/templates/agenda/item-import.html:43 +#: users/static/templates/users/user-import.html:47 msgid "The header in first line is required." msgstr "" #. academic degree -#: agenda/static/templates/agenda/item-form.html:17 -#: agenda/static/templates/agenda/item-import.html:59 -#: assignments/static/templates/assignments/assignment-form.html:13 -#: assignments/static/templates/assignments/assignment-list.html:32 -#: core/static/templates/core/customslide-form.html:13 -#: core/static/templates/core/customslide-list.html:20 -#: mediafiles/static/templates/mediafiles/mediafile-form.html:21 -#: mediafiles/static/templates/mediafiles/mediafile-list.html:22 -#: motions/static/js/motions/motions.js:339 -#: motions/static/templates/motions/motion-list.html:71 -#: users/static/templates/users/user-detail-profile.html:17 -#: users/static/templates/users/user-form.html:22 -#: users/static/templates/users/user-import.html:63 +#: agenda/static/templates/agenda/item-import.html:63 +#: agenda/static/templates/agenda/item-list.html:170 +#: assignments/static/js/assignments/site.js:76 +#: assignments/static/templates/assignments/assignment-list.html:140 +#: assignments/static/templates/assignments/assignment-list.html:84 +#: core/static/js/core/site.js:405 +#: mediafiles/static/templates/mediafiles/mediafile-form.html:25 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:25 +#: motions/static/js/motions/site.js:150 +#: motions/static/templates/motions/motion-list.html:91 +#: users/static/js/users/site.js:262 +#: users/static/templates/users/user-detail-profile.html:22 +#: users/static/templates/users/user-import.html:67 msgid "Title" msgstr "" -#: agenda/static/templates/agenda/item-form.html:33 -msgid "Type" +#: assignments/static/templates/assignments/assignment-detail.html:108 +msgid "Unpublish result" msgstr "" -#: motions/static/templates/motions/motion-detail.html:89 +#: motions/static/templates/motions/motion-detail.html:66 msgid "Unsupport motion" msgstr "" -#: motions/static/templates/motions/motion-list.html:196 +#: agenda/static/templates/agenda/item-list.html:203 +#: assignments/static/templates/assignments/assignment-list.html:161 +#: motions/static/templates/motions/motion-list.html:216 msgid "Update" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-list.html:37 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:40 msgid "Upload time" msgstr "" -#: mediafiles/static/templates/mediafiles/mediafile-list.html:42 +#: mediafiles/static/templates/mediafiles/mediafile-list.html:45 msgid "Uploaded by" msgstr "" -#: agenda/static/templates/agenda/item-import.html:41 -#: users/static/templates/users/user-import.html:45 +#: users/static/js/users/site.js:721 +msgid "Use admin and admin for first login." +msgstr "" + +#: agenda/static/templates/agenda/item-import.html:45 +#: users/static/templates/users/user-import.html:49 msgid "Use the CSV example file from OpenSlides Wiki." msgstr "" -#: users/static/templates/users/user-detail-profile.html:8 -#: users/static/templates/users/user-detail.html:38 -#: users/static/templates/users/user-form.html:13 +#: core/static/templates/core/login-form.html:12 +#: users/static/templates/users/user-detail-profile.html:13 +#: users/static/templates/users/user-detail.html:43 msgid "Username" msgstr "" -#: motions/static/templates/motions/motion-detail.html:150 -#: motions/static/templates/motions/motion-detail.html:151 -#: motions/static/templates/motions/motion-detail.html:207 +#: users/static/js/users/site.js:742 +msgid "Username or password was not correct." +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:140 +#: motions/static/templates/motions/motion-detail.html:141 +#: motions/static/templates/motions/motion-detail.html:197 msgid "Valid votes" msgstr "" -#: motions/static/templates/motions/motion-detail.html:114 +#: motions/static/templates/motions/motion-detail.html:104 msgid "Vote" msgstr "" -#: motions/static/templates/motions/motion-detail.html:160 -#: motions/static/templates/motions/motion-detail.html:161 -#: motions/static/templates/motions/motion-detail.html:224 +#: assignments/static/js/assignments/site.js:476 +#: motions/static/templates/motions/motion-detail.html:150 +#: motions/static/templates/motions/motion-detail.html:151 +#: motions/static/templates/motions/motion-detail.html:214 msgid "Votes cast" msgstr "" -#: motions/static/templates/motions/motion-detail.html:111 +#: assignments/static/js/assignments/site.js:468 +msgid "Votes invalid" +msgstr "" + +#: assignments/static/js/assignments/site.js:460 +msgid "Votes valid" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:101 msgid "Voting result" msgstr "" -#: motions/static/js/motions/motions.js:426 +#: motions/static/js/motions/site.js:239 msgid "Workflow" msgstr "" -#: motions/static/templates/motions/motion-detail.html:135 -#: motions/static/templates/motions/motion-detail.html:136 -#: motions/static/templates/motions/motion-detail.html:178 +#: assignments/static/js/assignments/site.js:126 +#: assignments/static/js/assignments/site.js:418 +#: motions/static/templates/motions/motion-detail.html:125 +#: motions/static/templates/motions/motion-detail.html:126 +#: motions/static/templates/motions/motion-detail.html:168 msgid "Yes" msgstr "" -#: agenda/static/templates/agenda/item-list.html:112 +#: assignments/static/templates/assignments/assignment-list.html:72 +msgid "elections" +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:158 msgid "h" msgstr "" -#: agenda/static/templates/agenda/item-import.html:24 -#: agenda/static/templates/agenda/item-import.html:74 -#: users/static/templates/users/user-import.html:24 -#: users/static/templates/users/user-import.html:84 +#: agenda/static/templates/agenda/item-import.html:28 +#: agenda/static/templates/agenda/item-import.html:78 +#: users/static/templates/users/user-import.html:28 +#: users/static/templates/users/user-import.html:88 msgid "imported" msgstr "" -#: agenda/static/templates/agenda/item-list.html:67 +#: agenda/static/templates/agenda/item-list.html:98 msgid "items" msgstr "" -#: motions/static/templates/motions/motion-detail.html:127 +#: motions/static/templates/motions/motion-detail.html:117 msgid "majority" msgstr "" -#: agenda/static/templates/agenda/item-list.html:68 +#: motions/static/templates/motions/motion-list.html:74 +msgid "motion" +msgstr "" + +#: users/static/templates/users/user-list.html:86 +msgid "participants" +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:99 +#: assignments/static/templates/assignments/assignment-list.html:73 +#: motions/static/templates/motions/motion-list.html:75 +#: users/static/templates/users/user-list.html:87 msgid "selected" msgstr "" -#: motions/static/templates/motions/motion-detail.html:128 +#: motions/static/templates/motions/motion-detail.html:118 msgid "undocumented" msgstr "" diff --git a/openslides/locale/en/LC_MESSAGES/django.po b/openslides/locale/en/LC_MESSAGES/django.po index ef7c0e25c..51559a44b 100644 --- a/openslides/locale/en/LC_MESSAGES/django.po +++ b/openslides/locale/en/LC_MESSAGES/django.po @@ -5,66 +5,66 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-21 00:01+0100\n" +"POT-Creation-Date: 2015-11-30 20:59+0100\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: agenda/models.py:136 +#: agenda/models.py:160 msgid "Agenda item" msgstr "" -#: agenda/models.py:137 +#: agenda/models.py:161 msgid "Hidden item" msgstr "" -#: agenda/models.py:139 +#: agenda/models.py:163 msgid "Number" msgstr "" -#: agenda/models.py:144 users/models.py:137 +#: agenda/models.py:168 users/models.py:137 msgid "Comment" msgstr "" -#: agenda/models.py:149 +#: agenda/models.py:173 msgid "Closed" msgstr "" -#: agenda/models.py:157 +#: agenda/models.py:181 msgid "Type" msgstr "" -#: agenda/models.py:174 core/models.py:130 +#: agenda/models.py:198 core/models.py:130 msgid "Weight" msgstr "" -#: agenda/models.py:195 +#: agenda/models.py:219 msgid "List of speakers is closed" msgstr "" -#: agenda/models.py:202 +#: agenda/models.py:226 msgid "Can see agenda" msgstr "" -#: agenda/models.py:203 +#: agenda/models.py:227 msgid "Can manage agenda" msgstr "" -#: agenda/models.py:204 +#: agenda/models.py:228 msgid "Can see hidden items and time scheduling of agenda" msgstr "" -#: agenda/models.py:307 +#: agenda/models.py:303 #, python-format msgid "%(user)s is already on the list of speakers of item %(id)s." msgstr "" -#: agenda/models.py:311 +#: agenda/models.py:307 msgid "An anonymous user can not be on lists of speakers." msgstr "" -#: agenda/models.py:351 +#: agenda/models.py:347 msgid "Can put oneself on the list of speakers" msgstr "" @@ -81,8 +81,8 @@ msgid "Input format: DD.MM.YYYY HH:MM" msgstr "" #: agenda/signals.py:34 agenda/signals.py:43 agenda/signals.py:53 -#: agenda/signals.py:60 agenda/signals.py:72 agenda/views.py:230 -#: agenda/views.py:231 +#: agenda/signals.py:60 agenda/signals.py:72 agenda/views.py:240 +#: agenda/views.py:241 msgid "Agenda" msgstr "" @@ -114,149 +114,149 @@ msgstr "" msgid "Roman" msgstr "" -#: agenda/views.py:104 +#: agenda/views.py:105 msgid "The list of speakers is closed." msgstr "" -#: agenda/views.py:113 +#: agenda/views.py:114 msgid "User does not exist." msgstr "" -#: agenda/views.py:121 +#: agenda/views.py:122 #, python-format msgid "User %s was successfully added to the list of speakers." msgstr "" -#: agenda/views.py:139 +#: agenda/views.py:140 msgid "You are not on the list of speakers." msgstr "" -#: agenda/views.py:147 agenda/views.py:177 +#: agenda/views.py:148 agenda/views.py:178 msgid "Speaker does not exist." msgstr "" -#: agenda/views.py:151 +#: agenda/views.py:152 #, python-format msgid "Speaker %s was successfully removed from the list of speakers." msgstr "" -#: agenda/views.py:172 +#: agenda/views.py:173 msgid "The list of speakers is empty." msgstr "" -#: agenda/views.py:179 +#: agenda/views.py:180 msgid "User is now speaking." msgstr "" -#: agenda/views.py:190 +#: agenda/views.py:191 #, python-format msgid "There is no one speaking at the moment according to %(item)s." msgstr "" -#: agenda/views.py:192 +#: agenda/views.py:193 msgid "The speech is finished now." msgstr "" -#: assignments/models.py:30 +#: agenda/views.py:230 +msgid "The agenda has been numbered." +msgstr "" + +#: assignments/models.py:29 msgid "candidate" msgstr "" -#: assignments/models.py:31 assignments/views.py:413 +#: assignments/models.py:30 assignments/views.py:414 msgid "elected" msgstr "" -#: assignments/models.py:32 +#: assignments/models.py:31 msgid "blocked" msgstr "" -#: assignments/models.py:65 +#: assignments/models.py:64 msgid "Searching for candidates" msgstr "" -#: assignments/models.py:66 +#: assignments/models.py:65 msgid "Voting" msgstr "" -#: assignments/models.py:67 +#: assignments/models.py:66 msgid "Finished" msgstr "" -#: assignments/models.py:72 core/models.py:124 core/signals.py:126 +#: assignments/models.py:71 core/models.py:124 core/signals.py:126 #: mediafiles/models.py:19 motions/models.py:554 users/models.py:124 #: users/pdf.py:26 msgid "Title" msgstr "" -#: assignments/models.py:79 +#: assignments/models.py:78 msgid "Description" msgstr "" -#: assignments/models.py:85 assignments/views.py:302 +#: assignments/models.py:84 assignments/views.py:303 msgid "Number of members to be elected" msgstr "" -#: assignments/models.py:93 +#: assignments/models.py:92 msgid "Default comment on the ballot paper" msgstr "" -#: assignments/models.py:121 +#: assignments/models.py:120 msgid "Can see elections" msgstr "" -#: assignments/models.py:122 +#: assignments/models.py:121 msgid "Can nominate another participant" msgstr "" -#: assignments/models.py:123 +#: assignments/models.py:122 msgid "Can nominate oneself" msgstr "" -#: assignments/models.py:124 +#: assignments/models.py:123 msgid "Can manage elections" msgstr "" -#: assignments/models.py:127 assignments/views.py:442 assignments/views.py:459 +#: assignments/models.py:126 assignments/views.py:251 assignments/views.py:443 +#: assignments/views.py:460 msgid "Election" msgstr "" -#: assignments/models.py:357 +#: assignments/models.py:355 msgid "Comment on the ballot paper" msgstr "" -#: assignments/models.py:360 -#, python-format -msgid "Ballot %d" -msgstr "" - -#: assignments/models.py:367 assignments/views.py:522 motions/models.py:691 +#: assignments/models.py:362 assignments/views.py:523 motions/models.py:691 #: motions/pdf.py:125 motions/pdf.py:270 msgid "Yes" msgstr "" -#: assignments/models.py:367 assignments/views.py:523 motions/models.py:691 +#: assignments/models.py:362 assignments/views.py:524 motions/models.py:691 #: motions/pdf.py:125 motions/pdf.py:272 msgid "No" msgstr "" -#: assignments/models.py:367 motions/models.py:691 +#: assignments/models.py:362 motions/models.py:691 msgid "Abstain" msgstr "" -#: assignments/models.py:369 +#: assignments/models.py:364 msgid "Votes" msgstr "" -#: assignments/serializers.py:114 +#: assignments/serializers.py:119 #, python-format msgid "You have to submit data for %d candidates." msgstr "" -#: assignments/serializers.py:118 motions/serializers.py:168 +#: assignments/serializers.py:123 motions/serializers.py:168 #, python-format msgid "You have to submit data for %d vote values." msgstr "" -#: assignments/serializers.py:122 motions/serializers.py:172 +#: assignments/serializers.py:127 motions/serializers.py:172 #, python-format msgid "Vote value %s is invalid." msgstr "" @@ -281,7 +281,7 @@ msgstr "" #: assignments/signals.py:51 assignments/signals.py:60 #: assignments/signals.py:71 assignments/signals.py:78 #: assignments/signals.py:81 assignments/signals.py:90 -#: assignments/views.py:253 +#: assignments/views.py:254 msgid "Elections" msgstr "" @@ -387,84 +387,85 @@ msgstr "" #: assignments/views.py:169 #, python-format -msgid "User %s does not want to be an candidate." +msgid "User %s does not want to be a candidate. Only a manager can do this." msgstr "" -#: assignments/views.py:174 +#: assignments/views.py:173 +#, python-format +msgid "User %s is already nominated." +msgstr "" + +#: assignments/views.py:175 #, python-format msgid "User %s was nominated successfully." msgstr "" -#: assignments/views.py:181 +#: assignments/views.py:182 msgid "" "You can not delete someones candidature to this election because it is " "finished." msgstr "" -#: assignments/views.py:184 +#: assignments/views.py:185 #, python-format msgid "User %s has no status in this election." msgstr "" -#: assignments/views.py:186 +#: assignments/views.py:187 #, python-format msgid "Candidate %s was withdrawn/unblocked successfully." msgstr "" -#: assignments/views.py:198 +#: assignments/views.py:199 #, python-format msgid "User %s is not a candidate of this election." msgstr "" -#: assignments/views.py:200 +#: assignments/views.py:201 #, python-format msgid "User %s was successfully elected." msgstr "" -#: assignments/views.py:204 +#: assignments/views.py:205 #, python-format msgid "User %s is not an elected candidate of this election." msgstr "" -#: assignments/views.py:207 +#: assignments/views.py:208 #, python-format msgid "User %s was successfully unelected." msgstr "" -#: assignments/views.py:217 +#: assignments/views.py:218 msgid "Can not create poll because there are no candidates." msgstr "" -#: assignments/views.py:220 motions/views.py:252 +#: assignments/views.py:221 motions/views.py:252 msgid "Poll created successfully." msgstr "" -#: assignments/views.py:250 -msgid "Assignment" +#: assignments/views.py:275 +msgid "No elections available." msgstr "" -#: assignments/views.py:274 -msgid "No assignments available." -msgstr "" - -#: assignments/views.py:293 +#: assignments/views.py:294 #, python-format msgid "Election: %s" msgstr "" -#: assignments/views.py:309 assignments/views.py:337 +#: assignments/views.py:310 assignments/views.py:338 msgid "Candidates" msgstr "" -#: assignments/views.py:333 +#: assignments/views.py:334 msgid "Election result" msgstr "" -#: assignments/views.py:339 +#: assignments/views.py:340 msgid "ballot" msgstr "" -#: assignments/views.py:358 +#: assignments/views.py:359 #, python-format msgid "" "Y: %(YES)s\n" @@ -472,38 +473,38 @@ msgid "" "A: %(ABSTAIN)s" msgstr "" -#: assignments/views.py:369 motions/pdf.py:115 poll/models.py:82 +#: assignments/views.py:370 motions/pdf.py:115 poll/models.py:82 msgid "Valid votes" msgstr "" -#: assignments/views.py:380 motions/pdf.py:117 poll/models.py:84 +#: assignments/views.py:381 motions/pdf.py:117 poll/models.py:84 msgid "Invalid votes" msgstr "" -#: assignments/views.py:391 motions/pdf.py:119 poll/models.py:86 +#: assignments/views.py:392 motions/pdf.py:119 poll/models.py:86 msgid "Votes cast" msgstr "" -#: assignments/views.py:466 +#: assignments/views.py:467 #, python-format msgid "%d. ballot" msgstr "" -#: assignments/views.py:468 +#: assignments/views.py:469 #, python-format msgid "%d candidate" msgid_plural "%d candidates" msgstr[0] "" msgstr[1] "" -#: assignments/views.py:470 +#: assignments/views.py:471 #, python-format msgid "%d available post" msgid_plural "%d available posts" msgstr[0] "" msgstr[1] "" -#: assignments/views.py:524 motions/pdf.py:125 motions/pdf.py:274 +#: assignments/views.py:525 motions/pdf.py:125 motions/pdf.py:274 msgid "Abstention" msgstr "" @@ -636,8 +637,8 @@ msgstr "" #: core/signals.py:86 msgid "" -"You can replace the logo. Just copy a file to \"static/img/logo.png\" in " -"your OpenSlides data path." +"You can replace the logo. Just copy a file to \"static/img/logo-projector.png" +"\" in your OpenSlides data path." msgstr "" #: core/signals.py:89 core/signals.py:97 core/signals.py:105 diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html index 49571e544..d2e6d98b8 100644 --- a/openslides/users/static/templates/users/user-import.html +++ b/openslides/users/static/templates/users/user-import.html @@ -42,7 +42,7 @@
  1. Default groups: Delegate 3, Staff 4 -
  2. At least first name or lastname have to be filled in. All +
  3. At least first name or last name have to be filled in. All other fields are optional and may be empty.
  4. The header in first line is required.
  5. Required CSV file encoding is UTF-8.