From 4075c1aa3fbf9437d08f154ba54f138806a6f92b Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 4 Oct 2016 12:00:11 +0200
Subject: [PATCH] Fixed translations strings. Updated template-en.pot.

---
 .../agenda/current-list-of-speakers.html      |  2 +-
 .../static/templates/agenda/item-detail.html  |  4 +-
 .../static/templates/agenda/item-list.html    |  4 +-
 .../slide-current-list-of-speakers.html       |  2 +-
 .../templates/core/manage-projectors.html     |  7 +-
 .../locale/angular-gettext/template-en.pot    | 75 +++++++++----------
 .../templates/mediafiles/mediafile-list.html  |  4 +-
 openslides/motions/static/js/motions/site.js  |  2 +-
 8 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/current-list-of-speakers.html b/openslides/agenda/static/templates/agenda/current-list-of-speakers.html
index c6c4a7923..cd0473467 100644
--- a/openslides/agenda/static/templates/agenda/current-list-of-speakers.html
+++ b/openslides/agenda/static/templates/agenda/current-list-of-speakers.html
@@ -34,7 +34,7 @@
                 ng-class="{ 'projected': isCurrentLoSProjected() == projector.id }">
                 <i class="fa fa-video-camera" ng-show="isCurrentLoSProjected() == projector.id"></i>
                 {{ projector.name }}
-                <span ng-if="projector.id == defaultProjectorId">(<translate>Standard</translate>)</span>
+                <span ng-if="projector.id == defaultProjectorId">(<translate>Default</translate>)</span>
               </a>
             </li>
           </ul>
diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html
index 477855a6d..2832be5eb 100644
--- a/openslides/agenda/static/templates/agenda/item-detail.html
+++ b/openslides/agenda/static/templates/agenda/item-detail.html
@@ -11,7 +11,7 @@
       </a>
       <!-- project list of speakers -->
       <span class="btn-group" style="min-width:54px;" uib-dropdown
-        uib-tooltip="{{ 'Projektor' | translate }} {{ item.isListOfSpeakersProjected() }}"
+        uib-tooltip="{{ 'Projector' | translate }} {{ item.isListOfSpeakersProjected() }}"
         tooltip-enable="item.isListofSpeakersProjected() > 0"
         os-perms="core.can_manage_projector">
         <button type="button" class="btn btn-default btn-sm"
@@ -32,7 +32,7 @@
               ng-class="{ 'projected': (item.isListOfSpeakersProjected() == projector.id) }">
               <i class="fa fa-video-camera" ng-show="item.isListOfSpeakersProjected() == projector.id"></i>
               {{ projector.name }}
-              <span ng-if="defaultProjectorListOfSpeakersId == projector.id">(<translate>Standard</translate>)</span>
+              <span ng-if="defaultProjectorListOfSpeakersId == projector.id">(<translate>Default</translate>)</span>
             </a>
           </li>
         </ul>
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 0cf7a6871..a78df62fd 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -48,7 +48,7 @@
               ng-class="{ 'projected': isAgendaProjected(mainListTree) == projector.id }">
               <i class="fa fa-video-camera" ng-show="isAgendaProjected(mainListTree) == projector.id"></i>
               {{ projector.name }}
-              <span ng-if="projector.id == defaultProjectorId_all_items">(<translate>Standard</translate>)</span>
+              <span ng-if="projector.id == defaultProjectorId_all_items">(<translate>Default</translate>)</span>
             </a>
           </li>
         </ul>
@@ -192,7 +192,7 @@
                   ng-class="{ 'projected': item.isProjected(item.tree) == projector.id }">
                   <i class="fa fa-video-camera" ng-show="item.isProjected(item.tree) == projector.id"></i>
                   {{ projector.name }}
-                  <span ng-if="projector.id == getProjectionDefault(item)">(<translate>Standard</translate>)</span>
+                  <span ng-if="projector.id == getProjectionDefault(item)">(<translate>Default</translate>)</span>
                 </a>
               </li>
             </ul>
