Merge pull request #435 from glogiotatidis/privacy

[fix bug 846051] String updates for privacy controls.
[bug 846051] Add new string to edit profile

[bug 846051] Add new string to edit profile

Fix code formatting
[bug 850259] Translate strings
Merge pull request #437 from hoosteeno/privacy

Modify strings
Merge branch 'privacy'