Merge pull request #6036 from emanuelschuetze/translation-20210427

Updated translations

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

@@ -126,6 +126,9 @@ _('[Begin speech] starts the countdown, [End speech] stops the countdown.');
 _('Only present participants can be added to the list of speakers');
 _('Show hint »first speech« in the list of speakers management view');
 _('List of speakers is initially closed');
+_('Enable forspeech / counter speech');
+_('Enable star icon to mark speaker (e.g. for contribution)');
+_('Everyone can see the request of a point of order (instead of managers for list of speakers only)');
 _('Default visibility for new agenda items (except topics)');
 _('public');
 _('internal');

client/src/app/shared/components/list-of-speakers-content/list-of-speakers-content.component.html

@@ -55,11 +55,11 @@
             {{ activeSpeaker.getListTitle() }}
             <div class="active-speaker-subtitle">
                 <i *ngIf="activeSpeaker.pro_speech === true">
-                    {{ 'Pro speech' | translate }}
+                    {{ 'Forspeech' | translate }}
                 </i>
 
                 <i *ngIf="activeSpeaker.pro_speech === false">
-                    {{ 'Contra speech' | translate }}
+                    {{ 'Counter speech' | translate }}
                 </i>
 
                 <i *ngIf="activeSpeaker.marked">
@@ -112,7 +112,7 @@
                             <ng-container *ngIf="speaker.pro_speech === true">
                                 <mat-icon inline class="inline-icon-text-align green-text"> add_circle </mat-icon>
                                 <i class="user-subtitle">
-                                    {{ 'Pro speech' | translate }}
+                                    {{ 'Forspeech' | translate }}
                                 </i>
                             </ng-container>
 
@@ -121,7 +121,7 @@
                                     remove_circle
                                 </mat-icon>
                                 <i class="user-subtitle">
-                                    {{ 'Contra speech' | translate }}
+                                    {{ 'Counter speech' | translate }}
                                 </i>
                             </ng-container>
 
@@ -174,7 +174,7 @@
                                 <button
                                     mat-icon-button
                                     (click)="onProContraButtons(speaker, true)"
-                                    matTooltip="{{ 'Pro speech' | translate }}"
+                                    matTooltip="{{ 'Forspeech' | translate }}"
                                     *ngIf="enableProContraSpeech && !speaker.point_of_order"
                                 >
                                     <mat-icon class="user-subtitle" *ngIf="speaker.pro_speech !== true"> add_circle_outline </mat-icon>
@@ -187,7 +187,7 @@
                                 <button
                                     mat-icon-button
                                     (click)="onProContraButtons(speaker, false)"
-                                    matTooltip="{{ 'Contra speech' | translate }}"
+                                    matTooltip="{{ 'Counter speech' | translate }}"
                                     *ngIf="enableProContraSpeech && !speaker.point_of_order"
                                 >
                                     <mat-icon class="user-subtitle" *ngIf="speaker.pro_speech !== false"> remove_circle_outline </mat-icon>
@@ -305,14 +305,14 @@
             <button mat-menu-item (click)="onProContraButtons(speaker, true)" *ngIf="enableProContraSpeech">
                 <mat-icon *ngIf="speaker.pro_speech !== true"> add_circle_outline </mat-icon>
                 <mat-icon class="green-text" *ngIf="speaker.pro_speech === true"> add_circle </mat-icon>
-                <span>{{ 'Pro speech' | translate }}</span>
+                <span>{{ 'Forspeech' | translate }}</span>
             </button>
 
             <!-- contra button -->
             <button mat-menu-item (click)="onProContraButtons(speaker, false)" *ngIf="enableProContraSpeech">
                 <mat-icon *ngIf="speaker.pro_speech !== false"> remove_circle_outline </mat-icon>
                 <mat-icon class="red-warning-text" *ngIf="speaker.pro_speech === false"> remove_circle </mat-icon>
-                <span>{{ 'Contra speech' | translate }}</span>
+                <span>{{ 'Counter speech' | translate }}</span>
             </button>
 
             <!-- star button -->

client/src/app/shared/components/point-of-order-dialog/point-of-order-dialog.component.html

@@ -3,7 +3,7 @@
 </h2>
 
 <mat-dialog-content>
