Set directory files to translatable, and cleanup - bnc#877369
Merge pull request #16 from FelixZhang/bnc#877369-1

Set directory files to translatable, and cleanup - bnc#877369