Merge pull request #1268 from emanuelschuetze/translationstrings

Updated translation strings.

openslides/assignment/templates/assignment/assignmentpoll_form.html

@@ -23,7 +23,7 @@
             </a>
             <a class="btn btn-mini activate_link {% if poll.is_active_slide %}btn-primary{% endif %}" href="{{ poll|absolute_url:'projector' }}"
                 rel="tooltip" data-original-title="{% trans 'Show election result' %}">
-                <i class="icon-facetime-video {% if poll.is_active_slide %}icon-white{% endif %}"></i> {% trans "Vote result" %}</a>
+                <i class="icon-facetime-video {% if poll.is_active_slide %}icon-white{% endif %}"></i> {% trans "Election result" %}</a>
         {% endif %}
         {% if perms.motion.can_manage_motion %}
             <a class="btn btn-mini" href="{{ poll|absolute_url:'delete' }}"

openslides/assignment/views.py

@@ -372,7 +372,7 @@ class AssignmentPDF(PDFView):
                         stylesheet['Signaturefield']))
         cell2b.append(Spacer(0, 0.2 * cm))
 
-        # Vote results
+        # Election result
 
         # Preparing
         vote_results = assignment.vote_results(only_published=True)
@@ -382,7 +382,7 @@ class AssignmentPDF(PDFView):
         # Left side
         cell3a = []
         cell3a.append(Paragraph(
-            "%s:" % (_("Vote result")), stylesheet['Heading4']))
+            "%s:" % (_("Election result")), stylesheet['Heading4']))
 
         if polls.count() == 1:
             cell3a.append(Paragraph(

openslides/core/static/css/dashboard.css

@@ -150,6 +150,9 @@
  *
  * TODO: move to projector app or merge projector with core
  */
+#countdown_shortcut_storage {
+    margin-top: 5px;
+}
 
 #countdown_shortcut_storage .countdown_shortcut_time {
     margin-right: 2px;

openslides/participant/views.py

@@ -116,7 +116,7 @@ class UserMultipleCreateView(FormView):
                 last_name=last_name,
                 default_password=default_password,
                 password=make_password(default_password, '', 'md5'))
-        messages.success(self.request, _('%(number)d users successfully created.') % {'number': number + 1})
+        messages.success(self.request, _('%(number)d participants successfully created.') % {'number': number + 1})
         return super(UserMultipleCreateView, self).form_valid(form)
 
 

openslides/poll/models.py

@@ -81,9 +81,9 @@ class CollectDefaultVotesMixin(models.Model):
     invalid votes and votes cast.
     """
     votesvalid = MinMaxIntegerField(null=True, blank=True, min_value=-2,
-                                    verbose_name=ugettext_lazy('Votes valid'))
+                                    verbose_name=ugettext_lazy('Valid votes'))
     votesinvalid = MinMaxIntegerField(null=True, blank=True, min_value=-2,
-                                      verbose_name=ugettext_lazy('Votes invalid'))
+                                      verbose_name=ugettext_lazy('Invalid votes'))
     votescast = MinMaxIntegerField(null=True, blank=True, min_value=-2,
                                    verbose_name=ugettext_lazy('Votes cast'))
 

openslides/projector/templates/projector/overlay_countdown_widget.html

@@ -7,7 +7,7 @@
             <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
             <span class="add-on">{% trans "s" context "seconds" %}</span>
             <button id="countdown_set" class="countdown_control btn tooltip-bottom" href="{% url 'countdown_set_default' %}"
-                rel="tooltip" data-original-title="{% trans 'Add time to favourits' %}">
+                rel="tooltip" data-original-title="{% trans 'Add time to favourites' %}">
                 <i class="icon-star"></i>
             </button>
         </div>
@@ -27,10 +27,10 @@
         </a>
 
         <!-- countdown_shortcut -->
-        <span id="countdown_shortcut_dummy" class="countdown_shortcut_time btn btn-default">
+        <span id="countdown_shortcut_dummy" class="countdown_shortcut_time btn btn-mini btn-default">
             <span></span>
             <a class="countdown_shortcut_remove" href="#">
-                <button type="button" class="close" aria-hidden="true">&times;</button>
+                <button type="button" class="close" aria-hidden="true"><sup>&times;</sup></button>
             </a>
         </span>
         <div id="countdown_shortcut_storage"></div>