fixed uploader and more translatable texts
Merge pull request #94 from yapapaya/master

Fixed uploads