Merge pull request #4412 from emanuelschuetze/translations20190226

Updated translations

client/src/app/core/marked-translations.ts

@@ -52,16 +52,7 @@ _('Standard font size in PDF');
 _('Projector');
 _('Projector language');
 _('Current browser language');
-_('Show logo on projector');
-_('You can replace the logo by uploading an image and set it as the "Projector logo" in "files".');
-_('Show the clock on projector');
-_('Show title and description of event on projector');
-_('Display header and footer');
-_('Background color of projector header and footer');
-_('Font color of projector header and footer');
-_('Font color of projector headline');
 _('Predefined seconds of new countdowns');
-_('Color for blanked projector');
 _('Default projector');
 _('Custom translations');
 _('List of speakers overlay');
@@ -300,6 +291,7 @@ _('Can manage configuration');
 _('Can use the chat');
 _('Can manage the chat');
 _('Can manage logos and fonts');
+_('Can see history');
 // mediafiles
 _('Can see the list of files');
 _('Can upload files');

client/src/app/site/motions/components/motion-detail/motion-detail.component.html

@@ -545,7 +545,7 @@
                         matInput
                         placeholder="{{ 'Identifier' | translate }}"
                         formControlName="identifier"
-                        [value]="motionCopy.identifier"
+                        [value]="motionCopy.identifier || ''"
                     />
                 </mat-form-field>
             </div>

client/src/app/site/projector/components/projector-list/projector-list.component.html

@@ -120,7 +120,7 @@
                             </mat-hint>
                         </mat-form-field>
                         <mat-form-field>
-                            <span translate>Header headline color</span>
+                            <span translate>Headline color</span>
                             <input matInput formControlName="header_h1_color" type="color" />
                             <mat-hint *ngIf="!updateForm.controls.header_h1_color.valid">
                                 <span translate>Required</span>

client/src/assets/i18n/de.po

@@ -196,8 +196,8 @@ msgstr "Zurück"
 msgid "Back to login"
 msgstr "Zurück zur Anmeldung"
 
-msgid "Background color of projector header and footer"
+msgid "Background color"
-msgstr "Hintergrundfarbe des Projektor-Kopf- und Fußbereichs"
+msgstr "Hintergrundfarbe"
 
 msgid "Ballot and ballot papers"
 msgstr "Wahlgang und Stimmzettel"
@@ -294,6 +294,9 @@ msgstr ""
 msgid "Can see hidden files"
 msgstr "Darf versteckte Dateien sehen"
 
+msgid "Can see history"
+msgstr "Darf die Chronik sehen"
+
 msgid "Can see internal items and time scheduling of agenda"
 msgstr "Darf interne Einträge und Zeitplan der Tagesordnung sehen"
 
@@ -388,9 +391,6 @@ msgstr "Redeliste schließen"
 msgid "Collapse all"
 msgstr "Alle zusammenklappen"
 
-msgid "Color for blanked projector"
-msgstr "Farbe für ausgeblendeten Projektor"
-
 msgid "Column separator"
 msgstr "Spaltentrenner"
 
@@ -464,6 +464,9 @@ msgstr "Referenz zur aktuellen Redeliste"
 msgid "Current list of speakers slide"
 msgstr "Aktuelle Redeliste (Folie)"
 
+msgid "Current speaker chyron"
+msgstr "Bauchbinde aktuelle/r Redner/in"
+
 msgid "Custom number of ballot papers"
 msgstr "Benutzerdefinierte Anzahl von Stimmzetteln"
 
@@ -569,9 +572,6 @@ msgstr "Deaktiviert"
 msgid "Disabled (no percents)"
 msgstr "Deaktiviert (keine Prozente)"
 
-msgid "Display header and footer"
-msgstr "Kopf- und Fußzeile anzeigen"
-
 msgid "Do not concern"
 msgstr "Nicht befassen"
 
@@ -779,12 +779,6 @@ msgstr "Empfehlung folgen"
 msgid "Follow recommendations for all motions"
 msgstr "Empfehlungen für alle Anträge folgen"
 
-msgid "Font color of projector header and footer"
-msgstr "Schriftfarbe des Projektor-Kopf- und Fußbereichs"
-
-msgid "Font color of projector headline"
-msgstr "Schriftfarbe der Projektor-Überschrift"
-
 msgid "Forgot Password?"
 msgstr "Passwort vergessen?"
 
@@ -827,6 +821,15 @@ msgstr "Gruppen mit Schreibberechtigungen"
 msgid "Has notes"
 msgstr "Hat Notizen"
 
+msgid "Header background color"
+msgstr "Hintergrundfarbe Kopfbereich"
+
+msgid "Header font color"
+msgstr "Schriftfarbe Kopfbereich"
+
+msgid "Headline color"
+msgstr "Überschriftenfarbe"
+
 msgid "Help text for access data and welcome PDF"
 msgstr "Hilfetext für das Zugangsdaten- und Willkommens-PDF"
 
@@ -1652,8 +1655,11 @@ msgstr "Vollständigen Antragstext anzeigen"
 msgid "Show errors only"
 msgstr "Nur fehlerhafte Einträge anzeigen"
 
