Update langstrings plus related template changes
Update lang strings
Fix comment breaking po file
Merge pull request #338 from CloudNiner/topic/lang-updates

Update langstrings plus related template changes