Conflicts: companion/src/modeledit.ui radio/src/translations/cz.h radio/src/translations/de.h radio/src/translations/fr.h radio/src/translations/it.h radio/src/translations/pl.h radio/src/translations/pt.h radio/src/translations/se.h
Conflicts: companion/src/modeledit.ui radio/src/translations/cz.h radio/src/translations/de.h radio/src/translations/fr.h radio/src/translations/it.h radio/src/translations/pl.h radio/src/translations/pt.h radio/src/translations/se.h