Merge branch '2.4' into 3djc/diag-touch

# Conflicts:
#	radio/src/thirdparty/libopenui

radio/src/gui/screenshot.cpp

@@ -80,7 +80,7 @@ const char * writeScreenshot()
 #if defined(COLORLCD)
   for (int y = LCD_H - 1; y >= 0; y--) {
     for (int x = 0; x < LCD_W; x++) {
-      pixel_t pixel = *lcd->getPixelPtr(x, y);
+      auto pixel = *lcd->getPixelPtr(x, y);
       uint32_t dst = (0xFF << 24) + (GET_RED(pixel) << 16) + (GET_GREEN(pixel) << 8) + (GET_BLUE(pixel) << 0);
       if (f_write(&bmpFile, &dst, sizeof(dst), &written) != FR_OK || written != sizeof(dst)) {
         f_close(&bmpFile);

radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt

@@ -162,7 +162,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --specs=nano.specs")
 
 add_executable(bootloader ${BOOTLOADER_SRC})
-add_dependencies(bootloader ${BITMAPS_TARGET})
+add_dependencies(bootloader ${BITMAPS_TARGET} radio_translations)
 
 add_custom_command(
   TARGET bootloader POST_BUILD