Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext

diff --cc boot.php
Simple merge

diff --cc mod/item.php
Simple merge

diff --cc mod/profile_photo.php
Simple merge

diff --cc mod/register.php
Simple merge