ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5411 from emanuelschuetze/translations-20200511

Browse Source 
Updated translations.
This commit is contained in:
Emanuel Schütze 2020-06-11 17:46:13 +02:00 committed by GitHub
commit 438b3558bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 200 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/core/translate/marked-translations.ts
View File

@ -30,9 +30,12 @@ _('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');
_('Show live conference window');
_('Connect all users to live conference automatically');
_('Allow only current speakers and list of speakers managers to enter the live conference');
_('Server settings required to activate Jitsi Meet integration.');
_('Livestream url');
_('Remove URL to deactivate livestream. Check extra group permission to see livestream.');
_('Show this text on the login page');
_('OpenSlides Theme');
_('Export');
@ -324,6 +327,7 @@ _('Can manage tags');
_('Can manage configuration');
_('Can manage logos and fonts');
_('Can see history');
_('Can see the live stream');
// mediafiles
_('Can see the list of files');
_('Can upload files');

10
client/src/app/shared/components/jitsi/jitsi.component.html
View File

@ -46,7 +46,7 @@
class="indicator quick-icon"
color="accent"
(click)="viewStream()"
matTooltip="{{ 'Exit live conference and view the live stream' | translate }}"
matTooltip="{{ 'Exit live conference and continue livestream' | translate }}"
*ngIf="videoStreamUrl"
>
<mat-icon color="warn">
@ -133,10 +133,10 @@
<!-- The "somewhere else active" warning -->
<div class="disconnected" *ngIf="isJitsiActiveInAnotherTab && !isJitsiActive">
<span>{{
'The audio conference is already running in your OpenSlides session.' | translate
'The live conference is already running in your OpenSlides session.' | translate
}}</span>
<button mat-button color="warn" (click)="forceStart()">
<span>{{ 'Reenter to audio conference' | translate }}</span>
<span>{{ 'Reenter to live conference' | translate }}</span>
</button>
</div>
@ -175,9 +175,9 @@
*ngIf="!streamActiveInAnotherTab || streamRunning"
></os-vjs-player>
<div class="disconnected" *ngIf="streamActiveInAnotherTab && !streamRunning">
<span>{{ 'The video stream is already running in your OpenSlides session.' | translate }}</span>
<span>{{ 'The livestream is already running in your OpenSlides session.' | translate }}</span>
<button mat-button color="warn" (click)="deleteStreamingLock()">
<span>{{ 'Force the stream to reload' | translate }}</span>
<span>{{ 'Restart livestream' | translate }}</span>
</button>
</div>
</ng-container>

4
client/src/app/shared/components/live-stream/live-stream.component.html
View File

@ -11,10 +11,10 @@
<div class="user-in-conf-warning" *ngIf="isUserInConference">
<span>
{{ 'The stream is disableb because you are inside a conference' | translate }}
{{ 'The livestream is disabled because you are inside a conference' | translate }}
</span>
<button mat-raised-button color="warn" (click)="forceReloadStream()">
{{ 'Force the stream to reload' | translate }}
{{ 'Restart livestream' | translate }}
</button>
</div>
</div>

9
client/src/app/site/login/components/unsupported-browser/unsupported-browser.component.html
View File

@ -1,9 +1,9 @@
<main>
<h1 class="center spacer-top-20" *ngIf="!supported">
{{ 'Your browser is not supported by OpenSlides' | translate }}
{{ 'Your browser is not supported by OpenSlides!' | translate }}
</h1>
<h1 class="center spacer-top-20" *ngIf="supported">
{{ 'Congratuations! Your browser is supported by OpenSlides' | translate }}
{{ 'Congratuations! Your browser is supported by OpenSlides.' | translate }}
</h1>
<mat-card class="os-card">
@ -13,13 +13,12 @@
{{ browserVersion }})
</span>
<br />
<span *ngIf="!!supportedVersion">{{ 'Minimal required version for your browser' | translate }}: {{ supportedVersion }}</span>
<span *ngIf="!!supportedVersion">{{ 'Minimal required version' | translate }}: {{ supportedVersion }}</span>
</div>
<div class="spacer-top-20" *ngIf="!supported">
<span>{{
'Please update your browser or contact your system administration to have your browser updated for you.'
| translate
'Please update your browser or contact your system administration.' | translate
}}</span>
</div>

2
client/src/assets/i18n/de.json
View File

File diff suppressed because one or more lines are too long

96
client/src/assets/i18n/de.po
View File

