merge request id	740
Titel	LL-1308: Lokalisierung Onboarding
Beschreibung	merged contentBlocks.php into cms.php and removed contentBlocks.php. - changed lacolization structure for onboarding modal - optimized keys - reworked some translations (native english)
Status	merged
Created at	2023-01-26T08:31:26.162Z
Updated at	2023-01-26T10:00:07.549Z
Source branch	feature/LL-1308--update-translation-onboarding-modal
Target branch	develop
Author	Sascha Immig
Assignee	Gregor Gabriel

Discussion notes

added 1 commit 01e5de99 - fixed duplicate entry Compare with previous version	Sascha Immig	2023-01-26T08:45:51.356Z
added 1 commit 86c0cf6b - Optimization due to different languages Compare with previous version	Sascha Immig	2023-01-26T08:54:16.917Z
added 79 commits 86c0cf6b...8526f2ca - 78 commits from branch develop 9cb9e6d6 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2023-01-26T09:49:56.278Z
enabled an automatic merge when the pipeline for 9cb9e6d6420b18c7910c17f7f255f8034ba4f12f succeeds	Gregor Gabriel	2023-01-26T09:50:17.996Z
merged	Gregor Gabriel	2023-01-26T10:00:07.655Z
mentioned in commit fdb960ce37a708066cf032dc976bfc4f7acb6c2c	Gregor Gabriel	2023-01-26T10:00:07.914Z

Merge Commits

Title	Id	Author	Created at	Message
fixed duplicate entry	01e5de99c2c21cd78afe6f02b776a1284d7dac7c	TUV\immigs	2023-01-26T08:45:43.000Z	fixed duplicate entry
merged contentBlocks.php into cms.php and removed contentBlocks.php.	15bba2284907f2deccbb050c607948e2d016714f	TUV\immigs	2023-01-26T08:28:27.000Z	merged contentBlocks.php into cms.php and removed contentBlocks.php. - changed lacolization structure for onboarding modal - optimized keys - reworked some translations (native english)
Optimization due to different languages	86c0cf6b6e6266895607b5fd806a7924b686bc57	TUV\immigs	2023-01-26T08:53:19.000Z	Optimization due to different languages
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	9cb9e6d6420b18c7910c17f7f255f8034ba4f12f	TUV\gabrielg	2023-01-26T09:49:51.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1308--update-translation-onboarding-modal # Conflicts: # resources/lang/de/base.php # resources/lang/en/base.php