Merge pull request #5874 from emanuelschuetze/translations-20210208

Updated translations

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

@@ -38,10 +38,26 @@ _('Livestream url');
 _('Remove URL to deactivate livestream. Check extra group permission to see livestream.');
 _('Livestream poster image url');
 _('Shows if livestream is not started. Recommended image format: 500x200px, PNG or JPG');
+_('Enable virtual help desk room');
+_('Shows a button with help icon to connect to an extra Jitsi conference room for technical audio/video tests.');
 _('Number of next speakers automatically connecting to the live conference');
 _('Live conference has to be active. Choose 0 to disable auto connect.');
 _('Automatically open the microphone for new conference speakers');
 _('Automatically open the web cam for new conference speakers');
+_('Virtual applause');
+_('Enable virtual applause');
+_('Level indicator');
+_('Particles');
+_('Applause visualization');
+_('Show applause amount');
+_('Lowest applause amount');
+_('Defines the minimum deflection which is required to recognize applause.');
+_('Highest applause amount');
+_('Defines the maximum deflection. Entering zero will use the amount of present participants instead.');
+_('Applause interval in seconds');
+_('Defines the time in which applause amounts are add up.');
+_('Applause particle image URL');
+_('Shows the given image as applause particle. Recommended image format: 24x24px, PNG, JPG or SVG');
 _('Show this text on the login page');
 _('OpenSlides Theme');
 _('Export');
@@ -439,6 +455,10 @@ _('Recommendation set to {arg1}');
 _('Vote created');
 _('Vote updated');
 _('Vote deleted');
+_('Voting started');
+_('Voting stopped');
+_('Voting reset');
+_('Voting anonymized');
 _('Number set');
 _('OpenSlides is temporarily reset to following timestamp');
 _('Motion change recommendation created');

client/src/app/shared/components/jitsi/jitsi.component.html

@@ -115,7 +115,7 @@
                 mat-mini-fab
                 (click)="enterSupportRoom()"
                 [disabled]="isJitsiActive"
-                matTooltip="{{ 'Access help desk' | translate }}"
+                matTooltip="{{ 'Help desk' | translate }}"
                 *ngIf="canAccessSupport"
             >
                 <mat-icon color="primary">live_help</mat-icon>
@@ -127,7 +127,7 @@
                 [disabled]="applauseDisabled"
                 mat-mini-fab
                 (click)="sendApplause()"
-                matTooltip="{{ 'Send applause' | translate }}"
+                matTooltip="{{ 'Give applause' | translate }}"
                 *ngIf="showApplause"
                 [matBadge]="showApplauseBadge ? applauseLevel : null"
                 matBadgeColor="accent"

client/src/app/site/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.html

@@ -33,7 +33,7 @@
             <b> {{ getVotesAvailable(delegation) }}/{{ poll.max_votes_amount }} </b>
 
             <span *ngIf="poll.min_votes_amount > 1">