@ -172,6 +172,13 @@ msgstr "Leerzeichen im Bezeichner erlauben"
msgid "Allow create poll"
msgstr "Abstimmung möglich"
msgid ""
"Allow only current speakers and list of speakers managers to enter the live "
"conference"
msgstr ""
"Nur aktuellen Redner/innen und der Redelistenverwaltung erlauben in eine "
"Livekonferenz beizutreten"
msgid "Allow submitter edit"
msgstr "Antragsteller/in darf bearbeiten"
@ -389,9 +396,6 @@ msgstr "Nachfragen, voreingestellt ja"
msgid "Attachments"
msgstr "Anhänge"
msgid "Audio conference"
msgstr "Audiokonferenz"
msgid "Available votes"
msgstr "Verfügbare Stimmen"
@ -538,6 +542,9 @@ msgstr "Darf die Startseite sehen"
msgid "Can see the list of files"
msgstr "Darf die Dateiliste sehen"
msgid "Can see the live stream"
msgstr "Darf den Livestream sehen"
msgid "Can see the projector"
msgstr "Darf den Projektor sehen"
@ -680,8 +687,11 @@ 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 "Congratuations! Your browser is supported by OpenSlides."
msgstr "Glückwunsch! Ihr Browser wird von OpenSlides unterstützt. "
msgid "Connect all users to live conference automatically"
msgstr "Alle Nutzer automatisch mit der Livekonferenz verbinden"
msgid "Content"
msgstr "Inhalt"
@ -1036,6 +1046,9 @@ msgstr ""
"Geben Sie die Dauer in Sekunden an. Zum Deaktivieren der Warn-Farbe 0 "
"auswählen."
msgid "Enter live conference"
msgstr "Livekonferenz beitreten"
msgid ""
"Enter number of the next shown speakers. Choose -1 to show all next "
"speakers."
@ -1090,6 +1103,9 @@ msgstr "Veranstalter"
msgid "Exit"
msgstr "Beenden"
msgid "Exit live conference and continue livestream"
msgstr "Livekonferenz verlassen und Livestream fortsetzen"
msgid "Expand all"
msgstr "Alle ausklappen"
@ -1473,6 +1489,15 @@ msgstr "Redelisten-Einblendung"
msgid "List view"
msgstr "Listenansicht"
msgid "Live conference"
msgstr "Livekonferenz"
msgid "Livestream"
msgstr "Livestream"
msgid "Livestream url"
msgstr "Livestream-URL"
msgid "Loading data. Please wait ..."
msgstr "Daten werden geladen. Bitte warten ..."
@ -1494,8 +1519,8 @@ msgstr "Als persönlichen Favorit markieren"
msgid "Mark speaker"
msgstr "Redner/in markieren"
msgid "Maximize Jitsi window"
msgstr "Jitsi-Fenster maximieren"
msgid "Maximize / minimize Jitsi window"
msgstr "Jitsi-Fenster maximieren/minimieren"
msgid "Media file"
msgstr "Mediendatei"
@ -1509,6 +1534,9 @@ msgstr "Mitteilungen"
msgid "Meta information"
msgstr "Metainformationen"
msgid "Minimal required version"
msgstr "Minimal erforderliche Version"
msgid "Minimize"
msgstr "Minimieren"
@ -1883,6 +1911,9 @@ msgstr "OpenSlides-Zugangsdaten"
msgid "OpenSlides is temporarily reset to following timestamp"
msgstr "OpenSlides ist vorübergehend auf folgenden Zeitpunkt zurückgesetzt:"
msgid "OpenSlides recommends:"
msgstr "OpenSlides empfiehlt:"
msgid "Origin"
msgstr "Herkunft"
@ -2013,6 +2044,11 @@ msgstr "Bitte geben Sie Ihr neues Passwort ein"
msgid "Please select the directory:"
msgstr "Bitte wählen Sie das Verzeichnis aus:"
msgid "Please update your browser or contact your system administration."
msgstr ""
"Bitte aktualisieren Sie Ihren Browser oder kontaktieren Sie Ihre "
"Systemadministration."
msgid "Preamble text for PDF document (all elections)"
msgstr "Einleitungstext für PDF-Dokument (alle Wahlen) "
@ -2115,8 +2151,8 @@ msgstr "Empfehlung"
msgid "Recommendation set to {arg1}"
msgstr "Empfehlung gesetzt auf {arg1}"
msgid "Reenter to audio conference"
msgstr "Audiokonferenz erneut beitreten"
msgid "Reenter to live conference"
msgstr "Livekonferenz erneut beitreten"
msgid "Refer to committee"
msgstr "In Ausschuss verweisen"
@ -2148,6 +2184,13 @@ msgstr "Verwerfung (nicht berechtigt)"
msgid "Remove"
msgstr "Entfernen"
msgid ""
"Remove URL to deactivate livestream. Check extra group permission to see "
"livestream."
msgstr ""
"Um den Livestream zu deaktivieren entfernen Sie die URL. Prüfen Sie die "
"extra Gruppenberechtigung um den Livestream zu sehen."
msgid "Remove all speakers"
msgstr "Alle Redner/innen entfernen"
@ -2216,6 +2259,9 @@ msgstr "Auf Werkseinstellung zurücksetzen"
msgid "Resolution and size"
msgstr "Auflösung und Größe"
msgid "Restart livestream"
msgstr "Livestream neustarten"
msgid "Restrictions"
msgstr "Zugriffsbeschränkung"
@ -2370,9 +2416,6 @@ 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"
@ -2403,6 +2446,9 @@ 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 live conference window"
msgstr "Livekonferenz-Fenster anzeigen"
msgid "Show logo"
msgstr "Logo anzeigen"
@ -2611,9 +2657,6 @@ 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."
@ -2643,6 +2686,17 @@ msgstr ""
msgid "The list of speakers is closed."
msgstr "Die Redeliste ist geschlossen."
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 already running in your OpenSlides session."
msgstr "Der Livestream 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"
@ -3048,6 +3102,12 @@ msgstr ""
"Sie haben die maximale Anzahl von Stimmen erreicht. Deselektieren Sie zuerst"
" eine Auswahl."
msgid "Your browser"
msgstr "Ihr Browser"
msgid "Your browser is not supported by OpenSlides!"
msgstr "Ihr Browser wird von OpenSlides nicht unterstützt!"
msgid "Your decision cannot be changed afterwards."
msgstr "Ihre Stimmabgabe kann anschließend nicht mehr geändert werden."
@ -3106,6 +3166,9 @@ msgstr "von"
msgid "committee"
msgstr "Gremium"
msgid "connecting ..."
msgstr "Verbindungsaufbau ..."
msgid "connections"
msgstr "Verbindungen"
@ -3283,6 +3346,9 @@ msgstr "bis"
msgid "undocumented"
msgstr "nicht erfasst"
msgid "version"
msgstr "Version"
msgid "with filter"
msgstr "mit Filter"

