Merge zh-Hans and zh-Hant for consistency. Fix for pt-BR.

Fixes #1 and fixes #2
ignore .DS_Store