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

Merge pull request #4393 from emanuelschuetze/translations-20190224

Browse Source 
Updated translations
This commit is contained in:
Emanuel Schütze 2019-02-24 22:24:12 +01:00 committed by GitHub
commit eb2c866e5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/components/head-bar/head-bar.component.scss
View File

@ -8,7 +8,7 @@
position: -webkit-sticky; position: -webkit-sticky;
position: sticky; position: sticky;
top: 0px; top: 0px;
z-index: 2; z-index: 3;
} }
.toolbar-left { .toolbar-left {

1
client/src/app/site/history/components/history-list/history-list.component.ts
View File

@ -115,7 +115,6 @@ export class HistoryListComponent extends ListViewBaseComponent<ViewHistory, His
const element = this.viewModelStore.get(history.getCollectionString(), history.getModelId()); const element = this.viewModelStore.get(history.getCollectionString(), history.getModelId());
let message = this.translate.instant('OpenSlides is temporarily reset to following timestamp:'); let message = this.translate.instant('OpenSlides is temporarily reset to following timestamp:');
message += ' ' + history.getLocaleString('DE-de'); message += ' ' + history.getLocaleString('DE-de');
if (isDetailNavigable(element)) { if (isDetailNavigable(element)) {
this.raiseError(message); this.raiseError(message);
this.router.navigate([element.getDetailStateURL()]); this.router.navigate([element.getDetailStateURL()]);

2
client/src/app/site/motions/components/motion-detail/motion-detail.component.html
View File

@ -881,7 +881,7 @@
<!-- upload file dialog --> <!-- upload file dialog -->
<ng-template #uploadDialog> <ng-template #uploadDialog>
<h1 mat-dialog-title> <h1 mat-dialog-title>
<span translate>Upload Files</span> <span translate>Upload files</span>
</h1> </h1>
<os-media-upload-content <os-media-upload-content
(uploadSuccessEvent)="uploadSuccess($event)" (uploadSuccessEvent)="uploadSuccess($event)"

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

File diff suppressed because one or more lines are too long

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

@ -930,6 +930,9 @@ msgstr "Ist ein Gremium"
msgid "Is active" msgid "Is active"
msgstr "Ist aktiv" msgstr "Ist aktiv"
msgid "Is already projected"
msgstr "ist bereits projiziert"
msgid "Is committee" msgid "Is committee"
msgstr "Ist Gremium" msgstr "Ist Gremium"
@ -1197,6 +1200,9 @@ msgstr "Keine Suchergebnisse gefunden für"
msgid "No statute paragraphs" msgid "No statute paragraphs"
msgstr "Keine Satzungsabschnitte vorhanden" msgstr "Keine Satzungsabschnitte vorhanden"
msgid "No."
msgstr "Nr."
msgid "None" msgid "None"
msgstr "aus" msgstr "aus"
@ -2179,6 +2185,9 @@ msgstr "Einträge pro Seite"
msgid "majority" msgid "majority"
msgstr "Mehrheit" msgstr "Mehrheit"
msgid "motions"
msgstr "Anträge"
msgid "motions-example" msgid "motions-example"
msgstr "Anträge-Beispiel" msgstr "Anträge-Beispiel"

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

@ -885,6 +885,9 @@ msgstr ""
msgid "Is active" msgid "Is active"
msgstr "" msgstr ""
msgid "Is already projected"
msgstr ""
msgid "Is committee" msgid "Is committee"
msgstr "" msgstr ""
@ -1152,6 +1155,9 @@ msgstr ""
msgid "No statute paragraphs" msgid "No statute paragraphs"
msgstr "" msgstr ""
msgid "No."
msgstr ""
msgid "None" msgid "None"
msgstr "" msgstr ""
@ -2085,6 +2091,9 @@ msgstr ""
msgid "majority" msgid "majority"
msgstr "" msgstr ""
msgid "motions"
msgstr ""
msgid "motions-example" msgid "motions-example"
msgstr "" msgstr ""

7
client/src/assets/styles/global-components-style.scss
View File

@ -62,6 +62,11 @@
} }
mat-card-header { mat-card-header {
background-color: mat-color($background, app-bar);; background-color: mat-color($background, app-bar);
}
// drag & drop view
.node-content-wrapper {
background-color: mat-color($background, app-bar);
} }
} }

1
client/src/styles.scss
View File

@ -332,7 +332,6 @@ mat-expansion-panel {
.os-tree { .os-tree {
.node-content-wrapper { .node-content-wrapper {
background-color: aliceblue;
border: 1px black; border: 1px black;
width: 100%; width: 100%;
padding: 10px 20px; padding: 10px 20px;