diff --git a/openslides/locale/README.txt b/openslides/locale/README.txt index a54166107..eda53dfe2 100644 --- a/openslides/locale/README.txt +++ b/openslides/locale/README.txt @@ -1,27 +1,35 @@ -Instruction to update translation for OpenSlides: -------------------------------------------------- +Instruction to update translations for OpenSlides (JavaScipt and Django): +------------------------------------------------------------------------- -1. Go to the openslides directory (which contains the 'locale' directory): +1. Update English resource files: + + a) for JavaScript run: + $ ./node_modules/.bin/gulp pot + -> updates 'openslides/locale/angular-gettext/template-en.pot' + + b) for Django: + $ cd openslides + $ django-admin.py makemessages -l en + -> updates 'openslides/locale/en/LC_MESSAGES/django.po' + +2. Commit and merge the following files into OpenSlides master repo: + a) openslides/locale/angular-gettext/template-en.pot + b) openslides/locale/en/LC_MESSAGES/django.po + + Transifex will update both resource files once a day by pulling from GitHub. + +3. Translate both files in transifex into desired languages. + https://www.transifex.com/openslides/ + +4. Download translated po files for each language and override it: + a) openslides/locale/angular-gettext/{LANG-CODE}.po + b) openslides/locale/{LANG-CODE}/LC_MESSAGES/django.po + +5. Create mo file for each language (only for django po files required) $ cd openslides - -2. Update the German po file (locale/de/LC_MESSAGES/django.po): - $ django-admin.py makemessages -l de - $ django-admin.py makemessages -l de -d djangojs - -3. Edit the German po file: locale/de/LC_MESSAGES/django.po - Don't forget the js-file: locale/de/LC_MESSAGES/djangojs.po - (Search for "fuzzy" and empty msgstr entries.) - -4. Update the German mo file (locale/de/LC_MESSAGES/django.mo): $ django-admin.py compilemessages -5. Restart server: - $ python manage.py runserver - --- -Additional hints for internationalization (i18n) in Django: -https://docs.djangoproject.com/en/dev/topics/i18n/ - -Note: gettext is required to extract message IDs or compile message files. -For gettext on Windows read: -https://docs.djangoproject.com/en/dev/topics/i18n/translation/#gettext-on-windows +6. Commit and merge for each language the following files: + a) openslides/locale/angular-gettext/{LANG-CODE}.po + b) openslides/locale/{LANG-CODE}/LC_MESSAGES/django.po + openslides/locale/{LANG-CODE}/LC_MESSAGES/django.mo diff --git a/openslides/locale/angular-gettext/template-en.pot b/openslides/locale/angular-gettext/template-en.pot index 8ee938ef9..02c0fa300 100644 --- a/openslides/locale/angular-gettext/template-en.pot +++ b/openslides/locale/angular-gettext/template-en.pot @@ -4,32 +4,44 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id-Version: \n" -#: assignments/static/templates/assignments/assignment-list.html:54 +#: users/static/templates/users/user-list.html:72 +msgid "--- Select group ---" +msgstr "" + +#: assignments/static/templates/assignments/assignment-list.html:56 msgid "--- Select phase ---" msgstr "" -#: motions/static/templates/motions/motion-list.html:60 +#: motions/static/templates/motions/motion-list.html:62 msgid "--- Select state ---" msgstr "" -#: motions/static/templates/motions/motion-detail.html:91 +#: motions/static/templates/motions/motion-detail.html:103 msgid "--- Set next state ---" msgstr "" -#: users/static/js/users/site.js:365 +#: assignments/static/templates/assignments/assignment-detail.html:69 +msgid "--- Set phase ---" +msgstr "" + +#: users/static/js/users/site.js:339 #: users/static/templates/users/user-detail-profile.html:39 #: users/static/templates/users/user-detail.html:37 msgid "About me" msgstr "" -#: assignments/static/js/assignments/site.js:384 -#: assignments/static/js/assignments/site.js:476 -#: motions/static/templates/motions/motion-detail.html:136 -#: motions/static/templates/motions/motion-detail.html:137 -#: motions/static/templates/motions/motion-detail.html:187 +#: assignments/static/js/assignments/site.js:379 +#: assignments/static/js/assignments/site.js:488 +#: motions/static/js/motions/site.js:339 +#: motions/static/templates/motions/motion-detail.html:159 msgid "Abstain" msgstr "" +#: motions/static/js/motions/base.js:326 +#: motions/static/js/motions/base.js:333 +msgid "Accept" +msgstr "" + #: mediafiles/static/templates/mediafiles/mediafile-list.html:50 #: users/static/templates/users/group-list.html:41 msgid "Actions" @@ -39,8 +51,8 @@ msgstr "" msgid "Add countdown" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:143 -#: assignments/static/templates/assignments/assignment-detail.html:79 +#: agenda/static/templates/agenda/item-detail.html:150 +#: assignments/static/templates/assignments/assignment-detail.html:115 msgid "Add me" msgstr "" @@ -56,6 +68,10 @@ msgstr "" msgid "Add new message" msgstr "" +#: motions/static/js/motions/base.js:336 +msgid "Adjourn" +msgstr "" + #: users/static/templates/users/user-detail.html:42 msgid "Administrative data" msgstr "" @@ -63,16 +79,16 @@ msgstr "" #: agenda/static/js/agenda/site.js:14 #: agenda/static/templates/agenda/item-detail.html:6 #: agenda/static/templates/agenda/item-list.html:25 -#: agenda/static/templates/agenda/item-list.html:47 +#: agenda/static/templates/agenda/item-list.html:48 #: agenda/static/templates/agenda/slide-item-list.html:2 #: assignments/static/templates/assignments/assignment-detail.html:36 -#: motions/static/templates/motions/motion-detail.html:37 +#: motions/static/templates/motions/motion-detail.html:41 msgid "Agenda" msgstr "" -#: agenda/static/templates/agenda/item-list.html:112 -#: core/static/js/core/base.js:176 -#: core/static/templates/core/customslide-detail.html:22 +#: agenda/static/templates/agenda/item-list.html:115 +#: core/static/js/core/base.js:247 +#: core/static/templates/core/customslide-detail.html:28 msgid "Agenda item" msgstr "" @@ -84,29 +100,37 @@ msgstr "" msgid "All motions" msgstr "" -#: agenda/static/templates/agenda/item-list.html:151 -#: assignments/static/templates/assignments/assignment-list.html:121 +#: agenda/static/templates/agenda/item-list.html:154 +#: assignments/static/templates/assignments/assignment-list.html:124 #: core/static/templates/core/tag-list.html:38 #: motions/static/templates/motions/category-list.html:47 -#: motions/static/templates/motions/motion-list.html:146 +#: motions/static/templates/motions/motion-list.html:149 #: users/static/templates/users/group-list.html:55 -#: users/static/templates/users/user-list.html:142 +#: users/static/templates/users/user-list.html:151 msgid "Are you sure you want to delete this entry?" msgstr "" +#: motions/static/templates/motions/motion-detail.html:126 +msgid "Are you sure you want to delete this poll?" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:238 +msgid "Are you sure you want to delete this version?" +msgstr "" + #: users/static/templates/users/user-import.html:74 msgid "" "At least first name or last name have to be filled in. All\n" " other fields are optional and may be empty." msgstr "" -#: core/static/js/core/site.js:494 -#: motions/static/js/motions/site.js:224 +#: core/static/js/core/site.js:498 +#: motions/static/js/motions/site.js:239 msgid "Attachment" msgstr "" -#: core/static/templates/core/customslide-detail.html:28 -#: motions/static/templates/motions/motion-detail.html:243 +#: core/static/templates/core/customslide-detail.html:34 +#: motions/static/templates/motions/motion-detail.html:209 msgid "Attachments" msgstr "" @@ -142,36 +166,46 @@ msgstr "" msgid "Back to users overview" msgstr "" +#: assignments/static/templates/assignments/assignment-detail.html:131 #: assignments/static/templates/assignments/assignmentpoll-form.html:1 msgid "Ballot" msgstr "" +#: agenda/static/templates/agenda/item-detail.html:58 +msgid "Begin next speech" +msgstr "" + +#: agenda/static/templates/agenda/item-detail.html:116 +msgid "Begin speech" +msgstr "" + #: core/static/templates/core/projector-controls.html:33 msgid "Bigger" msgstr "" -#: agenda/static/templates/agenda/item-list.html:200 -#: assignments/static/templates/assignments/assignment-form.html:9 -#: assignments/static/templates/assignments/assignment-list.html:161 -#: assignments/static/templates/assignments/assignmentpoll-form.html:8 -#: core/static/templates/core/customslide-form.html:9 +#: agenda/static/templates/agenda/item-list.html:203 +#: assignments/static/templates/assignments/assignment-form.html:13 +#: assignments/static/templates/assignments/assignment-list.html:164 +#: assignments/static/templates/assignments/assignmentpoll-form.html:17 +#: core/static/templates/core/customslide-form.html:13 #: core/static/templates/core/projector-controls.html:133 #: core/static/templates/core/tag-form.html:24 #: mediafiles/static/templates/mediafiles/mediafile-form.html:38 #: motions/static/templates/motions/category-form.html:28 -#: motions/static/templates/motions/motion-detail.html:159 -#: motions/static/templates/motions/motion-form.html:9 -#: motions/static/templates/motions/motion-list.html:220 +#: motions/static/templates/motions/motion-form.html:13 +#: motions/static/templates/motions/motion-list.html:223 +#: motions/static/templates/motions/motionpoll-form.html:17 #: users/static/templates/users/group-form.html:30 #: users/static/templates/users/user-detail-password.html:39 #: users/static/templates/users/user-detail-profile.html:46 -#: users/static/templates/users/user-form.html:9 +#: users/static/templates/users/user-form.html:13 msgid "Cancel" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:129 -#: assignments/static/templates/assignments/assignment-detail.html:46 -#: assignments/static/templates/assignments/assignment-list.html:89 +#: assignments/static/templates/assignments/assignment-detail.html:166 +#: assignments/static/templates/assignments/assignment-detail.html:82 +#: assignments/static/templates/assignments/assignment-list.html:92 +#: assignments/static/templates/assignments/slide_assignment.html:6 msgid "Candidates" msgstr "" @@ -180,12 +214,12 @@ msgstr "" msgid "Categories" msgstr "" -#: motions/static/js/motions/site.js:238 +#: motions/static/js/motions/site.js:253 #: motions/static/templates/motions/category-detail.html:10 -#: motions/static/templates/motions/motion-detail.html:75 +#: motions/static/templates/motions/motion-detail.html:87 #: motions/static/templates/motions/motion-import.html:59 -#: motions/static/templates/motions/motion-list.html:105 -#: motions/static/templates/motions/motion-list.html:174 +#: motions/static/templates/motions/motion-list.html:108 +#: motions/static/templates/motions/motion-list.html:177 msgid "Category" msgstr "" @@ -195,26 +229,31 @@ msgstr "" msgid "Clear preview" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:38 -msgid "Close" -msgstr "" - -#: agenda/static/templates/agenda/slide-list-of-speakers.html:5 +#: agenda/static/templates/agenda/item-detail.html:31 +#: agenda/static/templates/agenda/item-detail.html:43 +#: agenda/static/templates/agenda/slide-list-of-speakers.html:10 msgid "Closed" msgstr "" -#: agenda/static/templates/agenda/item-list.html:174 -#: users/static/js/users/site.js:357 +#: agenda/static/templates/agenda/item-list.html:177 +#: users/static/js/users/site.js:331 #: users/static/templates/users/user-detail.html:45 #: users/static/templates/users/user-import.html:92 msgid "Comment" msgstr "" -#: assignments/static/js/assignments/site.js:150 -#: assignments/static/js/assignments/site.js:526 +#: assignments/static/js/assignments/site.js:538 msgid "Comment on the ballot paper" msgstr "" +#: motions/static/js/motions/base.js:338 +msgid "Commit a bill" +msgstr "" + +#: motions/static/js/motions/base.js:330 +msgid "Complex Workflow" +msgstr "" + #: users/static/templates/users/user-detail-password.html:29 msgid "Confirm new password" msgstr "" @@ -239,16 +278,15 @@ msgstr "" msgid "Countdowns" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:88 -msgid "Current speaker:" +#: agenda/static/templates/agenda/item-detail.html:92 +msgid "Current speaker" msgstr "" #: mediafiles/static/templates/mediafiles/mediafile-form.html:19 msgid "Current value:" msgstr "" -#: assignments/static/js/assignments/site.js:131 -#: assignments/static/js/assignments/site.js:166 +#: assignments/static/js/assignments/site.js:140 msgid "Default comment on the ballot paper" msgstr "" @@ -256,7 +294,7 @@ msgstr "" msgid "Default groups" msgstr "" -#: users/static/js/users/site.js:343 +#: users/static/js/users/site.js:317 msgid "Default password" msgstr "" @@ -264,49 +302,63 @@ msgstr "" msgid "Delegate" msgstr "" -#: agenda/static/templates/agenda/item-list.html:150 -#: assignments/static/templates/assignments/assignment-detail.html:122 -#: assignments/static/templates/assignments/assignment-list.html:120 +#: agenda/static/templates/agenda/item-list.html:153 +#: assignments/static/templates/assignments/assignment-detail.html:159 +#: assignments/static/templates/assignments/assignment-list.html:123 #: core/static/templates/core/tag-list.html:37 #: mediafiles/static/templates/mediafiles/mediafile-list.html:76 #: motions/static/templates/motions/category-list.html:46 -#: motions/static/templates/motions/motion-list.html:145 +#: motions/static/templates/motions/motion-detail.html:128 +#: motions/static/templates/motions/motion-detail.html:241 +#: motions/static/templates/motions/motion-list.html:148 #: users/static/templates/users/group-list.html:58 -#: users/static/templates/users/user-list.html:141 +#: users/static/templates/users/user-list.html:150 msgid "Delete" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:66 +#: assignments/static/templates/assignments/assignment-list.html:68 msgid "Delete selected elections" msgstr "" -#: agenda/static/templates/agenda/item-list.html:92 +#: agenda/static/templates/agenda/item-list.html:94 msgid "Delete selected items" msgstr "" -#: motions/static/templates/motions/motion-list.html:72 +#: motions/static/templates/motions/motion-list.html:74 msgid "Delete selected motions" msgstr "" -#: users/static/templates/users/user-list.html:80 +#: users/static/templates/users/user-list.html:87 msgid "Delete selected participants" msgstr "" -#: assignments/static/js/assignments/site.js:115 -#: assignments/static/templates/assignments/assignment-detail.html:43 +#: assignments/static/js/assignments/site.js:124 +#: assignments/static/templates/assignments/assignment-detail.html:79 #: core/static/templates/core/projector-controls.html:120 msgid "Description" msgstr "" -#: users/static/js/users/site.js:375 +#: users/static/js/users/site.js:349 msgid "Designates whether this user is in the room or not." msgstr "" -#: users/static/js/users/site.js:383 +#: users/static/js/users/site.js:358 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting the account." msgstr "" -#: agenda/static/templates/agenda/item-list.html:116 +#: motions/static/js/motions/base.js:337 +msgid "Do not concern" +msgstr "" + +#: motions/static/js/motions/base.js:328 +msgid "Do not decide" +msgstr "" + +#: motions/static/js/motions/site.js:223 +msgid "Don't create a new version." +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:119 msgid "Done" msgstr "" @@ -320,26 +372,28 @@ msgstr "" msgid "Drag and drop items to change the order of the agenda. Your modification will be saved immediately." msgstr "" -#: agenda/static/templates/agenda/item-list.html:114 -#: agenda/static/templates/agenda/item-list.html:184 +#: agenda/static/templates/agenda/item-list.html:117 +#: agenda/static/templates/agenda/item-list.html:187 msgid "Duration" msgstr "" -#: agenda/static/templates/agenda/item-list.html:148 +#: agenda/static/templates/agenda/item-list.html:150 #: assignments/static/templates/assignments/assignment-detail.html:27 -#: assignments/static/templates/assignments/assignment-list.html:118 +#: assignments/static/templates/assignments/assignment-list.html:121 +#: core/static/templates/core/customslide-detail.html:23 #: core/static/templates/core/tag-list.html:36 #: mediafiles/static/templates/mediafiles/mediafile-list.html:71 #: motions/static/templates/motions/category-list.html:44 +#: motions/static/templates/motions/motion-detail.html:121 #: motions/static/templates/motions/motion-detail.html:27 -#: motions/static/templates/motions/motion-list.html:139 +#: motions/static/templates/motions/motion-list.html:142 #: users/static/templates/users/group-list.html:50 #: users/static/templates/users/user-detail.html:18 -#: users/static/templates/users/user-list.html:140 +#: users/static/templates/users/user-list.html:149 msgid "Edit" msgstr "" -#: agenda/static/templates/agenda/item-list.html:206 +#: agenda/static/templates/agenda/item-list.html:209 msgid "Edit ..." msgstr "" @@ -363,7 +417,7 @@ msgstr "" msgid "Edit election" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:167 +#: assignments/static/templates/assignments/assignment-list.html:170 msgid "Edit election ..." msgstr "" @@ -383,7 +437,7 @@ msgstr "" msgid "Edit motion" msgstr "" -#: motions/static/templates/motions/motion-list.html:226 +#: motions/static/templates/motions/motion-list.html:229 msgid "Edit motion ..." msgstr "" @@ -399,16 +453,17 @@ msgstr "" msgid "Edit tag" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:128 +#: assignments/static/templates/assignments/assignment-detail.html:165 msgid "Elected" msgstr "" #: assignments/static/js/assignments/base.js:82 +#: assignments/static/js/assignments/base.js:83 #: assignments/static/templates/assignments/assignment-detail.html:33 msgid "Election" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:87 +#: assignments/static/templates/assignments/assignment-detail.html:123 msgid "Election result" msgstr "" @@ -423,11 +478,19 @@ msgstr "" msgid "Encoding" msgstr "" -#: core/static/js/core/site.js:381 +#: agenda/static/templates/agenda/item-detail.html:63 +msgid "End current speech" +msgstr "" + +#: agenda/static/templates/agenda/item-detail.html:97 +msgid "End speech" +msgstr "" + +#: core/static/js/core/base.js:84 msgid "English" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:107 +#: assignments/static/templates/assignments/assignment-detail.html:144 msgid "Enter votes" msgstr "" @@ -435,16 +498,16 @@ msgstr "" msgid "Error: First or last name is required." msgstr "" -#: motions/static/js/motions/site.js:631 +#: motions/static/js/motions/site.js:789 msgid "Error: Identifier already exists." msgstr "" -#: motions/static/js/motions/site.js:649 +#: motions/static/js/motions/site.js:807 msgid "Error: Text is required." msgstr "" -#: agenda/static/js/agenda/site.js:360 -#: motions/static/js/motions/site.js:641 +#: agenda/static/js/agenda/site.js:377 +#: motions/static/js/motions/site.js:799 msgid "Error: Title is required." msgstr "" @@ -467,24 +530,24 @@ msgstr "" msgid "Filter" msgstr "" -#: agenda/static/templates/agenda/item-list.html:70 -#: assignments/static/templates/assignments/assignment-list.html:44 -#: motions/static/templates/motions/motion-list.html:50 -#: users/static/templates/users/user-list.html:60 +#: agenda/static/templates/agenda/item-list.html:72 +#: assignments/static/templates/assignments/assignment-list.html:46 +#: motions/static/templates/motions/motion-list.html:52 +#: users/static/templates/users/user-list.html:62 msgid "Filter ..." msgstr "" -#: users/static/js/users/site.js:306 +#: users/static/js/users/site.js:280 #: users/static/templates/users/user-detail-profile.html:26 #: users/static/templates/users/user-import.html:88 msgid "First name" msgstr "" -#: core/static/js/core/site.js:383 +#: core/static/js/core/base.js:86 msgid "French" msgstr "" -#: core/static/js/core/site.js:382 +#: core/static/js/core/base.js:85 msgid "German" msgstr "" @@ -492,20 +555,24 @@ msgstr "" msgid "Group" msgstr "" -#: users/static/js/users/site.js:328 +#: users/static/js/users/site.js:302 #: users/static/templates/users/group-list.html:13 #: users/static/templates/users/user-detail.html:33 #: users/static/templates/users/user-import.html:91 #: users/static/templates/users/user-list.html:10 -#: users/static/templates/users/user-list.html:109 +#: users/static/templates/users/user-list.html:117 msgid "Groups" msgstr "" -#: agenda/static/templates/agenda/item-list.html:193 +#: agenda/static/templates/agenda/item-list.html:196 msgid "Hidden item" msgstr "" -#: core/static/js/core/site.js:86 +#: agenda/static/templates/agenda/item-detail.html:73 +msgid "Hide" +msgstr "" + +#: core/static/js/core/site.js:73 msgid "Home" msgstr "" @@ -513,10 +580,10 @@ msgstr "" msgid "ID" msgstr "" -#: motions/static/js/motions/site.js:169 +#: motions/static/js/motions/site.js:175 #: motions/static/templates/motions/motion-import.html:54 -#: motions/static/templates/motions/motion-list.html:169 -#: motions/static/templates/motions/motion-list.html:90 +#: motions/static/templates/motions/motion-list.html:172 +#: motions/static/templates/motions/motion-list.html:93 msgid "Identifier" msgstr "" @@ -566,37 +633,44 @@ msgstr "" msgid "Import {{ users.length - usersFailed.length }} participants" msgstr "" -#: agenda/static/templates/agenda/item-list.html:141 +#: agenda/static/templates/agenda/item-list.html:144 msgid "Internal item" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:158 -#: motions/static/templates/motions/motion-detail.html:146 -#: motions/static/templates/motions/motion-detail.html:147 -#: motions/static/templates/motions/motion-detail.html:206 +#: assignments/static/templates/assignments/assignment-detail.html:195 +#: motions/static/js/motions/site.js:356 +#: motions/static/templates/motions/motion-detail.html:176 msgid "Invalid votes" msgstr "" -#: users/static/js/users/site.js:382 +#: users/static/js/users/site.js:357 #: users/static/templates/users/user-import.html:93 msgid "Is active" msgstr "" -#: users/static/js/users/site.js:374 -#: users/static/templates/users/user-list.html:70 +#: users/static/js/users/site.js:348 +#: users/static/templates/users/user-list.html:77 msgid "Is present" msgstr "" -#: agenda/static/templates/agenda/item-list.html:180 +#: agenda/static/templates/agenda/item-list.html:183 msgid "Item number" msgstr "" -#: users/static/js/users/site.js:313 +#: motions/static/templates/motions/motion-detail.html:244 +msgid "Last modified" +msgstr "" + +#: users/static/js/users/site.js:287 #: users/static/templates/users/user-detail-profile.html:30 #: users/static/templates/users/user-import.html:89 msgid "Last name" msgstr "" +#: agenda/static/templates/agenda/item-detail.html:69 +msgid "Last speakers" +msgstr "" + #: users/static/templates/users/user-list.html:30 msgid "List of access data" msgstr "" @@ -606,9 +680,9 @@ msgid "List of participants" msgstr "" #: agenda/static/templates/agenda/item-detail.html:17 -#: agenda/static/templates/agenda/item-detail.html:28 -#: agenda/static/templates/agenda/item-list.html:146 -#: agenda/static/templates/agenda/slide-list-of-speakers.html:4 +#: agenda/static/templates/agenda/item-detail.html:30 +#: agenda/static/templates/agenda/item-list.html:149 +#: agenda/static/templates/agenda/slide-list-of-speakers.html:7 #: assignments/static/templates/assignments/assignment-detail.html:15 #: core/static/templates/core/customslide-detail.html:11 #: motions/static/templates/motions/motion-detail.html:15 @@ -627,7 +701,13 @@ msgstr "" msgid "Messages" msgstr "" +#: assignments/static/templates/assignments/assignment-detail.html:46 +#: motions/static/templates/motions/motion-detail.html:51 +msgid "Meta information" +msgstr "" + #: motions/static/js/motions/base.js:171 +#: motions/static/js/motions/base.js:172 #: motions/static/templates/motions/motion-detail.html:33 #: motions/static/templates/motions/slide_motion.html:19 msgid "Motion" @@ -644,10 +724,14 @@ msgstr "" #: motions/static/templates/motions/category-list.html:29 #: users/static/templates/users/group-form.html:17 #: users/static/templates/users/group-list.html:38 -#: users/static/templates/users/user-list.html:98 +#: users/static/templates/users/user-list.html:106 msgid "Name" msgstr "" +#: motions/static/js/motions/base.js:339 +msgid "Needs review" +msgstr "" + #: agenda/static/templates/agenda/item-list.html:6 #: assignments/static/templates/assignments/assignment-list.html:6 #: core/static/templates/core/tag-list.html:6 @@ -663,7 +747,7 @@ msgstr "" msgid "New agenda item" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:90 +#: assignments/static/templates/assignments/assignment-detail.html:126 msgid "New ballot" msgstr "" @@ -671,7 +755,7 @@ msgstr "" msgid "New category" msgstr "" -#: motions/static/js/motions/site.js:688 +#: motions/static/js/motions/site.js:846 msgid "New category will be created." msgstr "" @@ -695,7 +779,7 @@ msgstr "" msgid "New participant" msgstr "" -#: motions/static/js/motions/site.js:670 +#: motions/static/js/motions/site.js:828 msgid "New participant will be created." msgstr "" @@ -707,50 +791,49 @@ msgstr "" msgid "New tag" msgstr "" -#: motions/static/templates/motions/motion-detail.html:223 +#: motions/static/templates/motions/motion-detail.html:189 msgid "New vote" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:101 -msgid "Next speakers:" +#: agenda/static/templates/agenda/item-detail.html:107 +msgid "Next speakers" msgstr "" -#: assignments/static/js/assignments/site.js:384 -#: assignments/static/js/assignments/site.js:467 -#: motions/static/templates/motions/motion-detail.html:131 -#: motions/static/templates/motions/motion-detail.html:132 -#: motions/static/templates/motions/motion-detail.html:178 +#: assignments/static/js/assignments/site.js:379 +#: assignments/static/js/assignments/site.js:479 +#: motions/static/js/motions/site.js:330 +#: motions/static/templates/motions/motion-detail.html:149 msgid "No" msgstr "" -#: agenda/static/templates/agenda/item-list.html:54 +#: agenda/static/templates/agenda/item-list.html:55 msgid "Number agenda" msgstr "" -#: assignments/static/js/assignments/site.js:122 -#: assignments/static/templates/assignments/assignment-list.html:147 +#: assignments/static/templates/assignments/assignment-list.html:150 msgid "Number of members to be elected" msgstr "" +#: assignments/static/js/assignments/site.js:131 +#: assignments/static/templates/assignments/assignment-detail.html:56 +msgid "Number of posts to be elected" +msgstr "" + #: users/static/templates/users/user-detail-password.html:13 msgid "Old password" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:72 -msgid "Old speakers:" -msgstr "" - #: agenda/static/templates/agenda/item-import.html:71 #: motions/static/templates/motions/motion-import.html:43 #: users/static/templates/users/user-import.html:76 msgid "Only double quotes are accepted as text delimiter (no single quotes)." msgstr "" -#: users/static/js/users/site.js:358 +#: users/static/js/users/site.js:332 msgid "Only for notes." msgstr "" -#: agenda/static/templates/agenda/item-detail.html:43 +#: agenda/static/templates/agenda/item-detail.html:48 msgid "Open" msgstr "" @@ -788,12 +871,21 @@ msgstr "" msgid "Permissions:" msgstr "" +#: motions/static/js/motions/base.js:332 +msgid "Permit" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:232 +msgid "Permit and activate" +msgstr "" + #: users/static/templates/users/user-detail.html:30 msgid "Personal data" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:153 -#: assignments/static/templates/assignments/assignment-list.html:94 +#: assignments/static/templates/assignments/assignment-detail.html:61 +#: assignments/static/templates/assignments/assignment-list.html:156 +#: assignments/static/templates/assignments/assignment-list.html:97 msgid "Phase" msgstr "" @@ -803,7 +895,7 @@ msgstr "" msgid "Please note:" msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:89 +#: assignments/static/templates/assignments/assignment-list.html:92 msgid "Posts" msgstr "" @@ -816,7 +908,7 @@ msgstr "" msgid "Prefix:" msgstr "" -#: users/static/templates/users/user-list.html:114 +#: users/static/templates/users/user-list.html:122 msgid "Present" msgstr "" @@ -826,15 +918,15 @@ msgstr "" msgid "Preview" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:101 +#: assignments/static/templates/assignments/assignment-detail.html:138 msgid "Print ballot paper" msgstr "" -#: users/static/js/users/site.js:366 +#: users/static/js/users/site.js:340 msgid "Profile text." msgstr "" -#: agenda/static/templates/agenda/item-list.html:43 +#: agenda/static/templates/agenda/item-list.html:44 msgid "Project agenda" msgstr "" @@ -847,12 +939,12 @@ msgid "Project countdown" msgstr "" #: assignments/static/templates/assignments/assignment-detail.html:21 -#: assignments/static/templates/assignments/assignment-list.html:108 +#: assignments/static/templates/assignments/assignment-list.html:111 msgid "Project election" msgstr "" #: agenda/static/templates/agenda/item-detail.html:23 -#: agenda/static/templates/agenda/item-list.html:127 +#: agenda/static/templates/agenda/item-list.html:130 msgid "Project item" msgstr "" @@ -861,43 +953,58 @@ msgid "Project message" msgstr "" #: motions/static/templates/motions/motion-detail.html:21 -#: motions/static/templates/motions/motion-list.html:124 +#: motions/static/templates/motions/motion-list.html:127 msgid "Project motion" msgstr "" #: users/static/templates/users/user-detail.html:12 -#: users/static/templates/users/user-list.html:127 +#: users/static/templates/users/user-list.html:136 msgid "Project user" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:113 +#: assignments/static/templates/assignments/assignment-detail.html:150 msgid "Publish ballot" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:118 +#: assignments/static/templates/assignments/assignment-detail.html:155 msgid "Published" msgstr "" -#: agenda/static/templates/agenda/item-list.html:147 -#: assignments/static/templates/assignments/assignment-list.html:119 -#: motions/static/templates/motions/motion-list.html:142 -#: motions/static/templates/motions/motion-list.html:163 +#: agenda/static/templates/agenda/item-list.html:151 +#: assignments/static/templates/assignments/assignment-list.html:122 +#: motions/static/templates/motions/motion-list.html:145 +#: motions/static/templates/motions/motion-list.html:166 msgid "QuickEdit" msgstr "" -#: motions/static/js/motions/site.js:208 -#: motions/static/templates/motions/motion-detail.html:238 +#: motions/static/js/motions/site.js:214 +#: motions/static/templates/motions/motion-detail.html:204 #: motions/static/templates/motions/motion-import.html:57 #: motions/static/templates/motions/slide_motion.html:28 msgid "Reason" msgstr "" +#: motions/static/js/motions/base.js:327 +#: motions/static/js/motions/base.js:334 +msgid "Reject" +msgstr "" + +#: motions/static/js/motions/base.js:340 +msgid "Reject (not authorized)" +msgstr "" + +#: agenda/static/templates/agenda/item-detail.html:101 +#: agenda/static/templates/agenda/item-detail.html:120 +#: agenda/static/templates/agenda/item-detail.html:84 +msgid "Remove" +msgstr "" + #: core/static/templates/core/projector-controls.html:73 msgid "Remove countdown" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:147 -#: assignments/static/templates/assignments/assignment-detail.html:83 +#: agenda/static/templates/agenda/item-detail.html:154 +#: assignments/static/templates/assignments/assignment-detail.html:119 msgid "Remove me" msgstr "" @@ -919,24 +1026,24 @@ msgstr "" msgid "Reset scrolling" msgstr "" -#: motions/static/templates/motions/motion-detail.html:97 +#: motions/static/templates/motions/motion-detail.html:109 msgid "Reset state" msgstr "" -#: assignments/static/templates/assignments/assignment-form.html:6 -#: assignments/static/templates/assignments/assignmentpoll-form.html:5 -#: core/static/templates/core/customslide-form.html:6 +#: assignments/static/templates/assignments/assignment-form.html:10 +#: assignments/static/templates/assignments/assignmentpoll-form.html:14 +#: core/static/templates/core/customslide-form.html:10 #: core/static/templates/core/projector-controls.html:128 #: core/static/templates/core/projector-controls.html:184 #: core/static/templates/core/tag-form.html:21 #: mediafiles/static/templates/mediafiles/mediafile-form.html:35 #: motions/static/templates/motions/category-form.html:25 -#: motions/static/templates/motions/motion-detail.html:156 -#: motions/static/templates/motions/motion-form.html:6 +#: motions/static/templates/motions/motion-form.html:10 +#: motions/static/templates/motions/motionpoll-form.html:14 #: users/static/templates/users/group-form.html:27 #: users/static/templates/users/user-detail-password.html:36 #: users/static/templates/users/user-detail-profile.html:43 -#: users/static/templates/users/user-form.html:6 +#: users/static/templates/users/user-form.html:10 msgid "Save" msgstr "" @@ -948,18 +1055,18 @@ msgstr "" msgid "Scroll up" msgstr "" -#: agenda/static/templates/agenda/item-list.html:65 -#: assignments/static/templates/assignments/assignment-list.html:39 -#: motions/static/templates/motions/motion-list.html:45 +#: agenda/static/templates/agenda/item-list.html:66 +#: assignments/static/templates/assignments/assignment-list.html:40 +#: motions/static/templates/motions/motion-list.html:46 #: users/static/templates/users/group-list.html:24 -#: users/static/templates/users/user-list.html:55 +#: users/static/templates/users/user-list.html:56 msgid "Search" msgstr "" -#: agenda/static/templates/agenda/item-list.html:37 -#: assignments/static/templates/assignments/assignment-list.html:29 -#: motions/static/templates/motions/motion-list.html:36 -#: users/static/templates/users/user-list.html:46 +#: agenda/static/templates/agenda/item-list.html:38 +#: assignments/static/templates/assignments/assignment-list.html:30 +#: motions/static/templates/motions/motion-list.html:37 +#: users/static/templates/users/user-list.html:47 msgid "Select ..." msgstr "" @@ -969,40 +1076,40 @@ msgstr "" msgid "Select a CSV file" msgstr "" -#: motions/static/js/motions/site.js:244 +#: motions/static/js/motions/site.js:259 msgid "Select or search a category ..." msgstr "" -#: users/static/js/users/site.js:336 +#: users/static/js/users/site.js:310 msgid "Select or search a group ..." msgstr "" -#: agenda/static/templates/agenda/item-detail.html:127 -#: assignments/static/templates/assignments/assignment-detail.html:63 +#: agenda/static/templates/agenda/item-detail.html:134 +#: assignments/static/templates/assignments/assignment-detail.html:99 msgid "Select or search a participant ..." msgstr "" -#: motions/static/js/motions/site.js:183 -#: motions/static/templates/motions/motion-list.html:184 +#: motions/static/js/motions/site.js:189 +#: motions/static/templates/motions/motion-list.html:187 msgid "Select or search a submitter ..." msgstr "" -#: motions/static/js/motions/site.js:272 -#: motions/static/templates/motions/motion-list.html:209 +#: motions/static/js/motions/site.js:287 +#: motions/static/templates/motions/motion-list.html:212 msgid "Select or search a supporter ..." msgstr "" -#: motions/static/js/motions/site.js:258 -#: motions/static/templates/motions/motion-list.html:195 +#: motions/static/js/motions/site.js:273 +#: motions/static/templates/motions/motion-list.html:198 msgid "Select or search a tag ..." msgstr "" -#: motions/static/js/motions/site.js:286 +#: motions/static/js/motions/site.js:301 msgid "Select or search a workflow ..." msgstr "" -#: core/static/js/core/site.js:500 -#: motions/static/js/motions/site.js:230 +#: core/static/js/core/site.js:504 +#: motions/static/js/motions/site.js:245 msgid "Select or search an attachment ..." msgstr "" @@ -1012,34 +1119,35 @@ msgstr "" msgid "Separator" msgstr "" -#: core/static/js/core/site.js:93 +#: core/static/js/core/site.js:80 msgid "Settings" msgstr "" +#: agenda/static/templates/agenda/item-detail.html:72 #: mediafiles/static/templates/mediafiles/mediafile-list.html:65 msgid "Show" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:69 -msgid "Show all speakers" -msgstr "" - -#: agenda/static/templates/agenda/item-list.html:82 +#: agenda/static/templates/agenda/item-list.html:84 msgid "Show closed items" msgstr "" -#: motions/static/js/motions/site.js:216 +#: motions/static/js/motions/site.js:231 msgid "Show extended fields" msgstr "" -#: motions/static/templates/motions/motion-detail.html:250 +#: motions/static/templates/motions/motion-detail.html:249 msgid "Show history" msgstr "" -#: agenda/static/templates/agenda/item-list.html:79 +#: agenda/static/templates/agenda/item-list.html:81 msgid "Show internal items" msgstr "" +#: motions/static/js/motions/base.js:324 +msgid "Simple Workflow" +msgstr "" + #: core/static/templates/core/projector-controls.html:28 msgid "Smaller" msgstr "" @@ -1049,7 +1157,8 @@ msgstr "" msgid "Sort agenda" msgstr "" -#: motions/static/templates/motions/motion-detail.html:117 +#: assignments/static/templates/assignments/assignmentpoll-form.html:8 +#: motions/static/templates/motions/motionpoll-form.html:8 msgid "Special values" msgstr "" @@ -1061,29 +1170,21 @@ msgstr "" msgid "Start" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:55 -msgid "Start next speaker" -msgstr "" - #: core/static/templates/core/projector-controls.html:124 msgid "Start time" msgstr "" -#: motions/static/templates/motions/motion-detail.html:85 -#: motions/static/templates/motions/motion-list.html:110 +#: motions/static/templates/motions/motion-detail.html:97 +#: motions/static/templates/motions/motion-list.html:113 #: motions/static/templates/motions/slide_motion.html:5 msgid "State" msgstr "" -#: agenda/static/templates/agenda/item-detail.html:60 -msgid "Stop current speaker" -msgstr "" - -#: users/static/js/users/site.js:320 +#: users/static/js/users/site.js:294 #: users/static/templates/users/user-detail-profile.html:35 #: users/static/templates/users/user-detail.html:31 #: users/static/templates/users/user-import.html:90 -#: users/static/templates/users/user-list.html:104 +#: users/static/templates/users/user-list.html:112 msgid "Structure level" msgstr "" @@ -1091,21 +1192,21 @@ msgstr "" msgid "Submitter" msgstr "" -#: motions/static/js/motions/site.js:177 -#: motions/static/templates/motions/motion-detail.html:49 -#: motions/static/templates/motions/motion-list.html:100 -#: motions/static/templates/motions/motion-list.html:182 +#: motions/static/js/motions/site.js:183 +#: motions/static/templates/motions/motion-detail.html:61 +#: motions/static/templates/motions/motion-list.html:103 +#: motions/static/templates/motions/motion-list.html:185 #: motions/static/templates/motions/slide_motion.html:9 msgid "Submitters" msgstr "" -#: motions/static/templates/motions/motion-detail.html:64 +#: motions/static/templates/motions/motion-detail.html:76 msgid "Support motion" msgstr "" -#: motions/static/js/motions/site.js:266 -#: motions/static/templates/motions/motion-detail.html:56 -#: motions/static/templates/motions/motion-list.html:207 +#: motions/static/js/motions/site.js:281 +#: motions/static/templates/motions/motion-detail.html:68 +#: motions/static/templates/motions/motion-list.html:210 msgid "Supporters" msgstr "" @@ -1116,17 +1217,17 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:18 #: assignments/static/templates/assignments/assignment-list.html:10 #: core/static/templates/core/tag-list.html:9 -#: motions/static/js/motions/site.js:252 -#: motions/static/templates/motions/motion-detail.html:79 +#: motions/static/js/motions/site.js:267 +#: motions/static/templates/motions/motion-detail.html:91 #: motions/static/templates/motions/motion-list.html:14 -#: motions/static/templates/motions/motion-list.html:193 +#: motions/static/templates/motions/motion-list.html:196 msgid "Tags" msgstr "" #: agenda/static/templates/agenda/item-import.html:83 -#: core/static/js/core/site.js:486 -#: motions/static/js/motions/site.js:199 -#: motions/static/templates/motions/motion-detail.html:233 +#: core/static/js/core/site.js:490 +#: motions/static/js/motions/site.js:205 +#: motions/static/templates/motions/motion-detail.html:199 #: motions/static/templates/motions/motion-import.html:56 msgid "Text" msgstr "" @@ -1135,31 +1236,43 @@ msgstr "" msgid "Text is optional and may be empty." msgstr "" +#: motions/static/templates/motions/motion-detail.html:228 +msgid "This is the last active version." +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:37 +msgid "This version is not permitted." +msgstr "" + #. academic degree #: agenda/static/templates/agenda/item-import.html:82 -#: agenda/static/templates/agenda/item-list.html:170 -#: assignments/static/js/assignments/site.js:107 -#: assignments/static/templates/assignments/assignment-list.html:143 -#: assignments/static/templates/assignments/assignment-list.html:84 -#: core/static/js/core/site.js:478 +#: agenda/static/templates/agenda/item-list.html:173 +#: assignments/static/js/assignments/site.js:116 +#: assignments/static/templates/assignments/assignment-list.html:146 +#: assignments/static/templates/assignments/assignment-list.html:87 +#: core/static/js/core/site.js:482 #: mediafiles/static/templates/mediafiles/mediafile-form.html:25 #: mediafiles/static/templates/mediafiles/mediafile-list.html:25 -#: motions/static/js/motions/site.js:191 +#: motions/static/js/motions/site.js:197 #: motions/static/templates/motions/motion-import.html:55 -#: motions/static/templates/motions/motion-list.html:95 -#: users/static/js/users/site.js:298 +#: motions/static/templates/motions/motion-list.html:98 +#: users/static/js/users/site.js:272 #: users/static/templates/users/user-detail-profile.html:22 #: users/static/templates/users/user-import.html:87 msgid "Title" msgstr "" -#: motions/static/templates/motions/motion-detail.html:69 +#: motions/static/js/motions/site.js:222 +msgid "Trivial change" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:81 msgid "Unsupport motion" msgstr "" -#: agenda/static/templates/agenda/item-list.html:203 -#: assignments/static/templates/assignments/assignment-list.html:164 -#: motions/static/templates/motions/motion-list.html:223 +#: agenda/static/templates/agenda/item-list.html:206 +#: assignments/static/templates/assignments/assignment-list.html:167 +#: motions/static/templates/motions/motion-list.html:226 msgid "Update" msgstr "" @@ -1172,77 +1285,101 @@ msgid "Uploaded by" msgstr "" #: core/static/templates/core/login-form.html:12 +#: users/static/js/users/site.js:264 #: users/static/templates/users/user-detail-profile.html:13 #: users/static/templates/users/user-detail.html:43 msgid "Username" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:152 -#: motions/static/templates/motions/motion-detail.html:141 -#: motions/static/templates/motions/motion-detail.html:142 -#: motions/static/templates/motions/motion-detail.html:198 +#: assignments/static/templates/assignments/assignment-detail.html:189 +#: motions/static/js/motions/site.js:348 +#: motions/static/templates/motions/motion-detail.html:169 msgid "Valid votes" msgstr "" -#: motions/static/templates/motions/motion-detail.html:105 +#: motions/static/templates/motions/motion-detail.html:221 +#: motions/static/templates/motions/motion-detail.html:224 +msgid "Version" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:217 +msgid "Version history" +msgstr "" + +#: motions/static/templates/motions/motion-detail.html:118 +#: motions/static/templates/motions/motionpoll-form.html:1 msgid "Vote" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:130 +#: assignments/static/templates/assignments/assignment-detail.html:167 msgid "Votes" msgstr "" -#: assignments/static/js/assignments/site.js:516 -#: assignments/static/templates/assignments/assignment-detail.html:164 -#: motions/static/templates/motions/motion-detail.html:151 -#: motions/static/templates/motions/motion-detail.html:152 -#: motions/static/templates/motions/motion-detail.html:215 +#: assignments/static/js/assignments/site.js:528 +#: assignments/static/templates/assignments/assignment-detail.html:201 +#: motions/static/js/motions/site.js:364 +#: motions/static/templates/motions/motion-detail.html:183 msgid "Votes cast" msgstr "" -#: assignments/static/js/assignments/site.js:508 +#: assignments/static/js/assignments/site.js:520 msgid "Votes invalid" msgstr "" -#: assignments/static/js/assignments/site.js:500 +#: assignments/static/js/assignments/site.js:512 msgid "Votes valid" msgstr "" -#: motions/static/templates/motions/motion-detail.html:102 +#: motions/static/templates/motions/motion-detail.html:114 msgid "Voting result" msgstr "" -#: users/static/js/users/site.js:321 +#: users/static/js/users/site.js:295 msgid "Will be shown after the name." msgstr "" -#: users/static/js/users/site.js:299 +#: users/static/js/users/site.js:273 msgid "Will be shown before the name." msgstr "" -#: motions/static/js/motions/site.js:280 +#: motions/static/js/motions/base.js:335 +msgid "Withdraw" +msgstr "" + +#: motions/static/js/motions/site.js:295 msgid "Workflow" msgstr "" -#: assignments/static/js/assignments/site.js:157 -#: assignments/static/js/assignments/site.js:384 -#: assignments/static/js/assignments/site.js:458 -#: motions/static/templates/motions/motion-detail.html:126 -#: motions/static/templates/motions/motion-detail.html:127 -#: motions/static/templates/motions/motion-detail.html:169 +#: assignments/static/js/assignments/site.js:379 +#: assignments/static/js/assignments/site.js:470 +#: motions/static/js/motions/site.js:321 +#: motions/static/templates/motions/motion-detail.html:139 msgid "Yes" msgstr "" +#: motions/static/js/motions/base.js:326 +#: motions/static/js/motions/base.js:333 +msgid "accepted" +msgstr "" + +#: motions/static/js/motions/base.js:336 +msgid "adjourned" +msgstr "" + #: agenda/static/templates/agenda/item-import.html:110 msgid "agenda items will be not imported." msgstr "" -#: assignments/static/templates/assignments/assignment-list.html:72 +#: motions/static/js/motions/base.js:338 +msgid "commited a bill" +msgstr "" + +#: assignments/static/templates/assignments/assignment-list.html:75 msgid "elections" msgstr "" #. 'h' means time in hours -#: agenda/static/templates/agenda/item-list.html:158 +#: agenda/static/templates/agenda/item-list.html:161 msgid "h" msgstr "" @@ -1251,16 +1388,17 @@ msgstr "" msgid "imported" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:135 -#: assignments/static/templates/assignments/assignment-detail.html:50 +#: assignments/static/templates/assignments/assignment-detail.html:172 +#: assignments/static/templates/assignments/assignment-detail.html:86 +#: assignments/static/templates/assignments/slide_assignment.html:10 msgid "is elected" msgstr "" -#: assignments/static/templates/assignments/assignment-detail.html:136 +#: assignments/static/templates/assignments/assignment-detail.html:173 msgid "is not elected" msgstr "" -#: agenda/static/templates/agenda/item-list.html:98 +#: agenda/static/templates/agenda/item-list.html:101 msgid "items" msgstr "" @@ -1272,11 +1410,12 @@ msgstr "" msgid "items will be imported." msgstr "" -#: motions/static/templates/motions/motion-detail.html:118 +#: assignments/static/templates/assignments/assignmentpoll-form.html:9 +#: motions/static/templates/motions/motionpoll-form.html:9 msgid "majority" msgstr "" -#: motions/static/templates/motions/motion-list.html:78 +#: motions/static/templates/motions/motion-list.html:81 msgid "motions" msgstr "" @@ -1292,7 +1431,19 @@ msgstr "" msgid "motions will be not imported." msgstr "" -#: users/static/templates/users/user-list.html:86 +#: motions/static/js/motions/base.js:339 +msgid "needs review" +msgstr "" + +#: motions/static/js/motions/base.js:337 +msgid "not concerned" +msgstr "" + +#: motions/static/js/motions/base.js:328 +msgid "not decided" +msgstr "" + +#: users/static/templates/users/user-list.html:94 msgid "participants" msgstr "" @@ -1308,17 +1459,47 @@ msgstr "" msgid "participants will be not imported." msgstr "" -#: agenda/static/templates/agenda/item-list.html:99 -#: assignments/static/templates/assignments/assignment-list.html:73 -#: motions/static/templates/motions/motion-list.html:79 -#: users/static/templates/users/user-list.html:87 +#: motions/static/js/motions/base.js:332 +msgid "permitted" +msgstr "" + +#: motions/static/js/motions/base.js:331 +msgid "published" +msgstr "" + +#: motions/static/js/motions/base.js:327 +#: motions/static/js/motions/base.js:334 +msgid "rejected" +msgstr "" + +#: motions/static/js/motions/base.js:340 +msgid "rejected (not authorized)" +msgstr "" + +#: agenda/static/templates/agenda/item-list.html:102 +#: assignments/static/templates/assignments/assignment-list.html:76 +#: motions/static/templates/motions/motion-list.html:82 +#: users/static/templates/users/user-list.html:95 msgid "selected" msgstr "" -#: motions/static/templates/motions/motion-detail.html:119 +#: agenda/static/templates/agenda/slide-list-of-speakers.html:9 +msgid "speakers" +msgstr "" + +#: motions/static/js/motions/base.js:325 +msgid "submitted" +msgstr "" + +#: assignments/static/templates/assignments/assignmentpoll-form.html:10 +#: motions/static/templates/motions/motionpoll-form.html:10 msgid "undocumented" msgstr "" +#: motions/static/js/motions/base.js:335 +msgid "withdrawed" +msgstr "" + #: users/static/templates/users/user-import.html:125 msgid "{{ groupname }}" msgstr "" diff --git a/openslides/locale/en/LC_MESSAGES/django.po b/openslides/locale/en/LC_MESSAGES/django.po index ecf8f9f34..2c2c885b4 100644 --- a/openslides/locale/en/LC_MESSAGES/django.po +++ b/openslides/locale/en/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-13 11:44+0100\n" +"POT-Creation-Date: 2016-01-22 21:13+0100\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -187,12 +187,12 @@ msgstr "" msgid "You have to submit data for %d candidates." msgstr "" -#: assignments/serializers.py:140 motions/serializers.py:168 +#: assignments/serializers.py:140 motions/serializers.py:176 #, python-format msgid "You have to submit data for %d vote values." msgstr "" -#: assignments/serializers.py:144 motions/serializers.py:172 +#: assignments/serializers.py:144 motions/serializers.py:180 #, python-format msgid "Vote value %s is invalid." msgstr "" @@ -331,7 +331,7 @@ msgstr "" #: assignments/views.py:175 msgid "" -"You can not delete someones candidature to this election because it is " +"You can not delete someone's candidature to this election because it is " "finished." msgstr "" @@ -677,7 +677,7 @@ msgstr "" #: motions/signals.py:86 motions/signals.py:98 motions/signals.py:108 #: motions/signals.py:120 motions/signals.py:133 motions/signals.py:142 #: motions/signals.py:153 motions/signals.py:162 motions/signals.py:170 -#: motions/views.py:351 motions/views.py:411 +#: motions/views.py:357 motions/views.py:417 msgid "Motion" msgstr "" @@ -706,7 +706,7 @@ msgstr "" msgid "State" msgstr "" -#: motions/pdf.py:91 motions/views.py:151 motions/views.py:163 +#: motions/pdf.py:91 motions/views.py:157 motions/views.py:169 msgid "Version" msgstr "" @@ -714,7 +714,7 @@ msgstr "" msgid "Vote result" msgstr "" -#: motions/pdf.py:121 motions/views.py:351 +#: motions/pdf.py:121 motions/views.py:357 msgid "Vote" msgstr "" @@ -745,11 +745,11 @@ msgstr "" msgid "Workflow %(pk)d does not exist." msgstr "" -#: motions/serializers.py:127 poll/models.py:262 +#: motions/serializers.py:129 poll/models.py:262 msgid "majority" msgstr "" -#: motions/serializers.py:129 poll/models.py:264 poll/models.py:266 +#: motions/serializers.py:131 poll/models.py:264 poll/models.py:266 msgid "undocumented" msgstr "" @@ -828,7 +828,7 @@ msgstr "" msgid "Voting and ballot papers" msgstr "" -#: motions/signals.py:150 motions/views.py:404 +#: motions/signals.py:150 motions/views.py:410 msgid "Motions" msgstr "" @@ -844,175 +844,83 @@ msgstr "" msgid "Show paragraph numbering (only in PDF)" msgstr "" -#: motions/signals.py:184 -msgid "Simple Workflow" -msgstr "" - -#: motions/signals.py:185 -msgid "submitted" -msgstr "" - -#: motions/signals.py:190 motions/signals.py:219 -msgid "accepted" -msgstr "" - -#: motions/signals.py:192 motions/signals.py:221 -msgid "Accept" -msgstr "" - -#: motions/signals.py:194 motions/signals.py:224 -msgid "rejected" -msgstr "" - -#: motions/signals.py:196 motions/signals.py:226 -msgid "Reject" -msgstr "" - -#: motions/signals.py:198 -msgid "not decided" -msgstr "" - -#: motions/signals.py:200 -msgid "Do not decide" -msgstr "" - -#: motions/signals.py:206 -msgid "Complex Workflow" -msgstr "" - -#: motions/signals.py:207 -msgid "published" -msgstr "" - -#: motions/signals.py:212 motions/views.py:153 -msgid "permitted" -msgstr "" - -#: motions/signals.py:214 -msgid "Permit" -msgstr "" - -#: motions/signals.py:229 -msgid "withdrawed" -msgstr "" - -#: motions/signals.py:231 -msgid "Withdraw" -msgstr "" - -#: motions/signals.py:234 -msgid "adjourned" -msgstr "" - -#: motions/signals.py:236 -msgid "Adjourn" -msgstr "" - -#: motions/signals.py:239 -msgid "not concerned" -msgstr "" - -#: motions/signals.py:241 -msgid "Do not concern" -msgstr "" - -#: motions/signals.py:244 -msgid "commited a bill" -msgstr "" - -#: motions/signals.py:246 -msgid "Commit a bill" -msgstr "" - -#: motions/signals.py:249 -msgid "needs review" -msgstr "" - -#: motions/signals.py:251 -msgid "Needs review" -msgstr "" - -#: motions/signals.py:254 -msgid "rejected (not authorized)" -msgstr "" - -#: motions/signals.py:256 -msgid "Reject (not authorized)" -msgstr "" - #: motions/views.py:85 msgid "Motion created" msgstr "" -#: motions/views.py:121 +#: motions/views.py:127 msgid "Motion updated" msgstr "" -#: motions/views.py:125 +#: motions/views.py:131 msgid "All supporters removed" msgstr "" -#: motions/views.py:155 +#: motions/views.py:159 +msgid "permitted" +msgstr "" + +#: motions/views.py:161 #, python-format msgid "Version %d permitted successfully." msgstr "" -#: motions/views.py:160 +#: motions/views.py:166 msgid "You can not delete the active version of a motion." msgstr "" -#: motions/views.py:165 +#: motions/views.py:171 msgid "deleted" msgstr "" -#: motions/views.py:167 +#: motions/views.py:173 #, python-format msgid "Version %d deleted successfully." msgstr "" -#: motions/views.py:188 +#: motions/views.py:194 msgid "You can not support this motion." msgstr "" -#: motions/views.py:190 +#: motions/views.py:196 msgid "Motion supported" msgstr "" -#: motions/views.py:191 +#: motions/views.py:197 msgid "You have supported this motion successfully." msgstr "" -#: motions/views.py:196 +#: motions/views.py:202 msgid "You can not unsupport this motion." msgstr "" -#: motions/views.py:198 +#: motions/views.py:204 msgid "Motion unsupported" msgstr "" -#: motions/views.py:199 +#: motions/views.py:205 msgid "You have unsupported this motion successfully." msgstr "" -#: motions/views.py:222 +#: motions/views.py:228 msgid "Invalid data. State must be an integer." msgstr "" -#: motions/views.py:225 +#: motions/views.py:231 #, python-format msgid "You can not set the state to %(state_id)d." msgstr "" -#: motions/views.py:233 +#: motions/views.py:239 #, python-format msgid "The state of the motion was set to %s." msgstr "" -#: motions/views.py:237 +#: motions/views.py:243 msgid "State set to" msgstr "" -#: motions/views.py:252 +#: motions/views.py:258 msgid "Vote created successfully." msgstr "" diff --git a/openslides/motions/signals.py b/openslides/motions/signals.py index 113113406..35f4688aa 100644 --- a/openslides/motions/signals.py +++ b/openslides/motions/signals.py @@ -1,6 +1,6 @@ from django.core.validators import MinValueValidator from django.utils.translation import ugettext as _ -from django.utils.translation import pgettext, ugettext_lazy, ugettext_noop +from django.utils.translation import pgettext, ugettext_lazy from openslides.core.config import ConfigVariable from openslides.poll.models import PERCENT_BASE_CHOICES @@ -181,79 +181,79 @@ def create_builtin_workflows(sender, **kwargs): # If there is at least one workflow, then do nothing. return - workflow_1 = Workflow.objects.create(name=ugettext_noop('Simple Workflow')) - state_1_1 = State.objects.create(name=ugettext_noop('submitted'), + workflow_1 = Workflow.objects.create(name='Simple Workflow') + state_1_1 = State.objects.create(name='submitted', workflow=workflow_1, allow_create_poll=True, allow_support=True, allow_submitter_edit=True) - state_1_2 = State.objects.create(name=ugettext_noop('accepted'), + state_1_2 = State.objects.create(name='accepted', workflow=workflow_1, - action_word=ugettext_noop('Accept'), + action_word='Accept', css_class='success') - state_1_3 = State.objects.create(name=ugettext_noop('rejected'), + state_1_3 = State.objects.create(name='rejected', workflow=workflow_1, - action_word=ugettext_noop('Reject'), + action_word='Reject', css_class='danger') - state_1_4 = State.objects.create(name=ugettext_noop('not decided'), + state_1_4 = State.objects.create(name='not decided', workflow=workflow_1, - action_word=ugettext_noop('Do not decide'), + action_word='Do not decide', css_class='default') state_1_1.next_states.add(state_1_2, state_1_3, state_1_4) workflow_1.first_state = state_1_1 workflow_1.save() - workflow_2 = Workflow.objects.create(name=ugettext_noop('Complex Workflow')) - state_2_1 = State.objects.create(name=ugettext_noop('published'), + workflow_2 = Workflow.objects.create(name='Complex Workflow') + state_2_1 = State.objects.create(name='published', workflow=workflow_2, allow_support=True, allow_submitter_edit=True, dont_set_identifier=True) - state_2_2 = State.objects.create(name=ugettext_noop('permitted'), + state_2_2 = State.objects.create(name='permitted', workflow=workflow_2, - action_word=ugettext_noop('Permit'), + action_word='Permit', allow_create_poll=True, allow_submitter_edit=True, versioning=True, leave_old_version_active=True) - state_2_3 = State.objects.create(name=ugettext_noop('accepted'), + state_2_3 = State.objects.create(name='accepted', workflow=workflow_2, - action_word=ugettext_noop('Accept'), + action_word='Accept', versioning=True, css_class='success') - state_2_4 = State.objects.create(name=ugettext_noop('rejected'), + state_2_4 = State.objects.create(name='rejected', workflow=workflow_2, - action_word=ugettext_noop('Reject'), + action_word='Reject', versioning=True, css_class='danger') - state_2_5 = State.objects.create(name=ugettext_noop('withdrawed'), + state_2_5 = State.objects.create(name='withdrawed', workflow=workflow_2, - action_word=ugettext_noop('Withdraw'), + action_word='Withdraw', versioning=True, css_class='default') - state_2_6 = State.objects.create(name=ugettext_noop('adjourned'), + state_2_6 = State.objects.create(name='adjourned', workflow=workflow_2, - action_word=ugettext_noop('Adjourn'), + action_word='Adjourn', versioning=True, css_class='default') - state_2_7 = State.objects.create(name=ugettext_noop('not concerned'), + state_2_7 = State.objects.create(name='not concerned', workflow=workflow_2, - action_word=ugettext_noop('Do not concern'), + action_word='Do not concern', versioning=True, css_class='default') - state_2_8 = State.objects.create(name=ugettext_noop('commited a bill'), + state_2_8 = State.objects.create(name='commited a bill', workflow=workflow_2, - action_word=ugettext_noop('Commit a bill'), + action_word='Commit a bill', versioning=True, css_class='default') - state_2_9 = State.objects.create(name=ugettext_noop('needs review'), + state_2_9 = State.objects.create(name='needs review', workflow=workflow_2, - action_word=ugettext_noop('Needs review'), + action_word='Needs review', versioning=True, css_class='default') - state_2_10 = State.objects.create(name=ugettext_noop('rejected (not authorized)'), + state_2_10 = State.objects.create(name='rejected (not authorized)', workflow=workflow_2, - action_word=ugettext_noop('Reject (not authorized)'), + action_word='Reject (not authorized)', versioning=True, css_class='default') state_2_1.next_states.add(state_2_2, state_2_5, state_2_10) diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js index 20e9ce8a1..f43455e68 100644 --- a/openslides/motions/static/js/motions/base.js +++ b/openslides/motions/static/js/motions/base.js @@ -312,5 +312,45 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users']) 'Motion', 'Category', function(Motion, Category) {} +]) + + +// Mark all motion workflow state strings for translation in JavaScript. +// (see motions/signals.py) +.config([ + 'gettext', + function (gettext) { + // workflow 1 + gettext('Simple Workflow') + gettext('submitted') + gettext('accepted') + gettext('Accept') + gettext('rejected') + gettext('Reject') + gettext('not decided') + gettext('Do not decide') + // workflow 2 + gettext('Complex Workflow') + gettext('published') + gettext('permitted') + gettext('Permit') + gettext('accepted') + gettext('Accept') + gettext('rejected') + gettext('Reject') + gettext('withdrawed') + gettext('Withdraw') + gettext('adjourned') + gettext('Adjourn') + gettext('not concerned') + gettext('Do not concern') + gettext('commited a bill') + gettext('Commit a bill') + gettext('needs review') + gettext('Needs review') + gettext('rejected (not authorized)') + gettext('Reject (not authorized)') + } ]); + }()); diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html index b020ddc83..5fa284951 100644 --- a/openslides/motions/static/templates/motions/slide_motion.html +++ b/openslides/motions/static/templates/motions/slide_motion.html @@ -3,7 +3,7 @@