From c89f9bcccd611774e3e10f74f21b86954e8d9b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Sun, 26 Oct 2014 16:10:43 +0100 Subject: [PATCH 1/8] Updated German and Czech language files. --- CHANGELOG | 5 +- openslides/locale/cs/LC_MESSAGES/django.mo | Bin 48412 -> 48300 bytes openslides/locale/cs/LC_MESSAGES/django.po | 181 +++++++++--------- openslides/locale/cs/LC_MESSAGES/djangojs.mo | Bin 2755 -> 2710 bytes openslides/locale/cs/LC_MESSAGES/djangojs.po | 10 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 48479 -> 48367 bytes openslides/locale/de/LC_MESSAGES/django.po | 191 +++++++++---------- openslides/locale/de/LC_MESSAGES/djangojs.mo | Bin 2691 -> 2692 bytes openslides/locale/de/LC_MESSAGES/djangojs.po | 12 +- 9 files changed, 189 insertions(+), 210 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b541777af..4ff6a8563 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,24 +10,21 @@ Version 1.6.1 (unreleased) 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. - 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 German and Czech translation. Version 1.6 (2014-06-02) diff --git a/openslides/locale/cs/LC_MESSAGES/django.mo b/openslides/locale/cs/LC_MESSAGES/django.mo index 3ca13d3352195022ab0aba1266ecfb3dbc94c092..5411c625b6182f36c303224a19c6b5f39a5b96de 100644 GIT binary patch delta 13531 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 delta 13613 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 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 a3da8c12a7d640da0b4761069853cc0f768bcc08..c0ea5265b532945ab1ec3b03039b4843de5f06da 100644 GIT binary patch delta 542 zcmXZZ&npCB7{Kvo4R&`NByEafN-nl(-_ra5fRx&>Y#hn!4K%-6KZ`Mb?_@{{RfWWH)@|pvF?weo|mm~qX*_t-?U^mCQ%E^sEso= zp2b1pMVqgqe)<^o*X=bgo!H3-#t#Z!n2*9@)`Z5mm3e=mx>MV#)i?dAwe4!;g(jHr YsS699DMfj+zmgnq*5g|9BsuK-0;Q%oJ^%m! delta 587 zcmXxhKS%;`6bJC9SJ@d7Arcs*i!{{9@6IHWkcfsBNm^=IFZ3pL_53-uvC@S>iTv-3q+{#LF;(xFY$QFj?hFElhjr-5dfXK!}3kiOs2gqOa2>AtG zq_6`A5O*OD`h-0A3r1lW8`sAm4~|2wAAuP-2Dz^!=Vi$Et?&b1Sb_YdS`IcK4{{+l z`V#NKB;rHKUqJrpTaf>{tM-ktW8_rcQu(x_3eNPna+Hde7p*1j*BkY1*P5?-x`0DF zXW6#psI=`ACY{sO$gt8|Rkx`(8*A%L?d|LIj3l!Enc2GQX}{`WPPV3t?cK, 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 e810b9e3c59514451b251bf46a413a1cb4b5b1ed..0640ee1e43f006ad5d599b1dc22dde1de072c03a 100644 GIT binary patch delta 13589 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 delta 13680 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 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 fb85150d301985874d1286f78421eede8a9ce388..3db6d05596e3d2ddc6061a57e6690edf392a9744 100644 GIT binary patch delta 512 zcmXZYJ4*vm5QgDN*0`=A!~_;3A}rbjA(9J5BBCG!O9ibgL@y30kK~Ws%mx z#$YN%D@h|F78W9iorU-VEG&FS2A1>ecZNB0c2E3Mzxy2tyAhH1L6Ja2T0eKpnV=I;84;W&$aVb%&c)QjXTS1iwChW)DTZ()*L s!x22}T{{O(ypYco%0aO-SDbB^-Ni(8cYE)sz7wp~8uz!orWrkck3s6!BoL+PS|#ZavDfrucEA~-pS_y{^^hf3x^b#-!aaCLA| zOQ(Wk7ZGuA5C`2H1a}7)|3?ml`^$F^=boFK`X~O~cOt$`h`jfUOaUMzm`*;h)YhR_GK}NW1htSg`5=%r~{`h7cI}BUZ`Su z!SWL7!7G+mQ7^iVdd>#wz)jSFdzSajh8K$zC`4>%!v*TiFD+l84!Abks0Vc|-=hxb zq4qx_k36$v@C~Q%6SZ%c-=*h`qUP~6Ui24Eu;>>~T44tDBD0n&mg|^ff7$l8aD=>r oS!{N?PSeQ*, 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" From 9a4d357287a0b427cd048fc8e13aa477e4ea7944 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 27 Oct 2014 20:17:50 +0100 Subject: [PATCH 2/8] Fixed #1354: Added CKEditor plugin insterpre to README. --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index f44936f0f..b8b68848d 100644 --- a/README.rst +++ b/README.rst @@ -270,6 +270,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 From 815789bd8e249eca374b31611751bf6f4b0ceec8 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 27 Oct 2014 20:29:06 +0100 Subject: [PATCH 3/8] Added version numbers of required packages to portable build instruction. --- extras/win32-portable/create_portable.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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: From 8be1215e122d0436b61b48e21d591d6793993206 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 27 Oct 2014 20:40:19 +0100 Subject: [PATCH 4/8] Updated FR translation. --- openslides/locale/fr/LC_MESSAGES/django.mo | Bin 49601 -> 49490 bytes openslides/locale/fr/LC_MESSAGES/django.po | 185 ++++++++++----------- 2 files changed, 88 insertions(+), 97 deletions(-) diff --git a/openslides/locale/fr/LC_MESSAGES/django.mo b/openslides/locale/fr/LC_MESSAGES/django.mo index e0487e05f1ebe92fdb20effccca5269f2513d167..c572abf642aae2b3cc11911ca7e92a88a3f7e681 100644 GIT binary patch delta 13543 zcmZA82Y436zQ^%RA%y@T2_b<1d1)z-012V@-lT-yLQQ~B0)$Yc_=+GPD#d_;pwdB_ z2SO20q>F+SDJn>B2LYvs6hZIzml^N%x%)VN=07t#J8d_K=Q(?)czyqdm-}L{_k4$I zjHlxi!=oXN)5*(mCPu5&aZV&Tjt8E^s(1?HF>e*ese{$A9FD=#xD?CaK`e^DU?k?@ z=89Mr{jd|}bsV?Ti;Qke$0&RkgK-NM!LN}qIajQYQ62hMGXsvbHpSwU_s0@A8B5|4 z)C2dSFCIZ2?3_X$p6^_=6*o{1x`%=2QQdJ0V-V`b7*u^F^ufj$fURtK7i>U01oeOo zsQW+17(9-e;8Tpi$QqRMe5V!}tw1VjW-~Am*PuV1$2@og_24_G4j*EEjHqea#iAZu z83$lpjK!6xfgZ=AcpeMlALuSX#TG0TIL<|_#9DOWZd5;) zFdzPk+QL6kOJAV2iNi36xE!jV+O=8#LS#Bopb-tW4JTk2@hsbL6-E$$g=&8ubw2N- z9vsd|RL9Y%t*e2Rum!69cnrnaSOizv_^Udszh-iV0uA7{^*L&(1L~Tk4z|`pb(o4; z>Q}8(Q8S&5+L8sR0j@#~=$I|Ph?>Y<^hQ5-J@fkHN8MN*)p1kQ0FqHN?21~EfvCf% z`_$2N)P2iQTeS%_kzKa@C~9TSVOhM3x-YoCd9J$x8SOdhp+<2NvX2(2A5owJ(pFP!-f+tc^U!?KCH&2X{t2Xn<`n$~17? zsKfNGEnkA_a6M|JwxJ96qF%SFr~y4gO~kLEsV|IuiK}6KT!^uH|Id*rM}c=E^V(I! zIO2YogtL)vj&s1)|A~5yDl}#m*a9`vY3Pl!Q3IKW8t6LIK(<=<+wzl`m*+d@ZNW{{ z(%eTa4$2{n6%KEF~ zO$s!lcTgSA$BMYb#wSp(>3P(l{0((z3p6vQIvO?8*64#>Q2q3>aXR`EkFfDLR6p)! ztbZ{wA5)+XccDgh+BQ6gvBXzUD-_V&%%C`yBQAxNu{CPtCZo1sIeOxL)IbiQCUg?{ z$MI;v4=QZwCew$^M&!Ucfh|qP$*7r3L_X8b6x0grM$W7AJ!;8ATbc4QsPgKlnN7g5 z_#r;RJ*Y3>mRHQ7{T6k<+qbpZ+rp@VGN?VOjG9?>)Xaur0M0@`{1Efva`eZIsJ;Fi zHGqSdAFrd@KSbu}{E7O4HffVPaJSQ)j0!SPr+y0R^_qv;iqB93+KO6{oi^T!+LA-4 z2mOcz@FwaT{}_v7U|X~I@zyG+0oB2LdjFe}QO6xn9d$=_GzbH6taUnSfFGb%Vhw7> zTTrj%UetZ3(HF0w+TTG<;03C^M>|tq0KIs=6G1gzEPQ>b~<>3a_K?_f2O1bwdyt&AbHa)W)G^R1wutL)78vi7w1U zy)D_OFWq_@???TR`We;V@2ErT+1^+f)lWHV{r0TC_PR3#8qrA9S(t!9ILF4zP!HOU zTFPUn_NP!wegU~g!***b}$2~je1T;)P#m(X?&{#>#v3zD5#8AQ6nte(VY4? z)cf293t-s>d+|G z;hJvEMlI}&=Sff`6D)Rt65z0QqM?c4*%XaJe0 zj>lT3+6HrN{1NJqt;Gts731(aYQ{lb%ml*GMeIU7uz@XaYvV4c0i_{Z;&xsoqr)^0 zLvaIYg!@qqZ=ja=nT@@=GJ4`L)ZX{RC>(;p_#SFND^UYpZ{zJ4M!Xw&0i3f~Q15?q zH&am^btu}Q_B;!<$MaAfuRtx?c2r0EQCo5z^`W|pTFHl~2|Pi4fQocCD_af2i5p{K zOhF%>?_`nDOeWX{Gf}@-EJq!-%cz0*_b_ohs(okF0MbxrU<{_<4Aj7Hq6Yd0R>J~4 z&HLXJ%MhodyC|7iWHjUbxr<0GiOynu!94r*!jG;K|QH59dlk*LF21vS&U zsD3-4wyH0x{~0Ov{a;8yB?`9KiW{ho|3J;e>17635aS6$QD>kLR>T>oE&Ckx7X64? zq06YP`3=?2V_Tl5xA|#Vs5k4c23;u7h*D68Cj-^NXsm!!Q61!<2DTqHknd0r{L|{y z$E-{Ms-MC(E{ zQ3E@SQRp+!%qSj95_dx#x(P_f&Q$cpIjF5$fa-4zY9NQvSMUFKWOTzB%!5}@r~4NA z;6v1V`wVqPf(MxnOQYh-m>(OXAGSx`*8_Ei`k}t8BT;Y1YpAzk9{TcpXB`>MFb7NE zN%X_}SOlNhI3(S?&&9Abn1bJ+3!?|;zDQ1U)N@v&yBL{6 zWD@WicEC_Jny;gij+`fFA8Jd=3^gC74(KADgF1|xYR&ctXui5mGc)DnjeH|-+PpEw3po`}9!!^RCT zkhr-m?`rKcob_)&#UKjw;I*g+Z^a1Qjrs5#YN>Cb9&`uu<6{g!uMx&TRQm|b9S~|D zi8ii@>c25+Yg@Z*!9d$!gmpY>rc;q;ILlFoCuF4gVHAscP;Jx$T3C}&r@I^KF!w?o z-c-~CC*g7rzL*G(J8qQubGQO(Z-%4JzzVF0Pf>>{Cd>RK)Ed>{SXBEtSPKuLX67;4 zm=|5dAsB;6sQXe-hjk3H!ft0S87;*IjK!}p5+9%rSI`*qekY+$eP?vxcnrivsF|&^ zZbJ=ZFKT7JMXlubSQsCm`u7{FcI>oMl+gOm=}`$wZ5I2*P1>rpe`kMVfqHP&BWs%I1w!YE?Bx3y49 z-UM~Hk}(K-VjavtJ!m~@We#9j`~mg)y+m!L=j*25YN#!J1@(dIi7xE#CR3cuRMZ2P zq4sJcYKGsVMtl!7fXApq>O0xYEEH=KC!*e-;aC|LVhQ{Xb!hLRR^lb9UC}p8|L(?Q z^t$xM0yqfu-jBr)T#Z_pU8otKK&{AsQ3HO2TCu-T1N5I_wlV^>Wl5-hTH3gmjkA!m z;dW+_QAbNrd$a-dfCE?(k7Fc0K+Pm*s#(fXSc*6ir(q|og+F5=hQDck7`4JS#A8ug zcL=pY-rQ72?|*eNx^WDu!_C+Z&!7)RO*bnPkJ^%|sDUJ7?jc33&_vWs=c3NUN?ZQ9 zjlV;!;AK?1r|8A=oqRLQj0&Q*!i9Q3Eb8^Ci3!*N_04}1wdC)iA1+2OT#0J`Df;3* z)WE()?foTN{sPMrd%wl{Yw0VI(UR9j&8Qh_@A_KDqB?pPby%07wqy_b;bqhVZ`=3* zYUQ5W*kh)t&x<;&!Kky=b|&ku4@WNwVsSjWaD|Nzq8{)Y`r}j73V6P4Ub8?{c_CE0 z5*UrqsMFsT%VGvak#G5bxx1bK& z9vp~|kn`pAc$d#QUcnaFVHSU^;76$Yu3#6u=O&{sQIpx`%QgzN)W=X;aSe59U!o3Y ztvP0Zy|A?hKgUt+&dxQ5_&x>^$GvCHR9(zR+y=EmJ+L9BVtI70CKE{J6l#gCp-$&7 zs6+LajXkr?4TVwd8={uJJ@&+&sDbQ2ZRsi0>--xAqt86E(nV1BRYz~V{|(7#gw0SR z?1;KC1@#tWp$_AlsI6Lr`Y!B5ZQ0M(>!|zhVgY=NnvnN=(|-W!%NdU9Hwwe_{#PTT z8``2q+RHjJw*jAKEJXQY)B`tRDDFV5&~eONL0f(e)$SQ;%RJsU11N)W#0eOJy)ans ze?^HC#QVavCo_Vgg?wfh0p!4uTV1$5eft4(sAl)ET&p zMe!C^LC;0z$8+^XtiMj{FbWdzEi8h&P)mLW)$uJT`h3`jI1068)3GMLk6P-J z$mw>@peAq*HKD7h2|h%fjlbMv3X>`Mk=e`Y)+QK1d3)6NAp>>eV$|!i26ZSmqgLW; zY=jqVT=HY{;A*G=)To93!+BT-PorL^;7^PZ7)x9R)nOad%u-Mt zr(qFupIGptcsg43U6by-v5Hj%&Dx7dSEhY=|`jXd@gF~7oZN` z3RJs`sHOK@ZsKq(LtGm*(7vccHxxC2>DUrK##VS6tMYuO$_jIMhN6~kHR{F#s0Uoa zG58p@GDBCIpK_D2HSwod0iR$ZMy)dS-B4RN8MQ()F%p-d`rn6cb$EeH8GML(zr$9W z2bDwZZ9Oc3$*5C20!!iRsP@ZIXJ#AfLBC@(=3B#WyqJW=aWd+xeS+%e(>1KWADJB# zXyp4a9Ur6K)83z&fz3xB;+?1m?nQq*jT+cR)PrAQT?}1o+IK`vpofizq1tDmRxW!j z>#xIdg@U~J80(?4&MaMhYYS9;dmE>qW-tKr;25lq6H!aM)y5}K{rRsqe-pOA(!`Uo z9IkYei6wIa6Yx1|>Ebq+1|6}A2m6Ft@~s=q9{z}xh@WD4jQz~m38RQ7qgHSYa?YHK zs1<(WKj!y@t(Zpaen4h6nJ$~m;k$(zq4#DpvlwdyjH5gWD`H>Np__}|xCaa3K@7&T z7>KvAAwI*(SUbmjqDLTS&h0EDGm?tkSPLs{;ct8#ij8nT2BGg(^Wi9hzQoa}J+Fvb zv1X`&47c@JsQV_OwrG}(=b_rILYLnEb!5s?a1{0WJwzRnz-{IijS8rlw8MPZ2Sace zYNnG>U%GkLji|G77&X9CsPD-g)WChWo3|kl{dm3;ZwsoTmcAo;;W!&l#45x~PsCLIO4A0v5S5&*l*bbkgK5(tRGT)0nSeke+YD;H*1i1(oeauT)o=THy6Wy^m>?dcQi->3ok?lJ8mk+;{0Lajs$mc+_98auhk z=rA3@Vt5Jl;1{Tl1NNE+hoENevPNNX;y6^hmgs>WlXRUReMLc2(lgQ`RdR*k8z$>) zK=&33n%T}$<~fk z)+W!Pc02iO;ZHQs7R)0aK!YCS8`!!w)?aWG<-gmwn|;b3l=Y)5$i~0f`cb%+x~Zh$ zwr(+H&xo6mHtKzPhk}{}GfCaa>)_~mNUBO4NGit7(b>;pB8GiH6hKX7QZl7AupVW) zrjhi*HMH?O^76{!+sc}UGDA4U4-@}ew>KtGexNt=juRie!uo9Aoce4Sg$A5GZO-mi1s(3ZdJ z!TKoKDh5#*uF z$h%0o%8{Dee0}=5PU=Ve3FV)YAM0dKD__9|En#J zBj1G7i+BmCD*4f*9pn?TljB0%gNZVUu92eX{@>SNwW8oQw!t&_7xDt;{`iL6-;$-S zn)KC|Ho9(Ezr)6qU&buTE0Zr|>j>+rt@8`15$RXbZqh6o?8CmwlXP9OH@Qui`|qUe zlJOyl-KgnGx4L}E&m~nOT_yfKx0GLVsNYFhBaHCO_J|GXN{t^;by9h1z9s$wSK)Ee zEt0Ns)O(S1^`^cq={V^<(rQvX<=L2rHgAz{n0+!n#QlPjYWA)~^4_G)q%kC2Bdiy# z3$3aA%!PA8m96sbCC5a|l( zpX;j455uLlFx@_MD85hmXp2TnL;A5qqpbj6m3*!C-lw^9BoNtb>zk9Sjfo=g#2 zcmbpA4fEBCd>vc27H5<8lb%vF#FpR1rnLJ~?YW*3H?Vzlwry1IPnuxkqvUhQGk^Z> z*T3v_)Hdi$2YpHXDW6SxO!)xYX0J6r_3zreXh9r~HIQE;bN{|{VFm7OLHeG26H+gd zt}GApd}js0!rUT$%+j!)&EL09#L1Muk7My$(!Z~j#5YNwkSz0?prmn<HeVKFN#&{U zgYQuH&y|v$oDkyv-nRUX;_;;Vq$8vv+;Nz?Iiw-Px+;>NLMmuN{k8bN*LKPalZtYm zFQq+6wQTKl%Ky2lknc^KQ&``VzooX?notU!+lEi9#jq&#{kh?9@}skZ5~I`oi9RJN zMGB&J0qGUW{(W^KC_ufgj`)c5g#1e^jUU>&;no+ZWI4N`sW%+*(HM7*n@U2ZAArZ z9m@BU-$B}D%MM^W+U~?dBwyO-8mj-e^MHysNM}h8N$sc{X6l`B#E;3Bq)eadf%pSu zhqAw{9MP=<(Gp7AQ=%)CxD5F{DFrCwJwWerT$sYqEYDTA_LQcKF`XD1|u zxI=C02e#!`*p(JO_!EXve~8Jey z5-P2pMN;PUGBxSeD3=3*KJUz3ot6}E;FNUU%>N`3uGiP|_ zh$1<#*o@KV-%wp`0rti9G&h;88yz{ KIn%b+%KJZccitTU delta 13638 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, 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." From 6df6b92dd714b52593a05e26913ee65418146672 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 28 Nov 2014 20:51:24 +0100 Subject: [PATCH 5/8] Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) --- CHANGELOG | 3 +- openslides/assignment/views.py | 253 ++++++++++++++++----------------- 2 files changed, 123 insertions(+), 133 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4ff6a8563..23e202612 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,8 +15,7 @@ Motions: - 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". diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index bf0eb2a93..e2b0b1319 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -8,7 +8,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 @@ -346,138 +346,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.iteritems(): - row = [] - - candidate_string = candidate.clean_name - if candidate in elected_candidates: - candidate_string = "* " + candidate_string - if candidate.name_suffix: - 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))) - ]) - ) - - # 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([ @@ -486,7 +477,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'])) From 35e31874a1bc4fcb22c37d2edf8a7b84ab017ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 11 Nov 2014 00:01:45 +0100 Subject: [PATCH 6/8] Updated CHANGELOG. --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 23e202612..9fb5dc871 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,7 +23,7 @@ Participants: * Updated error message if group id does not exists. Other: - Fixed CKEditor stuff (added insertpre plugin and removed unused code). -- Updated German and Czech translation. +- Updated French, German and Czech translation. Version 1.6 (2014-06-02) From 9a50dab5fc07f1060f594d24b834478590d3debc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 4 Dec 2014 15:45:19 +0100 Subject: [PATCH 7/8] Release 1.6.1 --- CHANGELOG | 2 +- openslides/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9fb5dc871..5fdcc322b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ http://openslides.org -Version 1.6.1 (unreleased) +Version 1.6.1 (2014-12-08) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=16] diff --git a/openslides/__init__.py b/openslides/__init__.py index a146589c4..cb8dee6b1 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- VERSION = (1, 6, 1, 'final', 1) # During development it is the next release -RELEASE = False +RELEASE = True def get_version(version=None, release=None): From 750918fe744b6d905a6cb6628d3b666dfacad884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 4 Dec 2014 15:47:21 +0100 Subject: [PATCH 8/8] Update version to 1.6.2-dev --- CHANGELOG | 5 +++++ openslides/__init__.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5fdcc322b..e09e3d91a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,11 @@ http://openslides.org +Version 1.6.2 (unreleased) +========================== +[https://github.com/OpenSlides/OpenSlides/milestones/1.6.2] + + Version 1.6.1 (2014-12-08) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=16] diff --git a/openslides/__init__.py b/openslides/__init__.py index cb8dee6b1..58b5f8b81 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -VERSION = (1, 6, 1, 'final', 1) # During development it is the next release -RELEASE = True +VERSION = (1, 6, 2, 'final', 1) # During development it is the next release +RELEASE = False def get_version(version=None, release=None):