Merge branch 'no-watermark' of git://github.com/sembrestels/Tidypics

diff --cc languages/da.php
Simple merge

diff --cc languages/de.php
Simple merge

diff --cc languages/en.php
Simple merge

diff --cc languages/es.php
Simple merge

diff --cc languages/fr.php
Simple merge

diff --cc languages/he.php
Simple merge

diff --cc views/default/forms/photos/admin/settings/main.php
Simple merge