Commenting and translating
Merging translations