-                ({{ 'At least' | translate }} <b>{{ poll.min_votes_amount }}</b
+                ({{ 'at least' | translate }} <b>{{ poll.min_votes_amount }}</b
                 >)
             </span>
         </h4>

client/src/app/site/polls/components/poll-form/poll-form.component.html

@@ -70,7 +70,7 @@
                             [errorStateMatcher]="parentErrorStateMatcher"
                         />
                         <mat-error *ngIf="contentForm.controls['votes_amount'].hasError('rangeError')">
-                            {{ 'Min votes must be smaller or equal to max votes' | translate }}
+                            {{ 'Min votes cannot be greater than max votes.' | translate }}
                         </mat-error>
                     </mat-form-field>
 

client/src/assets/i18n/de.po

@@ -1,10 +1,10 @@
 # 
 # Translators:
-# Emanuel Schütze <emanuel.schuetze@intevation.de>, 2020
+# Emanuel Schütze <emanuel.schuetze@intevation.de>, 2021
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Emanuel Schütze <emanuel.schuetze@intevation.de>, 2020\n"
+"Last-Translator: Emanuel Schütze <emanuel.schuetze@intevation.de>, 2021\n"
 "Language-Team: German (https://www.transifex.com/openslides/teams/14270/de/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -242,6 +242,15 @@ msgstr "Anonymisieren kann erst nach Beenden der Stimmabgabe erfolgen."
 msgid "Anonymous"
 msgstr "Anonym"
 
+msgid "Applause interval in seconds"
+msgstr "Applaus-Zeitintervall in Sekunden"
+
+msgid "Applause particle image URL"
+msgstr "Applaus-Partikelbild-URL"
+
+msgid "Applause visualization"
+msgstr "Applaus-Visualisierung"
+
 msgid "Apply"
 msgstr "Übernehmen"
 
@@ -886,6 +895,22 @@ msgstr ""
 msgid "Default voting type"
 msgstr "Voreingestellte Art der Stimmabgabe"
 
+msgid ""
+"Defines the maximum deflection. Entering zero will use the amount of present"
+" participants instead."
+msgstr ""
+"Definiert den maximalen Ausschlag. Bei Eingabe von 0 wird die Anzahl der "
+"anwesenden Teilnehmenden verwendet."
+
+msgid ""
+"Defines the minimum deflection which is required to recognize applause."
+msgstr ""
+"Definiert den minimalen Ausschlag, der erforderlich ist, um Applaus zu "
+"erkennen."
+
+msgid "Defines the time in which applause amounts are add up."
+msgstr "Definiert die Zeit in der Applauswerte aufsummiert werden."
+
 msgid "Delegates"
 msgstr "Delegierte"
 
@@ -1096,6 +1121,12 @@ msgstr "Ansicht zur Teilnehmeranwesenheit aktivieren"
 msgid "Enable points of order"
 msgstr "Geschäftsordnungsanträge aktivieren"
 
+msgid "Enable virtual applause"
+msgstr "Virtuellen Applaus einschalten"
+
+msgid "Enable virtual help desk room"
+msgstr "Virtuellen Help-Desk-Raum einschalten"
+
 msgid "Enable/disable account ..."
 msgstr "Account ein-/ausschalten ..."
 
@@ -1287,6 +1318,9 @@ msgstr "Neue Passwörter generieren"
 msgid "Generate password"
 msgstr "Passwort generieren"
 
+msgid "Give applause"
+msgstr "Applaus geben"
+
 msgid "Given name"
 msgstr "Vorname"
 
@@ -1338,6 +1372,9 @@ msgstr "Schriftfarbe Kopfbereich"
 msgid "Headline color"
 msgstr "Überschriftenfarbe"
 
+msgid "Help desk"
+msgstr "Help Desk"
+
 msgid "Help text for access data and welcome PDF"
 msgstr "Hilfetext für das Zugangsdaten- und Willkommens-PDF"
 
@@ -1369,6 +1406,9 @@ msgid "Hide the amount of speakers in subtitle of list of speakers slide"
 msgstr ""
 "Anzahl der Redner/innen im Untertitel der Redelistenprojektion ausblenden"
 
+msgid "Highest applause amount"
+msgstr "Höchster Applauswert"
+
 msgid "Hint on voting"
 msgstr "Hinweis zur Stimmabgabe"
 
@@ -1535,6 +1575,9 @@ msgstr "Links"
 msgid "Legal notice"
 msgstr "Impressum"
 
+msgid "Level indicator"
+msgstr "Pegelanzeige"
+
 msgid "License"
 msgstr "Lizenz"
 
@@ -1597,6 +1640,9 @@ msgstr "Als Gast anmelden"
 msgid "Logout"
 msgstr "Abmelden"
 
+msgid "Lowest applause amount"
+msgstr "Niedrigster Applauswert"
+
 msgid "Main motion and line number"
 msgstr "Hauptantrag und Zeilennummer"
 
@@ -1606,6 +1652,9 @@ msgstr "Als persönlichen Favorit markieren"
 msgid "Mark speaker"
 msgstr "Redner/in markieren"
 
+msgid "Maximum amount of votes"
+msgstr "Maximale Stimmenanzahl"
+
 msgid "Media access is denied"
 msgstr "Medienzugriff verweigert"
 
@@ -1621,12 +1670,18 @@ msgstr "Mitteilungen"
 msgid "Meta information"
 msgstr "Metainformationen"
 
+msgid "Min votes cannot be greater than max votes."
+msgstr "Die min. Stimmen dürfen nicht größer also die max. Stimmen sein."
+
 msgid "Minimal required version"
 msgstr "Minimal erforderliche Version"
 
 msgid "Minimize"
 msgstr "Minimieren"
 
+msgid "Minimum amount of votes"
+msgstr "Minimale Stimmenanzahl"
+
 msgid "More"
 msgstr "Mehr"
 
@@ -2109,6 +2164,9 @@ msgstr "Teilnehmende"
 msgid "Participants have been imported."
 msgstr "Teilnehmende wurden importiert."
 
+msgid "Particles"
+msgstr "Partikel"
+
 msgid "Password"
 msgstr "Passwort"
 
@@ -2548,6 +2606,9 @@ msgstr "Änderungsantrag im Hauptantrag anzeigen"
 msgid "Show amendments together with motions"
 msgstr "Änderungsanträge zusätzlich in der Hauptantragsübersicht anzeigen"
 
+msgid "Show applause amount"
+msgstr "Applauswert anzeigen"
+
 msgid "Show checkbox to record decision"
 msgstr "Ankreuzfelder zum Dokumentieren der Entscheidung anzeigen"
 
@@ -2626,6 +2687,13 @@ msgstr "Veranstaltungstitel anzeigen"
 msgid "Show/Hide video conference"
 msgstr "Videokonferenz anzeigen/verstecken"
 
+msgid ""
+"Shows a button with help icon to connect to an extra Jitsi conference room "
+"for technical audio/video tests."
+msgstr ""
+"Zeigt einen Fragezeichen-Button an, um sich mit einem extra Jitsi-"
+"Konferenzraum für technische Audio-/Video-Tests zu verbinden."
+
 msgid ""
 "Shows if livestream is not started. Recommended image format: 500x200px, PNG"
 " or JPG"
@@ -2633,6 +2701,13 @@ msgstr ""
 "Wird angezeigt, wenn der Livestream nicht gestartet werden kann. "
 "Bildformatempfehlung: 500x200px, PNG oder JPG"
 
+msgid ""
+"Shows the given image as applause particle. Recommended image format: "
+"24x24px, PNG, JPG or SVG"
+msgstr ""
+"Zeigt das angegebene Bild als Applaus-Partikel. Bildformatempfehlung: "
+"24x24px, PNG, JPG oder SVG"
+
 msgid "Simple Workflow"
 msgstr "Einfacher Arbeitsablauf"
 
@@ -2837,11 +2912,6 @@ msgstr "Die Redeliste ist geöffnet."
 msgid "The live conference is already running in your OpenSlides session."
 msgstr "Die Livekonferenz läuft bereits in Ihrer OpenSlides-Sitzung."
 
-msgid "The livestream is disabled because you are inside a conference"
-msgstr ""
-"Der Livestream ist deaktiviert, weil Sie gerade an der Livekonferenz "
-"teilnehmen."
-
 msgid ""
 "The maximum number of characters per line. Relevant when line numbering is "
 "enabled. Min: 40"
@@ -3093,6 +3163,9 @@ msgstr "Gültige Stimmen"
 msgid "View"
 msgstr "Anzeigen"
 
+msgid "Virtual applause"
+msgstr "Virtueller Applaus"
+
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
@@ -3117,6 +3190,9 @@ msgstr "Stimmen"
 msgid "Voting and ballot papers"
 msgstr "Abstimmung und Stimmzettel"
 
+msgid "Voting anonymized"
+msgstr "Abstimmung anonymisiert"
+
 msgid "Voting is currently in progress."
 msgstr "Stimmabgabe läuft aktuell "
 
@@ -3126,6 +3202,9 @@ msgstr "Wahlmethode"
 msgid "Voting opened"
 msgstr "Abstimmung eröffnet"
 
+msgid "Voting reset"
+msgstr "Abstimmung zurückgesetzt"
+
 msgid "Voting result"
 msgstr "Abstimmungsergebnis"
 
@@ -3138,6 +3217,12 @@ msgstr "Stimmrecht für"
 msgid "Voting right received from (principals)"
 msgstr "Stimmrecht erhalten von (Vollmachtgeber)"
 
+msgid "Voting started"
+msgstr "Abstimmung gestartet"
+
+msgid "Voting stopped"
+msgstr "Abstimmung gestoppt"
+
 msgid "Voting successful."
 msgstr "Stimmabgabe erfolgreich."
 
@@ -3388,6 +3473,9 @@ msgstr "analog"
 msgid "and"
 msgstr "und"
 
+msgid "at least"
+msgstr "mindestens"
+
 msgid "ballot-paper"
 msgstr "stimmzettel"
 

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

@@ -221,6 +221,15 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
+msgid "Applause interval in seconds"
+msgstr ""
+
+msgid "Applause particle image URL"
+msgstr ""
+
+msgid "Applause visualization"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -828,6 +837,17 @@ msgstr ""
 msgid "Default voting type"
 msgstr ""
 
+msgid ""
+"Defines the maximum deflection. Entering zero will use the amount of "
+"present participants instead."
+msgstr ""
+
+msgid "Defines the minimum deflection which is required to recognize applause."
+msgstr ""
+
+msgid "Defines the time in which applause amounts are add up."
+msgstr ""
+
 msgid "Delegates"
 msgstr ""
 
@@ -1027,6 +1047,12 @@ msgstr ""
 msgid "Enable points of order"
 msgstr ""
 
+msgid "Enable virtual applause"
+msgstr ""
+
+msgid "Enable virtual help desk room"
+msgstr ""
+
 msgid "Enable/disable account ..."
 msgstr ""
 
@@ -1212,6 +1238,9 @@ msgstr ""
 msgid "Generate password"
 msgstr ""
 
+msgid "Give applause"
+msgstr ""
+
 msgid "Given name"
 msgstr ""
 
@@ -1263,6 +1292,9 @@ msgstr ""
 msgid "Headline color"
 msgstr ""
 
+msgid "Help desk"
+msgstr ""
+
 msgid "Help text for access data and welcome PDF"
 msgstr ""
 
@@ -1293,6 +1325,9 @@ msgstr ""
 msgid "Hide the amount of speakers in subtitle of list of speakers slide"
 msgstr ""
 
+msgid "Highest applause amount"
+msgstr ""
+
 msgid "Hint on voting"
 msgstr ""
 
@@ -1457,6 +1492,9 @@ msgstr ""
 msgid "Legal notice"
 msgstr ""
 
+msgid "Level indicator"
+msgstr ""
+
 msgid "License"
 msgstr ""
 
@@ -1517,6 +1555,9 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
+msgid "Lowest applause amount"
+msgstr ""
+
 msgid "Main motion and line number"
 msgstr ""
 
@@ -1526,6 +1567,9 @@ msgstr ""
 msgid "Mark speaker"
 msgstr ""
 
+msgid "Maximum amount of votes"
+msgstr ""
+
 msgid "Media access is denied"
 msgstr ""
 
@@ -1541,12 +1585,18 @@ msgstr ""
 msgid "Meta information"
 msgstr ""
 
+msgid "Min votes cannot be greater than max votes."
+msgstr ""
+
 msgid "Minimal required version"
 msgstr ""
 
 msgid "Minimize"
 msgstr ""
 
+msgid "Minimum amount of votes"
+msgstr ""
+
 msgid "More"
 msgstr ""
 
@@ -2019,6 +2069,9 @@ msgstr ""
 msgid "Participants have been imported."
 msgstr ""
 
+msgid "Particles"
+msgstr ""
+
 msgid "Password"
 msgstr ""
 
@@ -2448,6 +2501,9 @@ msgstr ""
 msgid "Show amendments together with motions"
 msgstr ""
 
+msgid "Show applause amount"
+msgstr ""
+
 msgid "Show checkbox to record decision"
 msgstr ""
 
@@ -2523,11 +2579,21 @@ msgstr ""
 msgid "Show/Hide video conference"
 msgstr ""
 
+msgid ""
+"Shows a button with help icon to connect to an extra Jitsi conference room "
+"for technical audio/video tests."
+msgstr ""
+
 msgid ""
 "Shows if livestream is not started. Recommended image format: 500x200px, "
 "PNG or JPG"
 msgstr ""
 
+msgid ""
+"Shows the given image as applause particle. Recommended image format: "
+"24x24px, PNG, JPG or SVG"
+msgstr ""
+
 msgid "Simple Workflow"
 msgstr ""
 
@@ -2726,9 +2792,6 @@ msgstr ""
 msgid "The live conference is already running in your OpenSlides session."
 msgstr ""
 
-msgid "The livestream is disabled because you are inside a conference"
-msgstr ""
-
 msgid ""
 "The maximum number of characters per line. Relevant when line numbering is "
 "enabled. Min: 40"
@@ -2942,6 +3005,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+msgid "Virtual applause"
+msgstr ""
+
 msgid "Visibility"
 msgstr ""
 
@@ -2966,6 +3032,9 @@ msgstr ""
 msgid "Voting and ballot papers"
 msgstr ""
 
+msgid "Voting anonymized"
+msgstr ""
+
 msgid "Voting is currently in progress."
 msgstr ""
 
@@ -2975,6 +3044,9 @@ msgstr ""
 msgid "Voting opened"
 msgstr ""
 
+msgid "Voting reset"
+msgstr ""
+
 msgid "Voting result"
 msgstr ""
 
@@ -2987,6 +3059,12 @@ msgstr ""
 msgid "Voting right received from (principals)"
 msgstr ""
 
+msgid "Voting started"
+msgstr ""
+
+msgid "Voting stopped"
+msgstr ""
+
 msgid "Voting successful."
 msgstr ""
 
@@ -3215,6 +3293,9 @@ msgstr ""
 msgid "and"
 msgstr ""
 
+msgid "at least"
+msgstr ""
+
 msgid "ballot-paper"
 msgstr ""
 

server/openslides/core/config_variables.py

@@ -173,11 +173,9 @@ def get_config_variables():
         name="general_system_conference_enable_helpdesk",
         default_value=False,
         input_type="boolean",
-        label="Enable help desk",
+        label="Enable virtual help desk room",
         help_text="""
-            Shows a help icon in the conference bar.
+            Shows a button with help icon to connect to an extra Jitsi conference room for technical audio/video tests.
-            Users can connect to a dedicated conference.
-            The conference host has to manually ensure the coverage of the help desk.
         """,
         weight=148,
         subgroup="Live conference",
@@ -190,8 +188,7 @@ def get_config_variables():
         default_value=False,
         input_type="boolean",
         label="Enable virtual applause",
-        help_text="Shows a 'Send applause' icon in the live stream bar",
+        weight=150,
-        weight=170,
         subgroup="Virtual applause",
     )
 
