Merge remote-tracking branch 'origin/OpenOLAT_12.5' (06b6e9ab) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 06b6e9ab authored 6 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents 71269112 84f6dd6f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

...a/org/olat/admin/user/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/admin/user/groups/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...lat/admin/user/groups/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/modules/bc/FileSelection.java 2 additions, 2 deletions

.../java/org/olat/core/commons/modules/bc/FileSelection.java
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...re/commons/modules/bc/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/modules/bc/commands/CmdCreateFolder.java 2 additions, 1 deletion

...lat/core/commons/modules/bc/commands/CmdCreateFolder.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdDownloadZip.java 7 additions, 1 deletion

...olat/core/commons/modules/bc/commands/CmdDownloadZip.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdZip.java 8 additions, 7 deletions

...ava/org/olat/core/commons/modules/bc/commands/CmdZip.java
src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...va/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/editor/PublishStepCatalog.java 5 additions, 2 deletions

src/main/java/org/olat/course/editor/PublishStepCatalog.java
src/main/java/org/olat/course/editor/_content/publish_catalog.html 1 addition, 1 deletion

...java/org/olat/course/editor/_content/publish_catalog.html
src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties 2 additions, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_it.properties 1 addition, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_pl.properties 1 addition, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...rg/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

.../modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties

with 44 additions and 20 deletions

Please register or to comment