diff --git a/openslides/agenda/static/templates/agenda/slide-current-list-of-speakers.html b/openslides/agenda/static/templates/agenda/slide-current-list-of-speakers.html
index b01120afa..aa38645ee 100644
--- a/openslides/agenda/static/templates/agenda/slide-current-list-of-speakers.html
+++ b/openslides/agenda/static/templates/agenda/slide-current-list-of-speakers.html
@@ -1,6 +1,6 @@
 <div ng-controller="SlideCurrentListOfSpeakersCtrl" class="content scrollcontent">
   <div class="title">
-    <h1 translate>Current List of speakers</h1>
+    <h1 translate>Current list of speakers</h1>
     <h2> {{ agendaItem.getTitle() }}
       <span class="slimlabel label label-danger ng-scope" style="" 
         ng-if="agendaItem.speaker_list_closed" translate>Closed</span>
diff --git a/openslides/core/static/templates/core/manage-projectors.html b/openslides/core/static/templates/core/manage-projectors.html
index 947f4a1d8..c2a3d76ef 100644
--- a/openslides/core/static/templates/core/manage-projectors.html
+++ b/openslides/core/static/templates/core/manage-projectors.html
@@ -10,8 +10,9 @@
       </div>
       <div class="dropdown">
         <button class="btn btn-default dropdown-toggle" id="menuListofSpeakers" data-toggle="dropdown"
-          aria-haspopup="true" aria-expanded="true">
-          <translate>Current list of speakers reference</translate>
+            uib-tooltip="{{ 'Select the projector to which the current list of speakers refers to.' | translate }}"
+            aria-haspopup="true" aria-expanded="true">
+          <translate>Reference for current list of speakers</translate>
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu dropdown-entries" aria-labelledby="menuListOfSpeakers">
@@ -29,7 +30,7 @@
         </button>
       </div>
     </div>
-    <h1 translate>Projektoren verwalten</h1>
+    <h1 translate>Manage projectors</h1>
   </div>
 </div>
 
diff --git a/openslides/locale/angular-gettext/template-en.pot b/openslides/locale/angular-gettext/template-en.pot
index 04cb6c76f..608b8d146 100644
--- a/openslides/locale/angular-gettext/template-en.pot
+++ b/openslides/locale/angular-gettext/template-en.pot
@@ -197,7 +197,7 @@ msgstr ""
 
 #: agenda/static/templates/agenda/item-list.html:225
 #: assignments/static/templates/assignments/assignment-list.html:145
-#: core/static/templates/core/manage-projectors.html:65
+#: core/static/templates/core/manage-projectors.html:66
 #: core/static/templates/core/tag-list.html:42
 #: motions/static/templates/motions/category-list.html:49
 #: motions/static/templates/motions/motion-list.html:362
@@ -309,18 +309,18 @@ msgstr ""
 msgid "Begin speech"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:148
+#: core/static/templates/core/manage-projectors.html:149
 #: core/static/templates/core/projector-controls.html:104
 msgid "Bigger"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:193
+#: core/static/templates/core/manage-projectors.html:194
 #: core/static/templates/core/projector-controls.html:55
 #: core/static/templates/core/projector-controls.html:74
 msgid "Blank"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:187
+#: core/static/templates/core/manage-projectors.html:188
 #: core/static/templates/core/projector-controls.html:68
 msgid "Broadcast"
 msgstr ""
@@ -582,20 +582,13 @@ msgstr ""
 msgid "Create new group"
 msgstr ""
 
-#: agenda/static/templates/agenda/slide-current-list-of-speakers.html:3
-msgid "Current List of speakers"
-msgstr ""
-
 #: agenda/static/templates/agenda/current-list-of-speakers.html:25
 #: agenda/static/templates/agenda/current-list-of-speakers.html:44
 #: agenda/static/templates/agenda/item-list.html:20
+#: agenda/static/templates/agenda/slide-current-list-of-speakers.html:3
 msgid "Current list of speakers"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:14