@@ -202,15 +199,15 @@ def get_config_variables():
         choices=(
             {
                 "value": "applause-type-bar",
-                "display_name": "Bar",
+                "display_name": "Level indicator",
             },
             {
                 "value": "applause-type-particles",
                 "display_name": "Particles",
             },
         ),
-        label="Applause Type",
+        label="Applause visualization",
-        weight=171,
+        weight=151,
         subgroup="Virtual applause",
     )
 
@@ -219,7 +216,7 @@ def get_config_variables():
         default_value=False,
         input_type="boolean",
         label="Show applause amount",
-        weight=172,
+        weight=152,
         subgroup="Virtual applause",
     )
 
@@ -228,8 +225,8 @@ def get_config_variables():
         default_value=1,
         input_type="integer",
         label="Lowest applause amount",
-        help_text="Lowest amount required for OpenSlides to recognize applause",
+        help_text="Defines the minimum deflection which is required to recognize applause.",
-        weight=173,
+        weight=153,
         subgroup="Virtual applause",
     )
 
@@ -238,8 +235,8 @@ def get_config_variables():
         default_value=0,
         input_type="integer",
         label="Highest applause amount",
-        help_text="Defines the maximum deflection of the amount. Entering zero will use the amount of present users instead.",
+        help_text="Defines the maximum deflection. Entering zero will use the amount of present participants instead.",
-        weight=174,
+        weight=154,
         subgroup="Virtual applause",
     )
 
