Merge pull request #751 from ostcar/translation

small translation update

openslides/agenda/models.py

@@ -324,7 +324,7 @@ class SpeakerManager(models.Manager):
                 % {'person': person, 'id': item.id})
         if isinstance(person, AnonymousUser):
             raise OpenSlidesError(
-                _('An anonymous user can not be on the list of speakers.'))
+                _('An anonymous user can not be on lists of speakers.'))
         weight = (self.filter(item=item).aggregate(
             models.Max('weight'))['weight__max'] or 0)
         return self.create(item=item, person=person, weight=weight + 1)

openslides/agenda/templates/agenda/edit.html

@@ -26,9 +26,7 @@
     <p>
         {% if item.related_sid %}
             <a href="{% model_url item.get_related_slide 'update' %}" class="btn btn-small">
-                {% blocktrans with type=item.get_related_type|trans name=item.get_related_slide %}
+                {% blocktrans with type=item.get_related_type|trans name=item.get_related_slide %}Edit {{ type }} {{ name }}{% endblocktrans %}
-                    Edit {{ type }} {{ name }}
-                {% endblocktrans %}
             </a>
         {% endif %}
     </p>

openslides/agenda/templates/agenda/overlay_speaker_widget.html

@@ -1,5 +1,6 @@
 {% load i18n %}
 
 <span>
-    {% trans "List of speakers" %} <small class="grey">({% trans 'This overlay only appears on agenda slides if it is activated' %}.)</small>
+    {% trans 'List of speakers' %}
+    <small class="grey">({% trans 'This overlay only appears on agenda slides if it is activated.' %})</small>
 </span>

openslides/locale/de/LC_MESSAGES/djangojs.po

@@ -1,19 +1,23 @@
-# German translations for JavaScript file in OpenSlides package.
+# English source 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.
-# Emanuel Schütze <emanuel@intevation.de>, 2013.
+# 
-#
+# Translators:
+# emanuel <emanuel@intevation.de>, 2013
+# ostcar <mail@oshahn.de>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenSlides 1.3\n"
+"Project-Id-Version: OpenSlides\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 21:13+0200\n"
+"POT-Creation-Date: 2013-06-03 22:50+0200\n"
-"PO-Revision-Date: 2012-07-28 11:07+0200\n"
+"PO-Revision-Date: 2013-06-16 16:18+0000\n"
-"Last-Translator: Emanuel Schütze <emanuel@intevation.de>\n"
+"Last-Translator: ostcar <mail@oshahn.de>\n"
-"Language: de\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"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: agenda/static/javascript/agenda-config-datepicker.js:9

openslides/motion/signals.py

@@ -41,7 +41,7 @@ def setup_motion_config_page(sender, **kwargs):
             initial=4,
             min_value=0,
             max_value=8,
-            help_text=ugettext_lazy('Choose 0 to disable the supporting system')))
+            help_text=ugettext_lazy('Choose 0 to disable the supporting system.')))
     motion_remove_supporters = ConfigVariable(
         name='motion_remove_supporters',
         default_value=False,

openslides/participant/templates/participant/overview.html

@@ -14,7 +14,7 @@
     <script src="{% static 'javascript/jquery.dataTables.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/dataTables.bootstrap.js' %}" type="text/javascript"></script>
 {% endblock %}
-    
+
 {% block content %}
     <h1>
         {% trans "Participants" %}
@@ -61,7 +61,7 @@
         {% for user in users %}
             <tr class="{% if user.active %}activeline{% endif %}">
                 <td>{% if perms.participant.can_manage_participant %}
-                        {% if user != request_user and not user.is_superuser %}
+                        {% if user != request_user %}
                          <a href="{% url 'user_status_toggle' user.id %}"
                            class="status_link btn btn-mini {% if user.is_active %}btn-success{% endif %}"
                            rel="tooltip" data-original-title="{% if user.is_active %}{% trans 'present' %}{% else %}{% trans 'absent' %}{% endif %}">

openslides/participant/views.py

@@ -183,9 +183,6 @@ class SetUserStatusView(RedirectView, SingleObjectMixin):
             if self.object.user == self.request.user:
                 messages.error(request, _("You can not deactivate yourself."))
                 return
-            elif self.object.is_superuser:
-                messages.error(request, _("You can not deactivate the administrator."))
-                return
             self.object.is_active = False
         elif action == 'toggle':
             self.object.is_active = not self.object.is_active