New phrases & minor fixes

Changed some inconsistencies and added the new translations.
translation merge