Mark more text for translation
Merge pull request #174 from caktus/feature/translation-3

Mark more text for translation
resolve conflict from latest merge
adding i18n for template