diff --git a/CHANGELOG b/CHANGELOG index 168023e9f..3594e8c1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,30 +11,27 @@ Version 2.0.0 (unreleased) - Used Django 1.7 as lowest requirement - Refactoring of the participant app. Now called 'users' -Version 1.6.1 (unreleased) + +Version 1.6.1 (2014-12-08) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=16] Agenda: - Fixed error in item numbers. - Motions: - Show supporters on motion slide if available. - Fixed motion detail view template. Added block to enable extra content via plugins. - Assignments: -- Fixed PDF when an assignment has a lot of posts. Used only 7 signature - lines. - +- Fixed PDF build error when an election has more than 20 posts or candidates. Participants: - Fixed participant csv import with group ids: * Allowed to add multiple groups in csv group id field, e. g. "3,4". * Fixed bug that group ids greater than 9 can not be imported. * Updated error message if group id does not exists. - Other: - Fixed CKEditor stuff (added insertpre plugin and removed unused code). +- Updated French, German and Czech translation. Version 1.6 (2014-06-02) diff --git a/README.rst b/README.rst index 19b57a34d..d577be9d4 100644 --- a/README.rst +++ b/README.rst @@ -260,6 +260,9 @@ OpenSlides uses the following projects or parts of them: * `Django haystack `_, License: BSD +* `insertpre CKEditor plugin `_, + License: GPL/LGPL/MPL + * `natsort `_, License: MIT * `pdf.js `_, License: Apache License v2.0 diff --git a/extras/win32-portable/create_portable.txt b/extras/win32-portable/create_portable.txt index 6d11325f4..a6d2edbfd 100644 --- a/extras/win32-portable/create_portable.txt +++ b/extras/win32-portable/create_portable.txt @@ -7,7 +7,21 @@ How to create a new portable Windows distribution of OpenSlides: 2. Install all required python packages (see requirements_production.txt): - easy_install -Z django backports.ssl_match_hostname beautifulsoup4 bleach django-ckeditor-updated django-haystack django-mptt jsonfield natsort reportlab roman setuptools sockjs_tornado tornado whoosh + easy_install -Z "django<1.7" ^ + backports.ssl_match_hostname ^ + "beautifulsoup4<4.4" ^ + "bleach<1.5" ^ + "django-ckeditor-updated<4.3" ^ + "django-haystack<2.2" ^ + "django-mptt<0.7" ^ + "jsonfield<0.10" ^ + "natsort<3.3" ^ + "reportlab<2.8" ^ + "roman<2.1" ^ + "sockjs_tornado<1.1" ^ + "tornado<3.3" ^ + "whoosh<2.6" ^ + "setuptools<3.7" 3. Install pywin32 from binary installer: diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index cdb74fdee..675f63d6f 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -6,7 +6,7 @@ from django.utils.translation import ungettext from reportlab.lib import colors from reportlab.lib.units import cm from reportlab.platypus import (PageBreak, Paragraph, SimpleDocTemplate, Spacer, - Table, TableStyle) + LongTable, Table, TableStyle) from openslides.agenda.views import CreateRelatedAgendaItemView as _CreateRelatedAgendaItemView from openslides.config.api import config @@ -345,138 +345,129 @@ class AssignmentPDF(PDFView): story.append(Paragraph( _("Election: %s") % assignment.name, stylesheet['Heading1'])) story.append(Spacer(0, 0.5 * cm)) - # posts - cell1a = [] - cell1a.append(Paragraph( - "%s:" % - _("Number of available posts"), stylesheet['Bold'])) - cell1b = [] - cell1b.append(Paragraph(str(assignment.posts), stylesheet['Paragraph'])) - # candidates - cell2a = [] - cell2a.append(Paragraph( - "%s:" % _("Candidates"), stylesheet['Heading4'])) - cell2b = [] - for candidate in assignment.candidates: - cell2b.append(Paragraph( - ".  %s" % candidate, - stylesheet['Signaturefield'])) - if assignment.status == "sea": - for x in range(0, 7): - cell2b.append( - Paragraph( - ".  " - "__________________________________________", - stylesheet['Signaturefield'])) - cell2b.append(Spacer(0, 0.2 * cm)) - # Election result - - # Preparing - vote_results = assignment.vote_results(only_published=True) - polls = assignment.poll_set.filter(published=True) - data_votes = [] - - # Left side - cell3a = [] - cell3a.append(Paragraph( - "%s:" % (_("Election result")), stylesheet['Heading4'])) - - if polls.count() == 1: - cell3a.append(Paragraph( - "%s %s" % (polls.count(), _("ballot")), stylesheet['Normal'])) - elif polls.count() > 1: - cell3a.append(Paragraph( - "%s %s" % (polls.count(), _("ballots")), stylesheet['Normal'])) - - # Add table head row - headrow = [] - headrow.append(_("Candidates")) - for poll in polls: - headrow.append("%s." % poll.get_ballot()) - data_votes.append(headrow) - - # Add result rows - elected_candidates = list(assignment.elected) - for candidate, poll_list in vote_results.items(): - row = [] - - candidate_string = candidate.clean_name - if candidate in elected_candidates: - candidate_string = "* " + candidate_string - if candidate.structure_level: - candidate_string += "\n(%s)" % candidate.structure_level - row.append(candidate_string) - for vote in poll_list: - if vote is None: - row.append('–') - elif 'Yes' in vote and 'No' in vote and 'Abstain' in vote: - row.append( - _("Y: %(YES)s\nN: %(NO)s\nA: %(ABSTAIN)s") - % {'YES': vote['Yes'], 'NO': vote['No'], - 'ABSTAIN': vote['Abstain']}) - elif 'Votes' in vote: - row.append(vote['Votes']) - else: - pass - data_votes.append(row) - - # Add valid votes row - footrow_one = [] - footrow_one.append(_("Valid votes")) - votesvalid_is_used = False - for poll in polls: - footrow_one.append(poll.print_votesvalid()) - if poll.votesvalid is not None: - votesvalid_is_used = True - if votesvalid_is_used: - data_votes.append(footrow_one) - - # Add invalid votes row - footrow_two = [] - footrow_two.append(_("Invalid votes")) - votesinvalid_is_used = False - for poll in polls: - footrow_two.append(poll.print_votesinvalid()) - if poll.votesinvalid is not None: - votesinvalid_is_used = True - if votesinvalid_is_used: - data_votes.append(footrow_two) - - # Add votes cast row - footrow_three = [] - footrow_three.append(_("Votes cast")) - votescast_is_used = False - for poll in polls: - footrow_three.append(poll.print_votescast()) - if poll.votescast is not None: - votescast_is_used = True - if votescast_is_used: - data_votes.append(footrow_three) - - table_votes = Table(data_votes) - table_votes.setStyle( - TableStyle([ - ('GRID', (0, 0), (-1, -1), 0.5, colors.grey), - ('VALIGN', (0, 0), (-1, -1), 'TOP'), - ('LINEABOVE', (0, 0), (-1, 0), 2, colors.black), - ('LINEABOVE', (0, 1), (-1, 1), 1, colors.black), - ('LINEBELOW', (0, -1), (-1, -1), 2, colors.black), - ('ROWBACKGROUNDS', (0, 1), (-1, -1), (colors.white, (.9, .9, .9))) - ]) - ) - - # table + # Filling table rows... data = [] - data.append([cell1a, cell1b]) + polls = assignment.poll_set.filter(published=True) + # 1. posts + data.append([ + Paragraph("%s:" % + _("Number of available posts"), stylesheet['Bold']), + Paragraph(str(assignment.posts), stylesheet['Paragraph'])]) + + # 2a. if no polls available print candidates + if not polls: + data.append([ + Paragraph("%s:" % + _("Candidates"), stylesheet['Heading4']), + []]) + for candidate in assignment.candidates: + data.append([ + [], + Paragraph(".  %s" % candidate, + stylesheet['Signaturefield'])]) + if assignment.status == "sea": + for x in range(0, 7): + data.append([ + [], + Paragraph(".  " + "__________________________________________", + stylesheet['Signaturefield'])]) + + # 2b. if polls available print election result if polls: - data.append([cell3a, table_votes]) - data.append(['', '* = ' + _('elected')]) - else: - data.append([cell2a, cell2b]) - data.append([Spacer(0, 0.2 * cm), '']) - t = Table(data) + # Preparing + vote_results = assignment.vote_results(only_published=True) + data_votes = [] + + # Left side + cell = [] + cell.append(Paragraph( + "%s:" % (_("Election result")), stylesheet['Heading4'])) + + # Add table head row + headrow = [] + headrow.append(_("Candidates")) + for poll in polls: + headrow.append("%s. %s" % (poll.get_ballot(), _("ballot"))) + data_votes.append(headrow) + + # Add result rows + elected_candidates = list(assignment.elected) + length = len(vote_results) + for candidate, poll_list in vote_results.iteritems(): + row = [] + candidate_string = candidate.clean_name + if candidate in elected_candidates: + candidate_string = "* " + candidate_string + if candidate.name_suffix and length < 20: + candidate_string += "\n(%s)" % candidate.name_suffix + row.append(candidate_string) + for vote in poll_list: + if vote is None: + row.append('–') + elif 'Yes' in vote and 'No' in vote and 'Abstain' in vote: + row.append( + _("Y: %(YES)s\nN: %(NO)s\nA: %(ABSTAIN)s") + % {'YES': vote['Yes'], 'NO': vote['No'], + 'ABSTAIN': vote['Abstain']}) + elif 'Votes' in vote: + row.append(vote['Votes']) + else: + pass + data_votes.append(row) + + # Add valid votes row + footrow_one = [] + footrow_one.append(_("Valid votes")) + votesvalid_is_used = False + for poll in polls: + footrow_one.append(poll.print_votesvalid()) + if poll.votesvalid is not None: + votesvalid_is_used = True + if votesvalid_is_used: + data_votes.append(footrow_one) + + # Add invalid votes row + footrow_two = [] + footrow_two.append(_("Invalid votes")) + votesinvalid_is_used = False + for poll in polls: + footrow_two.append(poll.print_votesinvalid()) + if poll.votesinvalid is not None: + votesinvalid_is_used = True + if votesinvalid_is_used: + data_votes.append(footrow_two) + + # Add votes cast row + footrow_three = [] + footrow_three.append(_("Votes cast")) + votescast_is_used = False + for poll in polls: + footrow_three.append(poll.print_votescast()) + if poll.votescast is not None: + votescast_is_used = True + if votescast_is_used: + data_votes.append(footrow_three) + + table_votes = Table(data_votes) + table_votes.setStyle( + TableStyle([ + ('GRID', (0, 0), (-1, -1), 0.5, colors.grey), + ('VALIGN', (0, 0), (-1, -1), 'TOP'), + ('LINEABOVE', (0, 0), (-1, 0), 2, colors.black), + ('LINEABOVE', (0, 1), (-1, 1), 1, colors.black), + ('LINEBELOW', (0, -1), (-1, -1), 2, colors.black), + ('ROWBACKGROUNDS', (0, 1), (-1, -1), (colors.white, (.9, .9, .9))) + ]) + ) + data.append([cell, table_votes]) + if elected_candidates: + data.append(['', '* = ' + _('elected')]) + + # table style + data.append(['', '']) + t = LongTable(data) t._argW[0] = 4.5 * cm t._argW[1] = 11 * cm t.setStyle(TableStyle([ @@ -485,7 +476,7 @@ class AssignmentPDF(PDFView): story.append(t) story.append(Spacer(0, 1 * cm)) - # text + # election description story.append( Paragraph("%s" % assignment.description.replace('\r\n', '
'), stylesheet['Paragraph'])) diff --git a/openslides/locale/cs/LC_MESSAGES/django.mo b/openslides/locale/cs/LC_MESSAGES/django.mo index 3ca13d335..5411c625b 100644 Binary files a/openslides/locale/cs/LC_MESSAGES/django.mo and b/openslides/locale/cs/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/cs/LC_MESSAGES/django.po b/openslides/locale/cs/LC_MESSAGES/django.po index 0f58b44af..f1ec309a0 100644 --- a/openslides/locale/cs/LC_MESSAGES/django.po +++ b/openslides/locale/cs/LC_MESSAGES/django.po @@ -4,19 +4,19 @@ # This file is distributed under the same license as the OpenSlides package. # Translators: # emanuel , 2013 -# emanuelschuetze , 2013 -# emanuelschuetze , 2013 -# normanjaeckel , 2014 -# normanjaeckel , 2013 -# ostcar , 2012 +# Emanuel Schütze , 2013 +# Emanuel Schütze , 2013 +# Norman Jäckel , 2014 +# Norman Jäckel , 2013 +# Oskar Hahn , 2012 # fri, 2013 # fri, 2013-2014 msgid "" msgstr "" "Project-Id-Version: OpenSlides\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-20 12:31+0200\n" -"PO-Revision-Date: 2014-05-26 14:33+0000\n" +"POT-Creation-Date: 2014-10-16 23:25+0200\n" +"PO-Revision-Date: 2014-10-26 08:31+0000\n" "Last-Translator: fri\n" "Language-Team: Czech (http://www.transifex.com/projects/p/openslides/language/cs/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgid "None" msgstr "Žádné" #: agenda/csv_import.py:22 motion/csv_import.py:37 -#: participant/csv_import.py:72 +#: participant/csv_import.py:70 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "Zdrojový soubor používá neplatné kódování znaků. Je podporováno pouze UTF-8!" @@ -76,7 +76,7 @@ msgstr "Rodičovská položka" msgid "Invalid format. Hours from 0 to 99 and minutes from 00 to 59" msgstr "Neplatný formát. Hodiny od 0 do 99 a minuty od 00 do 59" -#: agenda/forms.py:30 agenda/templates/agenda/overview.html:88 +#: agenda/forms.py:30 agenda/templates/agenda/overview.html:89 msgid "Duration" msgstr "Doba trvání" @@ -98,7 +98,7 @@ msgstr "%s je již na seznamu řečníků." #: agenda/templates/agenda/item_slide_summary.html:7 #: agenda/templates/agenda/overview.html:7 #: agenda/templates/agenda/overview.html:34 -#: agenda/templates/agenda/overview.html:96 +#: agenda/templates/agenda/overview.html:97 #: agenda/templates/agenda/widget_item.html:18 #: agenda/templates/search/agenda-results.html:7 #: agenda/templates/search/agenda-results.html:13 @@ -129,7 +129,7 @@ msgstr "Název" msgid "Text" msgstr "Text" -#: agenda/models.py:56 agenda/templates/agenda/overview.html:85 +#: agenda/models.py:56 agenda/templates/agenda/overview.html:86 #: agenda/templates/agenda/view.html:54 participant/models.py:46 #: participant/templates/participant/overview.html:55 #: participant/templates/participant/user_detail.html:71 @@ -172,16 +172,16 @@ msgstr "Položky pořadu jednání nemohou být potomky organizačních položek msgid "Organizational items can not have agenda items as child elements." msgstr "Organizační položky nemohou mít položky pořadu jednání jako potomky." -#: agenda/models.py:345 +#: agenda/models.py:348 #, python-format msgid "%(person)s is already on the list of speakers of item %(id)s." msgstr "%(person)s je již na seznamu řečníků položky %(id)s." -#: agenda/models.py:349 +#: agenda/models.py:352 msgid "An anonymous user can not be on lists of speakers." msgstr "Anonymní uživatel nemůže být v seznamu řečníků." -#: agenda/models.py:389 +#: agenda/models.py:392 msgid "Can put oneself on the list of speakers" msgstr "Smí se sám umístit na seznamu řečníků" @@ -308,7 +308,7 @@ msgstr "%s nyní mluví." #: agenda/views.py:648 #: agenda/templates/agenda/item_slide_list_of_speaker.html:26 -#: agenda/templates/agenda/overlay_speaker_projector.html:17 +#: agenda/templates/agenda/overlay_speaker_projector.html:20 msgid "The list of speakers is empty." msgstr "Seznam řečníků je prázdný." @@ -324,7 +324,7 @@ msgstr "%s je nyní hotový." #: agenda/views.py:716 agenda/widgets.py:44 #: agenda/templates/agenda/current_list_of_speakers_projector.html:4 #: agenda/templates/agenda/item_slide_list_of_speaker.html:9 -#: agenda/templates/agenda/overlay_speaker_projector.html:4 +#: agenda/templates/agenda/overlay_speaker_projector.html:7 #: agenda/templates/agenda/overlay_speaker_widget.html:4 #: agenda/templates/agenda/overview.html:43 #: agenda/templates/agenda/view.html:60 @@ -355,7 +355,7 @@ msgstr "Nová položka" #: mediafile/templates/mediafile/mediafile_form.html:22 #: motion/templates/motion/category_list.html:15 #: motion/templates/motion/motion_detail.html:35 -#: motion/templates/motion/motion_form.html:51 +#: motion/templates/motion/motion_form.html:50 #: motion/templates/motion/motion_form_csv_import.html:11 #: participant/templates/participant/edit.html:42 #: participant/templates/participant/group_detail.html:12 @@ -378,7 +378,7 @@ msgstr "Upravit %(type)s %(name)s" #: config/templates/config/config_form.html:47 #: mediafile/templates/mediafile/mediafile_form.html:33 #: motion/templates/motion/category_form.html:27 -#: motion/templates/motion/motion_form.html:60 +#: motion/templates/motion/motion_form.html:59 #: motion/templates/motion/motion_form_csv_import.html:42 #: motion/templates/motion/motionpoll_form.html:84 #: participant/templates/participant/edit.html:56 @@ -395,7 +395,7 @@ msgstr "Zrušit" #: core/templates/core/customslide_update.html:18 #: mediafile/templates/mediafile/mediafile_form.html:35 #: motion/templates/motion/category_form.html:30 -#: motion/templates/motion/motion_form.html:63 +#: motion/templates/motion/motion_form.html:62 #: motion/templates/motion/motion_form_csv_import.html:45 #: participant/templates/participant/edit.html:59 #: participant/templates/participant/group_edit.html:34 @@ -474,12 +474,12 @@ msgstr "Promítat seznam řečníků" #: agenda/templates/agenda/item_row.html:22 #: agenda/templates/agenda/widget_item.html:32 #: assignment/templates/assignment/assignment_detail.html:173 -#: assignment/templates/assignment/assignment_list.html:65 +#: assignment/templates/assignment/assignment_list.html:68 #: assignment/templates/assignment/widget_assignment.html:16 #: core/templates/core/widget_customslide.html:34 #: mediafile/templates/mediafile/mediafile_list.html:38 #: motion/templates/motion/category_list.html:30 -#: motion/templates/motion/motion_list.html:100 +#: motion/templates/motion/motion_list.html:103 #: motion/templates/motion/widget_motion.html:16 #: participant/templates/participant/group_overview.html:58 #: participant/templates/participant/overview.html:117 @@ -491,12 +491,12 @@ msgstr "Upravit" #: agenda/templates/agenda/item_row.html:25 #: agenda/templates/agenda/view.html:128 #: assignment/templates/assignment/assignment_detail.html:175 -#: assignment/templates/assignment/assignment_list.html:69 +#: assignment/templates/assignment/assignment_list.html:72 #: core/templates/core/widget_customslide.html:30 #: mediafile/templates/mediafile/mediafile_list.html:39 #: motion/templates/motion/category_list.html:33 #: motion/templates/motion/motion_detail.html:146 -#: motion/templates/motion/motion_list.html:103 +#: motion/templates/motion/motion_list.html:106 #: participant/templates/participant/group_overview.html:62 #: participant/templates/participant/overview.html:122 msgid "Delete" @@ -528,7 +528,7 @@ msgid "Item closed" msgstr "Položka zavřena" #: agenda/templates/agenda/item_slide_list_of_speaker.html:10 -#: agenda/templates/agenda/overlay_speaker_projector.html:4 +#: agenda/templates/agenda/overlay_speaker_projector.html:7 #: agenda/templates/agenda/view.html:60 msgid "closed" msgstr "zavřeno" @@ -548,7 +548,7 @@ msgstr "Chcete uložit změněné pořadí položek?" #: assignment/templates/assignment/assignment_detail.html:215 #: assignment/templates/assignment/assignmentpoll_slide.html:24 #: motion/models.py:712 motion/pdf.py:129 motion/pdf.py:274 -#: motion/templates/motion/motion_detail.html:228 +#: motion/templates/motion/motion_detail.html:230 #: motion/templates/motion/motionpoll_slide.html:20 #: motion/templates/motion/slide.html:23 utils/views.py:330 msgid "Yes" @@ -560,7 +560,7 @@ msgstr "Ano" #: assignment/templates/assignment/assignment_detail.html:212 #: assignment/templates/assignment/assignmentpoll_slide.html:26 #: motion/models.py:712 motion/pdf.py:129 motion/pdf.py:276 -#: motion/templates/motion/motion_detail.html:229 +#: motion/templates/motion/motion_detail.html:231 #: motion/templates/motion/motionpoll_slide.html:24 #: motion/templates/motion/slide.html:24 utils/views.py:330 msgid "No" @@ -585,53 +585,53 @@ msgstr "Vytisknout pořad jednání jako PDF" msgid "Current list of speakers" msgstr "Nynější seznam řečníků" -#: agenda/templates/agenda/overview.html:51 +#: agenda/templates/agenda/overview.html:52 +msgid "Number agenda items" +msgstr "Očíslovat položky pořadu jednání" + +#: agenda/templates/agenda/overview.html:57 msgid "Hide closed items" msgstr "Skrýt zavřené události" -#: agenda/templates/agenda/overview.html:54 +#: agenda/templates/agenda/overview.html:60 msgid "item" msgid_plural "items" msgstr[0] "položka" msgstr[1] "položky" msgstr[2] "položek" -#: agenda/templates/agenda/overview.html:62 +#: agenda/templates/agenda/overview.html:68 msgid "Start of event" msgstr "Začátek události" -#: agenda/templates/agenda/overview.html:66 +#: agenda/templates/agenda/overview.html:72 msgid "Estimated end" msgstr "Odhadovaný konec" -#: agenda/templates/agenda/overview.html:71 +#: agenda/templates/agenda/overview.html:77 msgid "Set start time of event" msgstr "Stanovit začátek události" -#: agenda/templates/agenda/overview.html:75 -msgid "Number agenda items" -msgstr "Očíslovat položky pořadu jednání" - -#: agenda/templates/agenda/overview.html:83 +#: agenda/templates/agenda/overview.html:84 msgid "Item" msgstr "Položka" -#: agenda/templates/agenda/overview.html:91 -#: assignment/templates/assignment/assignment_list.html:36 +#: agenda/templates/agenda/overview.html:92 +#: assignment/templates/assignment/assignment_list.html:37 #: mediafile/templates/mediafile/mediafile_list.html:24 #: motion/templates/motion/category_list.html:23 #: motion/templates/motion/motion_detail.html:122 -#: motion/templates/motion/motion_list.html:59 +#: motion/templates/motion/motion_list.html:60 #: participant/templates/participant/group_overview.html:33 #: participant/templates/participant/overview.html:57 msgid "Actions" msgstr "Činnosti" -#: agenda/templates/agenda/overview.html:110 +#: agenda/templates/agenda/overview.html:111 msgid "Show agenda" msgstr "Promítat pořad jednání" -#: agenda/templates/agenda/overview.html:133 +#: agenda/templates/agenda/overview.html:134 #: agenda/templates/agenda/widget_item.html:59 #: core/templates/core/widget_customslide.html:43 msgid "No items available." @@ -1016,7 +1016,7 @@ msgstr "Volba: %s" #: assignment/templates/assignment/assignment_detail.html:65 #: assignment/templates/assignment/assignment_detail.html:149 #: assignment/templates/assignment/assignment_list.html:34 -#: assignment/templates/assignment/assignment_list.html:48 +#: assignment/templates/assignment/assignment_list.html:50 #: assignment/templates/assignment/assignmentpoll_form.html:44 #: assignment/templates/assignment/slide.html:29 msgid "Candidates" @@ -1053,7 +1053,7 @@ msgstr "A: %(YES)s\nN: %(NO)s\nZ: %(ABSTAIN)s" #: assignment/templates/assignment/assignment_detail.html:234 #: assignment/templates/assignment/assignmentpoll_form.html:61 #: assignment/templates/assignment/assignmentpoll_slide.html:39 -#: motion/pdf.py:119 motion/templates/motion/motion_detail.html:234 +#: motion/pdf.py:119 motion/templates/motion/motion_detail.html:236 #: motion/templates/motion/motionpoll_form.html:54 #: motion/templates/motion/motionpoll_slide.html:33 #: motion/templates/motion/slide.html:29 poll/models.py:84 @@ -1065,7 +1065,7 @@ msgstr "Platné hlasy" #: assignment/templates/assignment/assignment_detail.html:250 #: assignment/templates/assignment/assignmentpoll_form.html:71 #: assignment/templates/assignment/assignmentpoll_slide.html:45 -#: motion/pdf.py:121 motion/templates/motion/motion_detail.html:237 +#: motion/pdf.py:121 motion/templates/motion/motion_detail.html:239 #: motion/templates/motion/motionpoll_form.html:58 #: motion/templates/motion/motionpoll_slide.html:39 #: motion/templates/motion/slide.html:32 poll/models.py:86 @@ -1077,7 +1077,7 @@ msgstr "Neplatné hlasy" #: assignment/templates/assignment/assignment_detail.html:266 #: assignment/templates/assignment/assignmentpoll_form.html:81 #: assignment/templates/assignment/assignmentpoll_slide.html:51 -#: motion/pdf.py:123 motion/templates/motion/motion_detail.html:242 +#: motion/pdf.py:123 motion/templates/motion/motion_detail.html:244 #: motion/templates/motion/motionpoll_form.html:62 #: motion/templates/motion/motionpoll_slide.html:45 #: motion/templates/motion/slide.html:37 poll/models.py:88 @@ -1109,19 +1109,18 @@ msgstr[2] "%d dostupných míst" #: assignment/templates/assignment/assignment_detail.html:213 #: assignment/templates/assignment/assignmentpoll_slide.html:28 #: motion/pdf.py:129 motion/pdf.py:278 -#: motion/templates/motion/motion_detail.html:230 +#: motion/templates/motion/motion_detail.html:232 #: motion/templates/motion/motionpoll_slide.html:28 #: motion/templates/motion/slide.html:25 msgid "Abstention" msgstr "Zdržení se" #: assignment/templates/assignment/assignment_detail.html:22 -#: assignment/templates/assignment/assignment_list.html:74 msgid "Print election as PDF" msgstr "Vytisknout volbu jako PDF" #: assignment/templates/assignment/assignment_detail.html:27 -#: assignment/templates/assignment/assignment_list.html:59 +#: assignment/templates/assignment/assignment_list.html:62 #: assignment/templates/assignment/assignmentpoll_form.html:21 msgid "Show election" msgstr "Promítnout volbu" @@ -1182,7 +1181,7 @@ msgstr "Ukázat výsledek volby" #: assignment/templates/assignment/assignment_detail.html:171 #: assignment/templates/assignment/assignmentpoll_form.html:96 -#: motion/templates/motion/motion_detail.html:218 +#: motion/templates/motion/motion_detail.html:221 #: motion/templates/motion/motionpoll_form.html:72 msgid "Ballot paper as PDF" msgstr "Hlasovací lístek jako PDF" @@ -1237,12 +1236,12 @@ msgstr "Zpět k volbě" msgid "Print all elections as PDF" msgstr "Vytisknout všechny volby jako PDF" -#: assignment/templates/assignment/assignment_list.html:44 +#: assignment/templates/assignment/assignment_list.html:46 msgctxt "Number of searched candidates for an election" msgid "Posts" msgstr "Místa" -#: assignment/templates/assignment/assignment_list.html:51 +#: assignment/templates/assignment/assignment_list.html:53 msgid "Elected" msgstr "Zvolen" @@ -1533,7 +1532,7 @@ msgstr "Nejsou dostupné žádné doplňky" #: motion/templates/motion/motion_diff.html:35 #: motion/templates/motion/motion_diff.html:39 #: motion/templates/motion/motionpoll_slide.html:10 -#: motion/templates/motion/slide.html:70 +#: motion/templates/motion/slide.html:80 msgid "Version" msgstr "Verze" @@ -1674,7 +1673,7 @@ msgstr "Navrhovatel neznámý. Používá se přednastavený navrhovatel." msgid "Motion imported" msgstr "Návrh zaveden" -#: motion/csv_import.py:123 participant/csv_import.py:83 +#: motion/csv_import.py:123 participant/csv_import.py:81 msgid "Errors" msgstr "Chyby" @@ -1694,7 +1693,7 @@ msgstr "%(counts)d z %(total)d návrhů úspěšně zavedeno." #: motion/forms.py:39 motion/models.py:542 motion/pdf.py:152 #: motion/templates/motion/motion_detail.html:94 #: motion/templates/motion/motion_diff.html:54 -#: motion/templates/motion/slide.html:77 +#: motion/templates/motion/slide.html:91 msgid "Reason" msgstr "Zdůvodnění" @@ -1712,6 +1711,7 @@ msgstr "Navrhovatel" #: motion/forms.py:92 motion/pdf.py:74 motion/signals.py:86 #: motion/templates/motion/motion_detail.html:190 #: motion/templates/motion/motion_list.html:56 +#: motion/templates/motion/slide.html:61 msgid "Supporters" msgstr "Podporovatel" @@ -1723,9 +1723,9 @@ msgstr "Nevytvářet novou verzi" msgid "Don't create a new version. Useful e.g. for trivial changes." msgstr "Nevytvářet novou verzi. Užitečné například pro nepodstatné změny." -#: motion/forms.py:121 motion/templates/motion/motion_detail.html:265 +#: motion/forms.py:121 motion/templates/motion/motion_detail.html:266 #: motion/templates/motion/motion_list.html:52 -#: motion/templates/motion/slide.html:60 +#: motion/templates/motion/slide.html:70 msgid "Category" msgstr "Skupina" @@ -1795,7 +1795,7 @@ msgstr "Smí spravovat návrhy" #: motion/templates/motion/motionpoll_form.html:7 #: motion/templates/motion/motionpoll_form.html:15 #: motion/templates/motion/motionpoll_slide.html:9 -#: motion/templates/motion/slide.html:69 +#: motion/templates/motion/slide.html:79 #: motion/templates/search/motion-results.html:7 msgid "Motion" msgstr "Návrh" @@ -2169,14 +2169,14 @@ msgid "Print motion as PDF" msgstr "Vytisknout návrh jako PDF" #: motion/templates/motion/motion_detail.html:41 -#: motion/templates/motion/motion_list.html:95 +#: motion/templates/motion/motion_list.html:98 #: motion/templates/motion/motionpoll_form.html:22 msgid "Show motion" msgstr "Promítnout návrh" #: motion/templates/motion/motion_detail.html:53 -#: motion/templates/motion/motion_form.html:33 -#: motion/templates/motion/motion_form.html:43 +#: motion/templates/motion/motion_form.html:32 +#: motion/templates/motion/motion_form.html:42 msgid "Edit motion" msgstr "Upravit návrh" @@ -2216,69 +2216,65 @@ msgstr "Schválit tuto verzi" msgid "Show log" msgstr "Ukázat zápis" -#: motion/templates/motion/motion_detail.html:212 +#: motion/templates/motion/motion_detail.html:213 #: motion/templates/motion/motionpoll_slide.html:11 msgid "vote" msgstr "Hlasování" -#: motion/templates/motion/motion_detail.html:215 +#: motion/templates/motion/motion_detail.html:218 #: motion/templates/motion/motionpoll_form.html:26 msgid "Show vote result" msgstr "Ukázat výsledek hlasování" -#: motion/templates/motion/motion_detail.html:220 +#: motion/templates/motion/motion_detail.html:223 msgid "Edit Vote" msgstr "Upravit hlasování" -#: motion/templates/motion/motion_detail.html:222 +#: motion/templates/motion/motion_detail.html:225 #: motion/templates/motion/motionpoll_form.html:31 msgid "Delete Vote" msgstr "Smazat hlasování" -#: motion/templates/motion/motion_detail.html:248 +#: motion/templates/motion/motion_detail.html:249 msgid "No result" msgstr "Žádný výsledek" -#: motion/templates/motion/motion_detail.html:258 +#: motion/templates/motion/motion_detail.html:259 msgid "New vote" msgstr "Nové hlasování" -#: motion/templates/motion/motion_detail.html:275 +#: motion/templates/motion/motion_detail.html:276 msgid "Last changes (of this version)" msgstr "Poslední změny (této verze)" -#: motion/templates/motion/motion_detail.html:277 +#: motion/templates/motion/motion_detail.html:278 #: motion/templates/motion/motion_diff.html:36 #: motion/templates/motion/motion_diff.html:40 #: motion/templates/motion/motion_list.html:58 msgid "Last changes" msgstr "Poslední změny" -#: motion/templates/motion/motion_detail.html:287 -msgid "Withdraw motion" -msgstr "Stáhnout návrh" - -#: motion/templates/motion/motion_detail.html:296 +#: motion/templates/motion/motion_detail.html:288 msgid "Unsupport" msgstr "Nepodporovat" -#: motion/templates/motion/motion_detail.html:302 +#: motion/templates/motion/motion_detail.html:294 msgid "Support" msgstr "Podporovat" -#: motion/templates/motion/motion_detail.html:310 +#: motion/templates/motion/motion_detail.html:302 msgid "minimum required supporters" msgstr "Nejnižší počet požadovaných podporovatelů" -#: motion/templates/motion/motion_detail.html:317 +#: motion/templates/motion/motion_detail.html:309 msgid "Manage motion" msgstr "Spravovat návrh" -#: motion/templates/motion/motion_detail.html:327 +#: motion/templates/motion/motion_detail.html:319 msgid "For administration only:" msgstr "Pouze pro správu:" -#: motion/templates/motion/motion_detail.html:329 +#: motion/templates/motion/motion_detail.html:321 msgid "Reset state" msgstr "Nastavit stav znovu" @@ -2291,13 +2287,13 @@ msgid "Diff view" msgstr "Zobrazení změn" #: motion/templates/motion/motion_diff.html:27 -#: motion/templates/motion/motion_form.html:49 +#: motion/templates/motion/motion_form.html:48 #: motion/templates/motion/motionpoll_form.html:18 msgid "Back to motion" msgstr "Zpět na návrh" -#: motion/templates/motion/motion_form.html:35 -#: motion/templates/motion/motion_form.html:45 +#: motion/templates/motion/motion_form.html:34 +#: motion/templates/motion/motion_form.html:44 #: motion/templates/motion/motion_list.html:36 msgid "New motion" msgstr "Nový návrh" @@ -2337,15 +2333,15 @@ msgstr "#" msgid "Motion title" msgstr "Název návrhu" -#: motion/templates/motion/motion_list.html:77 +#: motion/templates/motion/motion_list.html:79 msgid "Enough supporters" msgstr "Dostačující počet podporovatelů" -#: motion/templates/motion/motion_list.html:80 +#: motion/templates/motion/motion_list.html:82 msgid "Needs supporters" msgstr "Potřebuje podporovatele" -#: motion/templates/motion/motion_list.html:87 +#: motion/templates/motion/motion_list.html:89 msgid "There is a newer (unauthorized) version." msgstr "Je novější (neschválená verze." @@ -2369,19 +2365,14 @@ msgstr "Na řádku %d musíte poskytnout buď 'křestní_jméno' nebo 'příjmen #: participant/csv_import.py:62 #, python-format -msgid "Ignoring malformed group id in line %d." -msgstr "Chybové ID skupiny v řádku %d se přehlíží." +msgid "Ignoring group id \"%(id)s\" in line %(line)d which does not exist." +msgstr "Přehlíží se ID skupiny \"%(id)s\" v řádku %(line)d, který neexistuje." -#: participant/csv_import.py:65 -#, python-format -msgid "Group id %(id)s does not exists (line %(line)d)." -msgstr "ID skupiny %(id)s neexistuje (řádek %(line)d)." - -#: participant/csv_import.py:70 +#: participant/csv_import.py:68 msgid "Import aborted because of severe errors in the input file." msgstr "Zavedení zrušeno na základě vážných chyb ve zdrojovém souboru." -#: participant/csv_import.py:76 +#: participant/csv_import.py:74 #, python-format msgid "%d new participants were successfully imported." msgstr "%d noví účastníci byli úspěšně zavedeni." @@ -2968,11 +2959,11 @@ msgstr "Nastavit úroveň posunu obrazu znovu" msgid "Scroll level" msgstr "Úroveň posunu obrazu" -#: utils/forms.py:111 +#: utils/forms.py:112 msgid "CSV File" msgstr "Soubor CSV" -#: utils/forms.py:112 +#: utils/forms.py:113 msgid "The file has to be encoded in UTF-8." msgstr "Soubor musí být kódován v UTF-8." diff --git a/openslides/locale/cs/LC_MESSAGES/djangojs.mo b/openslides/locale/cs/LC_MESSAGES/djangojs.mo index a3da8c12a..c0ea5265b 100644 Binary files a/openslides/locale/cs/LC_MESSAGES/djangojs.mo and b/openslides/locale/cs/LC_MESSAGES/djangojs.mo differ diff --git a/openslides/locale/cs/LC_MESSAGES/djangojs.po b/openslides/locale/cs/LC_MESSAGES/djangojs.po index d606c727e..6159594e0 100644 --- a/openslides/locale/cs/LC_MESSAGES/djangojs.po +++ b/openslides/locale/cs/LC_MESSAGES/djangojs.po @@ -5,16 +5,16 @@ # Translators: # emanuel , 2013 # emanuelschuetze , 2013 -# emanuelschuetze , 2013 -# ostcar , 2012 +# Emanuel Schütze , 2013 +# Oskar Hahn , 2012 # fri, 2013 msgid "" msgstr "" "Project-Id-Version: OpenSlides\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-05 20:29+0200\n" -"PO-Revision-Date: 2013-11-20 12:42+0000\n" -"Last-Translator: emanuelschuetze \n" +"POT-Creation-Date: 2014-10-16 23:27+0200\n" +"PO-Revision-Date: 2014-10-26 08:30+0000\n" +"Last-Translator: fri\n" "Language-Team: Czech (http://www.transifex.com/projects/p/openslides/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index e810b9e3c..0640ee1e4 100644 Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 1c588a164..9ebc41bfd 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -4,23 +4,23 @@ # This file is distributed under the same license as the OpenSlides package. # Translators: # emanuel , 2013 -# emanuelschuetze , 2013 -# emanuelschuetze , 2013 +# Emanuel Schütze , 2013 +# Emanuel Schütze , 2013 # emanuel , 2013 -# emanuelschuetze , 2013 -# emanuelschuetze , 2013-2014 -# ostcar , 2012 -# normanjaeckel , 2013-2014 -# normanjaeckel , 2013 -# ostcar , 2012-2013 -# ostcar , 2012 +# Emanuel Schütze , 2013 +# Emanuel Schütze , 2013-2014 +# Oskar Hahn , 2012 +# Norman Jäckel , 2013-2014 +# Norman Jäckel , 2013 +# Oskar Hahn , 2012-2013 +# Oskar Hahn , 2012 msgid "" msgstr "" "Project-Id-Version: OpenSlides\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-20 12:31+0200\n" -"PO-Revision-Date: 2014-05-26 12:32+0000\n" -"Last-Translator: emanuelschuetze \n" +"POT-Creation-Date: 2014-10-16 23:25+0200\n" +"PO-Revision-Date: 2014-10-26 14:59+0000\n" +"Last-Translator: Norman Jäckel \n" "Language-Team: German (http://www.transifex.com/projects/p/openslides/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,7 @@ msgid "None" msgstr "Keine" #: agenda/csv_import.py:22 motion/csv_import.py:37 -#: participant/csv_import.py:72 +#: participant/csv_import.py:70 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 unterstützt!" @@ -79,7 +79,7 @@ msgstr "Elternelement" msgid "Invalid format. Hours from 0 to 99 and minutes from 00 to 59" msgstr "Ungültiges Format. Stunden von 0 bis 99 und Minuten von 00 bis 59" -#: agenda/forms.py:30 agenda/templates/agenda/overview.html:88 +#: agenda/forms.py:30 agenda/templates/agenda/overview.html:89 msgid "Duration" msgstr "Dauer" @@ -101,7 +101,7 @@ msgstr "%s ist bereits auf der Rednerliste" #: agenda/templates/agenda/item_slide_summary.html:7 #: agenda/templates/agenda/overview.html:7 #: agenda/templates/agenda/overview.html:34 -#: agenda/templates/agenda/overview.html:96 +#: agenda/templates/agenda/overview.html:97 #: agenda/templates/agenda/widget_item.html:18 #: agenda/templates/search/agenda-results.html:7 #: agenda/templates/search/agenda-results.html:13 @@ -132,7 +132,7 @@ msgstr "Titel" msgid "Text" msgstr "Text" -#: agenda/models.py:56 agenda/templates/agenda/overview.html:85 +#: agenda/models.py:56 agenda/templates/agenda/overview.html:86 #: agenda/templates/agenda/view.html:54 participant/models.py:46 #: participant/templates/participant/overview.html:55 #: participant/templates/participant/user_detail.html:71 @@ -175,16 +175,16 @@ msgstr "Tagesordnungseinträge können keine Kindelemente eines Organisationsein msgid "Organizational items can not have agenda items as child elements." msgstr "Organisationseinträge können keine Tagesordnungseinträge als Kindelemente haben." -#: agenda/models.py:345 +#: agenda/models.py:348 #, python-format msgid "%(person)s is already on the list of speakers of item %(id)s." msgstr "%(person)s ist bereits auf der Rednerliste von Eintrag %(id)s." -#: agenda/models.py:349 +#: agenda/models.py:352 msgid "An anonymous user can not be on lists of speakers." msgstr "Anonyme Gast-Benutzer können nicht auf Rednerlisten stehen." -#: agenda/models.py:389 +#: agenda/models.py:392 msgid "Can put oneself on the list of speakers" msgstr "Darf sich selbst auf die Rednerliste setzen" @@ -311,7 +311,7 @@ msgstr "%s redet jetzt." #: agenda/views.py:648 #: agenda/templates/agenda/item_slide_list_of_speaker.html:26 -#: agenda/templates/agenda/overlay_speaker_projector.html:17 +#: agenda/templates/agenda/overlay_speaker_projector.html:20 msgid "The list of speakers is empty." msgstr "Die Rednerliste ist leer." @@ -327,7 +327,7 @@ msgstr "%s ist jetzt fertig." #: agenda/views.py:716 agenda/widgets.py:44 #: agenda/templates/agenda/current_list_of_speakers_projector.html:4 #: agenda/templates/agenda/item_slide_list_of_speaker.html:9 -#: agenda/templates/agenda/overlay_speaker_projector.html:4 +#: agenda/templates/agenda/overlay_speaker_projector.html:7 #: agenda/templates/agenda/overlay_speaker_widget.html:4 #: agenda/templates/agenda/overview.html:43 #: agenda/templates/agenda/view.html:60 @@ -358,7 +358,7 @@ msgstr "Neuer Eintrag" #: mediafile/templates/mediafile/mediafile_form.html:22 #: motion/templates/motion/category_list.html:15 #: motion/templates/motion/motion_detail.html:35 -#: motion/templates/motion/motion_form.html:51 +#: motion/templates/motion/motion_form.html:50 #: motion/templates/motion/motion_form_csv_import.html:11 #: participant/templates/participant/edit.html:42 #: participant/templates/participant/group_detail.html:12 @@ -381,7 +381,7 @@ msgstr "%(type)s %(name)s bearbeiten" #: config/templates/config/config_form.html:47 #: mediafile/templates/mediafile/mediafile_form.html:33 #: motion/templates/motion/category_form.html:27 -#: motion/templates/motion/motion_form.html:60 +#: motion/templates/motion/motion_form.html:59 #: motion/templates/motion/motion_form_csv_import.html:42 #: motion/templates/motion/motionpoll_form.html:84 #: participant/templates/participant/edit.html:56 @@ -398,7 +398,7 @@ msgstr "Abbrechen" #: core/templates/core/customslide_update.html:18 #: mediafile/templates/mediafile/mediafile_form.html:35 #: motion/templates/motion/category_form.html:30 -#: motion/templates/motion/motion_form.html:63 +#: motion/templates/motion/motion_form.html:62 #: motion/templates/motion/motion_form_csv_import.html:45 #: participant/templates/participant/edit.html:59 #: participant/templates/participant/group_edit.html:34 @@ -477,12 +477,12 @@ msgstr "Rednerliste projizieren" #: agenda/templates/agenda/item_row.html:22 #: agenda/templates/agenda/widget_item.html:32 #: assignment/templates/assignment/assignment_detail.html:173 -#: assignment/templates/assignment/assignment_list.html:65 +#: assignment/templates/assignment/assignment_list.html:68 #: assignment/templates/assignment/widget_assignment.html:16 #: core/templates/core/widget_customslide.html:34 #: mediafile/templates/mediafile/mediafile_list.html:38 #: motion/templates/motion/category_list.html:30 -#: motion/templates/motion/motion_list.html:100 +#: motion/templates/motion/motion_list.html:103 #: motion/templates/motion/widget_motion.html:16 #: participant/templates/participant/group_overview.html:58 #: participant/templates/participant/overview.html:117 @@ -494,12 +494,12 @@ msgstr "Bearbeiten" #: agenda/templates/agenda/item_row.html:25 #: agenda/templates/agenda/view.html:128 #: assignment/templates/assignment/assignment_detail.html:175 -#: assignment/templates/assignment/assignment_list.html:69 +#: assignment/templates/assignment/assignment_list.html:72 #: core/templates/core/widget_customslide.html:30 #: mediafile/templates/mediafile/mediafile_list.html:39 #: motion/templates/motion/category_list.html:33 #: motion/templates/motion/motion_detail.html:146 -#: motion/templates/motion/motion_list.html:103 +#: motion/templates/motion/motion_list.html:106 #: participant/templates/participant/group_overview.html:62 #: participant/templates/participant/overview.html:122 msgid "Delete" @@ -531,7 +531,7 @@ msgid "Item closed" msgstr "Eintrag geschlossen" #: agenda/templates/agenda/item_slide_list_of_speaker.html:10 -#: agenda/templates/agenda/overlay_speaker_projector.html:4 +#: agenda/templates/agenda/overlay_speaker_projector.html:7 #: agenda/templates/agenda/view.html:60 msgid "closed" msgstr "geschlossen" @@ -551,7 +551,7 @@ msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?" #: assignment/templates/assignment/assignment_detail.html:215 #: assignment/templates/assignment/assignmentpoll_slide.html:24 #: motion/models.py:712 motion/pdf.py:129 motion/pdf.py:274 -#: motion/templates/motion/motion_detail.html:228 +#: motion/templates/motion/motion_detail.html:230 #: motion/templates/motion/motionpoll_slide.html:20 #: motion/templates/motion/slide.html:23 utils/views.py:330 msgid "Yes" @@ -563,7 +563,7 @@ msgstr "Ja" #: assignment/templates/assignment/assignment_detail.html:212 #: assignment/templates/assignment/assignmentpoll_slide.html:26 #: motion/models.py:712 motion/pdf.py:129 motion/pdf.py:276 -#: motion/templates/motion/motion_detail.html:229 +#: motion/templates/motion/motion_detail.html:231 #: motion/templates/motion/motionpoll_slide.html:24 #: motion/templates/motion/slide.html:24 utils/views.py:330 msgid "No" @@ -588,52 +588,52 @@ msgstr "Tagesordnung als PDF drucken" msgid "Current list of speakers" msgstr "Aktuelle Rednerliste" -#: agenda/templates/agenda/overview.html:51 +#: agenda/templates/agenda/overview.html:52 +msgid "Number agenda items" +msgstr "Tagesordnungseinträge nummerieren" + +#: agenda/templates/agenda/overview.html:57 msgid "Hide closed items" msgstr "Verstecke abgeschlossene Einträge" -#: agenda/templates/agenda/overview.html:54 +#: agenda/templates/agenda/overview.html:60 msgid "item" msgid_plural "items" msgstr[0] "Eintrag" msgstr[1] "Einträge" -#: agenda/templates/agenda/overview.html:62 +#: agenda/templates/agenda/overview.html:68 msgid "Start of event" msgstr "Beginn der Veranstaltung" -#: agenda/templates/agenda/overview.html:66 +#: agenda/templates/agenda/overview.html:72 msgid "Estimated end" msgstr "Voraussichtliches Ende" -#: agenda/templates/agenda/overview.html:71 +#: agenda/templates/agenda/overview.html:77 msgid "Set start time of event" msgstr "Beginn der Veranstaltung festlegen" -#: agenda/templates/agenda/overview.html:75 -msgid "Number agenda items" -msgstr "Tagesordnungseinträge nummerieren" - -#: agenda/templates/agenda/overview.html:83 +#: agenda/templates/agenda/overview.html:84 msgid "Item" msgstr "Eintrag" -#: agenda/templates/agenda/overview.html:91 -#: assignment/templates/assignment/assignment_list.html:36 +#: agenda/templates/agenda/overview.html:92 +#: assignment/templates/assignment/assignment_list.html:37 #: mediafile/templates/mediafile/mediafile_list.html:24 #: motion/templates/motion/category_list.html:23 #: motion/templates/motion/motion_detail.html:122 -#: motion/templates/motion/motion_list.html:59 +#: motion/templates/motion/motion_list.html:60 #: participant/templates/participant/group_overview.html:33 #: participant/templates/participant/overview.html:57 msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:110 +#: agenda/templates/agenda/overview.html:111 msgid "Show agenda" msgstr "Tagesordnung projizieren" -#: agenda/templates/agenda/overview.html:133 +#: agenda/templates/agenda/overview.html:134 #: agenda/templates/agenda/widget_item.html:59 #: core/templates/core/widget_customslide.html:43 msgid "No items available." @@ -1018,7 +1018,7 @@ msgstr "Wahlen: %s" #: assignment/templates/assignment/assignment_detail.html:65 #: assignment/templates/assignment/assignment_detail.html:149 #: assignment/templates/assignment/assignment_list.html:34 -#: assignment/templates/assignment/assignment_list.html:48 +#: assignment/templates/assignment/assignment_list.html:50 #: assignment/templates/assignment/assignmentpoll_form.html:44 #: assignment/templates/assignment/slide.html:29 msgid "Candidates" @@ -1055,7 +1055,7 @@ msgstr "J: %(YES)s\nN: %(NO)s\nE: %(ABSTAIN)s" #: assignment/templates/assignment/assignment_detail.html:234 #: assignment/templates/assignment/assignmentpoll_form.html:61 #: assignment/templates/assignment/assignmentpoll_slide.html:39 -#: motion/pdf.py:119 motion/templates/motion/motion_detail.html:234 +#: motion/pdf.py:119 motion/templates/motion/motion_detail.html:236 #: motion/templates/motion/motionpoll_form.html:54 #: motion/templates/motion/motionpoll_slide.html:33 #: motion/templates/motion/slide.html:29 poll/models.py:84 @@ -1067,7 +1067,7 @@ msgstr "Gültige Stimmen" #: assignment/templates/assignment/assignment_detail.html:250 #: assignment/templates/assignment/assignmentpoll_form.html:71 #: assignment/templates/assignment/assignmentpoll_slide.html:45 -#: motion/pdf.py:121 motion/templates/motion/motion_detail.html:237 +#: motion/pdf.py:121 motion/templates/motion/motion_detail.html:239 #: motion/templates/motion/motionpoll_form.html:58 #: motion/templates/motion/motionpoll_slide.html:39 #: motion/templates/motion/slide.html:32 poll/models.py:86 @@ -1079,7 +1079,7 @@ msgstr "Ungültige Stimmen" #: assignment/templates/assignment/assignment_detail.html:266 #: assignment/templates/assignment/assignmentpoll_form.html:81 #: assignment/templates/assignment/assignmentpoll_slide.html:51 -#: motion/pdf.py:123 motion/templates/motion/motion_detail.html:242 +#: motion/pdf.py:123 motion/templates/motion/motion_detail.html:244 #: motion/templates/motion/motionpoll_form.html:62 #: motion/templates/motion/motionpoll_slide.html:45 #: motion/templates/motion/slide.html:37 poll/models.py:88 @@ -1109,19 +1109,18 @@ msgstr[1] "%d verfügbare Posten" #: assignment/templates/assignment/assignment_detail.html:213 #: assignment/templates/assignment/assignmentpoll_slide.html:28 #: motion/pdf.py:129 motion/pdf.py:278 -#: motion/templates/motion/motion_detail.html:230 +#: motion/templates/motion/motion_detail.html:232 #: motion/templates/motion/motionpoll_slide.html:28 #: motion/templates/motion/slide.html:25 msgid "Abstention" msgstr "Enthaltung" #: assignment/templates/assignment/assignment_detail.html:22 -#: assignment/templates/assignment/assignment_list.html:74 msgid "Print election as PDF" msgstr "Wahl als PDF drucken" #: assignment/templates/assignment/assignment_detail.html:27 -#: assignment/templates/assignment/assignment_list.html:59 +#: assignment/templates/assignment/assignment_list.html:62 #: assignment/templates/assignment/assignmentpoll_form.html:21 msgid "Show election" msgstr "Wahl projizieren" @@ -1182,7 +1181,7 @@ msgstr "Wahlergebnis projizieren" #: assignment/templates/assignment/assignment_detail.html:171 #: assignment/templates/assignment/assignmentpoll_form.html:96 -#: motion/templates/motion/motion_detail.html:218 +#: motion/templates/motion/motion_detail.html:221 #: motion/templates/motion/motionpoll_form.html:72 msgid "Ballot paper as PDF" msgstr "Stimmzettel als PDF" @@ -1237,12 +1236,12 @@ msgstr "Zurück zur Wahl" msgid "Print all elections as PDF" msgstr "Alle Wahlen als PDF drucken" -#: assignment/templates/assignment/assignment_list.html:44 +#: assignment/templates/assignment/assignment_list.html:46 msgctxt "Number of searched candidates for an election" msgid "Posts" msgstr "Posten" -#: assignment/templates/assignment/assignment_list.html:51 +#: assignment/templates/assignment/assignment_list.html:53 msgid "Elected" msgstr "Gewählt" @@ -1533,7 +1532,7 @@ msgstr "Keine Widgets vorhanden." #: motion/templates/motion/motion_diff.html:35 #: motion/templates/motion/motion_diff.html:39 #: motion/templates/motion/motionpoll_slide.html:10 -#: motion/templates/motion/slide.html:70 +#: motion/templates/motion/slide.html:80 msgid "Version" msgstr "Version" @@ -1674,7 +1673,7 @@ msgstr "Antragsteller unbekannt. Voreingestellter Antragsteller wird verwendet." msgid "Motion imported" msgstr "Antrag importiert" -#: motion/csv_import.py:123 participant/csv_import.py:83 +#: motion/csv_import.py:123 participant/csv_import.py:81 msgid "Errors" msgstr "Fehler" @@ -1694,7 +1693,7 @@ msgstr "%(counts)d von %(total)d Anträgen erfolgreich importiert." #: motion/forms.py:39 motion/models.py:542 motion/pdf.py:152 #: motion/templates/motion/motion_detail.html:94 #: motion/templates/motion/motion_diff.html:54 -#: motion/templates/motion/slide.html:77 +#: motion/templates/motion/slide.html:91 msgid "Reason" msgstr "Begründung" @@ -1712,6 +1711,7 @@ msgstr "Antragsteller/in" #: motion/forms.py:92 motion/pdf.py:74 motion/signals.py:86 #: motion/templates/motion/motion_detail.html:190 #: motion/templates/motion/motion_list.html:56 +#: motion/templates/motion/slide.html:61 msgid "Supporters" msgstr "Unterstützer/innen" @@ -1723,9 +1723,9 @@ msgstr "Keine neue Version erzeugen" msgid "Don't create a new version. Useful e.g. for trivial changes." msgstr "Keine neue Version erzeugen. Nützlich z.B. für triviale Änderungen." -#: motion/forms.py:121 motion/templates/motion/motion_detail.html:265 +#: motion/forms.py:121 motion/templates/motion/motion_detail.html:266 #: motion/templates/motion/motion_list.html:52 -#: motion/templates/motion/slide.html:60 +#: motion/templates/motion/slide.html:70 msgid "Category" msgstr "Sachgebiet" @@ -1795,7 +1795,7 @@ msgstr "Darf Anträge verwalten" #: motion/templates/motion/motionpoll_form.html:7 #: motion/templates/motion/motionpoll_form.html:15 #: motion/templates/motion/motionpoll_slide.html:9 -#: motion/templates/motion/slide.html:69 +#: motion/templates/motion/slide.html:79 #: motion/templates/search/motion-results.html:7 msgid "Motion" msgstr "Antrag" @@ -2169,14 +2169,14 @@ msgid "Print motion as PDF" msgstr "Antrag als PDF drucken" #: motion/templates/motion/motion_detail.html:41 -#: motion/templates/motion/motion_list.html:95 +#: motion/templates/motion/motion_list.html:98 #: motion/templates/motion/motionpoll_form.html:22 msgid "Show motion" msgstr "Antrag projizieren" #: motion/templates/motion/motion_detail.html:53 -#: motion/templates/motion/motion_form.html:33 -#: motion/templates/motion/motion_form.html:43 +#: motion/templates/motion/motion_form.html:32 +#: motion/templates/motion/motion_form.html:42 msgid "Edit motion" msgstr "Antrag bearbeiten" @@ -2216,69 +2216,65 @@ msgstr "Diese Version zulassen" msgid "Show log" msgstr "Log anzeigen" -#: motion/templates/motion/motion_detail.html:212 +#: motion/templates/motion/motion_detail.html:213 #: motion/templates/motion/motionpoll_slide.html:11 msgid "vote" msgstr "Abstimmung" -#: motion/templates/motion/motion_detail.html:215 +#: motion/templates/motion/motion_detail.html:218 #: motion/templates/motion/motionpoll_form.html:26 msgid "Show vote result" msgstr "Wahlergebnis projizieren" -#: motion/templates/motion/motion_detail.html:220 +#: motion/templates/motion/motion_detail.html:223 msgid "Edit Vote" msgstr "Abstimmung bearbeiten" -#: motion/templates/motion/motion_detail.html:222 +#: motion/templates/motion/motion_detail.html:225 #: motion/templates/motion/motionpoll_form.html:31 msgid "Delete Vote" msgstr "Abstimmung löschen" -#: motion/templates/motion/motion_detail.html:248 +#: motion/templates/motion/motion_detail.html:249 msgid "No result" msgstr "Kein Ergebnis" -#: motion/templates/motion/motion_detail.html:258 +#: motion/templates/motion/motion_detail.html:259 msgid "New vote" msgstr "Neue Abstimmung" -#: motion/templates/motion/motion_detail.html:275 +#: motion/templates/motion/motion_detail.html:276 msgid "Last changes (of this version)" msgstr "Letzte Änderung (von dieser Version)" -#: motion/templates/motion/motion_detail.html:277 +#: motion/templates/motion/motion_detail.html:278 #: motion/templates/motion/motion_diff.html:36 #: motion/templates/motion/motion_diff.html:40 #: motion/templates/motion/motion_list.html:58 msgid "Last changes" msgstr "Letzte Änderung" -#: motion/templates/motion/motion_detail.html:287 -msgid "Withdraw motion" -msgstr "Antrag zurückziehen" - -#: motion/templates/motion/motion_detail.html:296 +#: motion/templates/motion/motion_detail.html:288 msgid "Unsupport" msgstr "Nicht unterstützen" -#: motion/templates/motion/motion_detail.html:302 +#: motion/templates/motion/motion_detail.html:294 msgid "Support" msgstr "Unterstützen" -#: motion/templates/motion/motion_detail.html:310 +#: motion/templates/motion/motion_detail.html:302 msgid "minimum required supporters" msgstr "minimal erforderliche Unterstützer/innen" -#: motion/templates/motion/motion_detail.html:317 +#: motion/templates/motion/motion_detail.html:309 msgid "Manage motion" msgstr "Antrag verwalten" -#: motion/templates/motion/motion_detail.html:327 +#: motion/templates/motion/motion_detail.html:319 msgid "For administration only:" msgstr "Nur zur Administration:" -#: motion/templates/motion/motion_detail.html:329 +#: motion/templates/motion/motion_detail.html:321 msgid "Reset state" msgstr "Status zurücksetzen" @@ -2291,13 +2287,13 @@ msgid "Diff view" msgstr "Änderungsanzeige" #: motion/templates/motion/motion_diff.html:27 -#: motion/templates/motion/motion_form.html:49 +#: motion/templates/motion/motion_form.html:48 #: motion/templates/motion/motionpoll_form.html:18 msgid "Back to motion" msgstr "Zurück zum Antrag" -#: motion/templates/motion/motion_form.html:35 -#: motion/templates/motion/motion_form.html:45 +#: motion/templates/motion/motion_form.html:34 +#: motion/templates/motion/motion_form.html:44 #: motion/templates/motion/motion_list.html:36 msgid "New motion" msgstr "Neuer Antrag" @@ -2337,15 +2333,15 @@ msgstr "#" msgid "Motion title" msgstr "Antragstitel" -#: motion/templates/motion/motion_list.html:77 +#: motion/templates/motion/motion_list.html:79 msgid "Enough supporters" msgstr "Ausreichend Unterstützer/innen" -#: motion/templates/motion/motion_list.html:80 +#: motion/templates/motion/motion_list.html:82 msgid "Needs supporters" msgstr "Benötigt Unterstützer/innen" -#: motion/templates/motion/motion_list.html:87 +#: motion/templates/motion/motion_list.html:89 msgid "There is a newer (unauthorized) version." msgstr "Es gibt eine neuere (nicht zugelassene) Version." @@ -2369,19 +2365,14 @@ msgstr "In Zeile %d müssen Sie einen Vor- oder Nachnamen angeben." #: participant/csv_import.py:62 #, python-format -msgid "Ignoring malformed group id in line %d." -msgstr "Fehlerhafte Gruppen-ID in Zeile %d wurde ignoriert." +msgid "Ignoring group id \"%(id)s\" in line %(line)d which does not exist." +msgstr "Gruppe mit der ID \"%(id)s\" in Zeile %(line)d nicht vorhanden. Zeile ausgelassen." -#: participant/csv_import.py:65 -#, python-format -msgid "Group id %(id)s does not exists (line %(line)d)." -msgstr "Gruppen-ID %(id)s existiert nicht (Zeile %(line)d)." - -#: participant/csv_import.py:70 +#: participant/csv_import.py:68 msgid "Import aborted because of severe errors in the input file." msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen." -#: participant/csv_import.py:76 +#: participant/csv_import.py:74 #, python-format msgid "%d new participants were successfully imported." msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert." @@ -2968,11 +2959,11 @@ msgstr "Scroll-Stufe zurücksetzen" msgid "Scroll level" msgstr "Scroll-Stufe" -#: utils/forms.py:111 +#: utils/forms.py:112 msgid "CSV File" msgstr "CSV-Datei" -#: utils/forms.py:112 +#: utils/forms.py:113 msgid "The file has to be encoded in UTF-8." msgstr "Die Datei muss UTF-8-kodiert sein." diff --git a/openslides/locale/de/LC_MESSAGES/djangojs.mo b/openslides/locale/de/LC_MESSAGES/djangojs.mo index fb85150d3..3db6d0559 100644 Binary files a/openslides/locale/de/LC_MESSAGES/djangojs.mo and b/openslides/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/djangojs.po b/openslides/locale/de/LC_MESSAGES/djangojs.po index 988a3b223..d2a8f62ec 100644 --- a/openslides/locale/de/LC_MESSAGES/djangojs.po +++ b/openslides/locale/de/LC_MESSAGES/djangojs.po @@ -5,17 +5,17 @@ # Translators: # emanuel , 2013 # emanuel , 2013 -# emanuelschuetze , 2013 -# emanuelschuetze , 2013 -# ostcar , 2012 -# ostcar , 2012 +# Emanuel Schütze , 2013 +# Emanuel Schütze , 2013 +# Oskar Hahn , 2012 +# Oskar Hahn , 2012 msgid "" msgstr "" "Project-Id-Version: OpenSlides\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-05 20:29+0200\n" +"POT-Creation-Date: 2014-10-16 23:27+0200\n" "PO-Revision-Date: 2013-11-20 12:42+0000\n" -"Last-Translator: emanuelschuetze \n" +"Last-Translator: Emanuel Schütze \n" "Language-Team: German (http://www.transifex.com/projects/p/openslides/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/openslides/locale/fr/LC_MESSAGES/django.mo b/openslides/locale/fr/LC_MESSAGES/django.mo index e0487e05f..c572abf64 100644 Binary files a/openslides/locale/fr/LC_MESSAGES/django.mo and b/openslides/locale/fr/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/fr/LC_MESSAGES/django.po b/openslides/locale/fr/LC_MESSAGES/django.po index 0431c73a0..b2736ec29 100644 --- a/openslides/locale/fr/LC_MESSAGES/django.po +++ b/openslides/locale/fr/LC_MESSAGES/django.po @@ -3,20 +3,20 @@ # Copyright (C) 2011–2013 by OpenSlides team, see AUTHORS. # This file is distributed under the same license as the OpenSlides package. # Translators: -# emanuelschuetze , 2013 -# emanuelschuetze , 2013 +# Emanuel Schütze , 2013 +# Emanuel Schütze , 2013 # Moira Brülisauer , 2012 -# moosline , 2013-2014 -# moosline , 2012-2013 -# moosline , 2012 -# normanjaeckel , 2013-2014 +# Moira Brülisauer , 2013-2014 +# Moira Brülisauer , 2012-2013 +# Moira Brülisauer , 2012 +# Norman Jäckel , 2013-2014 msgid "" msgstr "" "Project-Id-Version: OpenSlides\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-20 12:31+0200\n" -"PO-Revision-Date: 2014-05-26 13:32+0000\n" -"Last-Translator: moosline \n" +"POT-Creation-Date: 2014-10-16 23:25+0200\n" +"PO-Revision-Date: 2014-10-27 09:14+0000\n" +"Last-Translator: Moira Brülisauer \n" "Language-Team: French (http://www.transifex.com/projects/p/openslides/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgid "None" msgstr "Aucun" #: agenda/csv_import.py:22 motion/csv_import.py:37 -#: participant/csv_import.py:72 +#: participant/csv_import.py:70 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "Le fichier d'entrée a un mauvais encodage des caractères, seul UTF-8 est pris en charge!" @@ -75,7 +75,7 @@ msgstr "Elément parent" msgid "Invalid format. Hours from 0 to 99 and minutes from 00 to 59" msgstr "Format non valide. Heures de 0 à 99 et minutes de 00 à 59" -#: agenda/forms.py:30 agenda/templates/agenda/overview.html:88 +#: agenda/forms.py:30 agenda/templates/agenda/overview.html:89 msgid "Duration" msgstr "Durée" @@ -97,7 +97,7 @@ msgstr "%s est déjà sur la liste des orateurs." #: agenda/templates/agenda/item_slide_summary.html:7 #: agenda/templates/agenda/overview.html:7 #: agenda/templates/agenda/overview.html:34 -#: agenda/templates/agenda/overview.html:96 +#: agenda/templates/agenda/overview.html:97 #: agenda/templates/agenda/widget_item.html:18 #: agenda/templates/search/agenda-results.html:7 #: agenda/templates/search/agenda-results.html:13 @@ -128,7 +128,7 @@ msgstr "Titre" msgid "Text" msgstr "Texte" -#: agenda/models.py:56 agenda/templates/agenda/overview.html:85 +#: agenda/models.py:56 agenda/templates/agenda/overview.html:86 #: agenda/templates/agenda/view.html:54 participant/models.py:46 #: participant/templates/participant/overview.html:55 #: participant/templates/participant/user_detail.html:71 @@ -171,16 +171,16 @@ msgstr "Des éléments de l'ordre du jour ne peuvent pas être les descendants d msgid "Organizational items can not have agenda items as child elements." msgstr "Des eléments organisationnels ne peuvent pas avoir points de l'ordre du jour comme descendants." -#: agenda/models.py:345 +#: agenda/models.py:348 #, python-format msgid "%(person)s is already on the list of speakers of item %(id)s." msgstr "%(person)s est déjà sur la liste des orateurs du point de l'ordre du jour %(id)s." -#: agenda/models.py:349 +#: agenda/models.py:352 msgid "An anonymous user can not be on lists of speakers." msgstr "Un utilisateur anonyme no peut pas etre sur la liste des orateurs." -#: agenda/models.py:389 +#: agenda/models.py:392 msgid "Can put oneself on the list of speakers" msgstr "Peut se mettre sur la liste des orateurs" @@ -307,7 +307,7 @@ msgstr "%s est entrain de parler." #: agenda/views.py:648 #: agenda/templates/agenda/item_slide_list_of_speaker.html:26 -#: agenda/templates/agenda/overlay_speaker_projector.html:17 +#: agenda/templates/agenda/overlay_speaker_projector.html:20 msgid "The list of speakers is empty." msgstr "La liste des orateurs est vide." @@ -323,7 +323,7 @@ msgstr "%s est maintenant terminé." #: agenda/views.py:716 agenda/widgets.py:44 #: agenda/templates/agenda/current_list_of_speakers_projector.html:4 #: agenda/templates/agenda/item_slide_list_of_speaker.html:9 -#: agenda/templates/agenda/overlay_speaker_projector.html:4 +#: agenda/templates/agenda/overlay_speaker_projector.html:7 #: agenda/templates/agenda/overlay_speaker_widget.html:4 #: agenda/templates/agenda/overview.html:43 #: agenda/templates/agenda/view.html:60 @@ -354,7 +354,7 @@ msgstr "Nouvel élément" #: mediafile/templates/mediafile/mediafile_form.html:22 #: motion/templates/motion/category_list.html:15 #: motion/templates/motion/motion_detail.html:35 -#: motion/templates/motion/motion_form.html:51 +#: motion/templates/motion/motion_form.html:50 #: motion/templates/motion/motion_form_csv_import.html:11 #: participant/templates/participant/edit.html:42 #: participant/templates/participant/group_detail.html:12 @@ -377,7 +377,7 @@ msgstr "Modifier %(type)s %(name)s" #: config/templates/config/config_form.html:47 #: mediafile/templates/mediafile/mediafile_form.html:33 #: motion/templates/motion/category_form.html:27 -#: motion/templates/motion/motion_form.html:60 +#: motion/templates/motion/motion_form.html:59 #: motion/templates/motion/motion_form_csv_import.html:42 #: motion/templates/motion/motionpoll_form.html:84 #: participant/templates/participant/edit.html:56 @@ -394,7 +394,7 @@ msgstr "Annuler" #: core/templates/core/customslide_update.html:18 #: mediafile/templates/mediafile/mediafile_form.html:35 #: motion/templates/motion/category_form.html:30 -#: motion/templates/motion/motion_form.html:63 +#: motion/templates/motion/motion_form.html:62 #: motion/templates/motion/motion_form_csv_import.html:45 #: participant/templates/participant/edit.html:59 #: participant/templates/participant/group_edit.html:34 @@ -473,12 +473,12 @@ msgstr "Afficher la liste des orateurs" #: agenda/templates/agenda/item_row.html:22 #: agenda/templates/agenda/widget_item.html:32 #: assignment/templates/assignment/assignment_detail.html:173 -#: assignment/templates/assignment/assignment_list.html:65 +#: assignment/templates/assignment/assignment_list.html:68 #: assignment/templates/assignment/widget_assignment.html:16 #: core/templates/core/widget_customslide.html:34 #: mediafile/templates/mediafile/mediafile_list.html:38 #: motion/templates/motion/category_list.html:30 -#: motion/templates/motion/motion_list.html:100 +#: motion/templates/motion/motion_list.html:103 #: motion/templates/motion/widget_motion.html:16 #: participant/templates/participant/group_overview.html:58 #: participant/templates/participant/overview.html:117 @@ -490,12 +490,12 @@ msgstr "Modifier" #: agenda/templates/agenda/item_row.html:25 #: agenda/templates/agenda/view.html:128 #: assignment/templates/assignment/assignment_detail.html:175 -#: assignment/templates/assignment/assignment_list.html:69 +#: assignment/templates/assignment/assignment_list.html:72 #: core/templates/core/widget_customslide.html:30 #: mediafile/templates/mediafile/mediafile_list.html:39 #: motion/templates/motion/category_list.html:33 #: motion/templates/motion/motion_detail.html:146 -#: motion/templates/motion/motion_list.html:103 +#: motion/templates/motion/motion_list.html:106 #: participant/templates/participant/group_overview.html:62 #: participant/templates/participant/overview.html:122 msgid "Delete" @@ -527,7 +527,7 @@ msgid "Item closed" msgstr "Elément fermé" #: agenda/templates/agenda/item_slide_list_of_speaker.html:10 -#: agenda/templates/agenda/overlay_speaker_projector.html:4 +#: agenda/templates/agenda/overlay_speaker_projector.html:7 #: agenda/templates/agenda/view.html:60 msgid "closed" msgstr "fermé" @@ -547,7 +547,7 @@ msgstr "Voulez-vous enregistrer les modifications de l'ordre du jour?" #: assignment/templates/assignment/assignment_detail.html:215 #: assignment/templates/assignment/assignmentpoll_slide.html:24 #: motion/models.py:712 motion/pdf.py:129 motion/pdf.py:274 -#: motion/templates/motion/motion_detail.html:228 +#: motion/templates/motion/motion_detail.html:230 #: motion/templates/motion/motionpoll_slide.html:20 #: motion/templates/motion/slide.html:23 utils/views.py:330 msgid "Yes" @@ -559,7 +559,7 @@ msgstr "Oui" #: assignment/templates/assignment/assignment_detail.html:212 #: assignment/templates/assignment/assignmentpoll_slide.html:26 #: motion/models.py:712 motion/pdf.py:129 motion/pdf.py:276 -#: motion/templates/motion/motion_detail.html:229 +#: motion/templates/motion/motion_detail.html:231 #: motion/templates/motion/motionpoll_slide.html:24 #: motion/templates/motion/slide.html:24 utils/views.py:330 msgid "No" @@ -584,52 +584,52 @@ msgstr "Imprimer l'ordre du jour en PDF" msgid "Current list of speakers" msgstr "La liste actuelle des orateurs" -#: agenda/templates/agenda/overview.html:51 +#: agenda/templates/agenda/overview.html:52 +msgid "Number agenda items" +msgstr "Numéroter les éléments de l'ordre du jour" + +#: agenda/templates/agenda/overview.html:57 msgid "Hide closed items" msgstr "Cachez les élément terminés" -#: agenda/templates/agenda/overview.html:54 +#: agenda/templates/agenda/overview.html:60 msgid "item" msgid_plural "items" msgstr[0] "élément" msgstr[1] "éléments" -#: agenda/templates/agenda/overview.html:62 +#: agenda/templates/agenda/overview.html:68 msgid "Start of event" msgstr "Début de l'événement" -#: agenda/templates/agenda/overview.html:66 +#: agenda/templates/agenda/overview.html:72 msgid "Estimated end" msgstr "Fin prévue" -#: agenda/templates/agenda/overview.html:71 +#: agenda/templates/agenda/overview.html:77 msgid "Set start time of event" msgstr "Voir l'heure de début de l'événement" -#: agenda/templates/agenda/overview.html:75 -msgid "Number agenda items" -msgstr "Numéroter les éléments de l'ordre du jour" - -#: agenda/templates/agenda/overview.html:83 +#: agenda/templates/agenda/overview.html:84 msgid "Item" msgstr "Elément" -#: agenda/templates/agenda/overview.html:91 -#: assignment/templates/assignment/assignment_list.html:36 +#: agenda/templates/agenda/overview.html:92 +#: assignment/templates/assignment/assignment_list.html:37 #: mediafile/templates/mediafile/mediafile_list.html:24 #: motion/templates/motion/category_list.html:23 #: motion/templates/motion/motion_detail.html:122 -#: motion/templates/motion/motion_list.html:59 +#: motion/templates/motion/motion_list.html:60 #: participant/templates/participant/group_overview.html:33 #: participant/templates/participant/overview.html:57 msgid "Actions" msgstr "Actions" -#: agenda/templates/agenda/overview.html:110 +#: agenda/templates/agenda/overview.html:111 msgid "Show agenda" msgstr "Afficher l'odre du jour" -#: agenda/templates/agenda/overview.html:133 +#: agenda/templates/agenda/overview.html:134 #: agenda/templates/agenda/widget_item.html:59 #: core/templates/core/widget_customslide.html:43 msgid "No items available." @@ -1014,7 +1014,7 @@ msgstr "Election: %s" #: assignment/templates/assignment/assignment_detail.html:65 #: assignment/templates/assignment/assignment_detail.html:149 #: assignment/templates/assignment/assignment_list.html:34 -#: assignment/templates/assignment/assignment_list.html:48 +#: assignment/templates/assignment/assignment_list.html:50 #: assignment/templates/assignment/assignmentpoll_form.html:44 #: assignment/templates/assignment/slide.html:29 msgid "Candidates" @@ -1051,7 +1051,7 @@ msgstr "O: %(YES)s\nN: %(NO)s\nA: %(ABSTAIN)s" #: assignment/templates/assignment/assignment_detail.html:234 #: assignment/templates/assignment/assignmentpoll_form.html:61 #: assignment/templates/assignment/assignmentpoll_slide.html:39 -#: motion/pdf.py:119 motion/templates/motion/motion_detail.html:234 +#: motion/pdf.py:119 motion/templates/motion/motion_detail.html:236 #: motion/templates/motion/motionpoll_form.html:54 #: motion/templates/motion/motionpoll_slide.html:33 #: motion/templates/motion/slide.html:29 poll/models.py:84 @@ -1063,7 +1063,7 @@ msgstr "Votes valides" #: assignment/templates/assignment/assignment_detail.html:250 #: assignment/templates/assignment/assignmentpoll_form.html:71 #: assignment/templates/assignment/assignmentpoll_slide.html:45 -#: motion/pdf.py:121 motion/templates/motion/motion_detail.html:237 +#: motion/pdf.py:121 motion/templates/motion/motion_detail.html:239 #: motion/templates/motion/motionpoll_form.html:58 #: motion/templates/motion/motionpoll_slide.html:39 #: motion/templates/motion/slide.html:32 poll/models.py:86 @@ -1075,7 +1075,7 @@ msgstr "Votes invalides" #: assignment/templates/assignment/assignment_detail.html:266 #: assignment/templates/assignment/assignmentpoll_form.html:81 #: assignment/templates/assignment/assignmentpoll_slide.html:51 -#: motion/pdf.py:123 motion/templates/motion/motion_detail.html:242 +#: motion/pdf.py:123 motion/templates/motion/motion_detail.html:244 #: motion/templates/motion/motionpoll_form.html:62 #: motion/templates/motion/motionpoll_slide.html:45 #: motion/templates/motion/slide.html:37 poll/models.py:88 @@ -1105,19 +1105,18 @@ msgstr[1] "%d postes disponibles" #: assignment/templates/assignment/assignment_detail.html:213 #: assignment/templates/assignment/assignmentpoll_slide.html:28 #: motion/pdf.py:129 motion/pdf.py:278 -#: motion/templates/motion/motion_detail.html:230 +#: motion/templates/motion/motion_detail.html:232 #: motion/templates/motion/motionpoll_slide.html:28 #: motion/templates/motion/slide.html:25 msgid "Abstention" msgstr "Abstention" #: assignment/templates/assignment/assignment_detail.html:22 -#: assignment/templates/assignment/assignment_list.html:74 msgid "Print election as PDF" msgstr " Election en PDF" #: assignment/templates/assignment/assignment_detail.html:27 -#: assignment/templates/assignment/assignment_list.html:59 +#: assignment/templates/assignment/assignment_list.html:62 #: assignment/templates/assignment/assignmentpoll_form.html:21 msgid "Show election" msgstr "Projeter l'élection" @@ -1178,7 +1177,7 @@ msgstr "Afficher le résultat de l'élection" #: assignment/templates/assignment/assignment_detail.html:171 #: assignment/templates/assignment/assignmentpoll_form.html:96 -#: motion/templates/motion/motion_detail.html:218 +#: motion/templates/motion/motion_detail.html:221 #: motion/templates/motion/motionpoll_form.html:72 msgid "Ballot paper as PDF" msgstr "bulletin de vote en PDF" @@ -1233,12 +1232,12 @@ msgstr "Retourner vers l'éléction" msgid "Print all elections as PDF" msgstr "Toutes les élections en PDF" -#: assignment/templates/assignment/assignment_list.html:44 +#: assignment/templates/assignment/assignment_list.html:46 msgctxt "Number of searched candidates for an election" msgid "Posts" msgstr "Postes" -#: assignment/templates/assignment/assignment_list.html:51 +#: assignment/templates/assignment/assignment_list.html:53 msgid "Elected" msgstr "Elu" @@ -1529,7 +1528,7 @@ msgstr "Pas d'éléments disponibles" #: motion/templates/motion/motion_diff.html:35 #: motion/templates/motion/motion_diff.html:39 #: motion/templates/motion/motionpoll_slide.html:10 -#: motion/templates/motion/slide.html:70 +#: motion/templates/motion/slide.html:80 msgid "Version" msgstr "Version" @@ -1670,7 +1669,7 @@ msgstr "Présentateur inconnu. Présentateurs par défaut est utilisé." msgid "Motion imported" msgstr "Motion importée" -#: motion/csv_import.py:123 participant/csv_import.py:83 +#: motion/csv_import.py:123 participant/csv_import.py:81 msgid "Errors" msgstr "Erreurs" @@ -1690,7 +1689,7 @@ msgstr "%(counts)d de %(total)d motions ont été importés avec succes." #: motion/forms.py:39 motion/models.py:542 motion/pdf.py:152 #: motion/templates/motion/motion_detail.html:94 #: motion/templates/motion/motion_diff.html:54 -#: motion/templates/motion/slide.html:77 +#: motion/templates/motion/slide.html:91 msgid "Reason" msgstr "Motivation" @@ -1708,6 +1707,7 @@ msgstr "Requérant" #: motion/forms.py:92 motion/pdf.py:74 motion/signals.py:86 #: motion/templates/motion/motion_detail.html:190 #: motion/templates/motion/motion_list.html:56 +#: motion/templates/motion/slide.html:61 msgid "Supporters" msgstr "Partisants" @@ -1719,9 +1719,9 @@ msgstr "Ne créez pas une nouvelle version" msgid "Don't create a new version. Useful e.g. for trivial changes." msgstr "Ne créez pas une nouvelle version. par exemple utiles des changements triviaux." -#: motion/forms.py:121 motion/templates/motion/motion_detail.html:265 +#: motion/forms.py:121 motion/templates/motion/motion_detail.html:266 #: motion/templates/motion/motion_list.html:52 -#: motion/templates/motion/slide.html:60 +#: motion/templates/motion/slide.html:70 msgid "Category" msgstr "Catégorie" @@ -1791,7 +1791,7 @@ msgstr "Peut gérer les motions" #: motion/templates/motion/motionpoll_form.html:7 #: motion/templates/motion/motionpoll_form.html:15 #: motion/templates/motion/motionpoll_slide.html:9 -#: motion/templates/motion/slide.html:69 +#: motion/templates/motion/slide.html:79 #: motion/templates/search/motion-results.html:7 msgid "Motion" msgstr "Motion" @@ -2165,14 +2165,14 @@ msgid "Print motion as PDF" msgstr "Motion en PDF" #: motion/templates/motion/motion_detail.html:41 -#: motion/templates/motion/motion_list.html:95 +#: motion/templates/motion/motion_list.html:98 #: motion/templates/motion/motionpoll_form.html:22 msgid "Show motion" msgstr "Projeter la motion" #: motion/templates/motion/motion_detail.html:53 -#: motion/templates/motion/motion_form.html:33 -#: motion/templates/motion/motion_form.html:43 +#: motion/templates/motion/motion_form.html:32 +#: motion/templates/motion/motion_form.html:42 msgid "Edit motion" msgstr "Modifier la motion" @@ -2212,69 +2212,65 @@ msgstr "Permettre la version" msgid "Show log" msgstr "Afficher le log" -#: motion/templates/motion/motion_detail.html:212 +#: motion/templates/motion/motion_detail.html:213 #: motion/templates/motion/motionpoll_slide.html:11 msgid "vote" msgstr "voter" -#: motion/templates/motion/motion_detail.html:215 +#: motion/templates/motion/motion_detail.html:218 #: motion/templates/motion/motionpoll_form.html:26 msgid "Show vote result" msgstr "Afficher le résultat de vote" -#: motion/templates/motion/motion_detail.html:220 +#: motion/templates/motion/motion_detail.html:223 msgid "Edit Vote" msgstr "Modifier le vote" -#: motion/templates/motion/motion_detail.html:222 +#: motion/templates/motion/motion_detail.html:225 #: motion/templates/motion/motionpoll_form.html:31 msgid "Delete Vote" msgstr "Supprimer le vote" -#: motion/templates/motion/motion_detail.html:248 +#: motion/templates/motion/motion_detail.html:249 msgid "No result" msgstr "Pas de résultat" -#: motion/templates/motion/motion_detail.html:258 +#: motion/templates/motion/motion_detail.html:259 msgid "New vote" msgstr "Nouveau vote" -#: motion/templates/motion/motion_detail.html:275 +#: motion/templates/motion/motion_detail.html:276 msgid "Last changes (of this version)" msgstr "Les derniers changements (de cette version)" -#: motion/templates/motion/motion_detail.html:277 +#: motion/templates/motion/motion_detail.html:278 #: motion/templates/motion/motion_diff.html:36 #: motion/templates/motion/motion_diff.html:40 #: motion/templates/motion/motion_list.html:58 msgid "Last changes" msgstr "Derniers changement" -#: motion/templates/motion/motion_detail.html:287 -msgid "Withdraw motion" -msgstr "Retirer la motion" - -#: motion/templates/motion/motion_detail.html:296 +#: motion/templates/motion/motion_detail.html:288 msgid "Unsupport" msgstr "Ne plus soutenir" -#: motion/templates/motion/motion_detail.html:302 +#: motion/templates/motion/motion_detail.html:294 msgid "Support" msgstr "Soutenir" -#: motion/templates/motion/motion_detail.html:310 +#: motion/templates/motion/motion_detail.html:302 msgid "minimum required supporters" msgstr "Nombres minimum de partisans requis" -#: motion/templates/motion/motion_detail.html:317 +#: motion/templates/motion/motion_detail.html:309 msgid "Manage motion" msgstr "Gérer la motion" -#: motion/templates/motion/motion_detail.html:327 +#: motion/templates/motion/motion_detail.html:319 msgid "For administration only:" msgstr "Seulement pour l'administration:" -#: motion/templates/motion/motion_detail.html:329 +#: motion/templates/motion/motion_detail.html:321 msgid "Reset state" msgstr "Réinitialiser le statut" @@ -2287,13 +2283,13 @@ msgid "Diff view" msgstr "Afficher la difference" #: motion/templates/motion/motion_diff.html:27 -#: motion/templates/motion/motion_form.html:49 +#: motion/templates/motion/motion_form.html:48 #: motion/templates/motion/motionpoll_form.html:18 msgid "Back to motion" msgstr "Retourner vers la motion" -#: motion/templates/motion/motion_form.html:35 -#: motion/templates/motion/motion_form.html:45 +#: motion/templates/motion/motion_form.html:34 +#: motion/templates/motion/motion_form.html:44 #: motion/templates/motion/motion_list.html:36 msgid "New motion" msgstr "Nouvelle motion" @@ -2333,15 +2329,15 @@ msgstr "#" msgid "Motion title" msgstr "Titre de la motion" -#: motion/templates/motion/motion_list.html:77 +#: motion/templates/motion/motion_list.html:79 msgid "Enough supporters" msgstr "A assez de partisans" -#: motion/templates/motion/motion_list.html:80 +#: motion/templates/motion/motion_list.html:82 msgid "Needs supporters" msgstr "A besoin de partisans" -#: motion/templates/motion/motion_list.html:87 +#: motion/templates/motion/motion_list.html:89 msgid "There is a newer (unauthorized) version." msgstr "Il y a une version plus récente (et non autorisée)." @@ -2365,19 +2361,14 @@ msgstr "Dans la ligne %d, vous devez fournir soit 'prénom' ou 'nom'." #: participant/csv_import.py:62 #, python-format -msgid "Ignoring malformed group id in line %d." -msgstr "Ignorant Identifiant du groupe malformé a la ligne %d." +msgid "Ignoring group id \"%(id)s\" in line %(line)d which does not exist." +msgstr "Ignorant l'id du groupe \"%(id)s\" dans ligne %(line)d qui est inexistante." -#: participant/csv_import.py:65 -#, python-format -msgid "Group id %(id)s does not exists (line %(line)d)." -msgstr "Groupe id %(id)s n'existe pas (ligne %(line)d)." - -#: participant/csv_import.py:70 +#: participant/csv_import.py:68 msgid "Import aborted because of severe errors in the input file." msgstr "l'importation a été interrompue en raison d'erreurs graves dans le fichier d'entrée." -#: participant/csv_import.py:76 +#: participant/csv_import.py:74 #, python-format msgid "%d new participants were successfully imported." msgstr "%d nouveaux participants ont été importés avec succès. " @@ -2964,11 +2955,11 @@ msgstr "Réinitialiser le niveau de défilement" msgid "Scroll level" msgstr "Niveau de défilement" -#: utils/forms.py:111 +#: utils/forms.py:112 msgid "CSV File" msgstr "Fichier CSV" -#: utils/forms.py:112 +#: utils/forms.py:113 msgid "The file has to be encoded in UTF-8." msgstr "Le fichier doit être encodé en UTF-8."