Wrapped view strings in local for i18n
Moved i18n wrapper into formMacros, and out of calls to it - to make things work better
Merge remote-tracking branch 'punkave/master'
Merge remote-tracking branch 'punkave/master'
Merge from upstream
Merge from upstream (i18n fixes)
Forgot to wrap stuff in __()
Merge remote-tracking branch 'punkave/master'
Merge pull request #18 from israelidanny/master

updated i18n integration