Updated translations

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

@@ -30,6 +30,9 @@ _('Front page text');
 _('[Space for your welcome text.]');
 _('System');
 _('Allow access for anonymous guest users');
+_('Show audio conference window');
+_('Connect all users to audio conference automatically');
+_('Server settings required to activate Jitsi Meet integration.');
 _('Show this text on the login page');
 _('OpenSlides Theme');
 _('Export');
@@ -93,7 +96,8 @@ _('Enter duration in seconds. Choose 0 to disable warning color.');
 _('Hide the amount of speakers in subtitle of list of speakers slide');
 _('Couple countdown with the list of speakers');
 _('[Begin speech] starts the countdown, [End speech] stops the countdown.');
-_('Only present participants can be added to the list of speakers'), _('Agenda visibility');
+_('Only present participants can be added to the list of speakers');
+_('Show hint »first speech« in the list of speakers management view');
 _('Default visibility for new agenda items (except topics)');
 _('public');
 _('internal');

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

@@ -18,7 +18,7 @@
                 mat-mini-fab
                 *ngIf="isJoined"
                 (click)="toggleMute()"
-                matTooltip="{{ 'mute/unmute' | translate }}"
+                matTooltip="{{ 'Mute / Unmute' | translate }}"
             >
                 <mat-icon color="{{ muted ? 'primary' : 'warn' }}">{{ muted ? 'moff' : 'mic' }}</mat-icon>
             </button>
@@ -41,7 +41,7 @@
             <!-- <span class="list-wrapper apply-theme regular-shadow"> -->
             <!-- open-window button -->
             <button class="toggle-list-button" mat-button (click)="toggleShowJitsi()">
-                <span> {{ 'Audio Conference' | translate }}</span>
+                <span> {{ 'Audio conference' | translate }}</span>
                 <mat-icon class="opened-indicator" *ngIf="!showJitsiWindow">keyboard_arrow_up</mat-icon>
                 <mat-icon class="opened-indicator" *ngIf="showJitsiWindow">keyboard_arrow_down </mat-icon>
 
@@ -67,9 +67,9 @@
                 <div class="content">
                     <!-- The "somewhere else active" warning -->
                     <div class="disconnected" *ngIf="isJitsiActiveInAnotherTab && !isJitsiActive">
-                        <span>{{ 'Another instance of Jitsi is active in you OpenSlides session' | translate }}</span>
+                        <span>{{ 'The audio conference is already running in your OpenSlides session.' | translate }}</span>
                         <button mat-button color="warn" (click)="forceStart()">
-                            <span>{{ 'Force Jitsi to reload' | translate }}</span>
+                            <span>{{ 'Reenter to audio conference' | translate }}</span>
                         </button>
                     </div>
 
@@ -134,7 +134,7 @@
                             class="open-jitsi-in-tab"
                             color="accent"
                             (click)="openExternal()"
-                            matTooltip="{{ 'Open Jitsi in new tab' | translate }}"
+                            matTooltip="{{ 'Open Jitsi Meet in new tab' | translate }}"
                             [disabled]="isRoomPasswordProtected"
                         >
                             <mat-icon>

client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html

@@ -108,8 +108,8 @@
                     </span>
 
                     <!-- First contribution -->
-                    <span *ngIf="showFistContributionHint && isFirstContribution(speaker)" class="speaker-warning">
+                    <span *ngIf="showFistContributionHint && isFirstContribution(speaker)" class="red-warning-text speaker-warning">
-                        {{ 'First contribution' | translate }}
+                        {{ 'First speech' | translate }}
                     </span>
 
                     <!-- Speaker gender -->

client/src/assets/i18n/de.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Emanuel Schütze <emanuel.schuetze@intevation.de>, 2020
 # 
@@ -385,6 +386,9 @@ msgstr "Nachfragen, voreingestellt ja"
 msgid "Attachments"
 msgstr "Anhänge"
 
+msgid "Audio conference"
+msgstr "Audiokonferenz"
+
 msgid "Available votes"
 msgstr "Verfügbare Stimmen"
 
@@ -673,6 +677,9 @@ msgstr "Komplexer Arbeitsablauf"
 msgid "Confirm new password"
 msgstr "Neues Passwort bestätigen"
 
+msgid "Connect all users to audio conference automatically"
+msgstr "Alle Nutzer automatisch mit der Audiokonferenz verbinden"
+
 msgid "Content"
 msgstr "Inhalt"
 