82
client/src/assets/i18n/template-en.pot
View File

@ -156,6 +156,11 @@ msgstr ""
msgid "Allow create poll"
msgstr ""
msgid ""
"Allow only current speakers and list of speakers managers to enter the live "
"conference"
msgstr ""
msgid "Allow submitter edit"
msgstr ""
@ -353,9 +358,6 @@ msgstr ""
msgid "Attachments"
msgstr ""
msgid "Audio conference"
msgstr ""
msgid "Available votes"
msgstr ""
@ -500,6 +502,9 @@ msgstr ""
msgid "Can see the list of files"
msgstr ""
msgid "Can see the live stream"
msgstr ""
msgid "Can see the projector"
msgstr ""
@ -641,7 +646,10 @@ msgstr ""
msgid "Confirm new password"
msgstr ""
msgid "Connect all users to audio conference automatically"
msgid "Congratuations! Your browser is supported by OpenSlides."
msgstr ""
msgid "Connect all users to live conference automatically"
msgstr ""
msgid "Content"
@ -971,6 +979,9 @@ msgstr ""
msgid "Enter duration in seconds. Choose 0 to disable warning color."
msgstr ""
msgid "Enter live conference"
msgstr ""
msgid ""
"Enter number of the next shown speakers. Choose -1 to show all next "
"speakers."
@ -1021,6 +1032,9 @@ msgstr ""
msgid "Exit"
msgstr ""
msgid "Exit live conference and continue livestream"
msgstr ""
msgid "Expand all"
msgstr ""
@ -1401,6 +1415,15 @@ msgstr ""
msgid "List view"
msgstr ""
msgid "Live conference"
msgstr ""
msgid "Livestream"
msgstr ""
msgid "Livestream url"
msgstr ""
msgid "Loading data. Please wait ..."
msgstr ""
@ -1422,7 +1445,7 @@ msgstr ""
msgid "Mark speaker"
msgstr ""
msgid "Maximize Jitsi window"
msgid "Maximize / minimize Jitsi window"
msgstr ""
msgid "Media file"
@ -1437,6 +1460,9 @@ msgstr ""
msgid "Meta information"
msgstr ""
msgid "Minimal required version"
msgstr ""
msgid "Minimize"
msgstr ""
@ -1804,6 +1830,9 @@ msgstr ""
msgid "OpenSlides is temporarily reset to following timestamp"
msgstr ""
msgid "OpenSlides recommends:"
msgstr ""
msgid "Origin"
msgstr ""
@ -1933,6 +1962,9 @@ msgstr ""
msgid "Please select the directory:"
msgstr ""
msgid "Please update your browser or contact your system administration."
msgstr ""
msgid "Preamble text for PDF document (all elections)"
msgstr ""
@ -2035,7 +2067,7 @@ msgstr ""
msgid "Recommendation set to {arg1}"
msgstr ""
msgid "Reenter to audio conference"
msgid "Reenter to live conference"
msgstr ""
msgid "Refer to committee"
@ -2068,6 +2100,11 @@ msgstr ""
msgid "Remove"
msgstr ""
msgid ""
"Remove URL to deactivate livestream. Check extra group permission to see "
"livestream."
msgstr ""
msgid "Remove all speakers"
msgstr ""
@ -2132,6 +2169,9 @@ msgstr ""
msgid "Resolution and size"
msgstr ""
msgid "Restart livestream"
msgstr ""
msgid "Restrictions"
msgstr ""
@ -2285,9 +2325,6 @@ msgstr ""
msgid "Show amendments together with motions"
msgstr ""
msgid "Show audio conference window"
msgstr ""
msgid "Show checkbox to record decision"
msgstr ""
@ -2318,6 +2355,9 @@ msgstr ""
msgid "Show hint »first speech« in the list of speakers management view"
msgstr ""
msgid "Show live conference window"
msgstr ""
msgid "Show logo"
msgstr ""
@ -2522,9 +2562,6 @@ 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 ""
@ -2549,6 +2586,15 @@ msgstr ""
msgid "The list of speakers is closed."
msgstr ""
msgid "The live conference is already running in your OpenSlides session."
msgstr ""
msgid "The livestream 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"
@ -2904,6 +2950,12 @@ msgstr ""
msgid "You reached the maximum amount of votes. Deselect somebody first."
msgstr ""
msgid "Your browser"
msgstr ""
msgid "Your browser is not supported by OpenSlides!"
msgstr ""
msgid "Your decision cannot be changed afterwards."
msgstr ""
@ -2961,6 +3013,9 @@ msgstr ""
msgid "committee"
msgstr ""
msgid "connecting ..."
msgstr ""
msgid "connections"
msgstr ""
@ -3138,6 +3193,9 @@ msgstr ""
msgid "undocumented"
msgstr ""
msgid "version"
msgstr ""
msgid "with filter"
msgstr ""

