Added few annotations, changed translations table syntax