Merge conflict with da.po resolved manually