45
openslides/core/config_variables.py
View File

@ -55,8 +55,9 @@ def get_config_variables():
"elections of an assembly.",
input_type="markupText",
label="Legal notice",
weight=132,
weight=131,
subgroup="Event",
hidden=True,
)
yield ConfigVariable(
@ -66,14 +67,16 @@ def get_config_variables():
label="Privacy policy",
weight=132,
subgroup="Event",
hidden=True,
)
yield ConfigVariable(
name="general_event_welcome_title",
default_value="Welcome to OpenSlides",
label="Front page title",
weight=134,
weight=133,
subgroup="Event",
hidden=True,
)
yield ConfigVariable(
@ -81,20 +84,12 @@ def get_config_variables():
default_value="[Space for your welcome text.]",
input_type="markupText",
label="Front page text",
weight=136,
weight=134,
subgroup="Event",
hidden=True,
)
# General System
yield ConfigVariable(
name="general_system_enable_anonymous",
default_value=False,
input_type="boolean",
label="Allow access for anonymous guest users",
weight=138,
subgroup="System",
)
# Live conference
yield ConfigVariable(
name="general_system_conference_show",
@ -103,7 +98,7 @@ def get_config_variables():
label="Show live conference window",
help_text="Server settings required to activate Jitsi Meet integration.",
weight=140,
subgroup="System",
subgroup="Live conference",
)
yield ConfigVariable(
@ -113,24 +108,36 @@ def get_config_variables():
label="Connect all users to live conference automatically",
help_text="Server settings required to activate Jitsi Meet integration.",
weight=141,
subgroup="System",
subgroup="Live conference",
)
yield ConfigVariable(
name="general_system_conference_los_restriction",
default_value=False,
input_type="boolean",
label="Allow only speakers and permitted users to enter the live conference",
label="Allow only current speakers and list of speakers managers to enter the live conference",
help_text="Server settings required to activate Jitsi Meet integration.",
weight=142,
subgroup="System",
subgroup="Live conference",
)
yield ConfigVariable(
name="general_system_stream_url",
default_value="",
label="Livestream url",
help_text="Remove URL to deactivate livestream. Check extra group permission to see livestream.",
weight=143,
subgroup="Live conference",
)
# General System
yield ConfigVariable(
name="general_system_enable_anonymous",
default_value=False,
input_type="boolean",
label="Allow access for anonymous guest users",
weight=150,
subgroup="System",
)
@ -138,7 +145,7 @@ def get_config_variables():
name="general_login_info_text",
default_value="",
label="Show this text on the login page",
weight=145,
weight=152,
subgroup="System",
)
@ -156,7 +163,7 @@ def get_config_variables():
"display_name": "OpenSlides Developer",
},
),
weight=146,
weight=154,
subgroup="System",
)