Conflicts: companion/src/customizesplashdialog.cpp companion/src/mainwindow.cpp companion/src/translations/companion_pl.ts