Updated translations

client/src/app/site/common/components/count-users/count-users.component.html

@@ -1,23 +1,20 @@
-<button type="button" mat-button (click)="countUsers()" *ngIf="!this.token">
+<button type="button" mat-stroked-button (click)="countUsers()" *ngIf="!this.token">
-    <span>{{ 'Count active users' | translate }}</span>
+    {{ 'Count active users' | translate }}
 </button>
-<button type="button" mat-button (click)="stopCounting()" *ngIf="this.token">
+<button type="button" mat-stroked-button (click)="stopCounting()" *ngIf="this.token">
-    <span>{{ 'Stop counting' | translate }}</span>
+    {{ 'Stop counting' | translate }}
 </button>
 <div *ngIf="stats">
     <p>
-        {{ userIds().length }} <span>{{ 'active users' | translate }}</span> ({{ stats.activeUserHandles }}
+        {{ userIds().length }} {{ 'active users' | translate }} 
-        <span>{{ 'connections' | translate }}</span
+        ({{ stats.activeUserHandles }} {{ 'connections' | translate }})
-        >)
     </p>
-    <h3>{{ 'Groups' | translate }}</h3>
+    {{ 'Groups' | translate }}:
     <ul>
         <li *ngFor="let groupId of groupIds()">
-            <strong>{{ stats.groups[groupId].name }}</strong>
+            <strong>{{ stats.groups[groupId].name }}:</strong>
-            <span> : {{ userInGroupIds(groupId).length }} </span>
+            {{ userInGroupIds(groupId).length }} {{ 'active users' | translate }}
-            <span>{{ 'active users' | translate }}</span>
+            ({{ stats.groups[groupId].userHandleCount }} {{ 'connections' | translate }})
-            (<span>{{ stats.groups[groupId].userHandleCount }}</span> <span>{{ 'connections' | translate }}</span
-            >)
         </li>
     </ul>
 </div>

client/src/app/site/common/components/legal-notice/legal-notice.component.html

@@ -35,13 +35,13 @@
 </mat-card>
 
 <mat-card class="os-card" *osPerms="'users.can_manage'">
-    <h3>{{ 'Statistics' | translate }}</h3>
+    <h2>{{ 'Statistics' | translate }}</h2>
     <div>
-        <h4>{{ 'Count active users' | translate }}</h4>
+        <h3>{{ 'Active users' | translate }}</h3>
         <os-count-users></os-count-users>
     </div>
     <div>
-        <h4>{{ 'Count active word requests' | translate }}</h4>
+        <h3>{{ 'Requests to speak' | translate }}</h3>
         <os-user-statistics></os-user-statistics>
     </div>
 </mat-card>

client/src/app/site/common/components/user-statistics/user-statistics.component.html

@@ -1,13 +1,13 @@
-<button mat-button *ngIf="!openedStatistics" (click)="changeViewOfStatistics()">
+<button mat-stroked-button *ngIf="!openedStatistics" (click)="changeViewOfStatistics()">
-    {{ 'Count active word requests' | translate }}
+    {{ 'Count completed requests to speak' | translate }}
 </button>
-<button mat-button *ngIf="openedStatistics" (click)="changeViewOfStatistics()">
+<button mat-stroked-button *ngIf="openedStatistics" (click)="changeViewOfStatistics()">
     {{ 'Stop counting' | translate }}
 </button>
 <ng-container *ngIf="openedStatistics">
     <table class="user-statistics-table">
         <tr>
-            <td>{{ 'Total number of word requests' | translate }}</td>
+            <td>{{ 'Number of all requests to speak' | translate }}</td>
             <td>{{ numberOfWordRequests }}</td>
         </tr>
         <tr>
@@ -15,7 +15,7 @@
             <td>{{ numberOfUniqueSpeakers }}</td>
         </tr>
         <tr>
-            <td>{{ 'Total duration of word requests' | translate }}</td>
+            <td>{{ 'Duration of all requests to speak' | translate }}</td>
             <td>{{ totalDuration }}</td>
         </tr>
     </table>

