# Conflicts: # companion/src/translations/companion_fr.ts # radio/src/gui/128x64/model_select.cpp # radio/src/gui/212x64/model_select.cpp # radio/src/gui/480x272/lcd.cpp
# Conflicts: # companion/src/translations/companion_fr.ts # radio/src/gui/128x64/model_select.cpp # radio/src/gui/212x64/model_select.cpp # radio/src/gui/480x272/lcd.cpp