Corrected merge bug in traductor.py
Updated testTraduction.py