@@ -247,18 +244,18 @@ def get_config_variables():
         name="general_system_stream_applause_timeout",
         default_value=5,
         input_type="integer",
-        label="Applause timeout in seconds",
+        label="Applause interval in seconds",
-        help_text="Determines how long a user has to wait to applaud again. Also determines the time in which applause is collected",
+        help_text="Defines the time in which applause amounts are add up.",
-        weight=175,
+        weight=155,
         subgroup="Virtual applause",
     )
 
     yield ConfigVariable(
         name="general_system_applause_particle_image",
         default_value="",
-        label="Applause particle image url",
+        label="Applause particle image URL",
         help_text="Shows the given image as applause particle. Recommended image format: 24x24px, PNG, JPG or SVG",
-        weight=176,
+        weight=156,
         subgroup="Virtual applause",
     )
 
@@ -269,7 +266,7 @@ def get_config_variables():
         default_value=False,
         input_type="boolean",
         label="Allow access for anonymous guest users",
-        weight=150,
+        weight=160,
         subgroup="System",
     )
 
@@ -277,7 +274,7 @@ def get_config_variables():
         name="general_login_info_text",
         default_value="",
         label="Show this text on the login page",
-        weight=152,
+        weight=162,
         subgroup="System",
     )
 
@@ -313,7 +310,7 @@ def get_config_variables():
                 "display_name": "OpenSlides Solarized",
             },
         ),
