Removing merge conflicts.
Updated Schema
Updated diagrams/Schema
Done translating the 'meta_contexts' directory.
Done translating the 'media_sets' directory.
Many new strings for translation.
Done translating the 'media_resources' directory.
Fixing syntax error.
Updated Schema
Updated diagrams/Schema
Fixing syntax error.
Conflict resolution.
Awesome, rebase fucked that up.
Fixing syntax error.
Fixing typo.
Merge branch 'rca_translations' into next
Adapting tests to new wording.
[HOT FIX] BROWSE
Authentication systems configured on deploy.
Prevent division by zero when no children in splash screen set.