Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk (0d8320a4) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 0d8320a4 authored 4 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk

parents 9383e735 763c8e10

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/quota/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...ava/org/olat/admin/quota/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties 214 additions, 211 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...commons/chiefcontrollers/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java 3 additions, 1 deletion

.../core/commons/editor/fileeditor/FileEditorController.java
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

.../core/commons/modules/bc/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/gui/control/generic/portal/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...i/control/generic/portal/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/util/vfs/LocalFileImpl.java 2 additions, 2 deletions

src/main/java/org/olat/core/util/vfs/LocalFileImpl.java
src/main/java/org/olat/core/util/vfs/lock/VFSLockManagerImpl.java 33 additions, 2 deletions

.../java/org/olat/core/util/vfs/lock/VFSLockManagerImpl.java
src/main/java/org/olat/course/_i18n/LocalStrings_fr.properties 3 additions, 3 deletions

...ain/java/org/olat/course/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/archiver/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...org/olat/course/archiver/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...g/olat/course/assessment/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_fr.properties 3 additions, 3 deletions

...ourse/assessment/ui/mode/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties 3 additions, 3 deletions

...ourse/assessment/ui/tool/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/condition/_i18n/LocalStrings_en.properties 13 additions, 12 deletions

...rg/olat/course/condition/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/condition/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...rg/olat/course/condition/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...a/org/olat/course/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/IQTESTCourseNode.java 3 additions, 1 deletion

src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
src/main/java/org/olat/course/nodes/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...va/org/olat/course/nodes/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

.../olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_fr.properties 14 additions, 2 deletions

...urse/nodes/livestream/ui/_i18n/LocalStrings_fr.properties

with 304 additions and 253 deletions

Please register or to comment