Merge pull request #4437 from emanuelschuetze/translations20190228

Updated translations

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

@@ -88,6 +88,8 @@ _('Default visibility for new agenda items (except topics)');
 _('Public item');
 _('Internal item');
 _('Hidden item');
+// agenda misc strings
+_('Only main agenda items');
 
 // Motions config strings
 // subgroup general

client/src/app/shared/components/projection-dialog/projection-dialog.component.html

@@ -1,6 +1,8 @@
 <h2 mat-dialog-title>
-    <span translate>Project</span> {{ projectorElementBuildDescriptor.getDialogTitle() }}?
+    <span translate>Project selection?</span>
 </h2>
+<div class="element-name">{{ projectorElementBuildDescriptor.getDialogTitle() }}</div>
+
 <mat-dialog-content>
     <div class="projectors"
         *ngFor="let projector of projectors"
@@ -17,7 +19,7 @@
 
     <div *ngIf="options.length > 0">
         <div *ngFor="let option of options">
-            <div *ngIf="isDecisionOption(option)">
+            <div *ngIf="isDecisionOption(option)" class="spacer-top-10 spacer-left-10">
                 <mat-checkbox
                     [checked]="optionValues[option.key]"
                     (change)="optionValues[option.key] = !optionValues[option.key]"
@@ -37,7 +39,7 @@
     </div>
 </mat-dialog-content>
 <mat-dialog-actions>
-    <button mat-button osAutofocus (click)="onProject()" color="primary" translate>Project</button>
+    <button mat-button osAutofocus (click)="onProject()" color="primary">{{ 'Project' | translate }}</button>
-    <button mat-button (click)="onAddToPreview()" translate>Add to preview</button>
+    <button mat-button (click)="onAddToPreview()">{{ 'Add to queue' | translate }}</button>
-    <button mat-button (click)="onCancel()" translate>Cancel</button>
+    <button mat-button (click)="onCancel()">{{ 'Cancel' | translate }}</button>
 </mat-dialog-actions>

client/src/app/shared/components/projection-dialog/projection-dialog.component.scss