-msgid "Show logo on projector"
+msgid "Show header and footer"
-msgstr "Logo auf dem Projektor anzeigen"
+msgstr "Kopf- und Fußzeile anzeigen"
+
+msgid "Show logo"
+msgstr "Logo anzeigen"
 
 msgid "Show orange countdown in the last x seconds of speaking time"
 msgstr "Countdown in den letzten x Sekunden der Redezeit orange darstellen"
@@ -1670,15 +1676,11 @@ msgstr "Ergänzungsfeld für Empfehlung anzeigen"
 msgid "Show state extension field"
 msgstr "Ergänzungsfeld für Status anzeigen"
 
-msgid "Show the clock on projector"
-msgstr "Uhr auf dem Projektor anzeigen"
-
 msgid "Show this text on the login page"
 msgstr "Diesen Text auf der Login-Seite anzeigen"
 
-msgid "Show title and description of event on projector"
+msgid "Show title"
-msgstr ""
+msgstr "Veranstaltungstitel anzeigen"
-"Titel und Kurzbeschreibung der Veranstaltung auf dem Projektor anzeigen"
 
 msgid "Simple Workflow"
 msgstr "Einfacher Arbeitsablauf"
@@ -2102,15 +2104,8 @@ msgid ""
 "You are using the history mode of OpenSlides. Changes will not be saved."
 msgstr "Der Chronik-Modus ist aktiv. Änderungen werden nicht gespeichert."
 
-msgid ""
+msgid "You can use {event_name} and {username} as placeholder."
-"You can replace the logo by uploading an image and set it as the \"Projector"
+msgstr "Sie können {event_name} und {username} als Platzhalter verwenden."
-" logo\" in \"files\"."
-msgstr ""
-"Sie können das Logo austauschen indem Sie ein Bild unter \"Dateien\" "
-"hochladen und es als \"Projektor-Logo\" festlegen."
-
-msgid "You can use {event_name} as a placeholder."
-msgstr "Sie können {event_name} als Platzhalter verwenden."
 
 msgid "You override the personally set password!"
 msgstr "Sie überschreiben hiermit das persönlich gesetzte Passwort!"

client/src/assets/i18n/template-en.pot

@@ -182,7 +182,7 @@ msgstr ""
 msgid "Back to login"
 msgstr ""
 
-msgid "Background color of projector header and footer"
+msgid "Background color"
 msgstr ""
 
 msgid "Ballot and ballot papers"
@@ -278,6 +278,9 @@ msgstr ""
 msgid "Can see hidden files"
 msgstr ""
 
+msgid "Can see history"
+msgstr ""
+
 msgid "Can see internal items and time scheduling of agenda"
 msgstr ""
 
@@ -371,9 +374,6 @@ msgstr ""
 msgid "Collapse all"
 msgstr ""
 
-msgid "Color for blanked projector"
-msgstr ""
-
 msgid "Column separator"
 msgstr ""
 
@@ -446,6 +446,9 @@ msgstr ""
 msgid "Current list of speakers slide"
 msgstr ""
 
+msgid "Current speaker chyron"
+msgstr ""
+
 msgid "Custom number of ballot papers"
 msgstr ""
 
@@ -534,9 +537,6 @@ msgstr ""
 msgid "Disabled (no percents)"
 msgstr ""
 
-msgid "Display header and footer"
-msgstr ""
-
 msgid "Do not concern"
 msgstr ""
 
@@ -736,12 +736,6 @@ msgstr ""
 msgid "Follow recommendations for all motions"
 msgstr ""
 
-msgid "Font color of projector header and footer"
-msgstr ""
-
-msgid "Font color of projector headline"
-msgstr ""
-
 msgid "Forgot Password?"
 msgstr ""
 
@@ -784,6 +778,15 @@ msgstr ""
 msgid "Has notes"
 msgstr ""
 
+msgid "Header background color"
+msgstr ""
+
+msgid "Header font color"
+msgstr ""
+
+msgid "Headline color"
+msgstr ""
+
 msgid "Help text for access data and welcome PDF"
 msgstr ""
 
@@ -1600,7 +1603,10 @@ msgstr ""
 msgid "Show errors only"
 msgstr ""
 
-msgid "Show logo on projector"
+msgid "Show header and footer"
+msgstr ""
+
+msgid "Show logo"
 msgstr ""
 
 msgid "Show orange countdown in the last x seconds of speaking time"
@@ -1618,13 +1624,10 @@ msgstr ""
 msgid "Show state extension field"
 msgstr ""
 
-msgid "Show the clock on projector"
-msgstr ""
-
 msgid "Show this text on the login page"
 msgstr ""
 
-msgid "Show title and description of event on projector"
+msgid "Show title"
 msgstr ""
 
 msgid "Simple Workflow"
@@ -2011,12 +2014,7 @@ msgstr ""
 msgid "You are using the history mode of OpenSlides. Changes will not be saved."
 msgstr ""
 
-msgid ""
+msgid "You can use {event_name} and {username} as placeholder."
-"You can replace the logo by uploading an image and set it as the "
-"\"Projector logo\" in \"files\"."
-msgstr ""
-
-msgid "You can use {event_name} as a placeholder."
 msgstr ""
 
 msgid "You override the personally set password!"

client/src/styles.scss

@@ -173,7 +173,7 @@ mat-card {
     }
 }
 .os-form-card {
-    max-width: 770px;
+    width: 770px;
     margin-top: 20px !important;
     margin-left: auto !important;
     margin-right: auto !important;