Merge pull request #5724 from emanuelschuetze/translation20201125

Updated translations

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

@@ -301,16 +301,6 @@ _('Finished');
 _('In the election process');
 
 // Voting strings
-_('Voting type');
-_('analog');
-_('nominal');
-_('non-nominal');
-_('Start voting');
-_('Stop voting');
-_('Publish');
-_('Entitled to vote');
-_('Voting method');
-_('Amount of votes');
 _('Motion votes');
 _('Ballots');
 

client/src/app/shared/pipes/poll-key-verbose.pipe.ts

@@ -1,5 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+
 const PollValues = {
     votesvalid: 'Valid votes',
     votesinvalid: 'Invalid votes',
@@ -9,9 +11,9 @@ const PollValues = {
     yes: 'Yes',
     no: 'No',
     abstain: 'Abstain',
-    amount_global_yes: 'General Yes',
+    amount_global_yes: _('General approval'),
-    amount_global_no: 'General No',
+    amount_global_no: _('General rejection'),
-    amount_global_abstain: 'General Abstain'
+    amount_global_abstain: _('General abstain')
 };
 
 /**

client/src/app/site/polls/models/view-base-poll.ts

@@ -1,3 +1,5 @@
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+
 import { BasePoll } from 'app/shared/models/poll/base-poll';
 import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model';
 import { BaseViewModel } from 'app/site/base/base-view-model';
@@ -24,29 +26,29 @@ export const PollStateVerbose = {
 };
 
 export const PollStateChangeActionVerbose = {
-    1: 'Reset',
+    1: _('Reset'),
-    2: 'Start voting',
+    2: _('Start voting'),
-    3: 'Stop voting',
+    3: _('Stop voting'),
-    4: 'Publish'
+    4: _('Publish')
 };
 
 export const PollTypeVerbose = {
-    analog: 'analog',
+    analog: _('analog'),
-    named: 'nominal',
+    named: _('nominal'),
-    pseudoanonymous: 'non-nominal'
+    pseudoanonymous: _('non-nominal')
 };
 
 export const PollPropertyVerbose = {
     majority_method: 'Required majority',
     onehundred_percent_base: '100% base',
-    type: 'Voting type',
+    type: _('Voting type'),
-    pollmethod: 'Voting method',
+    pollmethod: _('Voting method'),
     state: 'State',
-    groups: 'Entitled to vote',
+    groups: _('Entitled to vote'),
-    votes_amount: 'Amount of votes',
+    votes_amount: _('Amount of votes'),
-    global_yes: 'General Yes',
+    global_yes: _('General approval'),
-    global_no: 'General No',
+    global_no: _('General rejection'),
-    global_abstain: 'General Abstain'
+    global_abstain: _('General abstain')
 };
 
 export const MajorityMethodVerbose = {

client/src/assets/i18n/de.po

@@ -1112,7 +1112,7 @@ msgstr "Teilnehmernummer eingeben"
 
 msgid "Enter your email to send the password reset link"
 msgstr ""
-"Geben Sie Ihre E-Mail-Adresse ein um eine Link zum Zurücksetzen des "
+"Geben Sie Ihre E-Mail-Adresse ein, um einen Link zum Zurücksetzen des "
 "Passworts zu erhalten."
 
 msgid "Entitled to vote"
@@ -1194,7 +1194,7 @@ msgid "Favorites"
 msgstr "Favoriten"
 
 msgid "File information"
-msgstr "Dateiinformationen"
+msgstr "Dateiinfos"
 
 msgid "File name"
 msgstr "Dateiname"
@@ -1253,11 +1253,14 @@ msgstr "Geschlecht"
 msgid "General"
 msgstr "Allgemein"
 
-msgid "General Abstain"
+msgid "General abstain"
 msgstr "Generelle Enthaltung"
 
-msgid "General No"
+msgid "General approval"
-msgstr "Generelles Nein"
+msgstr "Generelle Zustimmung"
+
+msgid "General rejection"
+msgstr "Generelle Ablehnung"
 
 msgid "Generate new passwords"
 msgstr "Neue Passwörter generieren"
@@ -1810,6 +1813,9 @@ msgstr "Keine Einträge ausgewählte"
 msgid "No motion block set"
 msgstr "kein Antragsblock gesetzt"
 
+msgid "No per candidate"
+msgstr "Nein pro Kandidat"
+
 msgid "No personal note"
 msgstr "Keine persönliche Notiz"
 
@@ -2777,6 +2783,9 @@ msgstr ""
 msgid "The list of speakers is closed."
 msgstr "Die Redeliste ist geschlossen."
 
+msgid "The list of speakers is open."
+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."
 

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

@@ -1182,10 +1182,13 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-msgid "General Abstain"
+msgid "General abstain"
 msgstr ""
 
-msgid "General No"
+msgid "General approval"
+msgstr ""
+
+msgid "General rejection"
 msgstr ""
 
 msgid "Generate new passwords"
@@ -1736,6 +1739,9 @@ msgstr ""
 msgid "No motion block set"
 msgstr ""
 
+msgid "No per candidate"
+msgstr ""
+
 msgid "No personal note"
 msgstr ""
 
@@ -2675,6 +2681,9 @@ msgstr ""
 msgid "The list of speakers is closed."
 msgstr ""
 
+msgid "The list of speakers is open."
+msgstr ""
+
 msgid "The live conference is already running in your OpenSlides session."
 msgstr ""