Merge pull request #1683 from normanjaeckel/Translations

Updated Englisch language files.

openslides/agenda/static/templates/agenda/item-detail.html

@@ -33,7 +33,7 @@
 </div>
 
 
-<h2 translate>List of speakers
+<h2 translate>List of speakers</h2>
   <span os-perms="agenda.can_manage">
     <button ng-if="item.speaker_list_closed" ng-click="closeList(false)"
         class="btn btn-sm btn-danger" translate>

openslides/agenda/static/templates/agenda/item-import.html

@@ -58,7 +58,7 @@ Keep each item in a single line.</p>
         <th>#
         <th translate>Title
         <th translate>Text
-        <th translate>Duration
+        <th translate>Duration</th>
     <tbody ng-repeat="item in csv.result">
       <tr>
         <td>{{ $index+1 }}

openslides/assignments/projector.py

@@ -21,7 +21,7 @@ class AssignmentSlide(ProjectorElement):
         if pk is not None:
             # Detail slide.
             if not Assignment.objects.filter(pk=pk).exists():
-                raise ProjectorException(_('Assignment does not exist.'))
+                raise ProjectorException(_('Election does not exist.'))
 
     def get_requirements(self, config_entry):
         pk = config_entry.get('id')

openslides/core/config.py

@@ -65,7 +65,8 @@ class ConfigHandler:
         try:
             value = expected_type(value)
         except ValueError:
-            raise ConfigError(_('Wrong datatype. Expected %s, got %s.') % (expected_type, type(value)))
+            raise ConfigError(_('Wrong datatype. Expected %(expected_type)s, got %(got_type)s.') % {
+                'expected_type': expected_type, 'got_type': type(value)})
         if config_variable.input_type == 'choice' and value not in map(lambda choice: choice['value'], config_variable.choices):
             raise ConfigError(_('Invalid input. Choice does not match.'))
         for validator in config_variable.validators:

openslides/core/static/templates/core/projector-controls.html

@@ -1,5 +1,5 @@
 <!-- projector live view -->
-<h3 translate>Projector</h4>
+<h3 translate>Projector</h3>
 <a ui-sref="projector" target="_blank">
   <div id="iframewrapper">
     <iframe id="iframe" src="/projector" frameborder="0"></iframe>

openslides/locale/en/LC_MESSAGES/djangojs.po

@@ -1,250 +0,0 @@
-# Language file (for JavaScript) of OpenSlides used by transifex:
-# https://www.transifex.com/projects/p/openslides/
-# Copyright (C) 2011–2013 by OpenSlides team, see AUTHORS.
-# This file is distributed under the same license as the OpenSlides package.
-msgid ""
-msgstr ""
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-15 20:37+0100\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: agenda/static/js/agenda.js:14
-#, c-format
-msgid ", of which %s are hidden."
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:14
-msgid "All"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:19
-msgid "_MENU_ entries per page"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:20
-msgid "Search:"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:21
-msgid "Showing _START_ to _END_ of _TOTAL_ entries"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:22
-msgid "Showing 0 entries"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:23
-msgid "(filtered from _MAX_ total entries)"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:24
-msgid "No matching records found"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:26
-msgid "First"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:27
-msgid "Last"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:28
-msgid "Next"
-msgstr ""
-
-#: core/static/js/jquery/dataTables.bootstrap.js:29
-msgid "Previous"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:2
-#: core/static/js/jquery/datepicker-config.js:32
-msgid "en"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:3
-msgid "previous month"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:4
-msgid "next month"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:6
-msgid "January"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:6
-msgid "February"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:6
-msgid "March"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:7
-msgid "April"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:7
-#: core/static/js/jquery/datepicker-config.js:13
-msgid "May"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:7
-msgid "June"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:8
-msgid "July"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:8
-msgid "August"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:8
-msgid "September"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:9
-msgid "October"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:9
-msgid "November"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:9
-msgid "December"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:12
-msgid "Jan"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:12
-msgid "Feb"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:12
-msgid "Mar"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:13
-msgid "Apr"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:13
-msgid "Jun"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:14
-msgid "Jul"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:14
-msgid "Aug"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:14
-msgid "Sep"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:15
-msgid "Oct"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:15
-msgid "Nov"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:15
-msgid "Dec"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:18
-msgid "Sunday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:18
-msgid "Monday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:18
-msgid "Tuesday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:18
-msgid "Wednesday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:19
-msgid "Thursday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:19
-msgid "Friday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:19
-msgid "Saturday"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:22
-#: core/static/js/jquery/datepicker-config.js:26
-msgid "Su"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:22
-#: core/static/js/jquery/datepicker-config.js:26
-msgid "Mo"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:22
-#: core/static/js/jquery/datepicker-config.js:26
-msgid "Tu"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:22
-#: core/static/js/jquery/datepicker-config.js:26
-msgid "We"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:23
-#: core/static/js/jquery/datepicker-config.js:27
-msgid "Th"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:23
-#: core/static/js/jquery/datepicker-config.js:27
-msgid "Fr"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:23
-#: core/static/js/jquery/datepicker-config.js:27
-msgid "Sa"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:38
-msgid "Time"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:39
-msgid "Hour"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:40
-msgid "Minute"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:41
-msgid "Current time"
-msgstr ""
-
-#: core/static/js/jquery/datepicker-config.js:42
-msgid "Close"
-msgstr ""

openslides/users/static/templates/users/user-import.html

@@ -65,7 +65,7 @@ Keep each person in a single line.</p>
         <th translate>Last name
         <th translate>Structure level
         <th translate>Groups
-        <th translate>Comment
+        <th translate>Comment</th>
     <tbody ng-repeat="user in csv.result">
       <tr>
         <td>{{ $index+1 }}