Updated EN translation strings and updated EN po files.

Template fixes and improvements.

openslides/agenda/templates/agenda/item_row.html

@@ -44,7 +44,7 @@
     {% if perms.agenda.can_see_orga_items %}
     <div class="duration">
         {% if node.duration %}
-            {{ node.duration }}h
+            {{ node.duration }} h
             {% if start and end %}
                 <a rel="tooltip" data-original-title="{% trans 'End' %}:
                 {{ end|date:"DATETIME_FORMAT" }}"><i class="icon-clock"></i>

openslides/agenda/templates/agenda/overview.html

@@ -91,7 +91,7 @@
                 <td class="optional"></td>
                 {% endif %}
                 {% if perms.agenda.can_see_orga_items %}
-                <td class="duration">{{ duration }}h</td>
+                <td class="duration">{{ duration }} h</td>
                 {% endif %}
                 {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
                 <td class="manage">

openslides/locale/en/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

openslides/motion/templates/motion/motion_detail.html

@@ -38,11 +38,11 @@
                 {% trans 'More actions' %} <span class="caret"></span>
             </a>
             <ul class="dropdown-menu pull-right">
+                <!-- edit -->
+                {% if allowed_actions.edit %}
+                     <li><a href="{% model_url motion 'edit' %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li>
+                {% endif %}
                 {% if perms.motion.can_manage_motion %}
-                    <!-- edit -->
-                    {% if allowed_actions.edit %}
-                         <li><a href="{% model_url motion 'edit' %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li>
-                    {% endif %}
                     <!-- delete -->
                     {% if allowed_actions.delete %}
                         <li><a href="{% model_url motion 'delete' %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>

openslides/motion/views.py

@@ -731,7 +731,10 @@ class MotionCSVImportView(FormView):
         if count_success:
             messages.success(
                 self.request,
-                "<strong>%s</strong><br>%s" % (_('Summary'), _('%d of %d motions successfully imported.') % (count_success, count_lines)))
+                "<strong>%s</strong><br>%s" % (
+                    _('Summary'),
+                    _('%(counts)d of %(total)d motions successfully imported.')
+                    % {'counts': count_success, 'total': count_lines}))
         return super(MotionCSVImportView, self).form_valid(form)
 
 motion_csv_import = MotionCSVImportView.as_view()