Merge correct code from matoilic version
Update translation keys