coment from Victor
Merge remote-tracking branch 'origin/master'
Add all strings values in preferenses..