Adding untranslated strings from teacher dashboard
fixed embedded in javascript translations
put together strings that should not be separated
resolved merge conflicts