@@ -1000,6 +1007,9 @@ msgstr "Rede beenden"
 msgid "Enforce page breaks"
 msgstr "Seitenumbrüche erzwingen"
 
+msgid "Enter conference"
+msgstr "Konferenz beitreten"
+
 msgid "Enter duration in seconds. Choose 0 to disable warning color."
 msgstr ""
 "Geben Sie die Dauer in Sekunden an. Zum Deaktivieren der Warn-Farbe 0 "
@@ -1116,6 +1126,9 @@ msgstr "Beschlussfassung"
 msgid "Finished"
 msgstr "Abgeschlossen"
 
+msgid "First speech"
+msgstr "Erstredner/in"
+
 msgid "First state"
 msgstr "Erster Status"
 
@@ -1397,6 +1410,9 @@ msgstr "Zuletzt geändert"
 msgid "Last speakers"
 msgstr "Letzte Redner/innen"
 
+msgid "Leave"
+msgstr "Verlassen"
+
 msgid "Left"
 msgstr "Links"
 
@@ -1541,6 +1557,9 @@ msgstr "Zu TOP verschieben"
 msgid "Multiselect"
 msgstr "Mehrfachauswahl"
 
+msgid "Mute / Unmute"
+msgstr "Stummschaltung aktivieren / deaktivieren"
+
 msgid "Name"
 msgstr "Name"
 
@@ -1804,6 +1823,9 @@ msgstr "Nur Ampel"
 msgid "Open"
 msgstr "Öffnen"
 
+msgid "Open Jitsi Meet in new tab"
+msgstr "Jitsi Meet im neuen Tab öffnen"
+
 msgid "Open items"
 msgstr "Offene Einträge"
 
@@ -2057,6 +2079,9 @@ msgstr "Empfehlung"
 msgid "Recommendation set to {arg1}"
 msgstr "Empfehlung gesetzt auf {arg1}"
 
+msgid "Reenter to audio conference"
+msgstr "Audiokonferenz erneut beitreten"
+
 msgid "Refer to committee"
 msgstr "In Ausschuss verweisen"
 
@@ -2233,6 +2258,10 @@ msgstr "Laufende Nummer"
 msgid "Serially numbered"
 msgstr "fortlaufend nummerieren"
 
+msgid "Server settings required to activate Jitsi Meet integration."
+msgstr ""
+"Servereinstellungen erforderlich zur Aktivierung der Jitsi-Meet-Integration."
+
 msgid "Set as favorite"
 msgstr "Als Favorit markieren"
 
@@ -2296,6 +2325,9 @@ msgstr "Änderungsantrag im Hauptantrag anzeigen"
 msgid "Show amendments together with motions"
 msgstr "Änderungsanträge zusätzlich in der Hauptantragsübersicht anzeigen"
 
+msgid "Show audio conference window"
+msgstr "Audiokonferenz-Fenster anzeigen"
+
 msgid "Show checkbox to record decision"
 msgstr "Ankreuzfelder zum Dokumentieren der Entscheidung anzeigen"
 
@@ -2320,6 +2352,9 @@ msgstr "mehr anzeigen"
 msgid "Show header and footer"
 msgstr "Kopf- und Fußzeile anzeigen"
 
+msgid "Show hint »first speech« in the list of speakers management view"
+msgstr "Hinweis »Erstredner/in« in der Redelistenverwaltung anzeigen "
+
 msgid "Show logo"
 msgstr "Logo anzeigen"
 
@@ -2525,6 +2560,9 @@ msgstr "Texttrenner"
 msgid "The assembly may decide:"
 msgstr "Die Versammlung möge beschließen:"
 
+msgid "The audio conference is already running in your OpenSlides session."
+msgstr "Die Audiokonferenz läuft bereits in Ihrer OpenSlides-Sitzung."
+
 msgid "The event manager has not set up a legal notice yet."
 msgstr "Der Veranstalter hat noch kein Impressum hinterlegt."
 
@@ -3029,6 +3067,9 @@ msgstr "benutzerdefiniert"
 msgid "disabled"
 msgstr "deaktiviert"
 
+msgid "disconnected"
+msgstr "getrennt"
+
 msgid "diverse"
 msgstr "divers"
 

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

@@ -350,6 +350,9 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
+msgid "Audio conference"
+msgstr ""
+
 msgid "Available votes"
 msgstr ""
 
@@ -635,6 +638,9 @@ msgstr ""
 msgid "Confirm new password"
 msgstr ""
 