-msgid "Current list of speakers reference"
-msgstr ""
-
 #: assignments/static/js/assignments/site.js:804
 #: motions/static/js/motions/site.js:2020
 msgid "Custom number of ballot papers"
@@ -605,6 +598,11 @@ msgstr ""
 msgid "Czech"
 msgstr ""
 
+#: agenda/static/templates/agenda/current-list-of-speakers.html:37
+#: agenda/static/templates/agenda/item-detail.html:35
+#: agenda/static/templates/agenda/item-list.html:195
+#: agenda/static/templates/agenda/item-list.html:51
+#: mediafiles/static/templates/mediafiles/mediafile-list.html:225
 #: projector-button.html:23
 #: users/static/js/users/base.js:202
 msgid "Default"
@@ -630,7 +628,7 @@ msgstr ""
 #: agenda/static/templates/agenda/item-list.html:224
 #: assignments/static/templates/assignments/assignment-detail.html:139
 #: assignments/static/templates/assignments/assignment-list.html:144
-#: core/static/templates/core/manage-projectors.html:69
+#: core/static/templates/core/manage-projectors.html:70
 #: core/static/templates/core/tag-list.html:41
 #: mediafiles/static/templates/mediafiles/mediafile-list.html:241
 #: motions/static/templates/motions/category-list.html:48
@@ -752,7 +750,7 @@ msgstr ""
 msgid "Edit countdown"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:135
+#: core/static/templates/core/manage-projectors.html:136
 #: core/static/templates/core/projector-controls.html:91
 msgid "Edit current slide"
 msgstr ""
@@ -1007,7 +1005,7 @@ msgstr ""
 msgid "Identifier, reason, submitter, category and origin are optional and may be empty."
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:28
+#: core/static/templates/core/manage-projectors.html:29
 msgid "Identify"
 msgstr ""
 
@@ -1227,6 +1225,10 @@ msgstr ""
 msgid "Manage list"
 msgstr ""
 
+#: core/static/templates/core/manage-projectors.html:33
+msgid "Manage projectors"
+msgstr ""
+
 #: core/static/templates/core/projector-controls.html:269
 msgid "Message"
 msgstr ""
@@ -1268,7 +1270,7 @@ msgstr ""
 msgid "Motions"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:74
+#: core/static/templates/core/manage-projectors.html:75
 #: core/static/templates/core/tag-form.html:17
 #: core/static/templates/core/tag-list.html:30
 #: motions/static/templates/motions/category-form.html:21
@@ -1682,30 +1684,23 @@ msgstr ""
 msgid "Project user"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:52
+#: core/static/templates/core/manage-projectors.html:53
 msgid "Projection defaults"
 msgstr ""
 
 #: agenda/static/templates/agenda/current-list-of-speakers.html:18
+#: agenda/static/templates/agenda/item-detail.html:14
 #: agenda/static/templates/agenda/item-list.html:168
 #: agenda/static/templates/agenda/item-list.html:24
 #: core/static/js/core/site.js:1610
 #: core/static/js/core/site.js:1882
 #: index.html:182
+#: mediafiles/static/templates/mediafiles/mediafile-list.html:206
 #: projector-button.html:2
 #: users/static/js/users/site.js:1066
 msgid "Projector"
 msgstr ""
 
-#: agenda/static/templates/agenda/item-detail.html:14
-#: mediafiles/static/templates/mediafiles/mediafile-list.html:206
-msgid "Projektor"
-msgstr ""
-
-#: core/static/templates/core/manage-projectors.html:32
-msgid "Projektoren verwalten"
-msgstr ""
-
 #: motions/static/js/motions/site.js:2005
 msgid "Public"
 msgstr ""
@@ -1737,6 +1732,10 @@ msgstr ""
 msgid "Refer to committee"
 msgstr ""
 
+#: core/static/templates/core/manage-projectors.html:15
+msgid "Reference for current list of speakers"
+msgstr ""
+
 #: motions/static/js/motions/base.js:442
 msgid "Referral to committee"
 msgstr ""
