Removing merge conflicts.
Done translating the 'meta_contexts' directory.
Done translating the 'media_sets' directory.
Many new strings for translation.
Done translating the 'media_resources' directory.
Language was the wrong way round.
Updated Schema
Updated diagrams/Schema
Fixing syntax error.
Conflict resolution.