Merge pull request #13 from YmallShopping/translations

Translations