-        weight=154,
+        weight=164,
         subgroup="System",
     )
 
@@ -323,7 +320,7 @@ def get_config_variables():
         name="general_csv_separator",
         default_value=",",
         label="Separator used for all csv exports and examples",
-        weight=160,
+        weight=170,
         subgroup="Export",
     )
 
@@ -336,7 +333,7 @@ def get_config_variables():
             {"value": "utf-8", "display_name": "UTF-8"},
             {"value": "iso-8859-15", "display_name": "ISO-8859-15"},
         ),
-        weight=162,
+        weight=172,
         subgroup="Export",
     )
 
@@ -350,7 +347,7 @@ def get_config_variables():
             {"value": "center", "display_name": "Center"},
             {"value": "right", "display_name": "Right"},
         ),
-        weight=164,
+        weight=174,
         subgroup="Export",
     )
 
@@ -364,7 +361,7 @@ def get_config_variables():
             {"value": "11", "display_name": "11"},
             {"value": "12", "display_name": "12"},
         ),
-        weight=166,
+        weight=176,
         subgroup="Export",
     )
 
@@ -377,7 +374,7 @@ def get_config_variables():
             {"value": "A4", "display_name": "DIN A4"},
             {"value": "A5", "display_name": "DIN A5"},
         ),
-        weight=168,
+        weight=178,
         subgroup="Export",
     )