Switched i18n translation from CSV to gettext
Switched i18n translation from CSV to gettext
Merge branch 'user' into i18n
Changed setup translator to gettext
Updated i18n files
Merge pull request #531 from sexnothing/user

EEFOCUS custom form
Fix for user profile fields overwritten
Merge branch 'i18n' into user
Changed i18n adapter from CSV to gettext
Add custom interest and subscription
Merge pull request #532 from liuchuangww/user

Add custom interest and subscription
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #533 from sexnothing/user

EEFOCUS custom form
Merge remote-tracking branch 'upstream/user' into user
Typo fix
Merge pull request #534 from liuchuangww/user

Typo fix
Merge remote-tracking branch 'upstream/user' into user
Typo fix
Merge pull request #535 from liuchuangww/user

Typo fix
Merge remote-tracking branch 'upstream/user' into user