Conflicts: radio/src/translations/es.h.txt radio/src/translations/fr.h.txt radio/src/translations/pl.h.txt Manually resolved.
Conflicts: radio/src/translations/es.h.txt radio/src/translations/fr.h.txt radio/src/translations/pl.h.txt Manually resolved.