+msgid "Connect all users to audio conference automatically"
+msgstr ""
+
 msgid "Content"
 msgstr ""
 
@@ -938,6 +944,9 @@ msgstr ""
 msgid "Enforce page breaks"
 msgstr ""
 
+msgid "Enter conference"
+msgstr ""
+
 msgid "Enter duration in seconds. Choose 0 to disable warning color."
 msgstr ""
 
@@ -1048,6 +1057,9 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
+msgid "First speech"
+msgstr ""
+
 msgid "First state"
 msgstr ""
 
@@ -1326,6 +1338,9 @@ msgstr ""
 msgid "Last speakers"
 msgstr ""
 
+msgid "Leave"
+msgstr ""
+
 msgid "Left"
 msgstr ""
 
@@ -1470,6 +1485,9 @@ msgstr ""
 msgid "Multiselect"
 msgstr ""
 
+msgid "Mute / Unmute"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
@@ -1726,6 +1744,9 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+msgid "Open Jitsi Meet in new tab"
+msgstr ""
+
 msgid "Open items"
 msgstr ""
 
@@ -1978,6 +1999,9 @@ msgstr ""
 msgid "Recommendation set to {arg1}"
 msgstr ""
 
+msgid "Reenter to audio conference"
+msgstr ""
+
 msgid "Refer to committee"
 msgstr ""
 
@@ -2150,6 +2174,9 @@ msgstr ""
 msgid "Serially numbered"
 msgstr ""
 
+msgid "Server settings required to activate Jitsi Meet integration."
+msgstr ""
+
 msgid "Set as favorite"
 msgstr ""
 
@@ -2213,6 +2240,9 @@ msgstr ""
 msgid "Show amendments together with motions"
 msgstr ""
 
+msgid "Show audio conference window"
+msgstr ""
+
 msgid "Show checkbox to record decision"
 msgstr ""
 
@@ -2237,6 +2267,9 @@ msgstr ""
 msgid "Show header and footer"
 msgstr ""
 
+msgid "Show hint »first speech« in the list of speakers management view"
+msgstr ""
+
 msgid "Show logo"
 msgstr ""
 
@@ -2438,6 +2471,9 @@ msgstr ""
 msgid "The assembly may decide:"
 msgstr ""
 
+msgid "The audio conference is already running in your OpenSlides session."
+msgstr ""
+
 msgid "The event manager has not set up a legal notice yet."
 msgstr ""
 
@@ -2886,6 +2922,9 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
+msgid "disconnected"
+msgstr ""
+
 msgid "diverse"
 msgstr ""
 

openslides/agenda/config_variables.py

@@ -193,7 +193,7 @@ def get_config_variables():
         name="agenda_show_first_contribution",
         default_value=False,
         input_type="boolean",
-        label="Show a note when a speaker appears for the first time",
+        label="Show hint »first speech« in the list of speakers management view",
         weight=234,
         group="Agenda",
         subgroup="List of speakers",

openslides/core/config_variables.py

@@ -96,11 +96,31 @@ def get_config_variables():
         subgroup="System",
     )
 
+    yield ConfigVariable(
+        name="general_system_conference_auto_connect",
+        default_value=False,
+        input_type="boolean",
+        label="Show audio conference window",
+        help_text="Server settings required to activate Jitsi Meet integration.",
+        weight=140,
+        subgroup="System",
+    )
+
+    yield ConfigVariable(
+        name="general_system_conference_show",
+        default_value=False,
+        input_type="boolean",
+        label="Connect all users to audio conference automatically",
+        help_text="Server settings required to activate Jitsi Meet integration.",
+        weight=142,
+        subgroup="System",
+    )
+
     yield ConfigVariable(
         name="general_login_info_text",
         default_value="",
         label="Show this text on the login page",
-        weight=140,
+        weight=144,
         subgroup="System",
     )
 
@@ -118,25 +138,7 @@ def get_config_variables():
                 "display_name": "OpenSlides Developer",
             },
         ),
-        weight=141,
+        weight=146,
-        subgroup="System",
-    )
-
-    yield ConfigVariable(
-        name="general_system_conference_auto_connect",
-        default_value=False,
-        input_type="boolean",
-        label="Show the audio conferece integration at the bottom right corner",
-        weight=142,
-        subgroup="System",
-    )
-
-    yield ConfigVariable(
-        name="general_system_conference_show",
-        default_value=False,
-        input_type="boolean",
-        label="Allow users to automatically connect to the audio conference",
-        weight=143,
         subgroup="System",
     )