Adds theme translations.
Fixes merge conflicts.

Conflicts:
	config.php