client/src/app/site/common/components/user-statistics/user-statistics.component.ts

@@ -40,7 +40,7 @@ export class UserStatisticsComponent extends BaseViewComponent {
     /**
      * Returns an observable containing a list. This list contains objects separated by the structure-level of speakers.
      *
-     * Those objects hold information about number of word requests and duration of word requests for a given
+     * Those objects hold information about number and duration of requests to speak for a given
      * structure-level.
      */
     public get statisticsByStructureLevelObservable(): Observable<SpeakingTimeStructureLevelObject[]> {
@@ -63,19 +63,19 @@ export class UserStatisticsComponent extends BaseViewComponent {
         {
             prop: 'durationOfWordRequests',
             width: 'auto',
-            label: 'Duration of word requests'
+            label: this.translate.instant('Duration of requests to speak')
         },
         {
             prop: 'numberOfWordRequests',
             width: 'auto',
-            label: 'Number of word requests'
+            label: this.translate.instant('Number of requests to speak')
         }
     ];
 
     public readonly filterProps: string[] = ['structureLevel'];
 
     /**
-     * Holds information about hours, minutes and seconds for the total duration of word requests.
+     * Holds information about hours, minutes and seconds for the total duration of requests to speak.
      */
     private speakingTimeAsNumber = 0;
 

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

@@ -466,7 +466,7 @@
 
             <br>
             <mat-checkbox [(ngModel)]="showAllAmendments" *ngIf="isRecoMode(ChangeRecoMode.Diff)">
-                {{ 'Temporarily show all in text' | translate }}
+                {{ 'Show all changes' | translate }}
             </mat-checkbox>
         </div>
 

client/src/assets/i18n/de.po

@@ -82,6 +82,9 @@ msgstr "Aktiv"
 msgid "Active filters"
 msgstr "Aktive Filter"
 
+msgid "Active users"
+msgstr "Aktive Nutzer"
+
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -689,6 +692,9 @@ msgstr "Kopieren Sie die Name Ihrer Teilnehmer/innen in diese Textbox."
 msgid "Count active users"
 msgstr "Aktive Nutzer zählen"
 
+msgid "Count completed requests to speak"
+msgstr "Abgeschlossene Wortmeldungen zählen"
+
 msgid "Countdown"
 msgstr "Countdown"
 
@@ -737,6 +743,9 @@ msgstr "Aktuelles Datum"
 msgid "Current list of speakers"
 msgstr "Aktuelle Redeliste"
 
+msgid "Currently projected"
+msgstr "Aktuell projiziert"
+
 msgid "Custom aspect ratio"
 msgstr "Eigenes Seitenverhältnis"
 
@@ -918,6 +927,12 @@ msgstr "Duplizieren"
 msgid "Duration"
 msgstr "Dauer"
 
+msgid "Duration of all requests to speak"
+msgstr "Dauer aller Wortmeldungen"
+
+msgid "Duration of requests to speak"
+msgstr "Dauer der Wortmeldungen"
+
 msgid ""
 "During non-nominal voting OpenSlides does NOT store the individual user ID "
 "of the voter. This in no way means that a non-nominal vote is completely "
@@ -1750,6 +1765,9 @@ msgstr "Anzahl aller Delegierten"
 msgid "Number of all participants"
 msgstr "Anzahl aller Teilnehmenden"
 
+msgid "Number of all requests to speak"
+msgstr "Anzahl aller Wortmeldungen"
+
 msgid "Number of ballot papers"
 msgstr "Stimmzettelanzahl"
 
@@ -1768,6 +1786,9 @@ msgstr "Minimale Anzahl an Ziffern im Bezeichner"
 msgid "Number of persons to be elected"
 msgstr "Anzahl der zu wählenden Personen"
 
+msgid "Number of requests to speak"
+msgstr "Anzahl der Wortmeldungen"
+
 msgid "Number of the next speakers to be shown on the projector"
 msgstr "Anzahl der dargestellten nächsten Render/innen auf dem Projektor"
 
@@ -2140,6 +2161,9 @@ msgstr "Ersetzung"
 msgid "Reply address"
 msgstr "Antwortadresse"
 
+msgid "Requests to speak"
+msgstr "Wortmeldungen"
+
 msgid "Required"
 msgstr "Erforderlich"
 
@@ -2319,6 +2343,12 @@ msgstr "Kurzbeschreibung der Veranstaltung"
 msgid "Show all"
 msgstr "Alle anzeigen"
 
+msgid "Show all changes"
+msgstr "Alle Änderungen anzeigen"
+
+msgid "Show amendment"
+msgstr "Änderungsantrag anzeigen"
+
 msgid "Show amendment in parent motion"
 msgstr "Änderungsantrag im Hauptantrag anzeigen"
 
@@ -2463,6 +2493,9 @@ msgstr "Status"
 msgid "State set to {arg1}"
 msgstr "Status gesetzt auf {arg1}"
 
+msgid "Statistics"
+msgstr "Statistiken"
+
 msgid "Statute"
 msgstr "Satzung"
 
@@ -2779,6 +2812,9 @@ msgstr "Typ"
 msgid "Undone"
 msgstr "unerledigt"
 
+msgid "Unique speakers"
+msgstr "Eindeutige Redner/innen"
+
 msgid "Unknown user"
 msgstr "Unbekannter Nutzer"
 

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

@@ -70,6 +70,9 @@ msgstr ""
 msgid "Active filters"
 msgstr ""
 
+msgid "Active users"
+msgstr ""
+
 msgid "Add"
 msgstr ""
 
@@ -650,6 +653,9 @@ msgstr ""
 msgid "Count active users"
 msgstr ""
 
+msgid "Count completed requests to speak"
+msgstr ""
+
 msgid "Countdown"
 msgstr ""
 
@@ -698,6 +704,9 @@ msgstr ""
 msgid "Current list of speakers"
 msgstr ""
 
+msgid "Currently projected"
+msgstr ""
+
 msgid "Custom aspect ratio"
 msgstr ""
 
@@ -861,6 +870,12 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
+msgid "Duration of all requests to speak"
+msgstr ""
+
+msgid "Duration of requests to speak"
+msgstr ""
+
 msgid ""
 "During non-nominal voting OpenSlides does NOT store the individual user ID "
 "of the voter. This in no way means that a non-nominal vote is completely "
@@ -1673,6 +1688,9 @@ msgstr ""
 msgid "Number of all participants"
 msgstr ""
 
+msgid "Number of all requests to speak"
+msgstr ""
+
 msgid "Number of ballot papers"
 msgstr ""
 
@@ -1691,6 +1709,9 @@ msgstr ""
 msgid "Number of persons to be elected"
 msgstr ""
 
+msgid "Number of requests to speak"
+msgstr ""
+
 msgid "Number of the next speakers to be shown on the projector"
 msgstr ""
 
@@ -2058,6 +2079,9 @@ msgstr ""
 msgid "Reply address"
 msgstr ""
 
+msgid "Requests to speak"
+msgstr ""
+
 msgid "Required"
 msgstr ""
 
@@ -2234,6 +2258,12 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
+msgid "Show all changes"
+msgstr ""
+
+msgid "Show amendment"
+msgstr ""
+
 msgid "Show amendment in parent motion"
 msgstr ""
 
@@ -2375,6 +2405,9 @@ msgstr ""
 msgid "State set to {arg1}"
 msgstr ""
 
+msgid "Statistics"
+msgstr ""
+
 msgid "Statute"
 msgstr ""
 
@@ -2653,6 +2686,9 @@ msgstr ""
 msgid "Undone"
 msgstr ""
 
+msgid "Unique speakers"
+msgstr ""
+
 msgid "Unknown user"
 msgstr ""