added translation to permission form
fixed merge conflicts