Updated translations
Updated translations
Merge branch 'master' into tizen2