@@ -1811,12 +1810,12 @@ msgstr ""
 msgid "Reset recommendation"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:153
+#: core/static/templates/core/manage-projectors.html:154
 #: core/static/templates/core/projector-controls.html:109
 msgid "Reset scaling"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:173
+#: core/static/templates/core/manage-projectors.html:174
 #: core/static/templates/core/projector-controls.html:129
 msgid "Reset scrolling"
 msgstr ""
@@ -1830,7 +1829,7 @@ msgstr ""
 msgid "Reset zoom"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:80
+#: core/static/templates/core/manage-projectors.html:81
 msgid "Resolution"
 msgstr ""
 
@@ -1860,12 +1859,12 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:168
+#: core/static/templates/core/manage-projectors.html:169
 #: core/static/templates/core/projector-controls.html:124
 msgid "Scroll down"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:163
+#: core/static/templates/core/manage-projectors.html:164
 #: core/static/templates/core/projector-controls.html:119
 msgid "Scroll up"
 msgstr ""
@@ -1944,6 +1943,10 @@ msgstr ""
 msgid "Select or search an attachment ..."
 msgstr ""
 
+#: core/static/templates/core/manage-projectors.html:13
+msgid "Select the projector to which the current list of speakers refers to."
+msgstr ""
+
 #: motions/static/templates/motions/motion-import.html:20
 #: topics/static/templates/topics/topic-import.html:47
 #: users/static/templates/users/user-import.html:49
@@ -2031,7 +2034,7 @@ msgstr ""
 msgid "Simple Workflow"
 msgstr ""
 
-#: core/static/templates/core/manage-projectors.html:143
+#: core/static/templates/core/manage-projectors.html:144
 #: core/static/templates/core/projector-controls.html:99
 msgid "Smaller"
 msgstr ""
@@ -2071,14 +2074,6 @@ msgstr ""
 msgid "Staff"
 msgstr ""
 
-#: agenda/static/templates/agenda/current-list-of-speakers.html:37
-#: agenda/static/templates/agenda/item-detail.html:35
-#: agenda/static/templates/agenda/item-list.html:195
-#: agenda/static/templates/agenda/item-list.html:51
-#: mediafiles/static/templates/mediafiles/mediafile-list.html:225
-msgid "Standard"
-msgstr ""
-
 #: agenda/static/templates/agenda/item-detail.html:146
 #: core/static/templates/core/projector-controls.html:204
 msgid "Start"
diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
index 5381b8e85..4eefb7ef7 100644
--- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
+++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
@@ -203,7 +203,7 @@
             os-perms="core.can_manage_projector">
           <div class="btn-group" style="min-width:54px;" uib-dropdown
             ng-if="mediafile.is_presentable"
-            uib-tooltip="{{ 'Projektor' | translate }} {{ mediafile.isProjected() }}"
+            uib-tooltip="{{ 'Projector' | translate }} {{ mediafile.isProjected() }}"
             tooltip-enable="mediafile.isProjected() > 0">
             <button type="button" class="btn btn-default btn-sm"
               ng-click="showMediafile(defaultProjectorId, mediafile)"
@@ -222,7 +222,7 @@
                   ng-class="{ 'projected': (mediafile.isProjected() == projector.id) }">
                   <i class="fa fa-video-camera" ng-show="mediafile.isProjected() == projector.id"></i>
                   {{ projector.name }}
-                  <span ng-if="defaultProjectorId == projector.id">(<translate>Standard</translate>)</span>
+                  <span ng-if="defaultProjectorId == projector.id">(<translate>Default</translate>)</span>
                 </a>
               </li>
             </ul>
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index aab2d957f..8c60545a2 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -1999,7 +1999,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
         gettext('Remove all supporters of a motion if a submitter edits his ' +
                 'motion in early state');
 
-        // subgroup Suppoerters
+        // subgroup Supporters
         gettext('Comments');
         gettext('Comment fields for motions');
         gettext('Public');