Merge pull request #4964 from emanuelschuetze/translations-20190830

Updated translations

client/src/app/site/common/components/super-search/super-search.component.html

@@ -19,7 +19,7 @@
         </mat-menu>
     </div>
     <h4 *ngIf="searchResultCount > 0" class="result-count">
-        {{ searchResultCount }} {{ (searchResultCount === 1 ? 'result' : 'results') | translate }}
+        {{ searchResultCount }} {{ searchResultCount === 1 ? ( 'result' | translate ) : ( 'results' | translate ) }}
     </h4>
     <mat-divider></mat-divider>
     <div class="result-view" *ngIf="searchResults.length > 0">
@@ -36,7 +36,7 @@
                                 <mat-basic-chip
                                     class="lightblue filter-count"
                                     disableRipple
-                                    matTooltip="{{ (result.models.length === 1 ? 'result' : 'results') | translate }}"
+                                    matTooltip="{{ result.models.length === 1 ? ( 'result' | translate ) : ( 'results' | translate ) }}"
                                     >{{ result.models.length }}</mat-basic-chip
                                 >
                             </mat-panel-title>
@@ -82,8 +82,8 @@
                 </ng-container>
             </mat-accordion>
             <div class="no-results" *ngIf="!selectedModel && searchString.length > 0">
-                <span translate>No search result found for</span> "{{ searchString }}"
-                <span *ngIf="searchCollection">in {{ searchCollection | translate }}</span>
+                <span translate>No search result found</span>
+                <span *ngIf="searchCollection">&nbsp;({{ 'with filter' | translate }} "{{ searchCollection | translate }}")</span>.
             </div>
         </div>
         <mat-divider [vertical]="true"></mat-divider>

client/src/app/site/login/components/reset-password/reset-password.component.ts

@@ -30,7 +30,7 @@ export class ResetPasswordComponent extends BaseViewComponent implements OnInit
      */
     public constructor(
         titleService: Title,
-        translate: TranslateService,
+        protected translate: TranslateService,
         matSnackBar: MatSnackBar,
         private http: HttpService,
         formBuilder: FormBuilder,

client/src/assets/i18n/de.po

@@ -191,6 +191,9 @@ msgstr "Änderungsanträge"
 msgid "Amendments can change multiple paragraphs"
 msgstr "Änderungsanträge können mehrere Absätze ändern"
 
+msgid "An email with a password reset link was send!"
+msgstr "Es wurde eine E-Mail mit Link zum Passwort-Zurücksetzen gesendet."
+
 msgid "An unknown error occurred."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
@@ -1517,17 +1520,14 @@ msgstr "Keine Einträge ausgewählte"
 msgid "No motion block set"
 msgstr "kein Antragsblock gesetzt"
 
-msgid "No one"
-msgstr "Niemand"
-
 msgid "No personal note"
 msgstr "Keine persönliche Notiz"
 
 msgid "No recommendation"
 msgstr "keine Empfehlung gesetzt"
 
-msgid "No search result found for"
-msgstr "Keine Suchergebnisse gefunden für"
+msgid "No search result found"
+msgstr "Keine Suchergebnisse gefunden"
 
 msgid "No statute paragraphs"
 msgstr "Keine Satzungsabschnitte vorhanden"
@@ -2883,6 +2883,12 @@ msgstr "verworfen (nicht zulässig)"
 msgid "remove group(s)"
 msgstr "Gruppe(n) entfernen"
 
+msgid "result"
+msgstr "Ergebnis"
+
+msgid "results"
+msgstr "Ergebnisse"
+
 msgid "selected"
 msgstr "ausgewählt"
 
@@ -2907,6 +2913,9 @@ msgstr "nicht erfasst"
 msgid "unpublished"
 msgstr "unveröffentlicht"
 
+msgid "with filter"
+msgstr "mit Filter"
+
 msgid "with indexedDB"
 msgstr "mit indexedDB"
 

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

@@ -177,6 +177,9 @@ msgstr ""
 msgid "Amendments can change multiple paragraphs"
 msgstr ""
 
+msgid "An email with a password reset link was send!"
+msgstr ""
+
 msgid "An unknown error occurred."
 msgstr ""
 
@@ -1453,16 +1456,13 @@ msgstr ""
 msgid "No motion block set"
 msgstr ""
 
-msgid "No one"
-msgstr ""
-
 msgid "No personal note"
 msgstr ""
 
 msgid "No recommendation"
 msgstr ""
 
-msgid "No search result found for"
+msgid "No search result found"
 msgstr ""
 
 msgid "No statute paragraphs"
@@ -2756,6 +2756,12 @@ msgstr ""
 msgid "remove group(s)"
 msgstr ""
 
+msgid "result"
+msgstr ""
+
+msgid "results"
+msgstr ""
+
 msgid "selected"
 msgstr ""
 
@@ -2780,6 +2786,9 @@ msgstr ""
 msgid "unpublished"
 msgstr ""
 
+msgid "with filter"
+msgstr ""
+
 msgid "with indexedDB"
 msgstr ""