-    {{ 'Request' | translate }}
+    {{ 'Request' | translate }}:
     <form class="edit-form" [formGroup]="editForm">
         <mat-form-field>
             <input matInput osAutofocus [maxLength]="MAX_LENGTH" formControlName="note" />

client/src/app/site/polls/components/entitled-users-table/entitled-users-table.component.html

@@ -23,7 +23,7 @@
         </div>
         <div *pblNgridCellDef="'delegation'; row as entry">
             <div *ngIf="entry.vote_delegated_to_id">
-                <span class="repr-prefix">represented by</span>&nbsp;
+                <span class="repr-prefix">{{ 'represented by' | translate }}</span>&nbsp;
                 <span *ngIf="entry.vote_delegated_to">{{ entry.vote_delegated_to.getFullName() }}</span>
                 <i *ngIf="!entry.vote_delegated_to">{{ 'Deleted user' | translate }}</i>
             </div>

client/src/assets/i18n/de.po

@@ -788,6 +788,9 @@ msgstr "Alle Nutzer automatisch mit der Livekonferenz verbinden"
 msgid "Content"
 msgstr "Inhalt"
 
+msgid "Contribution"
+msgstr "Einbringung"
+
 msgid "Cookies have to be enabled to use OpenSlides."
 msgstr "Cookies müssen aktiviert sein, um OpenSlides verwenden zu können."
 
@@ -818,6 +821,9 @@ msgstr "Countdown-Titel"
 msgid "Countdowns"
 msgstr "Countdowns"
 
+msgid "Counter speech"
+msgstr "Gegenrede"
+
 msgid "Counting of votes is in progress ..."
 msgstr "Die Auszählung der Stimmen läuft ..."
 
@@ -1157,6 +1163,9 @@ msgstr "Betreff"
 msgid "Empty text field"
 msgstr "Leeres Textfeld"
 
+msgid "Enable forspeech / counter speech"
+msgstr "Fürrede/Gegenrede aktivieren"
+
 msgid "Enable numbering for agenda items"
 msgstr "Nummerierung von Tagesordnungspunkten aktivieren"
 
@@ -1166,6 +1175,11 @@ msgstr "Ansicht zur Teilnehmeranwesenheit aktivieren"
 msgid "Enable points of order"
 msgstr "Geschäftsordnungsanträge aktivieren"
 
+msgid "Enable star icon to mark speaker (e.g. for contribution)"
+msgstr ""
+"Stern-Icon zum Markieren von Redner*innen aktivieren (z.B. zur Einbringung "
+"eines Antrags)"
+
 msgid "Enable virtual applause"
 msgstr "Virtuellen Applaus einschalten"
 
@@ -1249,6 +1263,13 @@ msgstr "Veranstaltungsname"
 msgid "Event organizer"
 msgstr "Veranstalter"
 
+msgid ""
+"Everyone can see the request of a point of order (instead of managers for "
+"list of speakers only)"
+msgstr ""
+"Jede*r darf das Anliegen eines GO-Antrags sehen (anstatt nur die "
+"Redelistenverwaltung)"
+
 msgid "Exit"
 msgstr "Beenden"
 
@@ -1336,6 +1357,9 @@ msgstr "Passwort vergessen?"
 msgid "Format"
 msgstr "Format"
 
+msgid "Forspeech"
+msgstr "Fürrede"
+
 msgid "Front page text"
 msgstr "Text der Startseite"
 
@@ -1710,9 +1734,6 @@ msgstr "Hauptantrag und Zeilennummer"
 msgid "Mark as personal favorite"
 msgstr "Als persönlichen Favorit markieren"
 
-msgid "Mark speaker"
-msgstr "Redner*in markieren"
-
 msgid "Maximum amount of votes"
 msgstr "Maximale Stimmenanzahl"
 
@@ -1916,9 +1937,6 @@ msgstr "Kein Sachgebiet"
 msgid "No category set"
 msgstr "kein Sachgebiet gesetzt"
 
-msgid "No change recommendations yet"
-msgstr "Bisher keine Änderungsempfehlungen"
-
 msgid "No changes at the text."
 msgstr "Keine Änderung am Text."
 