@@ -1,3 +1,11 @@
+h2 {
+    margin-bottom: 5px;
+}
+
+.element-name {
+    margin-bottom: 10px;
+}
+
 mat-dialog-content {
     overflow: inherit;
     min-width: auto;

client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts

@@ -58,12 +58,12 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem, Item> i
         slideOptions: [
             {
                 key: 'only_main_items',
-                displayName: 'Only main agenda items',
+                displayName: this.translate.instant('Only main agenda items'),
                 default: false
             }
         ],
         projectionDefaultName: 'agenda_all_items',
-        getDialogTitle: () => this.translate.instant('Item list')
+        getDialogTitle: () => this.translate.instant('Agenda')
     };
 
     /**

client/src/app/site/motions/models/view-motion.ts

@@ -571,13 +571,13 @@ export class ViewMotion extends BaseAgendaViewModel implements Searchable {
             slideOptions: [
                 {
                     key: 'mode',
-                    displayName: 'Mode',
+                    displayName: 'Change recommendations',
                     default: 'original',
                     choices: [
-                        { value: 'original', displayName: 'Original' },
+                        { value: 'original', displayName: 'Original version' },
-                        { value: 'changed', displayName: 'Changed' },
+                        { value: 'changed', displayName: 'Changed version' },
-                        { value: 'diff', displayName: 'Diff' },
+                        { value: 'diff', displayName: 'Diff version' },
-                        { value: 'agreed', displayName: 'Agreed' }
+                        { value: 'agreed', displayName: 'Final version' }
                     ]
                 }
             ],

client/src/assets/i18n/de.po

@@ -84,6 +84,9 @@ msgstr "Füge mich hinzu"
 msgid "Add new custom translation"
 msgstr "Neue benutzerdefinierte Übersetzung hinzufügen"
 
+msgid "Add to queue"
+msgstr "Zur Warteschlange hinzufügen"
+
 msgid "Add/remove groups ..."
 msgstr "Gruppen hinzufügen/entfernen ..."
 
@@ -379,6 +382,9 @@ msgstr ""
 msgid "Choose 0 to disable the supporting system."
 msgstr "Zum Deaktivieren des Unterstützersystems '0' eingeben."
 
+msgid "Chyron"
+msgstr "Bauchbinde"
+
 msgid "Clear all"
 msgstr "Alle löschen"
 
@@ -455,27 +461,15 @@ msgstr "Neuen Arbeitsablauf erstellen"
 msgid "Creation date"
 msgstr "Erstellungsdatum"
 
-msgid "Current"
-msgstr "Aktuell"
-
 msgid "Current browser language"
 msgstr "Aktuelle Browsersprache"
 
 msgid "Current list of speakers"
 msgstr "Aktuelle Redeliste"
 
-msgid "Current list of speakers overlay"
-msgstr "Aktuelle Redeliste (Einblendung)"
-
 msgid "Current list of speakers reference"
 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"
 
@@ -1280,6 +1274,9 @@ msgstr "Eine E-Mail wurde erfolgreich versandt."
 msgid "Only for internal notes."
 msgstr "Nur für interne Notizen."
 
+msgid "Only main agenda items"
+msgstr "Nur Haupt-Tagesordnungspunkte"
+
 msgid "Open"
 msgstr "Öffnen"
 
@@ -1301,6 +1298,9 @@ msgstr "Originalfassung"
 msgid "Outside"
 msgstr "außerhalb"
 
+msgid "Overlay"
+msgstr "Einblendung"
+
 msgid "PDF"
 msgstr "PDF"
 
@@ -1434,8 +1434,8 @@ msgstr "Datenschutzerklärung"
 msgid "Project"
 msgstr "Projizieren"
 
-msgid "Project now"
+msgid "Project selection?"
-msgstr "Jetzt projizieren"
+msgstr "Auswahl projizieren?"
 
 msgid "Projector"
 msgstr "Projektor"
@@ -1709,8 +1709,8 @@ msgstr "Einfacher Arbeitsablauf"
 msgid "Simple majority"
 msgstr "Einfache Mehrheit"
 
-msgid "Slides"
+msgid "Slide"
-msgstr "Folien"
+msgstr "Folie"
 
 msgid "Sort"
 msgstr "Sortieren"

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

@@ -76,6 +76,9 @@ msgstr ""
 msgid "Add new custom translation"
 msgstr ""
 
+msgid "Add to queue"
+msgstr ""
+
 msgid "Add/remove groups ..."
 msgstr ""
 
@@ -362,6 +365,9 @@ msgstr ""
 msgid "Choose 0 to disable the supporting system."
 msgstr ""
 
+msgid "Chyron"
+msgstr ""
+
 msgid "Clear all"
 msgstr ""
 
@@ -437,27 +443,15 @@ msgstr ""
 msgid "Creation date"
 msgstr ""
 
-msgid "Current"
-msgstr ""
-
 msgid "Current browser language"
 msgstr ""
 
 msgid "Current list of speakers"
 msgstr ""
 
-msgid "Current list of speakers overlay"
-msgstr ""
-
 msgid "Current list of speakers reference"
 msgstr ""
 
-msgid "Current list of speakers slide"
-msgstr ""
-
-msgid "Current speaker chyron"
-msgstr ""
-
 msgid "Custom number of ballot papers"
 msgstr ""
 
@@ -1233,6 +1227,9 @@ msgstr ""
 msgid "Only for internal notes."
 msgstr ""
 
+msgid "Only main agenda items"
+msgstr ""
+
 msgid "Open"
 msgstr ""
 
@@ -1254,6 +1251,9 @@ msgstr ""
 msgid "Outside"
 msgstr ""
 
+msgid "Overlay"
+msgstr ""
+
 msgid "PDF"
 msgstr ""
 
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-msgid "Project now"
+msgid "Project selection?"
 msgstr ""
 
 msgid "Projector"
@@ -1657,7 +1657,7 @@ msgstr ""
 msgid "Simple majority"
 msgstr ""
 
-msgid "Slides"
+msgid "Slide"
 msgstr ""
 
 msgid "Sort"