Translations merged. Updates to greek and spanish translations.