@@ -2477,6 +2495,9 @@ msgstr "Ersetzung"
 msgid "Reply address"
 msgstr "Antwortadresse"
 
+msgid "Request"
+msgstr "Anliegen"
+
 msgid "Requests to speak"
 msgstr "Wortmeldungen"
 

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

@@ -741,6 +741,9 @@ msgstr ""
 msgid "Content"
 msgstr ""
 
+msgid "Contribution"
+msgstr ""
+
 msgid "Cookies have to be enabled to use OpenSlides."
 msgstr ""
 
@@ -771,6 +774,9 @@ msgstr ""
 msgid "Countdowns"
 msgstr ""
 
+msgid "Counter speech"
+msgstr ""
+
 msgid "Counting of votes is in progress ..."
 msgstr ""
 
@@ -1079,6 +1085,9 @@ msgstr ""
 msgid "Empty text field"
 msgstr ""
 
+msgid "Enable forspeech / counter speech"
+msgstr ""
+
 msgid "Enable numbering for agenda items"
 msgstr ""
 
@@ -1088,6 +1097,9 @@ msgstr ""
 msgid "Enable points of order"
 msgstr ""
 
+msgid "Enable star icon to mark speaker (e.g. for contribution)"
+msgstr ""
+
 msgid "Enable virtual applause"
 msgstr ""
 
@@ -1165,6 +1177,11 @@ msgstr ""
 msgid "Event organizer"
 msgstr ""
 
+msgid ""
+"Everyone can see the request of a point of order (instead of managers for "
+"list of speakers only)"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -1252,6 +1269,9 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
+msgid "Forspeech"
+msgstr ""
+
 msgid "Front page text"
 msgstr ""
 
@@ -1619,9 +1639,6 @@ msgstr ""
 msgid "Mark as personal favorite"
 msgstr ""
 
-msgid "Mark speaker"
-msgstr ""
-
 msgid "Maximum amount of votes"
 msgstr ""
 
@@ -1823,9 +1840,6 @@ msgstr ""
 msgid "No category set"
 msgstr ""
 
-msgid "No change recommendations yet"
-msgstr ""
-
 msgid "No changes at the text."
 msgstr ""
 
@@ -2365,6 +2379,9 @@ msgstr ""
 msgid "Reply address"
 msgstr ""
 
+msgid "Request"
+msgstr ""
+
 msgid "Requests to speak"
 msgstr ""
 

server/openslides/agenda/config_variables.py

@@ -181,12 +181,22 @@ def get_config_variables():
         subgroup="List of speakers",
     )
 
+    yield ConfigVariable(
+        name="agenda_list_of_speakers_speaker_note_for_everyone",
+        default_value=False,
+        input_type="boolean",
+        label="Everyone can see the request of a point of order (instead of managers for list of speakers only)",
+        weight=230,
+        group="Agenda",
+        subgroup="List of speakers",
+    )
+
     yield ConfigVariable(
         name="agenda_hide_amount_of_speakers",
         default_value=False,
         input_type="boolean",
         label="Hide the amount of speakers in subtitle of list of speakers slide",
-        weight=230,
+        weight=231,
         group="Agenda",
         subgroup="List of speakers",
     )
@@ -225,7 +235,7 @@ def get_config_variables():
         name="agenda_list_of_speakers_enable_pro_contra_speech",
         default_value=False,
         input_type="boolean",
-        label="Enable pro/contra buttons for speakers",
+        label="Enable forspeech / counter speech",
         weight=240,
         group="Agenda",
         subgroup="List of speakers",
@@ -235,18 +245,8 @@ def get_config_variables():
         name="agenda_list_of_speakers_can_set_mark_self",
         default_value=False,
         input_type="boolean",
-        label="Speakers can set the mark by themselfs",
+        label="Enable star icon to mark speaker (e.g. for contribution)",
         weight=245,
         group="Agenda",
         subgroup="List of speakers",
     )
-
-    yield ConfigVariable(
-        name="agenda_list_of_speakers_speaker_note_for_everyone",
-        default_value=False,
-        input_type="boolean",
-        label="Everyone can see the note of a speaker (instead of admins and the speaker only)",
-        weight=250,
-        group="Agenda",
-        subgroup="List of speakers",
-    )