[FIX] traduciones
[FIX]
Merge branch 'master' into colored-labels

Conflicts:
	addons/kinesis_athletics_view_mods/view/menuitem.xml