(GLUI) Improve tab icon colours for 'Dark Blue' theme (#9636)

* (video_driver_frame) Don't convert 0RGB1555 when menu is active

Fixes the color cycling that happens when the menu is up and the core's internal pixel format is 0RGB1555.

This happened because video_driver_scaler would keep converting from 0RGB1555 to RGB565, even when the core was paused.

* Update retroarch.c

* Update retroarch.c

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [twinaphex]
 patreon: libretro
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.travis.yml

@@ -36,6 +36,10 @@ matrix:
       env: DISABLE_OVERLAY=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: DISABLE_CDROM=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_VIDEO_LAYOUT=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_AUDIOMIXER=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: ENABLE_GLES=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
@@ -55,6 +59,7 @@ matrix:
     - os: osx
       osx_image: xcode10.1
       script:
+        - brew update-reset
         - brew install --force-bottle qt5
         - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
       deploy:
@@ -110,6 +115,14 @@ script:
      if [ -n "$DISABLE_CDROM" ]; then
        ARGS="$ARGS --disable-cdrom"
      fi
+  - |
+     if [ -n "$DISABLE_VIDEO_LAYOUT" ]; then
+       ARGS="$ARGS --disable-video_layout"
+     fi
+  - |
+     if [ -n "$DISABLE_AUDIOMIXER" ]; then
+       ARGS="$ARGS --disable-audiomixer"
+     fi
   - |
      if [ -n "$ENABLE_GLES" ]; then
        ARGS="$ARGS --enable-opengles"

CHANGES.md

@@ -1,4 +1,27 @@
-# Future (1.8.0)
+# Future (1.7.9) [v3]
+- AI SERVICE: Added in fix for BMP returns to AI service. Added in label passing to AI service call
+- BSV: Fix BSV recording/playback
+- BUGFIX: Fix crash when setting Thumbnail Directory
+- COMMON: Graceful driver switching for Windows and Linux
+- LAKKA: Wi-Fi Access Point settings
+- MENU: Menu scaling improvements
+- MENU/MATERIALUI: Material UI now correctly readjusts its layout when screen orientation changes on mobile devices
+- MENU/MATERIALUI: Material UI now resizes in real-time when the user manually sets the Menu Scale Factor (this never worked properly with the old DPI override)
+- MENU/MATERIALUI: Material UI no longer leaks memory on 'context reset' (fonts were previously never free()'d)
+- MENU/MATERIALUI: A new Android-style 'system bar' has been added. This shows current core name, clock and battery level
+- MENU/MATERIALUI: A new search icon is shown on the title bar when viewing playlists and file browser lists. Pressing this launches the search interface
+- MENU/MATERIALUI: The title bar now uses a larger font, and the sublabel font has also been enlarged a little, to more closely align with Material UI standards
+- MENU/MATERIALUI: A number (quite a large number) of layout/spacing issues have been fixed
+- MENU/MATERIALUI: The existing colour theme handling code is not fit for purpose, so the whole lot got ripped out and reimplemented. In doing so, also adjusted all the theme colours to better match Material UI standards - with a few liberties taken for aesthetic purposes.
+- OSD: Fix fast forward indicator when not using menu widgets
+- PSP1: Remove duplicated FPS indicator on the screen
+- SWITCH: Make audren threaded audio driver the new default
+- VIDEO LAYOUT: Add video layout mame overlay compatibility. Enabled for Windows/Linux/OSX/iOS/Android/libnx. Only works with GL driver for now
+
+# (1.7.9) (v2)
+- 3DS: Fix 3DS screen flickering when OSD is enabled
+- IOS: Fix crash that could happen at startup
+- MENU/MATERIALUI: Change DPI scaling back to original - too many issues with current implementation, requires a redesign
 
 # (1.7.9)
 - AI SERVICE: Image mode is now much faster, it now saves the image in-memory in PNG format then passes it along to the translation service
@@ -31,7 +54,6 @@ operation had run
 - MOBILE (ANDROID/IOS): Add option to automatically rotate overlays when changing orientation
 - OSD: Memory details should now be available on every platform (get_mem_total and get_mem_free need to be implemented in the frontend driver for it to work)
 - OSD: Memory details can now be shown individually without FPS and frame count
-- OSX/METAL: CoreAudio V3 driver should now be the default audio driver on first startup
 - PS2: Fix memory leaks in font/video driver
 - SWITCH: Set default aspect ratio to core provided instead of 4:3
 - THREADED VIDEO: Fix FPS text in threaded video mode

Makefile.common

@@ -844,13 +844,14 @@ endif
 
 ifeq ($(HAVE_VIDEO_LAYOUT), 1)
    DEFINES += -DHAVE_VIDEO_LAYOUT
-   OBJ += gfx/video_layout.o \
-      gfx/video_layout/view.o \
-      gfx/video_layout/element.o \
-      gfx/video_layout/component.o \
-      gfx/video_layout/internal.o \
-      gfx/video_layout/scope.o \
-      gfx/video_layout/load.o
+   OBJ += \
+			 gfx/video_layout.o \
+			 gfx/video_layout/view.o \
+			 gfx/video_layout/element.o \
+			 gfx/video_layout/component.o \
+			 gfx/video_layout/internal.o \
+			 gfx/video_layout/scope.o \
+			 gfx/video_layout/load.o
 endif
 
 ifeq ($(HAVE_STB_FONT), 1)

Makefile.libnx

@@ -61,7 +61,7 @@ ifeq ($(HAVE_OPENGL), 1)
   HAVE_XMB = 1
   HAVE_OZONE = 1
   HAVE_OVERLAY = 1
-  HAVE_VIDEO_LAYOUT = 0
+  HAVE_VIDEO_LAYOUT = 1
   HAVE_GLSL = 1
 else
   HAVE_RGUI = 1

config.def.h

@@ -114,9 +114,33 @@
 #endif
 
 #ifdef HAVE_MATERIALUI
+/* Show icons to the left of each menu entry */
 #define DEFAULT_MATERIALUI_ICONS_ENABLE true
 #endif
 
+/* Material UI colour theme */
+#define DEFAULT_MATERIALUI_THEME MATERIALUI_THEME_OZONE_DARK
+
+/* Type of animation to use when performing menu transitions
+ * > 'Auto' follows Material UI standards:
+ *   - Slide when switching between parent menus (tabs)
+ *   - Fade when changing levels in a menu
+ * Note: Not wrapping this with a HAVE_MATERIALUI ifdef
+ * because there's too much baggage involved... */
+#define DEFAULT_MATERIALUI_TRANSITION_ANIM MATERIALUI_TRANSITION_ANIM_AUTO
+
+/* Adjust menu padding etc. to better fit the
+ * screen when using landscape layouts */
+#if defined(RARCH_MOBILE)
+#define DEFAULT_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT false
+#else
+#define DEFAULT_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT true
+#endif
+
+/* Reposition navigation bar to make better use
+ * of screen space when using landscape layouts */
+#define DEFAULT_MATERIALUI_AUTO_ROTATE_NAV_BAR true
+
 #define DEFAULT_CRT_SWITCH_RESOLUTION CRT_SWITCH_NONE
 
 #define DEFAULT_CRT_SWITCH_RESOLUTION_SUPER 2560
@@ -127,6 +151,8 @@
 
 #define DEFAULT_PLAYLIST_ENTRY_RENAME true
 
+#define DEFAULT_DRIVER_SWITCH_ENABLE true
+
 #define DEFAULT_USER_LANGUAGE 0
 
 #if (defined(_WIN32) && !defined(_XBOX)) || (defined(__linux) && !defined(ANDROID) && !defined(HAVE_LAKKA)) || (defined(__MACH__) && !defined(IOS)) || defined(EMSCRIPTEN)
@@ -413,7 +439,8 @@ static bool quick_menu_show_download_thumbnails         = true;
 
 static bool kiosk_mode_enable            = false;
 
-static bool menu_horizontal_animation    = true;
+#define DEFAULT_MENU_HORIZONTAL_ANIMATION true
+
 static bool menu_show_online_updater     = true;
 static bool menu_show_load_core          = true;
 static bool menu_show_load_content       = true;
@@ -466,7 +493,6 @@ static bool content_show_add     	  = true;
 static bool content_show_playlists    = true;
 
 #ifdef HAVE_XMB
-static unsigned xmb_scale_factor      = 100;
 static unsigned xmb_alpha_factor      = 75;
 static unsigned menu_font_color_red   = 255;
 static unsigned menu_font_color_green = 255;
@@ -520,7 +546,8 @@ static bool rgui_extended_ascii = false;
 #define DEFAULT_BLOCK_CONFIG_READ false
 #endif
 
-#define DEFAULT_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST true
+/* TODO/FIXME - this setting is thread-unsafe right now and can corrupt the stack - default to off */
+#define DEFAULT_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST false
 
 static bool default_game_specific_options = true;
 static bool default_auto_overrides_enable = true;
@@ -888,15 +915,9 @@ static const bool playlist_fuzzy_archive_match = false;
 /* Show Menu start-up screen on boot. */
 static const bool default_menu_show_start_screen = true;
 
-#define DEFAULT_MENU_DPI_OVERRIDE_ENABLE false
-
-#ifdef RARCH_MOBILE
-#define DEFAULT_MENU_DPI_OVERRIDE_VALUE 72
-#elif defined(__CELLOS_LV2__)
-#define DEFAULT_MENU_DPI_OVERRIDE_VALUE 360
-#else
-#define DEFAULT_MENU_DPI_OVERRIDE_VALUE 200
-#endif
+/* Default scale factor for non-frambuffer-based menu
+ * drivers and menu widgets */
+#define DEFAULT_MENU_SCALE_FACTOR 1.0f
 
 /* Log level for the frontend */
 #define DEFAULT_FRONTEND_LOG_LEVEL 1
@@ -1124,6 +1145,8 @@ static char default_discord_app_id[] = "475456035851599874";
 
 #define DEFAULT_AI_SERVICE_ENABLE true
 
+#define DEFAULT_AI_SERVICE_PAUSE false
+
 #define DEFAULT_AI_SERVICE_MODE 1
 
 #define DEFAULT_AI_SERVICE_URL "http://localhost:4404/"

configuration.c

@@ -699,7 +699,7 @@ const char *config_get_default_audio(void)
          return "dsp";
       case AUDIO_SWITCH:
 #if defined(HAVE_LIBNX)
-         return "switch_thread";
+         return "switch_audren_thread";
 #else
          return "switch";
 #endif
@@ -1330,6 +1330,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    struct config_bool_setting  *tmp    = (struct config_bool_setting*)calloc(1, (*size + 1) * sizeof(struct config_bool_setting));
    unsigned count                      = 0;
 
+   SETTING_BOOL("driver_switch_enable", &settings->bools.driver_switch_enable, true, DEFAULT_DRIVER_SWITCH_ENABLE, false);
    SETTING_BOOL("frame_time_counter_reset_after_fastforwarding", &settings->bools.frame_time_counter_reset_after_fastforwarding, true, false, false);
    SETTING_BOOL("frame_time_counter_reset_after_load_state", &settings->bools.frame_time_counter_reset_after_load_state, true, false, false);
    SETTING_BOOL("frame_time_counter_reset_after_save_state", &settings->bools.frame_time_counter_reset_after_save_state, true, false, false);
@@ -1450,8 +1451,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("menu_unified_controls",         &settings->bools.menu_unified_controls, true, false, false);
    SETTING_BOOL("menu_throttle_framerate",       &settings->bools.menu_throttle_framerate, true, true, false);
    SETTING_BOOL("menu_linear_filter",            &settings->bools.menu_linear_filter, true, true, false);
-   SETTING_BOOL("menu_horizontal_animation",     &settings->bools.menu_horizontal_animation, true, true, false);
-   SETTING_BOOL("dpi_override_enable",           &settings->bools.menu_dpi_override_enable, true, DEFAULT_MENU_DPI_OVERRIDE_ENABLE, false);
+   SETTING_BOOL("menu_horizontal_animation",     &settings->bools.menu_horizontal_animation, true, DEFAULT_MENU_HORIZONTAL_ANIMATION, false);
    SETTING_BOOL("menu_pause_libretro",           &settings->bools.menu_pause_libretro, true, true, false);
    SETTING_BOOL("menu_savestate_resume",         &settings->bools.menu_savestate_resume, true, menu_savestate_resume, false);
    SETTING_BOOL("menu_mouse_enable",             &settings->bools.menu_mouse_enable, true, DEFAULT_MOUSE_ENABLE, false);
@@ -1556,6 +1556,8 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("menu_show_advanced_settings",  &settings->bools.menu_show_advanced_settings, true, DEFAULT_SHOW_ADVANCED_SETTINGS, false);
 #ifdef HAVE_MATERIALUI
    SETTING_BOOL("materialui_icons_enable",       &settings->bools.menu_materialui_icons_enable, true, DEFAULT_MATERIALUI_ICONS_ENABLE, false);
+   SETTING_BOOL("materialui_optimize_landscape_layout", &settings->bools.menu_materialui_optimize_landscape_layout, true, DEFAULT_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT, false);
+   SETTING_BOOL("materialui_auto_rotate_nav_bar", &settings->bools.menu_materialui_auto_rotate_nav_bar, true, DEFAULT_MATERIALUI_AUTO_ROTATE_NAV_BAR, false);
 #endif
 #ifdef HAVE_RGUI
    SETTING_BOOL("rgui_background_filler_thickness_enable", &settings->bools.menu_rgui_background_filler_thickness_enable, true, true, false);
@@ -1663,6 +1665,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_LOG_TO_FILE);
    SETTING_BOOL("log_to_file_timestamp", &settings->bools.log_to_file_timestamp, true, DEFAULT_LOG_TO_FILE_TIMESTAMP, false);
    SETTING_BOOL("ai_service_enable", &settings->bools.ai_service_enable, DEFAULT_AI_SERVICE_ENABLE, false, false);
+   SETTING_BOOL("ai_service_pause",      &settings->bools.ai_service_pause, true, DEFAULT_AI_SERVICE_PAUSE, false);
 
    *size = count;
 
@@ -1692,6 +1695,7 @@ static struct config_float_setting *populate_settings_float(settings_t *settings
    SETTING_FLOAT("input_overlay_scale",      &settings->floats.input_overlay_scale, true, 1.0f, false);
 #endif
 #ifdef HAVE_MENU
+   SETTING_FLOAT("menu_scale_factor",        &settings->floats.menu_scale_factor, true, DEFAULT_MENU_SCALE_FACTOR, false);
    SETTING_FLOAT("menu_wallpaper_opacity",   &settings->floats.menu_wallpaper_opacity, true, menu_wallpaper_opacity, false);
    SETTING_FLOAT("menu_framebuffer_opacity", &settings->floats.menu_framebuffer_opacity, true, menu_framebuffer_opacity, false);
    SETTING_FLOAT("menu_footer_opacity",      &settings->floats.menu_footer_opacity,    true, menu_footer_opacity, false);
@@ -1769,7 +1773,6 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("video_overscan_correction_bottom", &settings->uints.video_overscan_correction_bottom, true, DEFAULT_VIDEO_OVERSCAN_CORRECTION_BOTTOM, false);
 #endif
 #ifdef HAVE_MENU
-   SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, DEFAULT_MENU_DPI_OVERRIDE_VALUE, false);
    SETTING_UINT("menu_thumbnails",              &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false);
    SETTING_UINT("menu_left_thumbnails",         &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false);
    SETTING_UINT("menu_thumbnail_upscale_threshold", &settings->uints.menu_thumbnail_upscale_threshold, true, menu_thumbnail_upscale_threshold, false);
@@ -1799,7 +1802,6 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("menu_xmb_animation_horizontal_highlight",   &settings->uints.menu_xmb_animation_horizontal_highlight, true, 0 /* TODO/FIXME - implement */, false);
    SETTING_UINT("menu_xmb_animation_move_up_down",   &settings->uints.menu_xmb_animation_move_up_down, true, 0 /* TODO/FIXME - implement */, false);
    SETTING_UINT("xmb_alpha_factor",             &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false);
-   SETTING_UINT("xmb_scale_factor",             &settings->uints.menu_xmb_scale_factor, true, xmb_scale_factor, false);
    SETTING_UINT("xmb_layout",                   &settings->uints.menu_xmb_layout, true, xmb_menu_layout, false);
    SETTING_UINT("xmb_theme",                    &settings->uints.menu_xmb_theme, true, xmb_icon_theme, false);
    SETTING_UINT("xmb_menu_color_theme",         &settings->uints.menu_xmb_color_theme, true, xmb_theme, false);
@@ -1808,7 +1810,8 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("menu_font_color_blue",         &settings->uints.menu_font_color_blue, true, menu_font_color_blue, false);
    SETTING_UINT("menu_xmb_thumbnail_scale_factor", &settings->uints.menu_xmb_thumbnail_scale_factor, true, xmb_thumbnail_scale_factor, false);
 #endif
-   SETTING_UINT("materialui_menu_color_theme",  &settings->uints.menu_materialui_color_theme, true, MATERIALUI_THEME_BLUE, false);
+   SETTING_UINT("materialui_menu_color_theme",  &settings->uints.menu_materialui_color_theme, true, DEFAULT_MATERIALUI_THEME, false);
+   SETTING_UINT("materialui_menu_transition_animation", &settings->uints.menu_materialui_transition_animation, true, DEFAULT_MATERIALUI_TRANSITION_ANIM, false);
    SETTING_UINT("menu_shader_pipeline",         &settings->uints.menu_xmb_shader_pipeline, true, DEFAULT_MENU_SHADER_PIPELINE, false);
 #ifdef HAVE_OZONE
    SETTING_UINT("ozone_menu_color_theme",       &settings->uints.menu_ozone_color_theme, true, 1, false);
@@ -2125,6 +2128,7 @@ void config_set_defaults(void)
    settings->bools.ssh_enable                  = filestream_exists(LAKKA_SSH_PATH);
    settings->bools.samba_enable                = filestream_exists(LAKKA_SAMBA_PATH);
    settings->bools.bluetooth_enable            = filestream_exists(LAKKA_BLUETOOTH_PATH);
+   settings->bools.localap_enable              = false;
 #endif
 
 #ifdef HAVE_MENU

configuration.h

@@ -161,7 +161,6 @@ typedef struct settings
       bool menu_pointer_enable;
       bool menu_navigation_wraparound_enable;
       bool menu_navigation_browser_filter_supported_extensions_enable;
-      bool menu_dpi_override_enable;
       bool menu_show_advanced_settings;
       bool menu_throttle_framerate;
       bool menu_linear_filter;
@@ -187,6 +186,8 @@ typedef struct settings
       bool menu_show_video_layout;
 #endif
       bool menu_materialui_icons_enable;
+      bool menu_materialui_optimize_landscape_layout;
+      bool menu_materialui_auto_rotate_nav_bar;
       bool menu_rgui_background_filler_thickness_enable;
       bool menu_rgui_border_filler_thickness_enable;
       bool menu_rgui_border_filler_enable;
@@ -304,6 +305,9 @@ typedef struct settings
       bool bundle_finished;
       bool bundle_assets_extract_enable;
 
+      /* Driver */
+      bool driver_switch_enable;
+
       /* Misc. */
       bool discord_enable;
       bool threaded_data_runloop_enable;
@@ -350,6 +354,7 @@ typedef struct settings
       bool ssh_enable;
       bool samba_enable;
       bool bluetooth_enable;
+      bool localap_enable;
 
       bool automatically_add_content_to_playlist;
       bool video_window_show_decorations;
@@ -377,6 +382,7 @@ typedef struct settings
       bool scan_without_core_match;
 
       bool ai_service_enable;
+      bool ai_service_pause;
    } bools;
 
    struct
@@ -394,6 +400,7 @@ typedef struct settings
       float video_msg_color_b;
       float video_msg_bgcolor_opacity;
 
+      float menu_scale_factor;
       float menu_wallpaper_opacity;
       float menu_framebuffer_opacity;
       float menu_footer_opacity;
@@ -516,19 +523,18 @@ typedef struct settings
       unsigned menu_thumbnail_upscale_threshold;
       unsigned menu_rgui_thumbnail_downscaler;
       unsigned menu_rgui_thumbnail_delay;
-      unsigned menu_dpi_override_value;
       unsigned menu_rgui_color_theme;
       unsigned menu_xmb_animation_opening_main_menu;
       unsigned menu_xmb_animation_horizontal_highlight;
       unsigned menu_xmb_animation_move_up_down;
       unsigned menu_xmb_layout;
       unsigned menu_xmb_shader_pipeline;
-      unsigned menu_xmb_scale_factor;
       unsigned menu_xmb_alpha_factor;
       unsigned menu_xmb_theme;
       unsigned menu_xmb_color_theme;
       unsigned menu_xmb_thumbnail_scale_factor;
       unsigned menu_materialui_color_theme;
+      unsigned menu_materialui_transition_animation;
       unsigned menu_ozone_color_theme;
       unsigned menu_font_color_red;
       unsigned menu_font_color_green;

frontend/drivers/platform_psp.c

@@ -94,9 +94,9 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    logger_init();
 #elif defined(HAVE_FILE_LOGGER)
 #ifndef VITA
-   retro_main_log_file_init("ms0:/temp/retroarch-log.txt");
+   retro_main_log_file_init("ms0:/temp/retroarch-log.txt", false);
 #else
-   retro_main_log_file_init("ux0:/temp/retroarch-log.txt");
+   retro_main_log_file_init("ux0:/temp/retroarch-log.txt", false);
 #endif
 #endif
 #endif

gfx/common/sdl2_common.c

@@ -65,7 +65,8 @@ void sdl2_set_handles(void *data, enum rarch_display_type display_type)
 #endif
          break;
       case RARCH_DISPLAY_WAYLAND:
-#ifdef HAVE_WAYLAND
+/* SDL_VIDEO_DRIVER_WAYLAND is defined by SDL2 */
+#if defined(HAVE_WAYLAND) && defined(SDL_VIDEO_DRIVER_WAYLAND)
          video_driver_display_type_set(RARCH_DISPLAY_WAYLAND);
          video_driver_display_set((uintptr_t)info.info.wl.display);
          video_driver_window_set((uintptr_t)info.info.wl.surface);

gfx/common/vulkan_common.c

@@ -1651,12 +1651,6 @@ static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
 
    video_driver_set_gpu_api_devices(GFX_CTX_VULKAN_API, vulkan_gpu_list);
 
-   if (vk->context.gpu != VK_NULL_HANDLE)
-   {
-      free(gpus);
-      return true;
-   }
-
    if (0 <= settings->ints.vulkan_gpu_index && settings->ints.vulkan_gpu_index < (int)gpu_count)
    {
       RARCH_LOG("[Vulkan]: Using GPU index %d.\n", settings->ints.vulkan_gpu_index);
@@ -1908,11 +1902,8 @@ static bool vulkan_context_init_device(gfx_ctx_vulkan_data_t *vk)
       return false;
    }
 
-   if (vk->context.queue == VK_NULL_HANDLE)
-   {
-      vkGetDeviceQueue(vk->context.device,
-            vk->context.graphics_queue_index, 0, &vk->context.queue);
-   }
+   vkGetDeviceQueue(vk->context.device,
+      vk->context.graphics_queue_index, 0, &vk->context.queue);
 
 #ifdef HAVE_THREADS
    vk->context.queue_lock = slock_new();
@@ -2677,13 +2668,17 @@ void vulkan_context_destroy(gfx_ctx_vulkan_data_t *vk,
    else
    {
       if (vk->context.device)
+      {
          vkDestroyDevice(vk->context.device, NULL);
+         vk->context.device = NULL;
+      }
       if (vk->context.instance)
       {
          if (vk->context.destroy_device)
             vk->context.destroy_device();
 
          vkDestroyInstance(vk->context.instance, NULL);
+         vk->context.instance = NULL;
 
          if (vulkan_library)
          {

gfx/drivers/ctr_gfx.c

@@ -747,9 +747,9 @@ static bool ctr_frame(void* data, const void* frame,
       ctr->frame_coords->u1 = width;
       ctr->frame_coords->v1 = height;
       GSPGPU_FlushDataCache(ctr->frame_coords, sizeof(ctr_vertex_t));
-      ctrGuSetVertexShaderFloatUniform(0, (float*)&ctr->scale_vector, 1);
    }
 
+   ctrGuSetVertexShaderFloatUniform(0, (float*)&ctr->scale_vector, 1);
    ctrGuSetTexture(GPU_TEXUNIT0, VIRT_TO_PHYS(ctr->texture_swizzled), ctr->texture_width, ctr->texture_height,
                   (ctr->smooth? GPU_TEXTURE_MAG_FILTER(GPU_LINEAR)  | GPU_TEXTURE_MIN_FILTER(GPU_LINEAR)
                               : GPU_TEXTURE_MAG_FILTER(GPU_NEAREST) | GPU_TEXTURE_MIN_FILTER(GPU_NEAREST)) |

gfx/drivers/psp1_gfx.c

@@ -471,20 +471,10 @@ static void *psp_init(const video_info_t *video,
    return psp;
 }
 
-#if 0
-#define DISPLAY_FPS
-#endif
-
 static bool psp_frame(void *data, const void *frame,
       unsigned width, unsigned height, uint64_t frame_count,
       unsigned pitch, const char *msg, video_frame_info_t *video_info)
 {
-#ifdef DISPLAY_FPS
-   uint32_t diff;
-   static uint64_t currentTick,lastTick;
-   static int frames;
-   static float fps                        = 0.0;
-#endif
    psp1_video_t *psp                       = (psp1_video_t*)data;
 
    if (!width || !height)
@@ -498,40 +488,19 @@ static bool psp_frame(void *data, const void *frame,
    if (!psp->hw_render)
       sceGuSync(0, 0); /* let the core decide when to sync when HW_RENDER */
 
-   pspDebugScreenSetBase(psp->draw_buffer);
-
-   pspDebugScreenSetXY(0,0);
-
-   if (video_info->fps_show)
+   if (msg) 
    {
-      pspDebugScreenSetXY(68 - strlen(video_info->fps_text) - 1,0);
-      pspDebugScreenPuts(video_info->fps_text);
-      pspDebugScreenSetXY(0,1);
-   }
-
-   if (msg)
+      pspDebugScreenSetBase(psp->draw_buffer);
+      pspDebugScreenSetXY(0,0);
       pspDebugScreenPuts(msg);
+   }
+      
 
    if ((psp->vsync)&&(psp->vblank_not_reached))
       sceDisplayWaitVblankStart();
 
    psp->vblank_not_reached = true;
 
-#ifdef DISPLAY_FPS
-   frames++;
-   sceRtcGetCurrentTick(&currentTick);
-   diff = currentTick - lastTick;
-   if(diff > 1000000)
-   {
-      fps = (float)frames * 1000000.0 / diff;
-      lastTick = currentTick;
-      frames = 0;
-   }
-
-   pspDebugScreenSetXY(0,0);
-   pspDebugScreenPrintf("%f", fps);
-#endif
-
    psp->draw_buffer = FROM_GU_POINTER(sceGuSwapBuffers());
 
    if (psp->should_resize)

gfx/drivers/vulkan.c

@@ -1179,6 +1179,8 @@ static void *vulkan_init(const video_info_t *video,
    vk->ctx_driver                     = ctx_driver;
 
    video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
+   
+   RARCH_LOG("[Vulkan]: Found vulkan context: %s\n", ctx_driver->ident);
 
    video_context_driver_get_video_size(&mode);
    full_x                             = mode.width;

gfx/drivers_context/cocoa_gl_ctx.m

@@ -480,19 +480,20 @@ static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned
 {
    float screenscale               = cocoagl_gfx_ctx_get_native_scale();
 #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
-   CGRect size;
+   CGRect size, cgrect;
    GLsizei backingPixelWidth, backingPixelHeight;
 #if defined(HAVE_COCOA_METAL)
    NSView *g_view                  = apple_platform.renderView;
 #elif defined(HAVE_COCOA)
    CocoaView *g_view               = g_instance;
 #endif
-   CGRect cgrect                   = NSRectToCGRect([g_view frame]);
 #if MAC_OS_X_VERSION_10_7
    SEL selector                    = NSSelectorFromString(BOXSTRING("convertRectToBacking:"));
    if ([g_view respondsToSelector:selector])
       cgrect                       = NSRectToCGRect([g_view convertRectToBacking:[g_view bounds]]);
+   else
 #endif
+      cgrect                       = NSRectToCGRect([g_view frame]);
    backingPixelWidth               = CGRectGetWidth(cgrect);
    backingPixelHeight              = CGRectGetHeight(cgrect);
    size                            = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight);

gfx/drivers_context/wgl_ctx.c

@@ -85,6 +85,8 @@
 #endif
 #endif
 
+static void gfx_ctx_wgl_destroy(void *data);
+
 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGL_CORE)
 typedef HGLRC (APIENTRY *wglCreateContextAttribsProc)(HDC, HGLRC, const int*);
 static wglCreateContextAttribsProc pcreate_context;
@@ -563,7 +565,7 @@ static void *gfx_ctx_wgl_init(video_frame_info_t *video_info, void *video_driver
       return NULL;
 
    if (g_win32_inited)
-      goto error;
+      gfx_ctx_wgl_destroy(NULL);
 
 #ifdef HAVE_DYNAMIC
    dll_handle = dylib_load("OpenGL32.dll");

gfx/drivers_font/xdk360_fonts.cpp

@@ -1,684 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef _XBOX
-#include <xtl.h>
-#include <xgraphics.h>
-#endif
-
-#include <string/stdstring.h>
-
-#include "../common/d3d_common.h"
-#include "../common/d3d9_common.h"
-#include "../font_driver.h"
-
-#include "../drivers/d3d_shaders/font.hlsl.d3d9.h"
-
-#define XPR0_MAGIC_VALUE 0x30525058
-#define XPR1_MAGIC_VALUE 0x31525058
-#define XPR2_MAGIC_VALUE 0x58505232
-
-#define FONT_SCALE(d3d) ((d3d->resolution_hd_enable) ? 2 : 1)
-#define CALCFONTFILEHEADERSIZE(x) ( sizeof(uint32_t) + (sizeof(float)* 4) + sizeof(uint16_t) + (sizeof(wchar_t)*(x)) )
-#define FONTFILEVERSION 5
-
-#ifdef _XBOX360
-struct XPR_HEADER
-{
-   DWORD dwMagic;
-   DWORD dwHeaderSize;
-   DWORD dwDataSize;
-};
-#endif
-
-/* structure member offsets matter */
-struct XBRESOURCE
-{
-   DWORD dwType;
-   DWORD dwOffset;
-   DWORD dwSize;
-   char *strName;
-};
-
-enum
-{
-   RESOURCETYPE_USERDATA       = ( ( 'U' << 24 ) | ( 'S' << 16 ) | ( 'E' << 8 ) | ( 'R' ) ),
-   RESOURCETYPE_TEXTURE        = ( ( 'T' << 24 ) | ( 'X' << 16 ) | ( '2' << 8 ) | ( 'D' ) ),
-   RESOURCETYPE_VERTEXBUFFER   = ( ( 'V' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ),
-   RESOURCETYPE_INDEXBUFFER    = ( ( 'I' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ),
-   RESOURCETYPE_EOF            = 0xffffffff
-};
-
-class PackedResource
-{
-   protected:
-      BYTE*       m_pSysMemData;        /* Allocated memory for resource headers etc. */
-      DWORD       m_dwSysMemDataSize;
-
-      BYTE*       m_pVidMemData;        /* Allocated memory for resource data, etc. */
-      DWORD       m_dwVidMemDataSize;
-
-      XBRESOURCE* m_pResourceTags;     /* Tags to associate names with the resources */
-      DWORD       m_dwNumResourceTags; /* Number of resource tags */
-
-   public:
-      /* Loads the resources out of the specified bundle */
-      HRESULT Create(const char *strFilename, DWORD dwNumResourceTags,
-            void *pResourceTags);
-
-      void Destroy();
-
-      BOOL m_bInitialized;             /* Resource is fully initialized */
-
-      /* Functions to retrieve resources by their name */
-      void *GetData( const char* strName );
-      LPDIRECT3DTEXTURE9 *GetTexture(const char* strName);
-
-      /* Constructor/destructor */
-      PackedResource();
-      ~PackedResource();
-};
-
-LPDIRECT3DTEXTURE9 *PackedResource::GetTexture(const char* strName)
-{
-   LPDIRECT3DRESOURCE9 pResource = (LPDIRECT3DRESOURCE9)GetData(strName);
-   return (LPDIRECT3DTEXTURE9*)pResource;
-}
-
-PackedResource::PackedResource()
-{
-   m_pSysMemData       = NULL;
-   m_pVidMemData       = NULL;
-   m_pResourceTags     = NULL;
-   m_dwSysMemDataSize  = 0L;
-   m_dwVidMemDataSize  = 0L;
-   m_dwNumResourceTags = 0L;
-   m_bInitialized      = false;
-}
-
-PackedResource::~PackedResource()
-{
-   Destroy();
-}
-
-void *PackedResource::GetData(const char *strName)
-{
-   if (!m_pResourceTags || !strName)
-      return NULL;
-
-   for (DWORD i = 0; i < m_dwNumResourceTags; i++)
-   {
-      if (string_is_equal_noncase(strName, m_pResourceTags[i].strName))
-         return &m_pSysMemData[m_pResourceTags[i].dwOffset];
-   }
-
-   return NULL;
-}
-
-static INLINE void* AllocateContiguousMemory(DWORD Size, DWORD Alignment)
-{
-   return XMemAlloc(Size, MAKE_XALLOC_ATTRIBUTES(0, 0, 0, 0, eXALLOCAllocatorId_GameMax,
-            Alignment, XALLOC_MEMPROTECT_WRITECOMBINE, 0, XALLOC_MEMTYPE_PHYSICAL));
-}
-
-static INLINE void FreeContiguousMemory(void* pData)
-{
-   return XMemFree(pData, MAKE_XALLOC_ATTRIBUTES(0, 0, 0, 0, eXALLOCAllocatorId_GameMax,
-            0, 0, 0, XALLOC_MEMTYPE_PHYSICAL));
-}
-
-HRESULT PackedResource::Create(const char *strFilename,
-      DWORD dwNumResourceTags, void* pResourceTags)
-{
-   unsigned i;
-   DWORD dwNumBytesRead;
-   XPR_HEADER xprh;
-   HANDLE hFile = CreateFile(strFilename, GENERIC_READ, FILE_SHARE_READ, NULL,
-         OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL);
-
-   if (hFile == INVALID_HANDLE_VALUE)
-      return E_FAIL;
-
-   if (!ReadFile(hFile, &xprh, sizeof(XPR_HEADER), &dwNumBytesRead, NULL) ||
-         xprh.dwMagic != XPR2_MAGIC_VALUE)
-   {
-      CloseHandle(hFile);
-      return E_FAIL;
-   }
-
-   /* Compute memory requirements */
-   m_dwSysMemDataSize = xprh.dwHeaderSize;
-   m_dwVidMemDataSize = xprh.dwDataSize;
-
-   /* Allocate memory */
-   m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize);
-
-   if (!m_pSysMemData)
-   {
-      m_dwSysMemDataSize = 0;
-      return E_FAIL;
-   }
-
-   m_pVidMemData = (BYTE*)AllocateContiguousMemory(m_dwVidMemDataSize,
-         XALLOC_PHYSICAL_ALIGNMENT_4K
-         );
-
-   if(!m_pVidMemData)
-   {
-      m_dwSysMemDataSize = 0;
-      m_dwVidMemDataSize = 0;
-      free(m_pSysMemData);
-      m_pSysMemData = NULL;
-      return E_FAIL;
-   }
-
-   /* Read in the data from the file */
-   if( !ReadFile( hFile, m_pSysMemData, m_dwSysMemDataSize, &dwNumBytesRead, NULL) ||
-         !ReadFile( hFile, m_pVidMemData, m_dwVidMemDataSize, &dwNumBytesRead, NULL))
-   {
-      CloseHandle( hFile);
-      return E_FAIL;
-   }
-
-   /* Done with the file */
-   CloseHandle( hFile);
-
-   /* Extract resource table from the header data */
-   m_dwNumResourceTags = *(DWORD*)(m_pSysMemData + 0);
-   m_pResourceTags     = (XBRESOURCE*)(m_pSysMemData + 4);
-
-   /* Patch up the resources */
-
-   for(i = 0; i < m_dwNumResourceTags; i++)
-   {
-      m_pResourceTags[i].strName = (char*)(m_pSysMemData + (DWORD)m_pResourceTags[i].strName);
-      if((m_pResourceTags[i].dwType & 0xffff0000) == (RESOURCETYPE_TEXTURE & 0xffff0000))
-      {
-         D3DTexture *pTexture = (D3DTexture*)&m_pSysMemData[m_pResourceTags[i].dwOffset];
-         XGOffsetBaseTextureAddress(pTexture, m_pVidMemData, m_pVidMemData);
-      }
-   }
-
-   m_bInitialized = true;
-
-   return S_OK;
-}
-
-void PackedResource::Destroy()
-{
-   free(m_pSysMemData);
-
-   if (m_pVidMemData != NULL)
-      FreeContiguousMemory(m_pVidMemData);
-
-   m_pSysMemData       = NULL;
-   m_pVidMemData       = NULL;
-   m_pResourceTags     = NULL;
-   m_dwSysMemDataSize  = 0L;
-   m_dwVidMemDataSize  = 0L;
-   m_dwNumResourceTags = 0L;
-
-   m_bInitialized = false;
-}
-
-typedef struct GLYPH_ATTR
-{
-   uint16_t tu1, tv1, tu2, tv2;           /* Texture coordinates for the image. */
-   int16_t wOffset;                       /* Pixel offset for glyph start. */
-   int16_t wWidth;                        /* Pixel width of the glyph. */
-   int16_t wAdvance;                      /* Pixels to advance after the glyph. */
-   uint16_t wMask;
-} GLYPH_ATTR;
-
-typedef struct
-{
-   D3DVertexDeclaration *m_pFontVertexDecl;
-   D3DVertexShader      *m_pFontVertexShader;
-   D3DPixelShader       *m_pFontPixelShader;
-} Font_Locals_t;
-
-typedef struct
-{
-   Font_Locals_t s_FontLocals;
-   d3d9_video_t *d3d;
-   uint32_t m_dwSavedState;
-   uint32_t m_cMaxGlyph;                /* Number of entries in the translator table. */
-   uint32_t m_dwNumGlyphs;              /* Number of valid glyphs. */
-   float m_fFontHeight;                 /* Height of the font strike in pixels. */
-   float m_fFontTopPadding;             /* Padding above the strike zone. */
-   float m_fFontBottomPadding;          /* Padding below the strike zone. */
-   float m_fFontYAdvance;               /* Number of pixels to move the cursor for a line feed. */
-   wchar_t * m_TranslatorTable;         /* ASCII to glyph lookup table. */
-   LPDIRECT3DTEXTURE9 m_pFontTexture;
-   const GLYPH_ATTR* m_Glyphs;          /* Array of glyphs. */
-} xdk360_video_font_t;
-
-typedef struct
-{
-   uint32_t m_dwFileVersion;            /* Version of the font file (Must match FONTFILEVERSION). */
-   float m_fFontHeight;                 /* Height of the font strike in pixels. */
-   float m_fFontTopPadding;             /* Padding above the strike zone. */
-   float m_fFontBottomPadding;          /* Padding below the strike zone. */
-   float m_fFontYAdvance;               /* Number of pixels to move the cursor for a line feed. */
-   uint16_t m_cMaxGlyph;                /* Number of font characters (Should be an odd number to maintain DWORD Alignment). */
-   wchar_t m_TranslatorTable[1];        /* ASCII to Glyph lookup table, NOTE: It's m_cMaxGlyph+1 in size. */
-} FontFileHeaderImage_t;
-
-typedef struct
-{
-   uint32_t m_dwNumGlyphs;              /* Size of font strike array (First entry is the unknown glyph). */
-   GLYPH_ATTR m_Glyphs[1];              /* Array of font strike uv's etc... NOTE: It's m_dwNumGlyphs in size. */
-} FontFileStrikesImage_t;
-
-static PackedResource m_xprResource;
-
-static bool xdk360_video_font_create_shaders(xdk360_video_font_t * font, LPDIRECT3DDEVICE9 dev)
-{
-   ID3DXBuffer* pShaderCode = NULL;
-
-   static const D3DVERTEXELEMENT9 decl[] =
-   {
-      { 0,  0, D3DDECLTYPE_FLOAT2,   D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
-      { 0,  8, D3DDECLTYPE_USHORT2,  D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 },
-      { 0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1 },
-      D3DDECL_END()
-   };
-
-   if (font->s_FontLocals.m_pFontVertexDecl)
-   {
-      font->s_FontLocals.m_pFontVertexDecl->AddRef();
-      font->s_FontLocals.m_pFontVertexShader->AddRef();
-      font->s_FontLocals.m_pFontPixelShader->AddRef();
-      return true;
-   }
-
-   if (!d3d9_vertex_declaration_new(dev, decl, (void**)&font->s_FontLocals.m_pFontVertexDecl))
-      goto error;
-
-   if (!d3d9x_compile_shader( font_hlsl_d3d9_program, sizeof(font_hlsl_d3d9_program)-1 ,
-            NULL, NULL, "main_vertex", "vs.2.0", 0, &pShaderCode, NULL, NULL ))
-      goto error;
-
-   if (!d3d9_create_vertex_shader(dev, (const DWORD*)pShaderCode->GetBufferPointer(),
-         (void**)&font->s_FontLocals.m_pFontVertexShader ))
-      goto error;
-
-   d3d9x_buffer_release(pShaderCode);
-
-   if (!d3d9x_compile_shader(font_hlsl_d3d9_program, sizeof(font_hlsl_d3d9_program)-1 ,
-            NULL, NULL, "main_fragment", "ps.2.0", 0,&pShaderCode, NULL, NULL ))
-      goto error;
-
-   if (!d3d9_create_pixel_shader(dev, (DWORD*)pShaderCode->GetBufferPointer(),
-         (void**)&font->s_FontLocals.m_pFontPixelShader))
-      goto error;
-
-   d3d9x_buffer_release(pShaderCode);
-
-   return true;
-
-error:
-   if (pShaderCode)
-      d3d9x_buffer_release(pShaderCode);
-   d3d9_free_pixel_shader((LPDIRECT3DDEVICE9)font->d3d->dev,  font->s_FontLocals.m_pFontPixelShader);
-   d3d9_free_vertex_shader((LPDIRECT3DDEVICE9)font->d3d->dev, font->s_FontLocals.m_pFontVertexShader);
-   d3d9_vertex_declaration_free(font->s_FontLocals.m_pFontVertexDecl);
-   font->s_FontLocals.m_pFontPixelShader  = NULL;
-   font->s_FontLocals.m_pFontVertexShader = NULL;
-   font->s_FontLocals.m_pFontVertexDecl   = NULL;
-
-   return false;
-}
-
-static void *xdk360_init_font(void *video_data,
-      const char *font_path, float font_size,
-       bool is_threaded)
-{
-   uint32_t dwFileVersion;
-   const void *pFontData      = NULL;
-   void *pFontTexture         = NULL;
-   const uint8_t * pData      = NULL;
-   xdk360_video_font_t *font  = (xdk360_video_font_t*)calloc(1, sizeof(*font));
-
-   if (!font)
-      return NULL;
-
-   (void)font_size;
-
-   font->d3d                  = (d3d9_video_t*)video_data;
-
-   font->m_pFontTexture       = NULL;
-   font->m_dwNumGlyphs        = 0L;
-   font->m_Glyphs             = NULL;
-   font->m_cMaxGlyph          = 0;
-   font->m_TranslatorTable    = NULL;
-
-   /* Create the font. */
-   if (FAILED( m_xprResource.Create(font_path, 0, NULL)))
-      goto error;
-
-   pFontTexture               = (LPDIRECT3DTEXTURE9)m_xprResource.GetTexture( "FontTexture" );
-   pFontData                  = m_xprResource.GetData( "FontData");
-
-   /* Save a copy of the texture. */
-   font->m_pFontTexture       = (LPDIRECT3DTEXTURE9)pFontTexture;
-
-   /* Check version of file (to make sure it matches up with the FontMaker tool). */
-   pData                      = (const uint8_t*)pFontData;
-   dwFileVersion              = ((const FontFileHeaderImage_t *)pData)->m_dwFileVersion;
-
-   if (dwFileVersion != FONTFILEVERSION)
-   {
-      RARCH_ERR("Incorrect version number on font file.\n");
-      goto error;
-   }
-
-   font->m_fFontHeight        = ((const FontFileHeaderImage_t *)pData)->m_fFontHeight;
-   font->m_fFontTopPadding    = ((const FontFileHeaderImage_t *)pData)->m_fFontTopPadding;
-   font->m_fFontBottomPadding = ((const FontFileHeaderImage_t *)pData)->m_fFontBottomPadding;
-   font->m_fFontYAdvance      = ((const FontFileHeaderImage_t *)pData)->m_fFontYAdvance;
-
-   /* Point to the translator string which immediately follows the 4 floats. */
-   font->m_cMaxGlyph          = ((const FontFileHeaderImage_t *)pData)->m_cMaxGlyph;
-   font->m_TranslatorTable    = const_cast<FontFileHeaderImage_t*>((const FontFileHeaderImage_t *)pData)->m_TranslatorTable;
-
-   pData                     += CALCFONTFILEHEADERSIZE(font->m_cMaxGlyph + 1);
-
-   /* Read the glyph attributes from the file. */
-   font->m_dwNumGlyphs        = ((const FontFileStrikesImage_t *)pData)->m_dwNumGlyphs;
-   font->m_Glyphs             = ((const FontFileStrikesImage_t *)pData)->m_Glyphs;
-
-   /* Create the vertex and pixel shaders for rendering the font */
-   if (!xdk360_video_font_create_shaders(font, (LPDIRECT3DDEVICE9)font->d3d->dev))
-   {
-      RARCH_ERR( "Could not create font shaders.\n" );
-      goto error;
-   }
-
-   RARCH_LOG("Successfully initialized D3D9 HLSL fonts.\n");
-   return font;
-error:
-   RARCH_ERR("Could not initialize D3D9 HLSL fonts.\n");
-   if (font)
-      free(font);
-   return NULL;
-}
-
-static void xdk360_free_font(void *data, bool is_threaded)
-{
-   xdk360_video_font_t *font = (xdk360_video_font_t*)data;
-
-   if (!font)
-      return;
-
-   /* Destroy the font */
-   font->m_pFontTexture    = NULL;
-   font->m_dwNumGlyphs     = 0L;
-   font->m_Glyphs          = NULL;
-   font->m_cMaxGlyph       = 0;
-   font->m_TranslatorTable = NULL;
-
-   d3d9_free_pixel_shader((LPDIRECT3DDEVICE9)font->d3d->dev, font->s_FontLocals.m_pFontPixelShader);
-   d3d9_free_vertex_shader((LPDIRECT3DDEVICE9)font->d3d->dev, font->s_FontLocals.m_pFontVertexShader);
-   d3d9_vertex_declaration_free(font->s_FontLocals.m_pFontVertexDecl);
-
-   font->s_FontLocals.m_pFontPixelShader  = NULL;
-   font->s_FontLocals.m_pFontVertexShader = NULL;
-   font->s_FontLocals.m_pFontVertexDecl   = NULL;
-
-   if (m_xprResource.m_bInitialized)
-      m_xprResource.Destroy();
-
-   free(font);
-   font = NULL;
-}
-
-static void xdk360_render_msg_post(xdk360_video_font_t * font)
-{
-   LPDIRECT3DDEVICE9 dev;
-   if (!font || !font->d3d)
-      return;
-   dev = (LPDIRECT3DDEVICE9)font->d3d->dev;
-
-   if (!dev)
-	   return;
-
-   d3d9_set_texture(dev, 0, NULL);
-   d3d9_set_vertex_declaration(dev, NULL);
-   d3d9_set_vertex_shader(dev, NULL);
-   d3d9_set_pixel_shader(dev, NULL);
-   d3d9_set_render_state(dev, D3DRS_VIEWPORTENABLE, font->m_dwSavedState);
-}
-
-static void xdk360_render_msg_pre(xdk360_video_font_t * font)
-{
-   float vTexScale[4];
-   D3DSURFACE_DESC TextureDesc;
-   LPDIRECT3DDEVICE9 dev;
-
-   if (!font || !font->d3d)
-      return;
-
-   dev = (LPDIRECT3DDEVICE9)font->d3d->dev;
-
-   if (!dev)
-	   return;
-
-   /* Save state. */
-   d3d9_get_render_state(font->d3d->dev, D3DRS_VIEWPORTENABLE,
-         (DWORD*)&font->m_dwSavedState );
-
-   /* Set the texture scaling factor as a vertex shader constant. */
-   /* Get the description */
-   d3d9_texture_get_level_desc(font->m_pFontTexture, 0, &TextureDesc);
-
-   /* Set render state. */
-   d3d9_set_texture(dev, 0, font->m_pFontTexture);
-
-   vTexScale[0] = 1.0f / TextureDesc.Width;
-   vTexScale[1] = 1.0f / TextureDesc.Height;
-   vTexScale[2] = 0.0f;
-   vTexScale[3] = 0.0f;
-
-   d3d9_set_render_state(dev, D3DRS_VIEWPORTENABLE, FALSE);
-   d3d9_set_vertex_declaration(dev, font->s_FontLocals.m_pFontVertexDecl);
-   d3d9_set_vertex_shader(dev, font->s_FontLocals.m_pFontVertexShader);
-   d3d9_set_pixel_shader(dev, font->s_FontLocals.m_pFontPixelShader);
-   d3d9_set_vertex_shader_constantf(dev, 2, vTexScale, 1);
-}
-
-static void xdk360_draw_text(xdk360_video_font_t *font,
-      float x, float y, const wchar_t * strText)
-{
-   uint32_t dwNumChars;
-   float vColor[4], m_fCursorX, m_fCursorY;
-   volatile float *pVertex = NULL;
-   LPDIRECT3DDEVICE9 dev   = (LPDIRECT3DDEVICE9)font->d3d->dev;
-
-   /* Set the color as a vertex shader constant. */
-   vColor[0]   = ((0xffffffff & 0x00ff0000) >> 16L) / 255.0f;
-   vColor[1]   = ((0xffffffff & 0x0000ff00) >> 8L)  / 255.0f;
-   vColor[2]   = ((0xffffffff & 0x000000ff) >> 0L)  / 255.0f;
-   vColor[3]   = ((0xffffffff & 0xff000000) >> 24L) / 255.0f;
-
-   d3d9_set_vertex_shader_constantf(dev, 1, vColor, 1);
-
-   m_fCursorX  = floorf(x);
-   m_fCursorY  = floorf(y);
-
-   /* Adjust for padding. */
-   y          -= font->m_fFontTopPadding;
-
-   /* Begin drawing the vertices
-    * Declared as volatile to force writing in ascending
-    * address order.
-    *
-    * It prevents out of sequence writing in write combined
-    * memory.
-    */
-
-   dwNumChars = wcslen(strText);
-#ifdef __cplusplus
-   dev->BeginVertices(D3DPT_QUADLIST, 4 * dwNumChars,
-         sizeof(XMFLOAT4), (void**)&pVertex);
-#else
-   D3DDevice_BeginVertices(dev, D3DPT_QUADLIST, 4 * dwNumChars,
-         sizeof(XMFLOAT4), (void**)&pVertex);
-#endif
-
-   /* Draw four vertices for each glyph. */
-   while (*strText)
-   {
-      float fOffset, fAdvance, fWidth, fHeight;
-#ifdef MSB_FIRST
-      uint32_t tu1, tu2, tv1, tv2;
-#endif
-      const GLYPH_ATTR *pGlyph;
-      wchar_t letter = *strText++; /* Get the current letter in the string */
-
-      /* Handle the newline character. */
-      if (letter == L'\n')
-      {
-         m_fCursorX = x;
-         m_fCursorY += font->m_fFontYAdvance * FONT_SCALE(font->d3d);
-         continue;
-      }
-
-      /* Translate unprintable characters. */
-      if (letter <= font->m_cMaxGlyph)
-         pGlyph   = &font->m_Glyphs[font->m_TranslatorTable[letter]];
-      else
-         pGlyph   = &font->m_Glyphs[0];
-
-      fOffset     = FONT_SCALE(font->d3d) * (float)pGlyph->wOffset;
-      fAdvance    = FONT_SCALE(font->d3d) * (float)pGlyph->wAdvance;
-      fWidth      = FONT_SCALE(font->d3d) * (float)pGlyph->wWidth;
-      fHeight     = FONT_SCALE(font->d3d) * font->m_fFontHeight;
-
-      m_fCursorX += fOffset;
-
-      /* Add the vertices to draw this glyph. */
-
-#ifdef MSB_FIRST
-      /* Convert shorts to 32 bit longs for in register merging */
-      tu1 = pGlyph->tu1;
-      tv1 = pGlyph->tv1;
-      tu2 = pGlyph->tu2;
-      tv2 = pGlyph->tv2;
-#endif
-
-      /* NOTE: The vertexes are 2 floats for the screen coordinates,
-       * followed by two USHORTS for the u/vs of the character,
-       * terminated with the ARGB 32 bit color.
-       *
-       * This makes for 16 bytes per vertex data (Easier to read)
-       *
-       * Second NOTE: The U/V coordinates are merged and written
-       * using a DWORD due to the write combining hardware
-       * being only able to handle 32, 64 and 128 writes.
-       *
-       * Never store to write combined memory with 8 or 16bit
-       * instructions. You've been warned.
-       */
-
-      /* Setup the vertex/screen coordinates */
-      pVertex[0]                         = m_fCursorX;
-      pVertex[1]                         = m_fCursorY;
-      pVertex[3]                         = 0;
-      pVertex[4]                         = m_fCursorX + fWidth;
-      pVertex[5]                         = m_fCursorY;
-      pVertex[7]                         = 0;
-      pVertex[8]                         = m_fCursorX + fWidth;
-      pVertex[9]                         = m_fCursorY + fHeight;
-      pVertex[11]                        = 0;
-      pVertex[12]                        = m_fCursorX;
-      pVertex[13]                        = m_fCursorY + fHeight;
-#ifdef MSB_FIRST
-      ((volatile uint32_t *)pVertex)[2]  = (tu1 << 16) | tv1;       /* Merged using big endian rules */
-      ((volatile uint32_t *)pVertex)[6]  = (tu2 << 16) | tv1;       /* Merged using big endian rules */
-      ((volatile uint32_t*)pVertex)[10]  = (tu2 << 16) | tv2;        /* Merged using big endian rules */
-      ((volatile uint32_t*)pVertex)[14]  = (tu1 << 16) | tv2;        /* Merged using big endian rules */
-#endif
-      pVertex[15]                        = 0;
-      pVertex                           += 16;
-
-      m_fCursorX                        += fAdvance;
-
-      dwNumChars--;
-   }
-
-   /* Since we allocated vertex data space
-    * based on the string length, we now need to
-    * add some dummy verts for any skipped
-    * characters (like newlines, etc.)
-    */
-   while (dwNumChars)
-   {
-      unsigned i;
-      for (i = 0; i < 16; i++)
-         pVertex[i] = 0;
-
-      pVertex += 16;
-      dwNumChars--;
-   }
-
-#ifdef __cplusplus
-   dev->EndVertices();
-#else
-   D3DDevice_EndVertices(dev);
-#endif
-}
-
-static void xdk360_render_msg(
-      video_frame_info_t *video_info,
-      void *data, const char *str_msg,
-      const struct font_params *params)
-{
-   float x, y;
-   wchar_t msg[PATH_MAX_LENGTH];
-   xdk360_video_font_t *font        = (xdk360_video_font_t*)data;
-
-   if (params)
-   {
-      x = params->x;
-      y = params->y;
-   }
-   else
-   {
-      x = font->d3d->resolution_hd_enable ? 160 : 100;
-      y = 120;
-   }
-
-   mbstowcs(msg, str_msg, sizeof(msg) / sizeof(wchar_t));
-
-   if (msg || msg[0] != L'\0')
-   {
-      xdk360_render_msg_pre(font);
-      xdk360_draw_text(font, x, y, msg);
-      xdk360_render_msg_post(font);
-   }
-}
-
-font_renderer_t d3d_xbox360_font = {
-   xdk360_init_font,
-   xdk360_free_font,
-   xdk360_render_msg,
-   "xdk360_fonts",
-   NULL,                      /* get_glyph */
-   NULL,                      /* bind_block */
-   NULL,                      /* flush */
-   NULL                       /* get_message_width */
-};

gfx/font_driver.c

@@ -119,9 +119,7 @@ static bool d3d8_font_init_first(
 
 #ifdef HAVE_D3D9
 static const font_renderer_t *d3d9_font_backends[] = {
-#if defined(_XBOX)
-   &d3d_xbox360_font,
-#elif defined(_WIN32) && defined(HAVE_D3DX)
+#if defined(_WIN32) && defined(HAVE_D3DX)
    &d3d_win32_font,
 #endif
    NULL

gfx/font_driver.h

@@ -162,7 +162,6 @@ int font_driver_get_line_height(void *font_data, float scale);
 extern font_renderer_t gl_raster_font;
 extern font_renderer_t gl_core_raster_font;
 extern font_renderer_t gl1_raster_font;
-extern font_renderer_t d3d_xbox360_font;
 extern font_renderer_t d3d_xdk1_font;
 extern font_renderer_t d3d_win32_font;
 extern font_renderer_t ps2_font;

gfx/video_crt_switch.c

@@ -38,8 +38,6 @@ static unsigned ra_core_height    = 0;
 static unsigned ra_tmp_width      = 0;
 static unsigned ra_tmp_height     = 0;
 static unsigned ra_set_core_hz    = 0;
-static unsigned orig_width        = 0;
-static unsigned orig_height       = 0;
 static int crt_center_adjust      = 0;
 static int crt_tmp_center_adjust  = 0;
 static double p_clock             = 0;

gfx/video_layout.c

@@ -2,12 +2,12 @@
 #include <file/file_path.h>
 #include <file/archive_file.h>
 #include <compat/strl.h>
-#include <verbosity.h>
 
 #include "video_layout.h"
 #include "video_layout/view.h"
 
 #include "../retroarch.h"
+#include "../verbosity.h"
 
 bool load(view_array_t *view_array, rxml_document_t *doc);
 

gfx/video_layout/component.c

@@ -13,51 +13,51 @@ void component_init(component_t *comp, comp_type_t type)
 
    switch (comp->type)
    {
-   case VIDEO_LAYOUT_C_UNKNOWN:
-      break;
-   case VIDEO_LAYOUT_C_SCREEN:
-      comp->attr.screen.index = 0;
-      break;
-   case VIDEO_LAYOUT_C_RECT:
-      break;
-   case VIDEO_LAYOUT_C_DISK:
-      break;
-   case VIDEO_LAYOUT_C_IMAGE:
-      comp->attr.image.file = NULL;
-      comp->attr.image.alpha_file = NULL;
-      comp->attr.image.image_idx = 0;
-      comp->attr.image.alpha_idx = 0;
-      comp->attr.image.loaded = false;
-      break;
-   case VIDEO_LAYOUT_C_TEXT:
-      comp->attr.text.string = NULL;
-      comp->attr.text.align = VIDEO_LAYOUT_TEXT_ALIGN_CENTER;
-      break;
-   case VIDEO_LAYOUT_C_COUNTER:
-      comp->attr.counter.digits = 2;
-      comp->attr.counter.max_state = 999;
-      comp->attr.counter.align = VIDEO_LAYOUT_TEXT_ALIGN_CENTER;
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_X1:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H5:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H8:
-      break;
-   case VIDEO_LAYOUT_C_LED_7:
-      break;
-   case VIDEO_LAYOUT_C_LED_8_GTS1:
-      break;
-   case VIDEO_LAYOUT_C_LED_14:
-      break;
-   case VIDEO_LAYOUT_C_LED_14_SC:
-      break;
-   case VIDEO_LAYOUT_C_LED_16:
-      break;
-   case VIDEO_LAYOUT_C_LED_16_SC:
-      break;
-   case VIDEO_LAYOUT_C_REEL:
-      break;
+      case VIDEO_LAYOUT_C_UNKNOWN:
+         break;
+      case VIDEO_LAYOUT_C_SCREEN:
+         comp->attr.screen.index = 0;
+         break;
+      case VIDEO_LAYOUT_C_RECT:
+         break;
+      case VIDEO_LAYOUT_C_DISK:
+         break;
+      case VIDEO_LAYOUT_C_IMAGE:
+         comp->attr.image.file = NULL;
+         comp->attr.image.alpha_file = NULL;
+         comp->attr.image.image_idx = 0;
+         comp->attr.image.alpha_idx = 0;
+         comp->attr.image.loaded = false;
+         break;
+      case VIDEO_LAYOUT_C_TEXT:
+         comp->attr.text.string = NULL;
+         comp->attr.text.align = VIDEO_LAYOUT_TEXT_ALIGN_CENTER;
+         break;
+      case VIDEO_LAYOUT_C_COUNTER:
+         comp->attr.counter.digits = 2;
+         comp->attr.counter.max_state = 999;
+         comp->attr.counter.align = VIDEO_LAYOUT_TEXT_ALIGN_CENTER;
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_X1:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H5:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H8:
+         break;
+      case VIDEO_LAYOUT_C_LED_7:
+         break;
+      case VIDEO_LAYOUT_C_LED_8_GTS1:
+         break;
+      case VIDEO_LAYOUT_C_LED_14:
+         break;
+      case VIDEO_LAYOUT_C_LED_14_SC:
+         break;
+      case VIDEO_LAYOUT_C_LED_16:
+         break;
+      case VIDEO_LAYOUT_C_LED_16_SC:
+         break;
+      case VIDEO_LAYOUT_C_REEL:
+         break;
    }
 }
 
@@ -72,51 +72,51 @@ void component_copy(component_t *comp, const component_t *src)
 
    switch (comp->type)
    {
-   case VIDEO_LAYOUT_C_UNKNOWN:
-      break;
-   case VIDEO_LAYOUT_C_SCREEN:
-      comp->attr.screen.index = src->attr.screen.index;
-      break;
-   case VIDEO_LAYOUT_C_RECT:
-      break;
-   case VIDEO_LAYOUT_C_DISK:
-      break;
-   case VIDEO_LAYOUT_C_IMAGE:
-      comp->attr.image.file = init_string(src->attr.image.file);
-      comp->attr.image.alpha_file = init_string(src->attr.image.alpha_file);
-      comp->attr.image.image_idx = src->attr.image.image_idx;
-      comp->attr.image.alpha_idx = src->attr.image.alpha_idx;
-      comp->attr.image.loaded = src->attr.image.loaded;
-      break;
-   case VIDEO_LAYOUT_C_TEXT:
-      comp->attr.text.string = init_string(src->attr.text.string);
-      comp->attr.text.align = src->attr.text.align;
-      break;
-   case VIDEO_LAYOUT_C_COUNTER:
-      comp->attr.counter.digits = src->attr.counter.digits;
-      comp->attr.counter.max_state = src->attr.counter.max_state;
-      comp->attr.counter.align = src->attr.counter.align;
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_X1:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H5:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H8:
-      break;
-   case VIDEO_LAYOUT_C_LED_7:
-      break;
-   case VIDEO_LAYOUT_C_LED_8_GTS1:
-      break;
-   case VIDEO_LAYOUT_C_LED_14:
-      break;
-   case VIDEO_LAYOUT_C_LED_14_SC:
-      break;
-   case VIDEO_LAYOUT_C_LED_16:
-      break;
-   case VIDEO_LAYOUT_C_LED_16_SC:
-      break;
-   case VIDEO_LAYOUT_C_REEL:
-      break;
+      case VIDEO_LAYOUT_C_UNKNOWN:
+         break;
+      case VIDEO_LAYOUT_C_SCREEN:
+         comp->attr.screen.index = src->attr.screen.index;
+         break;
+      case VIDEO_LAYOUT_C_RECT:
+         break;
+      case VIDEO_LAYOUT_C_DISK:
+         break;
+      case VIDEO_LAYOUT_C_IMAGE:
+         comp->attr.image.file = init_string(src->attr.image.file);
+         comp->attr.image.alpha_file = init_string(src->attr.image.alpha_file);
+         comp->attr.image.image_idx = src->attr.image.image_idx;
+         comp->attr.image.alpha_idx = src->attr.image.alpha_idx;
+         comp->attr.image.loaded = src->attr.image.loaded;
+         break;
+      case VIDEO_LAYOUT_C_TEXT:
+         comp->attr.text.string = init_string(src->attr.text.string);
+         comp->attr.text.align = src->attr.text.align;
+         break;
+      case VIDEO_LAYOUT_C_COUNTER:
+         comp->attr.counter.digits = src->attr.counter.digits;
+         comp->attr.counter.max_state = src->attr.counter.max_state;
+         comp->attr.counter.align = src->attr.counter.align;
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_X1:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H5:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H8:
+         break;
+      case VIDEO_LAYOUT_C_LED_7:
+         break;
+      case VIDEO_LAYOUT_C_LED_8_GTS1:
+         break;
+      case VIDEO_LAYOUT_C_LED_14:
+         break;
+      case VIDEO_LAYOUT_C_LED_14_SC:
+         break;
+      case VIDEO_LAYOUT_C_LED_16:
+         break;
+      case VIDEO_LAYOUT_C_LED_16_SC:
+         break;
+      case VIDEO_LAYOUT_C_REEL:
+         break;
    }
 }
 
@@ -124,42 +124,42 @@ void component_deinit(component_t *comp)
 {
    switch (comp->type)
    {
-   case VIDEO_LAYOUT_C_UNKNOWN:
-      break;
-   case VIDEO_LAYOUT_C_SCREEN:
-      break;
-   case VIDEO_LAYOUT_C_RECT:
-      break;
-   case VIDEO_LAYOUT_C_DISK:
-      break;
-   case VIDEO_LAYOUT_C_IMAGE:
-      free(comp->attr.image.file);
-      free(comp->attr.image.alpha_file);
-      break;
-   case VIDEO_LAYOUT_C_TEXT:
-      free(comp->attr.text.string);
-      break;
-   case VIDEO_LAYOUT_C_COUNTER:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_X1:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H5:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H8:
-      break;
-   case VIDEO_LAYOUT_C_LED_7:
-      break;
-   case VIDEO_LAYOUT_C_LED_8_GTS1:
-      break;
-   case VIDEO_LAYOUT_C_LED_14:
-      break;
-   case VIDEO_LAYOUT_C_LED_14_SC:
-      break;
-   case VIDEO_LAYOUT_C_LED_16:
-      break;
-   case VIDEO_LAYOUT_C_LED_16_SC:
-      break;
-   case VIDEO_LAYOUT_C_REEL:
-      break;
+      case VIDEO_LAYOUT_C_UNKNOWN:
+         break;
+      case VIDEO_LAYOUT_C_SCREEN:
+         break;
+      case VIDEO_LAYOUT_C_RECT:
+         break;
+      case VIDEO_LAYOUT_C_DISK:
+         break;
+      case VIDEO_LAYOUT_C_IMAGE:
+         free(comp->attr.image.file);
+         free(comp->attr.image.alpha_file);
+         break;
+      case VIDEO_LAYOUT_C_TEXT:
+         free(comp->attr.text.string);
+         break;
+      case VIDEO_LAYOUT_C_COUNTER:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_X1:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H5:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H8:
+         break;
+      case VIDEO_LAYOUT_C_LED_7:
+         break;
+      case VIDEO_LAYOUT_C_LED_8_GTS1:
+         break;
+      case VIDEO_LAYOUT_C_LED_14:
+         break;
+      case VIDEO_LAYOUT_C_LED_14_SC:
+         break;
+      case VIDEO_LAYOUT_C_LED_16:
+         break;
+      case VIDEO_LAYOUT_C_LED_16_SC:
+         break;
+      case VIDEO_LAYOUT_C_REEL:
+         break;
    }
 }

gfx/video_layout/component.h

@@ -23,8 +23,7 @@ typedef enum comp_type
    VIDEO_LAYOUT_C_LED_16,
    VIDEO_LAYOUT_C_LED_16_SC,
    VIDEO_LAYOUT_C_REEL
-}
-comp_type_t;
+} comp_type_t;
 
 union comp_attr
 {
@@ -43,8 +42,7 @@ typedef struct component
    video_layout_color_t       color;
    int                        enabled_state;
    union comp_attr            attr;
-}
-component_t;
+} component_t;
 
 void component_init   (component_t *comp, comp_type_t type);
 void component_copy   (component_t *comp, const component_t *src);

gfx/video_layout/component_attr.h

@@ -4,8 +4,7 @@
 typedef struct c_attr_screen
 {
    int index;
-}
-c_attr_screen_t;
+} c_attr_screen_t;
 
 typedef struct c_attr_image
 {
@@ -14,22 +13,19 @@ typedef struct c_attr_image
    int   image_idx;
    int   alpha_idx;
    bool  loaded;
-}
-c_attr_image_t;
+} c_attr_image_t;
 
 typedef struct c_attr_text
 {
    char               *string;
    video_layout_text_align_t align;
-}
-c_attr_text_t;
+} c_attr_text_t;
 
 typedef struct c_attr_counter
 {
    int                 digits;
    int                 max_state;
    video_layout_text_align_t align;
-}
-c_attr_counter_t;
+} c_attr_counter_t;
 
 #endif

gfx/video_layout/element.c

@@ -15,7 +15,7 @@ void element_init(element_t *elem, const char *name, int components_count)
    elem->render_bounds = make_bounds_unit();
 
    elem->components = (component_t*)(components_count > 0 ?
-      calloc(components_count, sizeof(component_t)) : NULL);
+         calloc(components_count, sizeof(component_t)) : NULL);
    elem->components_count = components_count;
 }
 
@@ -30,7 +30,7 @@ void element_copy(element_t *elem, const element_t *src)
    elem->render_bounds = src->render_bounds;
 
    elem->components = (component_t*)(src->components_count > 0 ?
-      calloc(src->components_count, sizeof(component_t)) : NULL);
+         calloc(src->components_count, sizeof(component_t)) : NULL);
 
    for (i = 0; i < src->components_count; ++i)
       component_copy(&elem->components[i], &src->components[i]);
@@ -40,7 +40,7 @@ void element_copy(element_t *elem, const element_t *src)
 
 void element_deinit(element_t *elem)
 {
-   int i;
+   unsigned i;
 
    for (i = 0; i < elem->components_count; ++i)
       component_deinit(&elem->components[i]);
@@ -51,12 +51,11 @@ void element_deinit(element_t *elem)
 
 void element_apply_orientation(element_t *elem, video_layout_orientation_t orientation)
 {
-   int i;
+   unsigned i;
 
    for (i = 0; i < elem->components_count; ++i)
    {
-      component_t *comp;
-      comp = &elem->components[i];
+      component_t *comp = &elem->components[i];
       comp->orientation ^= orientation;
 
       if (orientation & VIDEO_LAYOUT_SWAP_XY)

gfx/video_layout/element.h

@@ -1,5 +1,6 @@
 #ifndef VIDEO_LAYOUT_ELEMENT_H
 #define VIDEO_LAYOUT_ELEMENT_H
+
 #include "internal.h"
 #include "component.h"
 
@@ -17,8 +18,7 @@ typedef struct element
 
    component_t     *components;
    int              components_count;
-}
-element_t;
+} element_t;
 
 void element_init              (element_t *elem, const char *name, int components_count);
 void element_copy              (element_t *elem, const element_t *src);

gfx/video_layout/internal.c

@@ -66,9 +66,7 @@ int get_int(const char *str)
 
 float get_dec(const char *str)
 {
-   float res;
-
-   res = 0.0f;
+   float res = 0.0f;
    sscanf(str, "%f", &res);
 
    return res;
@@ -152,12 +150,16 @@ video_layout_bounds_t make_bounds_unit(void)
    return bounds;
 }
 
-video_layout_bounds_t bounds_union(const video_layout_bounds_t *a, const video_layout_bounds_t *b)
+video_layout_bounds_t bounds_union(
+      const video_layout_bounds_t *a,
+      const video_layout_bounds_t *b)
 {
    video_layout_bounds_t bounds;
 
-   if (!bounds_valid(a)) return *b;
-   if (!bounds_valid(b)) return *a;
+   if (!bounds_valid(a))
+      return *b;
+   if (!bounds_valid(b))
+      return *a;
 
    bounds.x = MIN(a->x, b->x);
    bounds.y = MIN(a->y, b->y);
@@ -167,7 +169,9 @@ video_layout_bounds_t bounds_union(const video_layout_bounds_t *a, const video_l
    return bounds;
 }
 
-void bounds_scale(video_layout_bounds_t *dst, const video_layout_bounds_t *dim)
+void bounds_scale(
+      video_layout_bounds_t *dst,
+      const video_layout_bounds_t *dim)
 {
    dst->x *= dim->w;
    dst->y *= dim->h;

gfx/video_layout/load.c

@@ -52,10 +52,8 @@ static const char *const video_layout_internal_screen_params[] =
 
 static int child_count(rxml_node_t *node)
 {
-   int res;
    rxml_node_t *child;
-
-   res = 0;
+   int res = 0;
 
    for (child = node->children; child; child = child->next)
       ++res;
@@ -102,10 +100,8 @@ static void init_screen_params(scope_t *scope, int screen_index)
 
 static video_layout_bounds_t parse_bounds(scope_t *scope, rxml_node_t *node)
 {
-   video_layout_bounds_t bounds;
    const char *prop;
-
-   bounds = make_bounds_unit();
+   video_layout_bounds_t bounds = make_bounds_unit();
 
    if ((prop = scope_eval(scope, rxml_node_attrib(node, "x"))))       bounds.x = get_dec(prop);
    if ((prop = scope_eval(scope, rxml_node_attrib(node, "y"))))       bounds.y = get_dec(prop);
@@ -122,10 +118,8 @@ static video_layout_bounds_t parse_bounds(scope_t *scope, rxml_node_t *node)
 
 static video_layout_color_t parse_color(scope_t *scope, rxml_node_t *node)
 {
-   video_layout_color_t color;
    const char *prop;
-
-   color = make_color_white();
+   video_layout_color_t color = make_color_white();
 
    if ((prop = scope_eval(scope, rxml_node_attrib(node, "red"))))    color.r = get_dec(prop);
    if ((prop = scope_eval(scope, rxml_node_attrib(node, "green"))))  color.g = get_dec(prop);
@@ -137,10 +131,8 @@ static video_layout_color_t parse_color(scope_t *scope, rxml_node_t *node)
 
 static video_layout_orientation_t parse_orientation(scope_t *scope, rxml_node_t *node)
 {
-   video_layout_orientation_t result;
    const char *prop;
-
-   result = VIDEO_LAYOUT_ROT0;
+   video_layout_orientation_t result = VIDEO_LAYOUT_ROT0;
 
    if ((prop = scope_eval(scope, rxml_node_attrib(node, "rotate"))))
    {
@@ -223,14 +215,11 @@ static bool load_param(scope_t *scope, rxml_node_t *node, bool can_repeat)
 
 static bool load_component(scope_t *scope, component_t *comp, rxml_node_t *node)
 {
-   comp_type_t type;
-   bool result;
    const char *state;
    const char *attr;
    rxml_node_t *n;
-
-   type = comp_type_from_str(node->name);
-   result = true;
+   comp_type_t type = comp_type_from_str(node->name);
+   bool      result = true;
 
    if (type == VIDEO_LAYOUT_C_UNKNOWN)
    {
@@ -254,72 +243,72 @@ static bool load_component(scope_t *scope, component_t *comp, rxml_node_t *node)
 
    switch (comp->type)
    {
-   case VIDEO_LAYOUT_C_UNKNOWN:
-      break;
-   case VIDEO_LAYOUT_C_SCREEN:
-      break;
-   case VIDEO_LAYOUT_C_RECT:
-      break;
-   case VIDEO_LAYOUT_C_DISK:
-      break;
-   case VIDEO_LAYOUT_C_IMAGE:
-      {
-         if (!(attr = rxml_node_attrib(node, "file")))
+      case VIDEO_LAYOUT_C_UNKNOWN:
+         break;
+      case VIDEO_LAYOUT_C_SCREEN:
+         break;
+      case VIDEO_LAYOUT_C_RECT:
+         break;
+      case VIDEO_LAYOUT_C_DISK:
+         break;
+      case VIDEO_LAYOUT_C_IMAGE:
          {
-            RARCH_LOG("video_layout: invalid component <%s />, missing 'file' attribute\n", node->name);
-            result = false;
-         }
-         set_string(&comp->attr.image.file, scope_eval(scope, attr));
+            if (!(attr = rxml_node_attrib(node, "file")))
+            {
+               RARCH_LOG("video_layout: invalid component <%s />, missing 'file' attribute\n", node->name);
+               result = false;
+            }
+            set_string(&comp->attr.image.file, scope_eval(scope, attr));
 
-         if ((attr = rxml_node_attrib(node, "alphafile")))
-            set_string(&comp->attr.image.alpha_file, scope_eval(scope, attr));
-      }
-      break;
-   case VIDEO_LAYOUT_C_TEXT:
-      {
-         if (!(attr = rxml_node_attrib(node, "string")))
+            if ((attr = rxml_node_attrib(node, "alphafile")))
+               set_string(&comp->attr.image.alpha_file, scope_eval(scope, attr));
+         }
+         break;
+      case VIDEO_LAYOUT_C_TEXT:
          {
-            RARCH_LOG("video_layout: invalid component <%s />, missing 'string' attribute\n", node->name);
-            result = false;
+            if (!(attr = rxml_node_attrib(node, "string")))
+            {
+               RARCH_LOG("video_layout: invalid component <%s />, missing 'string' attribute\n", node->name);
+               result = false;
+            }
+            set_string(&comp->attr.text.string, scope_eval(scope, attr));
+
+            if ((attr = rxml_node_attrib(node, "align")))
+               comp->attr.text.align = (video_layout_text_align_t)get_int(scope_eval(scope, attr));
          }
-         set_string(&comp->attr.text.string, scope_eval(scope, attr));
+         break;
+      case VIDEO_LAYOUT_C_COUNTER:
+         {
+            if ((attr = rxml_node_attrib(node, "digits")))
+               comp->attr.counter.digits = get_int(scope_eval(scope, attr));
 
-         if ((attr = rxml_node_attrib(node, "align")))
-            comp->attr.text.align = (video_layout_text_align_t)get_int(scope_eval(scope, attr));
-      }
-      break;
-   case VIDEO_LAYOUT_C_COUNTER:
-      {
-         if ((attr = rxml_node_attrib(node, "digits")))
-            comp->attr.counter.digits = get_int(scope_eval(scope, attr));
+            if ((attr = rxml_node_attrib(node, "maxstate")))
+               comp->attr.counter.max_state = get_int(scope_eval(scope, attr));
 
-         if ((attr = rxml_node_attrib(node, "maxstate")))
-            comp->attr.counter.max_state = get_int(scope_eval(scope, attr));
-
-         if ((attr = rxml_node_attrib(node, "align")))
-            comp->attr.counter.align = (video_layout_text_align_t)get_int(scope_eval(scope, attr));
-      }
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_X1:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H5:
-      break;
-   case VIDEO_LAYOUT_C_DOTMATRIX_H8:
-      break;
-   case VIDEO_LAYOUT_C_LED_7:
-      break;
-   case VIDEO_LAYOUT_C_LED_8_GTS1:
-      break;
-   case VIDEO_LAYOUT_C_LED_14:
-      break;
-   case VIDEO_LAYOUT_C_LED_14_SC:
-      break;
-   case VIDEO_LAYOUT_C_LED_16:
-      break;
-   case VIDEO_LAYOUT_C_LED_16_SC:
-      break;
-   case VIDEO_LAYOUT_C_REEL:
-      break;
+            if ((attr = rxml_node_attrib(node, "align")))
+               comp->attr.counter.align = (video_layout_text_align_t)get_int(scope_eval(scope, attr));
+         }
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_X1:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H5:
+         break;
+      case VIDEO_LAYOUT_C_DOTMATRIX_H8:
+         break;
+      case VIDEO_LAYOUT_C_LED_7:
+         break;
+      case VIDEO_LAYOUT_C_LED_8_GTS1:
+         break;
+      case VIDEO_LAYOUT_C_LED_14:
+         break;
+      case VIDEO_LAYOUT_C_LED_14_SC:
+         break;
+      case VIDEO_LAYOUT_C_LED_16:
+         break;
+      case VIDEO_LAYOUT_C_LED_16_SC:
+         break;
+      case VIDEO_LAYOUT_C_REEL:
+         break;
    }
 
    return result;
@@ -329,13 +318,11 @@ static bool load_element(scope_t *scope, rxml_node_t *node)
 {
    const char *name;
    const char *state;
-   bool result;
    int i;
    element_t *elem;
    rxml_node_t *n;
    video_layout_bounds_t dim;
-
-   result = true;
+   bool result = true;
 
    if (!(name = rxml_node_attrib(node, "name")))
    {
@@ -394,10 +381,8 @@ static bool load_element(scope_t *scope, rxml_node_t *node)
 
 static bool load_screen(scope_t *scope, element_t *elem, rxml_node_t *node)
 {
-   const char *index;
    component_t *comp;
-
-   index = rxml_node_attrib(node, "index");
+   const char *index = rxml_node_attrib(node, "index");
 
    element_init(elem, NULL, 1);
    comp = &elem->components[0];
@@ -412,10 +397,8 @@ static bool load_screen(scope_t *scope, element_t *elem, rxml_node_t *node)
 static void merge_group(scope_t *scope, view_t *view, view_t *group,
    bool has_bounds, video_layout_bounds_t n_bounds, video_layout_orientation_t n_orient, video_layout_color_t n_color)
 {
-   bool constrain;
    int i, j, k;
-
-   constrain = bounds_valid(&n_bounds);
+   bool constrain = bounds_valid(&n_bounds);
 
    for (i = 0; i < group->layers_count; ++i)
    {
@@ -471,7 +454,7 @@ static bool load_view(scope_t *scope, view_t *view, rxml_node_t *node, bool is_n
       view_init(view, scope_eval(scope, name));
    }
 
-   result = true;
+   result     = true;
    has_bounds = false;
 
    for (n = node->children; n; n = n->next)
@@ -660,10 +643,8 @@ static bool load_group(scope_t *scope, rxml_node_t *node)
 
 static bool load_top_level(scope_t *scope, int *view_count, rxml_node_t *root)
 {
-   bool result;
    rxml_node_t *node;
-
-   result = true;
+   bool result = true;
    *view_count = 0;
 
    for (node = root->children; node; node = node->next)
@@ -695,12 +676,9 @@ static bool load_top_level(scope_t *scope, int *view_count, rxml_node_t *root)
 
 static bool load_views(scope_t *scope, view_array_t *view_array, rxml_node_t *root)
 {
-   bool result;
-   int i;
    rxml_node_t *node;
-
-   result = true;
-   i = 0;
+   bool result = true;
+   int i = 0;
 
    for (node = root->children; node; node = node->next)
    {
@@ -730,14 +708,12 @@ static bool load_views(scope_t *scope, view_array_t *view_array, rxml_node_t *ro
 bool load(view_array_t *view_array, rxml_document_t *doc)
 {
    bool result;
-   rxml_node_t *root;
    scope_t scope;
    int view_count;
-
-   root = rxml_root_node(doc);
+   rxml_node_t *root = rxml_root_node(doc);
 
    if (strcmp(root->name, "mamelayout") ||
-      strcmp(rxml_node_attrib(root, "version"), "2"))
+         strcmp(rxml_node_attrib(root, "version"), "2"))
    {
       RARCH_LOG("video_layout: invalid MAME Layout file\n");
       return false;

gfx/video_layout/scope.c

@@ -38,15 +38,12 @@ static void param_deinit(param_t *param)
 
 static param_t *param_find(scope_t *scope, const char *name, int level)
 {
-   param_t *param;
-   param = scope->param;
+   param_t *param = scope->param;
 
    while (param && param->level >= level)
    {
       if (strcmp(param->name, name) == 0)
-      {
          return param;
-      }
       param = param->prev;
    }
 
@@ -55,15 +52,13 @@ static param_t *param_find(scope_t *scope, const char *name, int level)
 
 void scope_init(scope_t *scope)
 {
-   scope->level = 0;
+   scope->level          = 0;
 
-   scope->param = NULL;
-
-   scope->elements = NULL;
+   scope->param          = NULL;
+   scope->elements       = NULL;
    scope->elements_count = 0;
-
-   scope->groups = NULL;
-   scope->groups_count = 0;
+   scope->groups         = NULL;
+   scope->groups_count   = 0;
 }
 
 void scope_deinit(scope_t *scope)
@@ -114,7 +109,10 @@ void scope_repeat(scope_t *scope)
 {
    param_t *param;
 
-   for (param = scope->param; param && param->level >= scope->level; param = param->prev)
+   for (
+         param = scope->param;
+         param && param->level >= scope->level;
+         param = param->prev)
    {
       generator_t *gen;
       if ((gen = param->generator))
@@ -149,12 +147,9 @@ void scope_repeat(scope_t *scope)
 
 void scope_param(scope_t *scope, const char *name, const char *value)
 {
-   char *eval_name;
-   char *eval_value;
    param_t *param;
-
-   eval_name = init_string(scope_eval(scope, name));
-   eval_value = init_string(scope_eval(scope, value));
+   char *eval_name = init_string(scope_eval(scope, name));
+   char *eval_value = init_string(scope_eval(scope, value));
 
    if ((param = param_find(scope, eval_name, scope->level)))
    {
@@ -177,13 +172,11 @@ void scope_param(scope_t *scope, const char *name, const char *value)
 
 void scope_generator(scope_t *scope, const char *name, const char *start, const char *increment, const char *lshift, const char *rshift)
 {
-   char *e_name;
    char *e_val;
    char *e_inc;
    generator_t *gen;
    param_t *param;
-
-   e_name = init_string(scope_eval(scope, name));
+   char *e_name = init_string(scope_eval(scope, name));
 
    if (param_find(scope, e_name, scope->level))
    {
@@ -234,7 +227,6 @@ const char *scope_eval(scope_t *scope, const char *src)
 {
    const char* next;
    bool in_var;
-
    char tmp[SCOPE_BUFFER_SIZE];
 
    if (!src)

gfx/video_layout/scope.h

@@ -21,8 +21,7 @@ typedef struct scope
    int        groups_count;
 
    char       eval[SCOPE_BUFFER_SIZE];
-}
-scope_t;
+} scope_t;
 
 void        scope_init         (scope_t *scope);
 void        scope_deinit       (scope_t *scope);

gfx/video_layout/types.h

@@ -1,7 +1,9 @@
 #ifndef VIDEO_LAYOUT_TYPES_H
 #define VIDEO_LAYOUT_TYPES_H
 
-typedef unsigned char video_layout_orientation_t;
+#include <stdint.h>
+
+typedef uint8_t video_layout_orientation_t;
 
 #define VIDEO_LAYOUT_FLIP_X  1
 #define VIDEO_LAYOUT_FLIP_Y  2
@@ -14,19 +16,17 @@ typedef unsigned char video_layout_orientation_t;
 
 typedef enum video_layout_blend
 {
-   VIDEO_LAYOUT_BLEND_ALPHA,
+   VIDEO_LAYOUT_BLEND_ALPHA = 0,
    VIDEO_LAYOUT_BLEND_ADD,
    VIDEO_LAYOUT_BLEND_MOD
-}
-video_layout_blend_t;
+} video_layout_blend_t;
 
 typedef enum video_layout_text_align
 {
-   VIDEO_LAYOUT_TEXT_ALIGN_CENTER,
+   VIDEO_LAYOUT_TEXT_ALIGN_CENTER = 0,
    VIDEO_LAYOUT_TEXT_ALIGN_LEFT,
    VIDEO_LAYOUT_TEXT_ALIGN_RIGHT
-}
-video_layout_text_align_t;
+} video_layout_text_align_t;
 
 typedef struct video_layout_color
 {
@@ -34,8 +34,7 @@ typedef struct video_layout_color
    float g;
    float b;
    float a;
-}
-video_layout_color_t;
+} video_layout_color_t;
 
 typedef struct video_layout_bounds
 {
@@ -43,7 +42,6 @@ typedef struct video_layout_bounds
    float y;
    float w;
    float h;
-}
-video_layout_bounds_t;
+} video_layout_bounds_t;
 
 #endif

gfx/video_layout/view.c

@@ -26,7 +26,8 @@ element_t *layer_add_element(layer_t *layer)
 {
    element_t *elem;
 
-   vec_size((void**)&layer->elements, sizeof(element_t), ++layer->elements_count);
+   vec_size((void**)&layer->elements,
+         sizeof(element_t), ++layer->elements_count);
 
    elem = &layer->elements[layer->elements_count - 1];
    element_init(elem, NULL, 0);
@@ -36,12 +37,12 @@ element_t *layer_add_element(layer_t *layer)
 
 void view_init(view_t *view, const char *name)
 {
-   view->name = init_string(name);
-   view->bounds = make_bounds();
+   view->name          = init_string(name);
+   view->bounds        = make_bounds();
    view->render_bounds = make_bounds_unit();
-   view->layers = NULL;
-   view->layers_count = 0;
-   view->screens = NULL;
+   view->layers        = NULL;
+   view->layers_count  = 0;
+   view->screens       = NULL;
    view->screens_count = 0;
 }
 
@@ -197,9 +198,8 @@ void view_normalize(view_t *view)
 
 void view_count_screens(view_t *view)
 {
-   int idx, i, j, k;
-
-   idx = -1;
+   int i, j, k;
+   int idx = -1;
 
    for (i = 0; i < view->layers_count; ++i)
    {

gfx/video_layout/view.h

@@ -11,8 +11,7 @@ typedef struct layer
 
    element_t            *elements;
    int                   elements_count;
-}
-layer_t;
+} layer_t;
 
 typedef struct view
 {
@@ -25,15 +24,13 @@ typedef struct view
 
    video_layout_bounds_t *screens;
    int                    screens_count;
-}
-view_t;
+} view_t;
 
 typedef struct view_array
 {
    view_t *views;
    int     views_count;
-}
-view_array_t;
+} view_array_t;
 
 void       layer_init         (layer_t *layer, const char *name);
 void       layer_deinit       (layer_t *layer);

gfx/video_shader_parse.c

@@ -1168,7 +1168,7 @@ const char *video_shader_to_str(enum rarch_shader_type type)
 bool video_shader_is_supported(enum rarch_shader_type type)
 {
    gfx_ctx_flags_t flags;
-   enum display_flags testflag;
+   enum display_flags testflag = GFX_CTX_FLAGS_NONE;
 
    flags.flags     = 0;
 
@@ -1216,6 +1216,7 @@ const char *video_shader_get_preset_extension(enum rarch_shader_type type)
 bool video_shader_any_supported(void)
 {
    gfx_ctx_flags_t flags;
+   flags.flags     = 0;
    video_context_driver_get_flags(&flags);
 
    return

griffin/griffin_cpp.cpp

@@ -123,10 +123,6 @@ VIDEO DRIVER
 /*============================================================
 FONTS
 ============================================================ */
-#if defined(_XBOX360)
-#include "../gfx/drivers_font/xdk360_fonts.cpp"
-#endif
-
 #ifdef WANT_GLSLANG
 #ifdef _WIN32
 #include "../deps/glslang/glslang/glslang/OSDependent/Windows/ossource.cpp"

intl/msg_hash_ar.h

@@ -422,10 +422,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Don't overwrite SaveRAM on loading savestate"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Bluetooth Enable"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "Buildbot Assets URL"
@@ -647,10 +649,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Download Core...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Content Downloader")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "DPI Override Enable")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI Override")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "أنظمة التشغيل")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -964,8 +962,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Input Autoconfig")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "نظام تشغيل الجوي باد")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Services")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Chinese (Simplified)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1431,8 +1431,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Run")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
       "Run")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "SAMBA Enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Savefile")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1509,8 +1511,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE,
       "System Files are in Content Dir")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
       "Write Screenshots to Content Dir")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "SSH Enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Start Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1927,7 +1931,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Volcanic Red")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Menu Shader Pipeline")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Menu Scale Factor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Icon Shadows Enable")
@@ -2001,8 +2005,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Scan content and add to the database.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Change audio output settings.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Enable or disable bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Saves changes to the configuration file on exit.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -2031,14 +2037,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Display system information.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Download add-ons, components, and content for RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Enable or disable network sharing of your folders.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Manage operating system level services.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Show hidden files/directories inside the file browser.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Enable or disable remote command line access.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Prevents your system's screensaver from becoming active.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -3156,10 +3166,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modify the opacity of the header graphic.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modify the opacity of the footer graphic.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Save all downloaded files to this directory.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3877,7 +3883,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -4120,3 +4126,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "إحذف قائمة التشغيل")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_chs.h

@@ -403,10 +403,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "加载即时存档时不覆盖游戏自带存档"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "启用蓝牙服务"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "构建机器人资源URL"
@@ -640,10 +642,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "下载核心……")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "下载游戏内容")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "启用DPI覆盖")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI覆盖")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "驱动")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -954,8 +952,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "输入设备自动配置文件夹")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "手柄驱动")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Lakka 服务")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "简体中文")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1465,8 +1465,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "运行")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
       "运行")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "启用SAMBA文件共享服务")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "存档文件文件夹")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1541,8 +1543,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "排序文件夹中的游戏存档")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "排序文件夹中的即时存档")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "启用SSH远程终端服务")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "启动核心")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1987,7 +1991,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "火山红")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "菜单渲染器管线")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "菜单缩放因子")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "启用图标阴影")
@@ -2070,8 +2074,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "下载、扫描游戏内容，并将其加入你的收藏中。")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "调整音频输出的选项。")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "启用或者禁止蓝牙。")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "程序将在退出时保存修改到配置文件。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -2103,14 +2109,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "显示数据库和光标的管理器。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "下载并更新 RetroArch 的附加插件和组件。")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "启用或者禁止网络文件夹共享(SAMBA)。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "管理操作系统层级的服务。")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "在文件浏览器中显示隐藏的文件或文件夹。")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "启用或者禁止远程终端访问(SSH)。")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "阻止系统激活屏幕保护程序。")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_LANGUAGE,
@@ -3403,10 +3413,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modify the opacity of the header graphic.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modify the opacity of the footer graphic.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "保存下载文件的文件夹。")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -4895,7 +4901,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -5138,3 +5144,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "删除播放列表")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_cht.h

@@ -375,10 +375,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "載入儲存狀態時不覆蓋SaveRAM"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "啟用藍牙服務"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "構建機器人資源URL"
@@ -590,10 +592,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "下載核心……")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "下載遊戲內容")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "啟用DPI覆蓋")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI覆蓋")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "驅動")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -894,8 +892,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "輸入設備自動設定目錄")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "手柄驅動")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Lakka 服務")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "簡體中文")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1323,8 +1323,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
       "右側搖桿")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "運行")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "啟用SAMBA文件共享服務")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "存檔文件目錄")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1393,8 +1395,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "排序文件夾中的存檔")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "排序文件夾中的狀態存儲")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "啟用SSH遠程終端服務")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "啟動核心")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1793,7 +1797,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "火山紅")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "選單Shader管線")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "選單縮放因子")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "啟用圖標陰影")
@@ -1855,8 +1859,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "下載且/或者掃瞄遊戲內容，並將其加入你的收藏中。")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "調整聲音輸出的選項。")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "啟用或者禁止藍牙。")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "程序將在退出時儲存修改到設定文件。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1885,14 +1891,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "顯示核心、網路和系統的訊息。顯示數據庫和光標的管理器。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "下載並更新RetroArch的附加插件和組件。")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "啟用或者禁止網路文件夾共享(SAMBA)。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "管理操作系統層級的服務。")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "在文件瀏覽器中顯示隱藏的文件或文件夾。")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "啟用或者禁止遠程終端訪問(SSH)。")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "阻止系統激活營幕保護程序。")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_LANGUAGE,
@@ -2972,10 +2982,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modify the opacity of the header graphic.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modify the opacity of the footer graphic.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Save all downloaded files to this directory.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3653,7 +3659,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -3896,3 +3902,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "刪除播放清單")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_de.h

@@ -410,10 +410,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Überschreibe SaveRAM nicht, wenn ein Zustand (Savestate) geladen wird"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Bluetooth aktivieren"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "Buildbot-Assets-URL"
@@ -623,10 +625,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Core herunterladen...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Inhalt herunterladen")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "Aktiviert DPI-Überschreibung")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI-Überschreibung")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Treiber")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -931,8 +929,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Automatische Konfiguration von Controllern")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Controller-Treiber")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Services")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Chinesisch (vereinfacht)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1382,8 +1382,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Starten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
       "Abspielen")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "SAMBA aktivieren")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Speicherdaten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1460,8 +1462,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE,
       "Systemdateien befinden sich im Verzeichnis des Inhalts")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
       "Bildschirmfotos im Verzeichnis des Inhalts speichern")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "SSH aktivieren")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Core starten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1876,7 +1880,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Volcanic Red")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Menü-Shader")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Menü-Skalierungsfaktor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Icon-Schatten aktivieren")
@@ -1944,8 +1948,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Sucht nach Inhalten und fügt diese zur Datenbank hinzu.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Ändere die Einstellungen der Audio-Ausgabe.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Aktiviere oder deaktiviere Bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Speichere Änderungen an der Konfigurationsdatei beim Beenden.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1974,14 +1980,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Zeige Informationen über Core, Netzwerk und das System an.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Lade Erweiterungen, Komponenten und Inhalte für RetroArch herunter.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Aktiviere die Netzwerkfreigabe deiner Ordner.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Verwalte Service-Einstellungen deines Betriebssystems.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Zeige versteckte Dateien und Ordner im Dateimanager an.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Aktiviere Fernzugriff auf die Kommandozeile.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Hält dein System davon ab, den Bildschirmschoner zu aktivieren.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -3084,10 +3094,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Ändere die Transparenz der Header-Grafik.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Ändere die Transparenz der Footer-Grafik.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "Das Menü wird normalerweise automatisch skaliert. Wenn Du stattdessen eine bestimmte Skalierung wünschst, aktiviere diese Option.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Lege hier die gewünschte Skalierung fest. HINWEIS: Du musst 'DPI-Überschreibung' aktivieren, damit diese Skalierung verwendet wird.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Speichere alle heruntergeladenen Dateien in diesem Verzeichnis.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3782,7 +3788,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -4025,3 +4031,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Wiedergabeliste löschen")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_el.h

@@ -430,10 +430,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
     "Απενεργοποίηση αντικατάστασης SaveRAM κατά την φάση φόρτωσης κατάστασης αποθήκευσης"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
     "Ενεργοποίηση Bluetooth"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
     "Σύνδεσμος Εργαλείων του Buildbot"
@@ -770,14 +772,6 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
     "Λήψη Περιεχομένου"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-    "DPI Override Enable"
-    )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-    "DPI Override"
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
     "Οδηγοί"
@@ -1414,10 +1408,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
     "Οδηγός Joypad"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
     "Υπηρεσίες"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
     "Κινέζικα (Απλοποιημένα)"
@@ -2366,10 +2362,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
     "Εκκίνηση"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
     "Ενεργοποίηση SAMBA"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
     "Αρχείο Αποθήκευσης"
@@ -2542,10 +2540,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
     "Write Screenshots to Content Dir"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
     "Ενεργοποίηση SSH"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_START_CORE,
     "Έναρξη Πυρήνα"
@@ -3449,7 +3449,7 @@ MSG_HASH(
     "Menu Shader Pipeline"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
     "Menu Scale Factor"
     )
 MSG_HASH(
@@ -3604,10 +3604,12 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
     "Αλλαγή ρυθμίσεων εξόδου ήχου."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
     "Ενεργοποίηση ή απενεργοποίηση bluetooth."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
     "Αποθήκευση αλλαγών στο αρχείο διαμόρφωσης κατά την έξοδο."
@@ -3668,6 +3670,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
     "Κατεβάστε πρόσθετα, στοιχεία και περιεχόμενο για το RetroArch."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
     "Enable or disable network sharing of your folders."
@@ -3676,14 +3679,17 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
     "Manage operating system level services."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
     "Show hidden files/directories inside the file browser."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SSH_ENABLE,
     "Enable or disable remote command line access."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
     "Αποτρέπει την προφύλαξη οθόνης του συστήματος από το να ενεργοποιηθεί."
@@ -5643,15 +5649,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
     "Modify the opacity of the footer graphic."
     )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-    "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this."
-    )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "Set the custom scaling size here.\n"
-    "NOTE: You have to enable 'DPI Override' for this scaling size to take effect."
-    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
     "Save all downloaded files to this directory."
@@ -7859,7 +7856,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -8100,3 +8097,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_FRAME_TIME_COUNTER_SETTINGS,
       "Adjust settings influencing the frame time counter (only active when threaded video is disabled).")
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_eo.h

@@ -307,10 +307,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Don't overwrite SaveRAM on loading savestate"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Bluetooth Enable"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "Buildbot Assets URL"
@@ -514,10 +516,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Download Core...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Content Downloader")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "DPI Override Enable")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI Override")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -815,8 +813,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Input Autoconfig")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Joypad Driver")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Services")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Chinese (Simplified)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1235,8 +1235,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
       "Right Analog")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Run")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "SAMBA Enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Savefile")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1303,8 +1305,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "Sort Saves In Folders")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "Sort Savestates In Folders")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "SSH Enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Start Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1709,7 +1713,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Volcanic Red")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Menu Shader Pipeline")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Menu Scale Factor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Icon Shadows Enable")
@@ -1769,8 +1773,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Scan contents and add to the database.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Adjusts settings for audio output.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Enable or disable bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Saves changes to configuration file on exit.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1797,14 +1803,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Display core, network and system information.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Download add-ons, components and contents for RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Enable or disable network sharing of your folders.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Manage operating system level services.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Show hidden files/directories inside the file browser.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Enable or disable remote command line access.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Prevents your system's screensaver from becoming active.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -2860,10 +2870,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modify the opacity of the header graphic.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modify the opacity of the footer graphic.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Save all downloaded files to this directory.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3541,7 +3547,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -3784,3 +3790,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Forigi ludliston")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_es.h

@@ -457,10 +457,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
     "No sobrescribir SaveRAM al cargar"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
     "Activar Bluetooth"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
     "URL de recursos del Buildbot"
@@ -809,14 +811,6 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
     "Descargador de contenido"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-    "Forzar DPI"
-    )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-    "Anular DPI"
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
     "Controladores"
@@ -1468,10 +1462,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
     "Controlador de mando"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
     "Servicios"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
     "Chino (Simplificado)"
@@ -2434,10 +2430,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
     "Iniciar"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
     "Activar SAMBA"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
     "Partidas guardadas"
@@ -2610,10 +2608,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
     "Escribir capturas de pantalla en la carpeta del contenido"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
     "Activar SSH"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_START_CORE,
     "Iniciar núcleo"
@@ -3521,7 +3521,7 @@ MSG_HASH(
     "Menú Shader Pipeline"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
     "Escala del menú"
     )
 MSG_HASH(
@@ -3677,10 +3677,12 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
     "Opciones de salida de audio"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
     "Activar o desactivar Bluetooth"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
     "Guarda los cambios en el archivo de configuración al salir"
@@ -3749,6 +3751,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
     "Descarga componentes y contenido adicional para RetroArch"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
     "Activar o desactivar el compartido de carpetas en red"
@@ -3757,14 +3760,17 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
     "Administrar los servicios del sistema operativo"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
     "Mostrar archivos y carpetas ocultos en el explorador de archivos"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SSH_ENABLE,
     "Activar o desactivar acceso remoto por linea de comandos"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
     "Evita que el protector de pantalla se active"
@@ -5756,15 +5762,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
     "Modificar opacidad del pie de página"
     )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-    "El menú es escalado dinamicamente. Activar si desea un valor predefinido"
-    )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "Establecer DPI\n"
-    "NOTA: Debe activar 'Forzar DPI' para que tenga efecto"
-    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
     "Guardar archivos descargados en esta carpeta"
@@ -8011,7 +8008,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -8254,3 +8251,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Borrar lista de reproducción")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_fr.h

@@ -466,10 +466,12 @@ MSG_HASH(
          MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
          "Ne pas écraser la SRAM en chargeant la sauvegarde instantanée"
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
          "Bluetooth"
          )
+#endif
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
          "Adresse URL des assets sur le Buildbot "
@@ -822,14 +824,6 @@ MSG_HASH(
          MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
          "Téléchargement de contenu"
          )
-MSG_HASH(
-         MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-         "Remplacer la valeur des pixels/pouce"
-         )
-MSG_HASH(
-         MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-         "Valeur de remplacement des pixels/pouce"
-         )
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
          "Pilotes"
@@ -1505,10 +1499,12 @@ MSG_HASH(
          MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
          "Manettes "
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
          "Services"
          )
+#endif
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
          "Chinois (Simplifié)"
@@ -2507,10 +2503,12 @@ MSG_HASH(
          MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
          "Lancer"
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
          "SAMBA"
          )
+#endif
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
          "Fichiers de sauvegarde "
@@ -2683,10 +2681,12 @@ MSG_HASH(
          MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
          "Enregistrer les captures d'écran avec le contenu"
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
          "SSH"
          )
+#endif
 MSG_HASH(
          MENU_ENUM_LABEL_VALUE_START_CORE,
          "Démarrer le cœur"
@@ -3930,7 +3930,7 @@ MSG_HASH(
          "Pipeline de shader du menu (fond animé) "
          )
 MSG_HASH(
-         MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+         MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
          "Facteur d'échelle du menu "
          )
 MSG_HASH(
@@ -4094,10 +4094,12 @@ MSG_HASH(
          MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
          "Modifier les réglages de sortie audio."
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
          "Détermine l'état de Bluetooth."
          )
+#endif
 MSG_HASH(
          MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
          "Enregistrer les modifications dans le fichier de configuration à la sortie."
@@ -4166,6 +4168,7 @@ MSG_HASH(
          MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
          "Télécharger des add-ons, des composants et du contenu pour RetroArch."
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
          "Partager des dossiers réseau via le protocole SMB."
@@ -4174,14 +4177,17 @@ MSG_HASH(
          MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
          "Gérer les services au niveau du système d'exploitation."
          )
+#endif
 MSG_HASH(
          MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
          "Affiche les fichiers/dossiers cachés dans le navigateur de fichiers."
          )
+#ifdef HAVE_LAKKA
 MSG_HASH(
          MENU_ENUM_SUBLABEL_SSH_ENABLE,
          "Utiliser SSH pour accéder à la ligne de commande à distance."
          )
+#endif
 MSG_HASH(
          MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
          "Empêche l'économiseur d'écran de votre système de s'activer."
@@ -6244,15 +6250,6 @@ MSG_HASH(
          MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
          "Modifier l'opacité du graphique de pied de page."
          )
-MSG_HASH(
-         MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-         "Le menu est normalement redimensionné de manière dynamique. Si vous souhaitez définir une taille de mise à l'échelle spécifique, activez cette option."
-         )
-MSG_HASH(
-         MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-         "Définir la taille de mise à l'échelle personnalisée ici.\n"
-         "REMARQUE : Vous devez activer 'Remplacer la valeur des pixels/pouce' pour que cette taille d'échelle prenne effet."
-         )
 MSG_HASH(
          MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
          "Tous les fichiers téléchargés seront conservés dans ce dossier."
@@ -8799,7 +8796,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -9042,3 +9039,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Supprimer la liste de lecture")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_it.h

@@ -410,10 +410,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Non sovrascrivere il SaveRAM durante il caricamento del salvataggio"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Bluetooth Abilitato"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "URL degli asset Buildbot"
@@ -623,10 +625,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Scarica Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Downloader dei contenuti")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "DPI Override Abilitato")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI Override")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -933,8 +931,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Input Autoconfig")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Driver del Joypad ")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Servizi")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Cinese (Semplificato)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1384,8 +1384,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Avvia")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
       "Avvia")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "Abilita SAMBA")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Salvare il file")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1462,8 +1464,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE,
       "I file di sistema sono contenuti nella directory")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
       "Scrivi gli Screenshots contenuti nella directory")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "Abilita SSH")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Avvia Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1876,7 +1880,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Rosso vulcanico")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Menu Shader Pipeline")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Menu Scale Factor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Abilita Ombre delle Icone")
@@ -1944,8 +1948,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Effettua la scansione del contenuto e li aggiunge al database.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Modifica le impostazioni per l'uscita audio.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Abilita o disabilita il bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Salva le modifiche al file di configurazione all'uscita del programma.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1974,14 +1980,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Visualizza le informazioni dei core, di rete e di sistema.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Scarica add-ons, componenti, e contenuti per RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Attiva o disattiva la condivisione di rete delle tue cartelle")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Gestire i servizi del livello di sistema operativo.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Mostra file / directory nascoste all'interno del file browser.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Abilita o disabilita l'accesso alla riga di comando remota.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Impedisce che lo screensaver del tuo sistema diventi attivo.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -3086,10 +3096,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modifica l'opacità dell'intestazione grafica.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modifica l'opacità grafica a piè di pagina.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "Il menu normalmente si scala dinamicamente. Se si desidera impostare una dimensione specifica, abilitare l'opzione.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Impostare qui la dimensione della scala personalizzata. NOTA: è necessario abilitare l'opzione 'DPI Override' per scalare a questa dimensione.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Salva tutti i file scaricati in questa directory.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3762,7 +3768,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -4005,3 +4011,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Elimina scaletta")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_ja.h

@@ -482,10 +482,12 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
    "ステートロード時にセーブRAMを置き換えない"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
    "Bluetoothを有効"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
    "BuildbotのアセットURL"
@@ -850,14 +852,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
    "コンテンツをダウンロード"
 )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-   "DPI優先を有効"
-)
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-   "DPI優先"
-)
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
    "ドライバ"
@@ -1537,10 +1531,12 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
    "ジョイパッドのドライバ"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
    "Lakkaのサービス"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
    "中国語 (簡体)"
@@ -2661,10 +2657,12 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
    "実行"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
    "SAMBAを有効"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
    "セーブファイル"
@@ -2837,10 +2835,12 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
    "コンテンツフォルダにスクリーンショットを書き込む"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
    "SSHを有効"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_START_CORE,
    "コアをスタート"
@@ -4177,7 +4177,7 @@ MSG_HASH(
    "メニューのシェーダパイプライン"
 )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+   MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
    "メニューの倍率"
 )
 MSG_HASH(
@@ -4339,10 +4339,12 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
    "オーディオ出力の設定を変更します。"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
    "Bluetoothを有効します。"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
    "終了時に設定を自動的に保存します。"
@@ -4411,6 +4413,7 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
    "RetroArch用のアドオン, コンポーネント, コンテンツをダウンロードします。"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
    "フォルダのネットワーク共有を有効します。"
@@ -4419,14 +4422,17 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
    "OSに関係するサービスを管理します。"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
    "ファイルブラウザの中に隠しファイルとフォルダを表示します。"
 )
+#ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SSH_ENABLE,
    "SSHでのアクセスを有効します。"
 )
+#endif
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
    "システムのスクリーンセーバが起動するのを抑制します。"
@@ -6572,16 +6578,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
    "フッタの不透明度を調整します。"
 )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-   "通常, メニューは動的にスケールされます。 "
-   "特定のスケールサイズを指定したい場合に有効にしてください。"
-)
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-   "カスタムスケールサイズを指定します。 "
-   "備考: このスケールサイズを反映するには, [優先DPI]を有効にする必要があります。"
-)
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
    "すべてのダウンロードしたファイルをこのフォルダに保存します。"
@@ -9231,10 +9227,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_DISC_INFORMATION,
    "挿入されたディスクの情報を表示します。"
 )
-MSG_HASH(
-   MSG_INCOMPATIBLE_CORE_FOR_VIDEO_DRIVER,
-   "このコアは設定されたビデオドライバに対応しません。"
-)
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_QT_RESET,
    "リセット"
@@ -9321,7 +9313,7 @@ MSG_HASH(
    "AIサービス有効"
 )
 MSG_HASH(
-   MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
+   MENU_ENUM_SUBLABEL_AI_SERVICE_MODE, /* TODO/FIXME - update this - see US original */
    "'Image mode'は翻訳中にゲームを一時停止, 'Speech mode'は実行継続します。"
 )
 MSG_HASH(
@@ -9749,3 +9741,23 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
     "プレイリストを削除"
     )
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_ko.h

@@ -473,10 +473,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
     "저장상태 불러올 때 SaveRAM 덮어쓰지 않기"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
     "블루투스 사용"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
     "빌드봇 애셋 URL"
@@ -841,14 +843,6 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
     "컨텐츠 다운로더"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-    "DPI 오버라이드 허용"
-    )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-    "DPI 오버라이드"
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
     "드라이버"
@@ -1528,10 +1522,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
     "조이패드 드라이버"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
     "서비스"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
     "중국어 (간체)"
@@ -2642,10 +2638,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
     "재생"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
     "SAMBA 사용"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
     "세이브파일"
@@ -2818,10 +2816,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
     "스크린샷을 컨텐츠 폴더에 저장"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
     "SSH 사용"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_START_CORE,
     "코어 실행"
@@ -4159,7 +4159,7 @@ MSG_HASH(
     "메뉴 쉐이더 파이프라인"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
     "메뉴 크기 요소"
     )
 MSG_HASH(
@@ -4323,10 +4323,12 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
     "오디오 출력 설정을 변경합니다."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
     "블루투스를 사용/해제합니다."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
     "종료 시 변경된 설정을 저장합니다."
@@ -4395,6 +4397,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
     "RetroArch용 애드온, 구성요소 및 컨텐츠를 다운로드합니다."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
     "네트워크 폴더 공유를 설정합니다."
@@ -4403,14 +4406,17 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
     "OS 수준 서비스를 관리합니다."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
     "파일 탐색기에 숨김 파일/폴더를 보입니다."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SSH_ENABLE,
     "원격 명령줄의 접근 사용을 설정합니다."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
     "시스템 화면보호기의 동작을 방지합니다."
@@ -6497,15 +6503,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
     "푸터 그래픽의 투명도를 변경합니다."
     )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-    "메뉴는 일반적으로 동적으로 조정됩니다. 특정 크기를 설정하려면 이 옵션을 활성화하십시오."
-    )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "사용자 정의 크기 조정을 설정합니다.\n"
-    "참고:크기조정을 적용하려면 'DPI 오버라이드'를 활성화해야합니다."
-    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
     "모든 다운로드 파일을 이 디렉토리에 저장합니다."
@@ -9107,10 +9104,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_DISC_INFORMATION,
     "삽입된 미디어 디스크의 정보를 봅니다."
     )
-MSG_HASH(
-    MSG_INCOMPATIBLE_CORE_FOR_VIDEO_DRIVER,
-    "현재 코어가 비디오 드라이버와 호환되지 않습니다."
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_RESET,
     "초기화"
@@ -9185,7 +9178,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
       "AI 서비스 URL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI 서비스 사용")
-MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
+MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE, /* TODO/FIXME - update this - see US original */
       "번역하는 동안 게임을 일시정지(이미지모드) 하거나 계속해서 실행(음성모드)합니다")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "번역 서비스에서 사용할 http:// 주소입니다.")
@@ -9605,3 +9598,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
       "메뉴를 열때 발생하는 애니메이션입니다.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "재생목록 삭제")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_lbl.h

@@ -82,8 +82,10 @@ MSG_HASH(MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE,
       "auto_shaders_enable")
 MSG_HASH(MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE,
       "block_sram_overwrite")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_BLUETOOTH_ENABLE,
       "bluetooth_enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL,
       "buildbot_assets_url")
 MSG_HASH(MENU_ENUM_LABEL_CACHE_DIRECTORY,
@@ -463,10 +465,8 @@ MSG_HASH(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS,
       "download_core_content_dirs")
 MSG_HASH(MENU_ENUM_LABEL_CONTENT_DIR,
       "content_directory")
-MSG_HASH(MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,
-      "dpi_override_enable")
-MSG_HASH(MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,
-      "dpi_override_value")
+MSG_HASH(MENU_ENUM_LABEL_MENU_SCALE_FACTOR,
+      "menu_scale_factor")
 MSG_HASH(MENU_ENUM_LABEL_DRIVER_SETTINGS,
       "driver_settings")
 MSG_HASH(MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE,
@@ -727,6 +727,8 @@ MSG_HASH(MENU_ENUM_LABEL_OZONE_SCROLL_CONTENT_METADATA,
       "ozone_scroll_content_metadata")
 MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,
       "materialui_menu_color_theme")
+MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_MENU_TRANSITION_ANIMATION,
+      "materialui_menu_transition_animation")
 MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "materialui_menu_footer_opacity")
 MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_MENU_HEADER_OPACITY,
@@ -1129,8 +1131,10 @@ MSG_HASH(MENU_ENUM_LABEL_RUN,
       "collection")
 MSG_HASH(MENU_ENUM_LABEL_RUN_MUSIC,
       "collection_music")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_SAMBA_ENABLE,
       "samba_enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_SAVEFILE_DIRECTORY,
       "savefile_directory")
 MSG_HASH(MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX,
@@ -1209,8 +1213,10 @@ MSG_HASH(MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE,
       "systemfiles_in_content_dir_enable")
 MSG_HASH(MENU_ENUM_LABEL_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
       "screenshots_in_content_dir_enable")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_SSH_ENABLE,
       "ssh_enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_START_CORE,
       "start_core")
 MSG_HASH(MENU_ENUM_LABEL_START_NET_RETROPAD,
@@ -1501,8 +1507,6 @@ MSG_HASH(MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME,
       "xmb_menu_color_theme")
 MSG_HASH(MENU_ENUM_LABEL_XMB_RIBBON_ENABLE,
       "xmb_ribbon_enable")
-MSG_HASH(MENU_ENUM_LABEL_XMB_SCALE_FACTOR,
-      "xmb_scale_factor")
 MSG_HASH(MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE,
       "xmb_shadows_enable")
 MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY,
@@ -1661,6 +1665,10 @@ MSG_HASH(MENU_ENUM_LABEL_GOTO_VIDEO,
       "goto_video")
 MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE,
       "materialui_icons_enable")
+MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,
+      "materialui_optimize_landscape_layout")
+MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR,
+      "materialui_auto_rotate_nav_bar")
 MSG_HASH(MENU_ENUM_LABEL_RENAME_ENTRY,
       "rename_entry")
 MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_LOAD_CORE,
@@ -2087,3 +2095,11 @@ MSG_HASH(MENU_ENUM_LABEL_FRAME_TIME_COUNTER_RESET_AFTER_SAVE_STATE,
       "frame_time_counter_reset_after_save_state")
 MSG_HASH(MENU_ENUM_LABEL_DELETE_PLAYLIST,
       "delete_playlist")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_LOCALAP_ENABLE,
+      "localap_enable")
+#endif
+MSG_HASH(MENU_ENUM_LABEL_DRIVER_SWITCH_ENABLE,
+      "driver_switch_enable")
+MSG_HASH(MENU_ENUM_LABEL_AI_SERVICE_PAUSE,
+      "ai_service_pause")

intl/msg_hash_nl.h

@@ -307,10 +307,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "SaveRAM niet overschrijven tijdens laden van savestate"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Bluetooth Activeren"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "Buildbot Assets URL"
@@ -514,10 +516,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Download Core...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Download Inhoud")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "DPI Override Activeren")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI Override")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -814,8 +812,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Invoerapparaten Autoconfiguratie")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Joypad Driver")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Services")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Chinees (Gesimplificeerd)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1237,8 +1237,10 @@ MSG_HASH(
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Run")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "SAMBA Enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Savebestand")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1305,8 +1307,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "Saves Sorteren In Map")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "Savestates Sorteren In Map")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "SSH Enable")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Start Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1711,7 +1715,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Vulkanisch Rood")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Menu Shader Pipeline")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Menu Scale Factor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Icon Shadows Enable")
@@ -1771,8 +1775,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Scan contents and add to the database.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Adjusts settings for audio output.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Enable or disable bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Saves changes to configuration file on exit.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1799,14 +1805,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Toon core, netwerk en systeem informatie.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Download add-ons, components and contents for RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Enable or disable network sharing of your folders.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Manage operating system level services.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Show hidden files/directories inside the file browser.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Enable or disable remote command line access.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Prevents your system's screensaver from becoming active.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -2865,10 +2875,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modify the opacity of the header graphic.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modify the opacity of the footer graphic.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Save all downloaded files to this directory.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3535,7 +3541,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Ingeschakeld")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -3778,3 +3784,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Afspeellijst verwijderen")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_pl.h

@@ -422,10 +422,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Nie zastępuj SaveRAM przy ładowaniu stanu zapisu"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Włącz Bluetooth"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "Adres URL zasobów Buildbot"
@@ -651,10 +653,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Pobierz rdzeń...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Program do pobierania treści")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "Zastąp włączone DPI")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "Nadpisz DPI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Sterowniki")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -965,8 +963,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Wprowadź autoconfig")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Sterownik joypada")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Usługi")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "chiński (uproszczony)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1440,8 +1440,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Uruchom")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
       "Uruchom muzykę")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "Włącz SAMBA")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Zapisz plik")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1528,8 +1530,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE,
       "Pliki systemowe znajdują się w katalogu treści")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
       "Zapisuj zrzuty ekranu w katalog treści")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "Włącz SSH")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Rozpocznij rdzeń")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1958,7 +1962,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Czerwień wulkaniczna")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Animowany efekt tłą")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Współczynnik skali menu")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Włącz cienie ikony")
@@ -2036,8 +2040,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Skanuj zawartość i dodaj do bazy danych.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Zmień ustawienia wyjścia audio.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Włącz lub wyłącz bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Zapisuje zmiany w pliku konfiguracyjnym przy wyjściu.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -2066,16 +2072,20 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Wyświetl informacje o systemie.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Pobierz dodatki, komponenty i treści do RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Włącz lub wyłącz udostępnianie sieciowe folderów.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Zarządzaj usługami na poziomie systemu operacyjnego.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Pokaż ukryte pliki/katalogi w przeglądarce plików.")
 MSG_HASH(MENU_ENUM_SUBLABEL_LATENCY_SETTINGS,
       "Zmień ustawienia związane z wideo, dźwiękiem i opóźnieniem sygnału wejściowego.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Włącz lub wyłącz zdalny dostęp do wiersza poleceń.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Zapobiega włączaniu wygaszacza ekranu systemu.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -3211,10 +3221,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Zmodyfikuj krycie grafiki nagłówka.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Zmodyfikuj krycie grafiki stopki.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "Menu zazwyczaj dynamicznie się skaluje. Jeśli chcesz zamiast tego ustawić określony rozmiar skalowania, włącz to.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Ustaw tutaj niestandardowy rozmiar skalowania. UWAGA: Musisz włączyć 'DPI Override', aby ten rozmiar skali zaczął obowiązywać.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Zapisz wszystkie pobrane pliki w tym katalogu.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -4317,7 +4323,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
       "Adres URL usługi AI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "Usługa AI włączona")
-MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
+MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE, /* TODO/FIXME - update this - see US original */
       "Wstrzymuje grę podczas tłumaczenia (tryb obrazu) lub kontynuuje działanie (tryb mowy)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "Adres URL http: // wskazujący na usługę tłumaczeniową do użycia.")
@@ -4625,3 +4631,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_FPS_UPDATE_INTERVAL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
     "Usuń listę odtwarzania"
     )
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_pt_br.h

@@ -473,10 +473,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
     "Não Sobregravar a SRAM ao Carregar Estado de Jogo"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
     "Habilitar Bluetooth"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
     "URL de Recursos do Buildbot"
@@ -841,14 +843,6 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
     "Download de Conteúdo"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-    "Habilitar Redefinição de DPI"
-    )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-    "Redefinição de DPI"
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
     "Driver"
@@ -1528,10 +1522,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
     "Joypad"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
     "Serviços"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
     "Chinês (Simplificado)"
@@ -2642,10 +2638,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
     "Executar"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
     "Habilitar SAMBA"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
     "Arquivo de Jogo-Salvo"
@@ -2818,10 +2816,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
     "Salvar Capturas de Tela no Diretório de Conteúdo"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
     "Habilitar SSH"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_START_CORE,
     "Iniciar Núcleo"
@@ -4159,7 +4159,7 @@ MSG_HASH(
     "Pipeline do Shader de Menu"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
     "Fator de Escala do Menu"
     )
 MSG_HASH(
@@ -4323,10 +4323,12 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
     "Altera as configurações de saída de áudio."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
     "Habilita ou desabilita o bluetooth."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
     "Salva as alterações nos arquivos de configuração ao sair."
@@ -4395,6 +4397,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
     "Baixa complementos, componentes e conteúdo para o RetroArch."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
     "Habilita ou desabilita o compartilhamento de pastas na rede."
@@ -4403,14 +4406,17 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
     "Gerencia serviços ao nível de sistema operacional."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
     "Exibe arquivos/diretórios ocultos no navegador de arquivos."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SSH_ENABLE,
     "Habilita ou desabilita o acesso remoto à linha de comando."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
     "Evita que a proteção de tela do seu sistema seja ativada."
@@ -6501,15 +6507,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
     "Modifica a opacidade do gráfico do rodapé."
     )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-    "O menu normalmente se dimensiona dinamicamente. Se você desejar definir uma escala de tamanho específica em vez disto, habilite esta função."
-    )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "Define o tamanho do dimensionamento personalizado aqui.\n"
-    "OBS: Você deve habilitar a função 'Redefinição de DPI' para que este dimensionamento tenha efeito."
-    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
     "Salva todos os arquivos baixados neste diretório."
@@ -9111,10 +9108,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_DISC_INFORMATION,
     "Ver informações sobre discos de mídia inseridos."
     )
-MSG_HASH(
-    MSG_INCOMPATIBLE_CORE_FOR_VIDEO_DRIVER,
-    "Este núcleo não é compatível com o driver de vídeo atual."
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_RESET,
     "Reiniciar"
@@ -9189,7 +9182,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
       "URL do Serviço de IA")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "Serviço de IA Habilitado")
-MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
+MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE, /* TODO/FIXME - update this - see US original */
       "Interrompe o jogo durante a tradução (modo Imagem) ou continua em execução (modo Fala)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "Um endereço http:// url apontando para o serviço de tradução a ser usado.")
@@ -9609,3 +9602,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
       "A animação que é acionada ao abrir um submenu.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Excluir lista de reprodução")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_pt_pt.h

@@ -370,10 +370,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Não substituir o SaveRAM no carregamento do estado de gravação"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Ativar Bluetooth"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "URL dos recursos do buildbot"
@@ -579,10 +581,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Transferir núcleo...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Descarregador de conteúdo")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "Ativar sobreposição de DPI")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "Sobreposição de DPI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Controlador")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -879,8 +877,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Entrada de auto-configuração")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Controlador de comandos")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Serviços")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Chinês (Simplificado)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1314,8 +1314,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
       "Analógico direito")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Executar")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "Ativar SAMBA")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Guardar ficheiro")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1384,8 +1386,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "Ordenação de gravação em pastas")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "Ordenação de gravação de estado em pastas")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "Ativar SSH")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Iniciar núcleo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1788,7 +1792,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Vermelho vulcânico")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Shader do canal do menu")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Fator de escala do menu")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Ativar sombras nos ícones")
@@ -1850,8 +1854,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Procurar por conteúdo e adicionar à base de dados.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Modificar as definições de saída de som.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Ativar/desativar Bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Guardar as alterações nos ficheiros de configuração ao sair.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1880,14 +1886,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Mostrar informações do núcleo, rede e sistema.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Transferir complementos, componentes e conteúdos para o RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Ativar/desativar partilha de pastas na rede.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Gerir o nível de serviços do sistema operativo.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Mostrar ficheiros/pastas escondidos no explorador de ficheiros.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Ativar/desativar acesso remoto pela linha de comandos.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Prevenir a ativação do protetor de ecrã do sistema.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -2943,10 +2953,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modificar a opacidade do gráfico do cabeçalho.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modificar a opacidade do gráfico do rodapé.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "O menu normalmente irá redimensionar-se, de forma dinâmica. Se você desejar definir uma dimensão em vez disso, ative esta opção.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Definir o tamanho do dimensionamento personalizado aqui. OBS: Você deve ativar a opção 'Sobreposição de DPI' para que este dimensionamento surta efeito.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Guardar todos os ficheiros transferidos nesta pasta.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3607,7 +3613,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -3850,3 +3856,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Apagar a lista de reprodução")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_ru.h

@@ -382,10 +382,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Не перезаписывать SaveRAM при загрузке сохранений"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Включить Bluetooth"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "Создание ботов URL"
@@ -595,10 +597,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Загрузка ядра...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Загрузка содержимого")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "Разрешить переопределение DPI")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "Переопределение DPI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Драйвер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -897,8 +895,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Преднастроенные контроллеры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Драйвер геймпада")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Сервисы")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Китайский (Простой)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1340,8 +1340,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Запустить")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
       "Запустить")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "Включить SAMBA")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Сохранения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1410,8 +1412,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "Сохранить сортировку в папках")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "Сортировать сохранения в папках")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "SSH включён")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Запустить ядро")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1824,7 +1828,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Вулканический красный")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Шейдерный фон меню")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Масштаб в меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Отображение теней у иконок")
@@ -1890,8 +1894,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Сканировать содержимое и добавить в базу данных.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Настройка параметров аудиовыхода.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Включить или отключить Bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Сохраняет изменения в файле конфигурации при выходе.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1920,14 +1926,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Показать информацию о ядре, сети и системе.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Загрузите надстройки, компоненты и содержимое для RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Включить или отключить сетевой доступ к папкам.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Управление службами операционной системы.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Показывать скрытые файлы/каталоги внутри файлового менеджера.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Включить или отключить удаленный доступ к командной строке.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Запрещается активация скринсейвера вашей системы.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -3014,10 +3024,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Изменение прозрачность графического заголовка.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Изменение прозрачности графика нижнего колонтитула.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "Меню интерфейса обычно сам подстраивается. Если вы хотите изменить DPI под свой вкус, то включите эту функцию.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Установить свой размер масштабирования. ПРИМЕЧАНИЕ: Вы должны включить 'DPI Override', чтобы эти изменения заработали.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Сохранять все закаченные файлы в этой папке.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3805,7 +3811,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -4048,3 +4054,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Удалить список воспроизведения")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_tr.h

@@ -473,10 +473,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
     "Savestate'i yüklerken SaveRAM'in üzerine yazma"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
     "Bluetooth"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
     "Buildbot İçerikleri URL’si"
@@ -833,14 +835,6 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
     "İçerik İndir"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-    "DPI Üzerine yazma"
-    )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-    "DPI Üzerine yazma"
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
     "Sürücüler"
@@ -1520,10 +1514,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
     "Joypad"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
     "Servisler"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
     "Çince (Basitleştirilmiş)"
@@ -2598,10 +2594,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
     "Başlat"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
     "SAMBA"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
     "Kayıt Dosyası"
@@ -2774,10 +2772,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
     "Ekran görüntülerini içerik dizinine yaz"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
     "SSH"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_START_CORE,
     "Çekirdeği Başlat"
@@ -3991,7 +3991,7 @@ MSG_HASH(
     "Menü Gölgelendirici Hattı"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
     "Menü Ölçeklendirme Faktörü"
     )
 MSG_HASH(
@@ -4150,10 +4150,12 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
     "Ses çıkışı ayarlarını değiştirin."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
     "Bluetooth durumunu belirler."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
     "Çıkışta yapılandırma dosyasındaki değişiklikleri kaydeder."
@@ -4222,6 +4224,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
     "RetroArch için eklentiler, bileşenler ve içerikler indirin."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
     "Ağ klasörlerini SMB protokolü ile paylaşın."
@@ -4230,14 +4233,17 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
     "İşletim sistemi düzeyinde servisleri yönetin."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
     "Dosya tarayıcısının içindeki gizli dosyaları/dizinleri göster."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SSH_ENABLE,
     "Uzaktan komut satırına erişmek için SSH kullanın."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
     "Sisteminizin ekran koruyucusunun aktif hale gelmesini önler."
@@ -6292,15 +6298,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
     "Altbilgi grafiğinin opaklığını değiştirin."
     )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-    "Menü normalde kendini dinamik olarak ölçeklendirir. Bunun yerine belirli bir ölçekleme boyutu ayarlamak istiyorsanız, bunu etkinleştirin."
-    )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "Özel ölçeklendirme boyutunu buradan ayarlayın.\n"
-    "NOT: Ölçeklendirme boyutunun etkili olması için 'DPI Geçersiz Kılma'yı etkinleştirmeniz gerekir."
-    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
     "İndirilen tüm dosyaları bu dizine kaydedin."
@@ -8810,7 +8807,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
       "AI Servis URL'si")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Servisi Etkinleştirildi")
-MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
+MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE, /* TODO/FIXME - update this - see US original */
       "Çeviri sırasında oyunu duraklatır (Görüntü modu) veya çalışmaya devam eder (Konuşma modu)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "Kullanılacak çeviri hizmetini gösteren bir http:// url'si.")
@@ -9054,3 +9051,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Yalnızca eski metin sistemi yerine modern dekore edilmiş animasyonları, bildirimleri, göstergeleri ve kontrolleri kullanın.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Parça listesini sil")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

intl/msg_hash_us.h

@@ -465,10 +465,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
     "Don't overwrite SaveRAM on loading savestate"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
     "Bluetooth"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
     "Buildbot Assets URL"
@@ -834,12 +836,12 @@ MSG_HASH(
     "Content Downloader"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-    "DPI Override"
+    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
+    "Menu Scale Factor"
     )
 MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-    "DPI Override"
+    MENU_ENUM_SUBLABEL_MENU_SCALE_FACTOR,
+    "Applies a global scaling factor when drawing the menu. Can be used to increase or decrease the size of the user interface."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
@@ -1538,10 +1540,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
     "Joypad"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
     "Services"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
     "Chinese (Simplified)"
@@ -1730,6 +1734,54 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
     "Yellow"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI,
+    "Material UI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI_DARK,
+    "Material UI Dark"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_OZONE_DARK,
+    "Ozone Dark"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NORD,
+    "Nord"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GRUVBOX_DARK,
+    "Gruvbox Dark"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_SOLARIZED_DARK,
+    "Solarized Dark"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIMATION,
+    "Menu Transition Animation"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_MENU_TRANSITION_ANIMATION,
+    "Enable smooth animation effects when navigating between different levels of the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_AUTO,
+    "Auto"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_FADE,
+    "Fade"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_SLIDE,
+    "Slide"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_NONE,
+    "OFF"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY,
     "Footer Opacity"
@@ -2652,10 +2704,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
     "Run"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
     "SAMBA"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
     "Savefile"
@@ -2828,10 +2882,12 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
     "Write Screenshots to Content Dir"
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
     "SSH"
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_START_CORE,
     "Start Core"
@@ -4192,10 +4248,6 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
     "Menu Shader Pipeline"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
-    "Menu Scale Factor"
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
     "Icon Shadows"
@@ -4357,10 +4409,12 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
     "Change audio output settings."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
     "Determines the state of Bluetooth."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
     "Saves changes to the configuration file on exit."
@@ -4429,6 +4483,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
     "Download add-ons, components, and content for RetroArch."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
     "Share network folders through the SMB protocol."
@@ -4437,14 +4492,17 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
     "Manage operating system level services."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
     "Show hidden files/directories inside the file browser."
     )
+#ifdef HAVE_LAKKA
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SSH_ENABLE,
     "Use SSH to access the command line remotely."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
     "Prevents your system's screensaver from becoming active."
@@ -6535,15 +6593,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
     "Modify the opacity of the footer graphic."
     )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-    "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this."
-    )
-MSG_HASH(
-    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "Set the custom scaling size here.\n"
-    "NOTE: You have to enable 'DPI Override' for this scaling size to take effect."
-    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
     "Save all downloaded files to this directory."
@@ -6882,6 +6931,22 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE,
     "Show icons at the left of the menu entries."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,
+    "Optimize Landscape Layout"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,
+    "Automatically adjust menu layout to better fit the screen when using landscape display orientations."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_AUTO_ROTATE_NAV_BAR,
+    "Auto-Rotate Navigation Bar"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR,
+    "Automatically move the navigation bar to the right hand side of the screen when using landscape display orientations."
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS,
     "Settings Tab"
@@ -9202,10 +9267,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_DISC_INFORMATION,
     "View information about inserted media discs."
     )
-MSG_HASH(
-    MSG_INCOMPATIBLE_CORE_FOR_VIDEO_DRIVER,
-    "This core is not compatible with the current video driver."
-    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_RESET,
     "Reset"
@@ -9281,7 +9342,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -9700,3 +9761,31 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
       "The animation that triggers when opening a submenu.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Delete Playlist")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SWITCH_ENABLE,
+      "Allow cores to switch the video driver")
+MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SWITCH_ENABLE,
+      "Allow cores to force switch to a different video driver than is currently loaded.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_PAUSE,
+      "AI Service Pause Toggle")
+MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_PAUSE,
+      "Pauses core while screen is translated.")

intl/msg_hash_vn.h

@@ -382,10 +382,12 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
       "Khi tải savestate đừng ghi đè SaveRAM"
       )
+#ifdef HAVE_LAKKA
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
       "Kích hoạt Bluetooth"
       )
+#endif
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
       "URL của Buildbot Assets"
@@ -591,10 +593,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
       "Tải về Core...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
       "Tải về nội dung")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "DPI Override Enable")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "Kích hoạt DPI Override")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Trình điều khiển")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
@@ -900,8 +898,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
       "Input Autoconfig Danh mục")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
       "Joypad Driver")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
       "Services")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Tiếng Trung Quốc (Chữ Hán giản thể)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -1343,8 +1343,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
       "Right Analog")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Run")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
       "Kích hoạt SAMBA")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
       "Savefile Danh mục")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
@@ -1413,8 +1415,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
       "Sort Saves In Folders")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
       "Sort Savestates In Folders")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
       "Kích hoạt SSH")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
       "Start Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
@@ -1821,7 +1825,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
       "Volcanic Red")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
       "Menu Shader Pipeline")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
       "Menu Scale Factor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
       "Kích hoạt Icon Shadows")
@@ -1887,8 +1891,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
       "Tải/quét nội dung và thêm vào bộ sưu tập.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
       "Điều chỉnh thiết lập cho âm thanh ra.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Bật/tắt bluetooth.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "Lưu cấu hình khi thoát retroarch.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
@@ -1917,14 +1923,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
       "Display core, network, and system information.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
       "Tải/cập nhật tiện ích và thành phần của RetroArch.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "Bật/tắt chia sẻ thư mục trên mạng.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
       "Quản lý dịch vụ của hệ điều hành.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
       "Hiện ra tập tin và thư mục ẩn trong trình duyệt tập tin.")
+#ifdef HAVE_LAKKA
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "Bật/tắt giao thức SSH.")
+#endif
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Chặn tính năng screensaver (màn hình chờ).")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
@@ -3022,10 +3032,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
       "Modify the opacity of the header graphic.")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
       "Modify the opacity of the footer graphic.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
-      "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.")
-MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-      "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
       "Save all downloaded files to this directory.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
@@ -3699,7 +3705,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AI_SERVICE_ENABLE,
       "AI Service Enabled")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
-      "Pauses gameplay during translation (Image mode), or continues to run (Speech mode)")
+      "Show translation as a text overlay (Image mode), or play as Text-To-Speech (Speech mode)")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_URL,
       "A http:// url pointing to the translation service to use.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AI_SERVICE_ENABLE,
@@ -3942,3 +3948,23 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE,
       "Use modern decorated animations, notifications, indicators and controls instead of the old text only system.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_PLAYLIST,
       "Xoá danh mục")
+#ifdef HAVE_LAKKA
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+      "Wi-Fi Access Point")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOCALAP_ENABLE,
+      "Enable or disable Wi-Fi Access Point.")
+MSG_HASH(MSG_LOCALAP_SWITCHING_OFF,
+      "Switching off Wi-Fi Access Point.")
+MSG_HASH(MSG_WIFI_DISCONNECT_FROM,
+      "Disconnecting from Wi-Fi '%s'")
+MSG_HASH(MSG_LOCALAP_ALREADY_RUNNING,
+      "Wi-Fi Access Point is already started")
+MSG_HASH(MSG_LOCALAP_NOT_RUNNING,
+      "Wi-Fi Access Point is not running")
+MSG_HASH(MSG_LOCALAP_STARTING,
+      "Starting Wi-Fi Access Point with SSID=%s and Passkey=%s")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_CREATE,
+      "Could not create Wi-Fi Access Point configuration file.")
+MSG_HASH(MSG_LOCALAP_ERROR_CONFIG_PARSE,
+     "Wrong configuration file - could not find APNAME or PASSWORD in %s")
+#endif

lakka.h

@@ -23,6 +23,7 @@
 #define LAKKA_BLUETOOTH_PATH "/storage/.cache/services/bluez.conf"
 #define LAKKA_UPDATE_DIR     "/storage/.update/"
 #define LAKKA_CONNMAN_DIR    "/storage/.cache/connman/"
+#define LAKKA_LOCALAP_PATH   "/storage/.cache/services/localap.conf"
 
 #include "switch_performance_profiles.h"
 

libretro-common/audio/conversion/float_to_s16_neon.S

@@ -19,7 +19,7 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
 
 #ifndef __MACH__
 .arm

libretro-common/audio/conversion/float_to_s16_neon.c

@@ -19,7 +19,7 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
 
 #if defined(__thumb__)
 #define DECL_ARMMODE(x) "  .align 2\n" "  .global " x "\n" "  .thumb\n" "  .thumb_func\n" "  .type " x ", %function\n" x ":\n"

libretro-common/audio/conversion/s16_to_float_neon.S

@@ -19,7 +19,7 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
 
 #ifndef __MACH__
 .arm

libretro-common/audio/conversion/s16_to_float_neon.c

@@ -19,7 +19,7 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
 
 #if defined(__thumb__)
 #define DECL_ARMMODE(x) "  .align 2\n" "  .global " x "\n" "  .thumb\n" "  .thumb_func\n" "  .type " x ", %function\n" x ":\n"

libretro-common/audio/resampler/drivers/sinc_resampler_neon.S

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
 
 #ifndef __MACH__
 .arm

libretro-common/include/glsym/rglgen_headers.h

@@ -28,55 +28,7 @@
 #include <EGL/eglext.h>
 #endif
 
-#if defined(IOS)
-
-#if defined(HAVE_OPENGLES3)
-#include <OpenGLES/ES3/gl.h>
-#include <OpenGLES/ES3/glext.h>
-#else
-#include <OpenGLES/ES2/gl.h>
-#include <OpenGLES/ES2/glext.h>
-#endif
-
-#elif defined(__APPLE__)
-#include <compat/apple_compat.h>
-#if MAC_OS_X_VERSION_10_7
-#include <OpenGL/gl3.h>
-#include <OpenGL/gl3ext.h>
-#else
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
-#endif
-#elif defined(HAVE_PSGL)
-#include <PSGL/psgl.h>
-#include <GLES/glext.h>
-#elif defined(HAVE_OPENGL_MODERN)
-#include <GL3/gl3.h>
-#include <GL3/gl3ext.h>
-#elif defined(HAVE_OPENGLES3)
-#include <GLES3/gl3.h>
-#define __gl2_h_
-#include <GLES2/gl2ext.h>
-#elif defined(HAVE_OPENGLES2)
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#elif defined(HAVE_OPENGLES1)
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#else
-#if defined(_WIN32) && !defined(_XBOX)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-#ifndef HAVE_LIBNX
-#include <GL/gl.h>
-#include <GL/glext.h>
-#else
-/* We need to avoid including <GL/gl.h> on this platform */
-#include "switch/nx_gl.h"
-#include <GL/glext.h>
-#endif /* SWITCH */
-#endif
+#include "rglgen_private_headers.h"
 
 #ifndef GL_MAP_WRITE_BIT
 #define GL_MAP_WRITE_BIT 0x0002

libretro-common/include/glsym/rglgen_private_headers.h

@@ -0,0 +1,76 @@
+/* Copyright (C) 2010-2019 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this libretro SDK code part (glsym).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef RGLGEN_PRIVATE_HEADERS_H__
+#define RGLGEN_PRIVATE_HEADERS_H__
+
+#if defined(IOS)
+
+#if defined(HAVE_OPENGLES3)
+#include <OpenGLES/ES3/gl.h>
+#include <OpenGLES/ES3/glext.h>
+#else
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#endif
+
+#elif defined(__APPLE__)
+#include <compat/apple_compat.h>
+#if MAC_OS_X_VERSION_10_7
+#include <OpenGL/gl3.h>
+#include <OpenGL/gl3ext.h>
+#else
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#endif
+#elif defined(HAVE_PSGL)
+#include <PSGL/psgl.h>
+#include <GLES/glext.h>
+#elif defined(HAVE_OPENGL_MODERN)
+#include <GL3/gl3.h>
+#include <GL3/gl3ext.h>
+#elif defined(HAVE_OPENGLES3)
+#include <GLES3/gl3.h>
+#define __gl2_h_
+#include <GLES2/gl2ext.h>
+#elif defined(HAVE_OPENGLES2)
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#elif defined(HAVE_OPENGLES1)
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#else
+#if defined(_WIN32) && !defined(_XBOX)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+#ifndef HAVE_LIBNX
+#include <GL/gl.h>
+#include <GL/glext.h>
+#else
+/* We need to avoid including <GL/gl.h> on this platform */
+#include "switch/nx_gl.h"
+#include <GL/glext.h>
+#endif /* SWITCH */
+#endif
+
+#endif

libretro-common/include/libretro.h

@@ -1248,6 +1248,16 @@ enum retro_mod
                                             * default when calling SET_VARIABLES/SET_CORE_OPTIONS.
                                             */
 
+#define RETRO_ENVIRONMENT_GET_PREFERRED_HW_RENDER 56
+                                           /* unsigned * --
+                                            *
+                                            * Allows an implementation to ask frontend preferred hardware
+                                            * context to use. Core should use this information to deal
+                                            * with what specific context to request with SET_HW_RENDER.
+                                            *
+                                            * 'data' points to an unsigned variable
+                                            */
+											
 /* VFS functionality */
 
 /* File paths:

libretro-common/include/rthreads/rthreads.h

@@ -245,11 +245,25 @@ void *sthread_tls_get(sthread_tls_t *tls);
 /**
  * @brief Binds thread specific data to a key
  * @param tls
- * @return whether the operation suceeded or not
+ * @return Whether the operation suceeded or not
  */
 bool sthread_tls_set(sthread_tls_t *tls, const void *data);
 #endif
 
+/*
+ * @brief Get thread ID of specified thread
+ * @param thread
+ * @return The ID of the specified thread
+ */
+uintptr_t sthread_get_thread_id(sthread_t *thread);
+
+/*
+ * @brief Get thread ID of the current thread
+ * @param 
+ * @return The ID of the current thread
+ */
+uintptr_t sthread_get_current_thread_id(void);
+
 RETRO_END_DECLS
 
 #endif

libretro-common/rthreads/rthreads.c

@@ -940,3 +940,19 @@ bool sthread_tls_set(sthread_tls_t *tls, const void *data)
 #endif
 }
 #endif
+
+uintptr_t sthread_get_thread_id(sthread_t *thread)
+{
+   if (!thread)
+      return 0;
+   return (uintptr_t)thread->id;
+}
+
+uintptr_t sthread_get_current_thread_id(void)
+{
+#ifdef USE_WIN32_THREADS
+   return (uintptr_t)GetCurrentThreadId();
+#else
+   return (uintptr_t)pthread_self();
+#endif
+}

menu/cbs/menu_cbs_sublabel.c

@@ -129,6 +129,7 @@ default_sublabel_macro(action_bind_sublabel_logging_settings_list,         MENU_
 default_sublabel_macro(action_bind_sublabel_user_interface_settings_list,  MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_ai_service_settings_list,  MENU_ENUM_SUBLABEL_AI_SERVICE_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_ai_service_mode,  MENU_ENUM_SUBLABEL_AI_SERVICE_MODE)
+default_sublabel_macro(action_bind_sublabel_ai_service_pause,  MENU_ENUM_SUBLABEL_AI_SERVICE_PAUSE)
 default_sublabel_macro(action_bind_sublabel_ai_service_target_lang,  MENU_ENUM_SUBLABEL_AI_SERVICE_TARGET_LANG)
 default_sublabel_macro(action_bind_sublabel_ai_service_source_lang,  MENU_ENUM_SUBLABEL_AI_SERVICE_SOURCE_LANG)
 default_sublabel_macro(action_bind_sublabel_ai_service_url,  MENU_ENUM_SUBLABEL_AI_SERVICE_URL)
@@ -178,10 +179,13 @@ default_sublabel_macro(action_bind_sublabel_latency_settings_list,         MENU_
 default_sublabel_macro(action_bind_sublabel_wifi_settings_list,            MENU_ENUM_SUBLABEL_WIFI_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_netplay_lan_scan_settings_list,MENU_ENUM_SUBLABEL_NETPLAY_LAN_SCAN_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_help_list,                     MENU_ENUM_SUBLABEL_HELP_LIST)
+#ifdef HAVE_LAKKA
 default_sublabel_macro(action_bind_sublabel_services_settings_list,        MENU_ENUM_SUBLABEL_SERVICES_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_ssh_enable,                    MENU_ENUM_SUBLABEL_SSH_ENABLE)
 default_sublabel_macro(action_bind_sublabel_samba_enable,                  MENU_ENUM_SUBLABEL_SAMBA_ENABLE )
 default_sublabel_macro(action_bind_sublabel_bluetooth_enable,              MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE )
+default_sublabel_macro(action_bind_sublabel_localap_enable,                MENU_ENUM_SUBLABEL_LOCALAP_ENABLE )
+#endif
 default_sublabel_macro(action_bind_sublabel_user_language,                 MENU_ENUM_SUBLABEL_USER_LANGUAGE)
 default_sublabel_macro(action_bind_sublabel_max_swapchain_images,          MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES )
 default_sublabel_macro(action_bind_sublabel_online_updater,                MENU_ENUM_SUBLABEL_ONLINE_UPDATER)
@@ -194,6 +198,8 @@ default_sublabel_macro(action_bind_sublabel_netplay_settings,              MENU_
 default_sublabel_macro(action_bind_sublabel_user_bind_settings,            MENU_ENUM_SUBLABEL_INPUT_USER_BINDS)
 default_sublabel_macro(action_bind_sublabel_input_hotkey_settings,         MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS)
 default_sublabel_macro(action_bind_sublabel_materialui_icons_enable,       MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE)
+default_sublabel_macro(action_bind_sublabel_materialui_optimize_landscape_layout, MENU_ENUM_SUBLABEL_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT)
+default_sublabel_macro(action_bind_sublabel_materialui_auto_rotate_nav_bar, MENU_ENUM_SUBLABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR)
 default_sublabel_macro(action_bind_sublabel_add_content_list,              MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST)
 default_sublabel_macro(action_bind_sublabel_video_frame_delay,             MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY)
 default_sublabel_macro(action_bind_sublabel_video_shader_delay,            MENU_ENUM_SUBLABEL_VIDEO_SHADER_DELAY)
@@ -214,6 +220,7 @@ default_sublabel_macro(action_bind_sublabel_config_save_on_exit,           MENU_
 default_sublabel_macro(action_bind_sublabel_configuration_settings_list,   MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS)
 default_sublabel_macro(action_bind_sublabel_configurations_list_list,      MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST)
 default_sublabel_macro(action_bind_sublabel_video_shared_context,          MENU_ENUM_SUBLABEL_VIDEO_SHARED_CONTEXT)
+default_sublabel_macro(action_bind_sublabel_driver_switch_enable,          MENU_ENUM_SUBLABEL_DRIVER_SWITCH_ENABLE)
 default_sublabel_macro(action_bind_sublabel_audio_latency,                 MENU_ENUM_SUBLABEL_AUDIO_LATENCY)
 default_sublabel_macro(action_bind_sublabel_audio_rate_control_delta,      MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA)
 default_sublabel_macro(action_bind_sublabel_audio_mute,                    MENU_ENUM_SUBLABEL_AUDIO_MUTE)
@@ -481,11 +488,13 @@ default_sublabel_macro(action_bind_sublabel_xmb_shadows_enable,
 default_sublabel_macro(action_bind_sublabel_xmb_vertical_thumbnails,               MENU_ENUM_SUBLABEL_XMB_VERTICAL_THUMBNAILS)
 default_sublabel_macro(action_bind_sublabel_menu_xmb_thumbnail_scale_factor,       MENU_ENUM_SUBLABEL_MENU_XMB_THUMBNAIL_SCALE_FACTOR)
 default_sublabel_macro(action_bind_sublabel_menu_color_theme,                      MENU_ENUM_SUBLABEL_MATERIALUI_MENU_COLOR_THEME)
+default_sublabel_macro(action_bind_sublabel_materialui_menu_transition_animation, MENU_ENUM_SUBLABEL_MATERIALUI_MENU_TRANSITION_ANIMATION)
 default_sublabel_macro(action_bind_sublabel_ozone_menu_color_theme,                MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME)
 default_sublabel_macro(action_bind_sublabel_ozone_collapse_sidebar,                MENU_ENUM_SUBLABEL_OZONE_COLLAPSE_SIDEBAR)
 default_sublabel_macro(action_bind_sublabel_ozone_truncate_playlist_name,          MENU_ENUM_SUBLABEL_OZONE_TRUNCATE_PLAYLIST_NAME)
 default_sublabel_macro(action_bind_sublabel_ozone_scroll_content_metadata,         MENU_ENUM_SUBLABEL_OZONE_SCROLL_CONTENT_METADATA)
 default_sublabel_macro(action_bind_sublabel_menu_use_preferred_system_color_theme, MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME)
+default_sublabel_macro(action_bind_sublabel_menu_scale_factor,                     MENU_ENUM_SUBLABEL_MENU_SCALE_FACTOR)
 default_sublabel_macro(action_bind_sublabel_menu_wallpaper_opacity,                MENU_ENUM_SUBLABEL_MENU_WALLPAPER_OPACITY)
 default_sublabel_macro(action_bind_sublabel_menu_framebuffer_opacity,              MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY)
 default_sublabel_macro(action_bind_sublabel_menu_horizontal_animation,             MENU_ENUM_SUBLABEL_MENU_HORIZONTAL_ANIMATION)
@@ -572,8 +581,6 @@ default_sublabel_macro(action_bind_sublabel_main_menu_enable_settings,
 default_sublabel_macro(action_bind_sublabel_rgui_show_start_screen,                MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN)
 default_sublabel_macro(action_bind_sublabel_menu_header_opacity,                   MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY)
 default_sublabel_macro(action_bind_sublabel_menu_footer_opacity,                   MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY)
-default_sublabel_macro(action_bind_sublabel_dpi_override_enable,                   MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE)
-default_sublabel_macro(action_bind_sublabel_dpi_override_value,                    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE)
 default_sublabel_macro(action_bind_sublabel_core_assets_directory,                 MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY)
 default_sublabel_macro(action_bind_sublabel_input_remapping_directory,             MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY)
 default_sublabel_macro(action_bind_sublabel_core_directory,                        MENU_ENUM_SUBLABEL_LIBRETRO_DIR_PATH)
@@ -1245,6 +1252,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_materialui_icons_enable);
             break;
+         case MENU_ENUM_LABEL_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_materialui_optimize_landscape_layout);
+            break;
+         case MENU_ENUM_LABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_materialui_auto_rotate_nav_bar);
+            break;
          case MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_viewport_custom_height);
             break;
@@ -1406,12 +1419,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_remapping_directory);
             break;
-         case MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE:
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dpi_override_enable);
-            break;
-         case MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE:
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dpi_override_value);
-            break;
          case MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_footer_opacity);
             break;
@@ -1686,6 +1693,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_xmb_animation_opening_main_menu);
             break;
+         case MENU_ENUM_LABEL_MENU_SCALE_FACTOR:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_scale_factor);
+            break;
          case MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_wallpaper_opacity);
             break;
@@ -1708,6 +1718,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_color_theme);
             break;
+         case MENU_ENUM_LABEL_MATERIALUI_MENU_TRANSITION_ANIMATION:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_materialui_menu_transition_animation);
+            break;
          case MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_xmb_shadows_enable);
             break;
@@ -2468,6 +2481,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_AUDIO_LATENCY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_latency);
             break;
+         case MENU_ENUM_LABEL_DRIVER_SWITCH_ENABLE:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_driver_switch_enable);
+            break;
          case MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_shared_context);
             break;
@@ -2715,6 +2731,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_AI_SERVICE_MODE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ai_service_mode);
             break;
+         case MENU_ENUM_LABEL_AI_SERVICE_PAUSE:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ai_service_pause);
+            break;
          case MENU_ENUM_LABEL_AI_SERVICE_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ai_service_enable);
             break;
@@ -2769,6 +2788,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_HELP_LIST:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_help_list);
             break;
+#ifdef HAVE_LAKKA
          case MENU_ENUM_LABEL_LAKKA_SERVICES:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_services_settings_list);
             break;
@@ -2781,6 +2801,10 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_BLUETOOTH_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_bluetooth_enable);
             break;
+         case MENU_ENUM_LABEL_LOCALAP_ENABLE:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_localap_enable);
+            break;
+#endif
          case MENU_ENUM_LABEL_USER_LANGUAGE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_language);
             break;

menu/cbs/menu_cbs_title.c

@@ -361,7 +361,9 @@ default_title_macro(action_get_retro_achievements_settings_list,MENU_ENUM_LABEL_
 default_title_macro(action_get_wifi_settings_list,              MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS)
 default_title_macro(action_get_network_settings_list,           MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS)
 default_title_macro(action_get_netplay_lan_scan_settings_list,  MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS)
+#ifdef HAVE_LAKKA
 default_title_macro(action_get_lakka_services_list,             MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES)
+#endif
 default_title_macro(action_get_user_settings_list,              MENU_ENUM_LABEL_VALUE_USER_SETTINGS)
 default_title_macro(action_get_directory_settings_list,         MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS)
 default_title_macro(action_get_privacy_settings_list,           MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS)
@@ -412,6 +414,7 @@ default_fill_title_macro(action_get_title_savestate_directory,          MENU_ENU
 default_fill_title_macro(action_get_title_dynamic_wallpapers_directory, MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY)
 default_fill_title_macro(action_get_title_core_assets_directory, MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR)
 default_fill_title_macro(action_get_title_config_directory,      MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY)
+default_fill_title_macro(action_get_title_thumbnail_directory,    MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY)
 default_fill_title_macro(action_get_title_input_remapping_directory,    MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY)
 default_fill_title_macro(action_get_title_autoconfig_directory,  MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR )
 default_fill_title_macro(action_get_title_playlist_directory,    MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY)
@@ -516,7 +519,8 @@ static int action_get_title_default(const char *path, const char *label,
 {
    strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SELECT_FILE), len);
    strlcat(s, " ", len);
-   strlcat(s, path, len);
+   if (!string_is_empty(path))
+      strlcat(s, path, len);
    return 0;
 }
 
@@ -746,11 +750,13 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       BIND_ACTION_GET_TITLE(cbs, action_get_netplay_lan_scan_settings_list);
       return 0;
    }
+#ifdef HAVE_LAKKA
    else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST)))
    {
       BIND_ACTION_GET_TITLE(cbs, action_get_lakka_services_list);
       return 0;
    }
+#endif
    else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_USER_SETTINGS_LIST)))
    {
       BIND_ACTION_GET_TITLE(cbs, action_get_user_settings_list);
@@ -991,6 +997,9 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_CORE_ASSETS_DIRECTORY:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_core_assets_directory);
             break;
+         case MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY:
+            BIND_ACTION_GET_TITLE(cbs, action_get_title_thumbnail_directory);
+            break;
          case MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_config_directory);
             break;

menu/drivers/stripes.c

@@ -2811,7 +2811,7 @@ static void stripes_frame(void *data, video_frame_info_t *video_info)
    if (!stripes)
       return;
 
-   scale_factor                            = (settings->uints.menu_xmb_scale_factor * (float)width) / (1920.0 * 100);
+   scale_factor                            = (settings->floats.menu_scale_factor * (float)width) / 1920.0f;
    pseudo_font_length                      = stripes->icon_spacing_horizontal * 4 - stripes->icon_size / 4;
 
    msg[0]             = '\0';
@@ -3022,7 +3022,7 @@ static void stripes_layout_ps3(stripes_handle_t *stripes, int width, int height)
    settings_t *settings          = config_get_ptr();
 
    float scale_factor            =
-      (settings->uints.menu_xmb_scale_factor * width) / (1920.0 * 100);
+      (settings->floats.menu_scale_factor * width) / 1920.0f;
 
    stripes->above_subitem_offset     =   1.5;
    stripes->above_item_offset        =  -1.0;
@@ -3107,10 +3107,10 @@ static void stripes_layout_psp(stripes_handle_t *stripes, int width)
    unsigned new_font_size, new_header_height;
    settings_t *settings          = config_get_ptr();
    float scale_factor            =
-      ((settings->uints.menu_xmb_scale_factor * width) / (1920.0 * 100)) * 1.5;
+      ((settings->floats.menu_scale_factor * width) / 1920.0) * 1.5;
 #ifdef _3DS
    scale_factor                  =
-      settings->uints.menu_xmb_scale_factor / 400.0;
+      settings->floats.menu_scale_factor / 4.0;
 #endif
 
    stripes->above_subitem_offset     =  1.5;
@@ -3248,7 +3248,7 @@ static void *stripes_init(void **userdata, bool video_is_threaded)
    stripes_handle_t *stripes          = NULL;
    settings_t *settings       = config_get_ptr();
    menu_handle_t *menu        = (menu_handle_t*)calloc(1, sizeof(*menu));
-   float scale_value          = settings->uints.menu_xmb_scale_factor;
+   float scale_value          = settings->floats.menu_scale_factor * 100.0f;
 
    /* scaling multiplier formulas made from these values:     */
    /* stripes_scale 50 = {2.5, 2.5,   2, 1.7, 2.5,   4, 2.4, 2.5} */

menu/drivers/xmb.c

@@ -3333,7 +3333,7 @@ static void xmb_render(void *data,
    if (!xmb)
       return;
 
-   scale_factor = (settings->uints.menu_xmb_scale_factor * (float)width) / (1920.0 * 100);
+   scale_factor = (settings->floats.menu_scale_factor * (float)width) / 1920.0f;
 
    if (scale_factor >= 0.1f && scale_factor != xmb->previous_scale_factor)
       xmb_context_reset_internal(xmb, video_driver_is_threaded(),
@@ -3641,7 +3641,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    if (!xmb)
       return;
 
-   scale_factor                            = (settings->uints.menu_xmb_scale_factor * (float)width) / (1920.0 * 100);
+   scale_factor                            = (settings->floats.menu_scale_factor * (float)width) / 1920.0f;
    thumbnail_scale_factor                  = ((float)settings->uints.menu_xmb_thumbnail_scale_factor / 100.0f);
    pseudo_font_length                      = xmb->icon_spacing_horizontal * 4 - xmb->icon_size / 4;
 
@@ -4424,7 +4424,7 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width)
    settings_t *settings          = config_get_ptr();
 
    float scale_factor            =
-      (settings->uints.menu_xmb_scale_factor * width) / (1920.0 * 100);
+      (settings->floats.menu_scale_factor * (float)width) / 1920.0f;
 
    xmb->above_subitem_offset     =   1.5;
    xmb->above_item_offset        =  -1.0;
@@ -4481,10 +4481,10 @@ static void xmb_layout_psp(xmb_handle_t *xmb, int width)
    unsigned new_font_size, new_header_height;
    settings_t *settings          = config_get_ptr();
    float scale_factor            =
-      ((settings->uints.menu_xmb_scale_factor * width) / (1920.0 * 100)) * 1.5;
+      ((settings->floats.menu_scale_factor * (float)width) / 1920.0f) * 1.5f;
 #ifdef _3DS
    scale_factor                  =
-      settings->uints.menu_xmb_scale_factor / 400.0;
+      settings->floats.menu_scale_factor / 4.0f;
 #endif
 
    xmb->above_subitem_offset     =  1.5;
@@ -4685,7 +4685,7 @@ static void *xmb_init(void **userdata, bool video_is_threaded)
    xmb_handle_t *xmb          = NULL;
    settings_t *settings       = config_get_ptr();
    menu_handle_t *menu        = (menu_handle_t*)calloc(1, sizeof(*menu));
-   float scale_value          = settings->uints.menu_xmb_scale_factor;
+   float scale_value          = settings->floats.menu_scale_factor * 100.0f;
 
    /* scaling multiplier formulas made from these values:     */
    /* xmb_scale 50 = {2.5, 2.5,   2, 1.7, 2.5,   4, 2.4, 2.5} */

menu/menu_animation.c

@@ -33,6 +33,7 @@
 #undef DG_DYNARR_IMPLEMENTATION
 
 #include "menu_animation.h"
+#include "menu_driver.h"
 #include "../configuration.h"
 #include "../performance_counters.h"
 
@@ -1255,13 +1256,20 @@ static void menu_animation_update_time(bool timedate_enable, unsigned video_widt
        *   any kind of DPI scaling - i.e. text gets smaller
        *   as resolution increases. This is annoying. It
        *   means we have to use a fixed multiplier for
-       *   Ozone as well... */
+       *   Ozone as well...
+       *   Note 3: GLUI uses the new DPI scaling system,
+       *   so scaling multiplier is menu_display_get_dpi_scale()
+       *   multiplied by a small correction factor (since the
+       *   default 1.0x speed is just a little faster than the
+       *   non-smooth ticker) */
       if (string_is_equal(settings->arrays.menu_driver, "rgui"))
          ticker_pixel_increment *= 0.25f;
       /* TODO/FIXME: Remove this Ozone special case if/when
        * Ozone gets proper DPI scaling */
       else if (string_is_equal(settings->arrays.menu_driver, "ozone"))
          ticker_pixel_increment *= 0.5f;
+      else if (string_is_equal(settings->arrays.menu_driver, "glui"))
+         ticker_pixel_increment *= (menu_display_get_dpi_scale(video_width, video_height) * 0.8f);
       else if (video_width > 0)
          ticker_pixel_increment *= ((float)video_width / 1920.0f);
 

menu/menu_defines.h

@@ -151,9 +151,24 @@ enum materialui_color_theme
    MATERIALUI_THEME_RED,
    MATERIALUI_THEME_YELLOW,
    MATERIALUI_THEME_NVIDIA_SHIELD,
+   MATERIALUI_THEME_MATERIALUI,
+   MATERIALUI_THEME_MATERIALUI_DARK,
+   MATERIALUI_THEME_OZONE_DARK,
+   MATERIALUI_THEME_NORD,
+   MATERIALUI_THEME_GRUVBOX_DARK,
+   MATERIALUI_THEME_SOLARIZED_DARK,
    MATERIALUI_THEME_LAST
 };
 
+enum materialui_transition_animation
+{
+   MATERIALUI_TRANSITION_ANIM_AUTO = 0,
+   MATERIALUI_TRANSITION_ANIM_FADE,
+   MATERIALUI_TRANSITION_ANIM_SLIDE,
+   MATERIALUI_TRANSITION_ANIM_NONE,
+   MATERIALUI_TRANSITION_ANIM_LAST
+};
+
 enum xmb_color_theme
 {
    XMB_THEME_LEGACY_RED  = 0,

menu/menu_displaylist.c

@@ -3827,6 +3827,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                {MENU_ENUM_LABEL_AI_SERVICE_MODE,                               PARSE_ONLY_UINT, true  },
                {MENU_ENUM_LABEL_AI_SERVICE_URL,                               PARSE_ONLY_STRING, true },
                {MENU_ENUM_LABEL_AI_SERVICE_ENABLE,                                   PARSE_ONLY_BOOL, true},
+               {MENU_ENUM_LABEL_AI_SERVICE_PAUSE,                                   PARSE_ONLY_BOOL, true},
                {MENU_ENUM_LABEL_AI_SERVICE_SOURCE_LANG,                                   PARSE_ONLY_UINT, true},
                {MENU_ENUM_LABEL_AI_SERVICE_TARGET_LANG,                                   PARSE_ONLY_UINT, true},
             };
@@ -4612,12 +4613,14 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
             }
          }
          break;
+#ifdef HAVE_LAKKA
       case DISPLAYLIST_LAKKA_SERVICES_LIST:
          {
             menu_displaylist_build_info_t build_list[] = {
                {MENU_ENUM_LABEL_SSH_ENABLE,                                            PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_SAMBA_ENABLE,                                          PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_BLUETOOTH_ENABLE,                                      PARSE_ONLY_BOOL},
+               {MENU_ENUM_LABEL_LOCALAP_ENABLE,                                        PARSE_ONLY_BOOL},
             };
 
             for (i = 0; i < ARRAY_SIZE(build_list); i++)
@@ -4629,6 +4632,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
             }
          }
          break;
+#endif
       case DISPLAYLIST_MENU_VIEWS_SETTINGS_LIST:
          {
             menu_displaylist_build_info_selective_t build_list[] = {
@@ -4773,9 +4777,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
       case DISPLAYLIST_LATENCY_SETTINGS_LIST:
          {
             menu_displaylist_build_info_t build_list[] = {
-               {MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,            PARSE_ONLY_UINT },
-               {MENU_ENUM_LABEL_VIDEO_HARD_SYNC,                       PARSE_ONLY_BOOL },
-               {MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,                PARSE_ONLY_UINT },
                {MENU_ENUM_LABEL_VIDEO_FRAME_DELAY,                     PARSE_ONLY_UINT },
                {MENU_ENUM_LABEL_AUDIO_LATENCY,                         PARSE_ONLY_UINT },
                {MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR,              PARSE_ONLY_UINT },
@@ -4786,6 +4787,25 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                {MENU_ENUM_LABEL_RUN_AHEAD_HIDE_WARNINGS,               PARSE_ONLY_BOOL },
             };
 
+            if (video_driver_test_all_flags(GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES))
+            {
+               menu_displaylist_parse_settings_enum(list,
+                      MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
+                      PARSE_ONLY_UINT, false);
+                count++;
+             }
+             if (video_driver_test_all_flags(GFX_CTX_FLAGS_HARD_SYNC))
+             {
+                menu_displaylist_parse_settings_enum(list,
+                   MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
+                   PARSE_ONLY_BOOL, false);
+                count++;
+                menu_displaylist_parse_settings_enum(list,
+                   MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,
+                   PARSE_ONLY_UINT, false);
+                count++;
+             }
+
             for (i = 0; i < ARRAY_SIZE(build_list); i++)
             {
                if (menu_displaylist_parse_settings_enum(list,
@@ -5206,6 +5226,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
          {
             menu_displaylist_build_info_t build_list[] = {
                {MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT,  PARSE_ONLY_BOOL},
+               {MENU_ENUM_LABEL_DRIVER_SWITCH_ENABLE,  PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN, PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE, PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE,    PARSE_ONLY_BOOL},
@@ -5389,6 +5410,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
       case DISPLAYLIST_MENU_SETTINGS_LIST:
          {
             menu_displaylist_build_info_t build_list[] = {
+               {MENU_ENUM_LABEL_MENU_SCALE_FACTOR,                            PARSE_ONLY_FLOAT},
                {MENU_ENUM_LABEL_MENU_WALLPAPER,                               PARSE_ONLY_PATH },
                {MENU_ENUM_LABEL_DYNAMIC_WALLPAPER,                            PARSE_ONLY_BOOL },
                {MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY,                       PARSE_ONLY_FLOAT},
@@ -5410,10 +5432,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                {MENU_ENUM_LABEL_MENU_RGUI_SHADOWS,                            PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT,                    PARSE_ONLY_UINT},
                {MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SPEED,              PARSE_ONLY_FLOAT},
-               {MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,                          PARSE_ONLY_BOOL},
-               {MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,                           PARSE_ONLY_UINT},
                {MENU_ENUM_LABEL_XMB_ALPHA_FACTOR,                             PARSE_ONLY_UINT},
-               {MENU_ENUM_LABEL_XMB_SCALE_FACTOR,                             PARSE_ONLY_UINT},
                {MENU_ENUM_LABEL_XMB_FONT,                                     PARSE_ONLY_PATH},
                {MENU_ENUM_LABEL_MENU_FONT_COLOR_RED,                          PARSE_ONLY_UINT},
                {MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN,                        PARSE_ONLY_UINT},
@@ -5427,7 +5446,10 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                {MENU_ENUM_LABEL_OZONE_COLLAPSE_SIDEBAR,                       PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_OZONE_TRUNCATE_PLAYLIST_NAME,                 PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE,                      PARSE_ONLY_BOOL},
+               {MENU_ENUM_LABEL_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,         PARSE_ONLY_BOOL},
+               {MENU_ENUM_LABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR,               PARSE_ONLY_BOOL},
                {MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,                  PARSE_ONLY_UINT},
+               {MENU_ENUM_LABEL_MATERIALUI_MENU_TRANSITION_ANIMATION,         PARSE_ONLY_UINT},
                {MENU_ENUM_LABEL_MATERIALUI_MENU_HEADER_OPACITY,               PARSE_ONLY_FLOAT},
                {MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY,               PARSE_ONLY_FLOAT},
                {MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,        PARSE_ONLY_BOOL },
@@ -7421,18 +7443,24 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
          menu_displaylist_parse_settings_enum(info->list,
                MENU_ENUM_LABEL_VIDEO_ADAPTIVE_VSYNC,
                PARSE_ONLY_BOOL, false);
-         if (menu_displaylist_parse_settings_enum(info->list,
-               MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
-               PARSE_ONLY_UINT, false) == 0)
+         if (video_driver_test_all_flags(GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES))
+         {
+            menu_displaylist_parse_settings_enum(info->list,
+                MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
+                PARSE_ONLY_UINT, false);
             count++;
-         if (menu_displaylist_parse_settings_enum(info->list,
+         }
+         if (video_driver_test_all_flags(GFX_CTX_FLAGS_HARD_SYNC))
+         {
+            menu_displaylist_parse_settings_enum(info->list,
                MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
-               PARSE_ONLY_BOOL, false) == 0)
+               PARSE_ONLY_BOOL, false);
             count++;
-         if (menu_displaylist_parse_settings_enum(info->list,
+            menu_displaylist_parse_settings_enum(info->list,
                MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,
-               PARSE_ONLY_UINT, false) == 0)
+               PARSE_ONLY_UINT, false);
             count++;
+         }
          if (menu_displaylist_parse_settings_enum(info->list,
                MENU_ENUM_LABEL_VIDEO_FRAME_DELAY,
                PARSE_ONLY_UINT, false) == 0)

menu/menu_driver.c

@@ -75,6 +75,16 @@
 #define POWERSTATE_CHECK_INTERVAL  (30 * 1000000)
 #define DATETIME_CHECK_INTERVAL    1000000
 
+/* Number of pixels corner-to-corner on a 1080p
+ * display:
+ * > sqrt((1920 * 1920) + (1080 * 1080))
+ * Note: This is a double, so no suffix */
+#define DIAGONAL_PIXELS_1080P 2202.90717008229831581901
+
+/* Standard reference DPI value, used when determining
+ * DPI-aware menu scaling factors */
+#define REFERENCE_DPI 96.0f
+
 typedef struct menu_ctx_load_image
 {
    void *data;
@@ -2024,61 +2034,198 @@ void menu_display_unset_framebuffer_dirty_flag(void)
    menu_display_framebuf_dirty = false;
 }
 
-/* Get the preferred DPI at which to render the menu.
- * NOTE: Only MaterialUI menu driver so far uses this, neither
- * RGUI or XMB use this. */
-float menu_display_get_dpi(unsigned width, unsigned height)
+float menu_display_get_pixel_scale(unsigned width, unsigned height)
 {
-#ifdef RARCH_MOBILE
-   gfx_ctx_metrics_t metrics;
-#endif
-   float dpi            = 0.0f;
-   settings_t *settings = config_get_ptr();
+   static unsigned last_width  = 0;
+   static unsigned last_height = 0;
+   static float scale          = 0.0f;
+   static bool scale_cached    = false;
+   settings_t *settings        = config_get_ptr();
 
-   /* Use manual override, if set */
-   if (settings && settings->bools.menu_dpi_override_enable)
-      return settings->uints.menu_dpi_override_value;
-
-#ifdef RARCH_MOBILE
-   /* Attempt to fetch actual screen DPI */
-   metrics.type  = DISPLAY_METRIC_DPI;
-   metrics.value = &dpi;
-
-   if (!video_context_driver_get_metrics(&metrics))
+   /* We need to perform a square root here, which
+    * can be slow on some platforms (not *slow*, but
+    * it involves enough work that it's worth trying
+    * to optimise). We therefore cache the pixel scale,
+    * and only update on first run or when the video
+    * size changes */
+   if (!scale_cached ||
+       (width  != last_width) ||
+       (height != last_height))
    {
-      /* Operation failed - use fallback...
-       * (Assume screen size of 5 inches) */
-      float diagonal = 5.0f;
-      dpi = sqrt((width * width) + (height * height)) / diagonal;
+      /* Baseline reference is a 1080p display */
+      scale = (float)(
+            sqrt((double)((width * width) + (height * height))) /
+            DIAGONAL_PIXELS_1080P);
+
+      scale_cached = true;
+      last_width   = width;
+      last_height  = height;
    }
+
+   /* Apply user scaling factor */
+   if (settings)
+      return scale * ((settings->floats.menu_scale_factor > 0.0001f) ?
+            settings->floats.menu_scale_factor : 1.0f);
+
+   return scale;
+}
+
+float menu_display_get_dpi_scale(unsigned width, unsigned height)
+{
+   static unsigned last_width  = 0;
+   static unsigned last_height = 0;
+   static float scale          = 0.0f;
+   static bool scale_cached    = false;
+   settings_t *settings        = config_get_ptr();
+
+   /* Scale is based on display metrics - these are a fixed
+    * hardware property. To minimise performance overheads
+    * we therefore only call video_context_driver_get_metrics()
+    * on first run, or when the current video resolution changes */
+   if (!scale_cached ||
+       (width  != last_width) ||
+       (height != last_height))
+   {
+      float diagonal_pixels;
+      float pixel_scale;
+      float dpi;
+      gfx_ctx_metrics_t metrics;
+
+      /* Determine the diagonal 'size' of the display
+       * (or window) in terms of pixels */
+      diagonal_pixels = (float)sqrt(
+            (double)((width * width) + (height * height)));
+
+      /* TODO/FIXME: On Mac, calling video_context_driver_get_metrics()
+       * here causes RetroArch to crash (EXC_BAD_ACCESS). This is
+       * unfortunate, and needs to be fixed at the gfx context driver
+       * level. Until this is done, all we can do is fallback to using
+       * the old legacy 'magic number' scaling on Mac platforms.
+       * Note: We use a rather ugly construct here so the 'Mac hack'
+       * can be added in one place, without polluting the rest of
+       * the code. */
+#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
+      if (true)
+      {
+         scale        = (diagonal_pixels / 6.5f) / 212.0f;
+         scale_cached = true;
+         last_width   = width;
+         last_height  = height;
+
+         if (settings)
+            return scale * ((settings->floats.menu_scale_factor > 0.0001f) ?
+                  settings->floats.menu_scale_factor : 1.0f);
+
+         return scale;
+      }
+#endif
+
+      /* Get pixel scale relative to baseline 1080p display */
+      pixel_scale = diagonal_pixels / DIAGONAL_PIXELS_1080P;
+
+      /* Attempt to get display DPI */
+      metrics.type  = DISPLAY_METRIC_DPI;
+      metrics.value = &dpi;
+
+      if (video_context_driver_get_metrics(&metrics) && (dpi > 0.0f))
+      {
+         float display_size;
+         float dpi_scale;
+
 #if defined(ANDROID) || defined(HAVE_COCOATOUCH)
-   else
-   {
-      /* Okay, Android is a real nuisance here...
-       * The reported DPI is just a binned value
-       * corresponding to a standard pixel density
-       * size (low, medium, high, extra high, etc.).
-       * This has nothing to do with *physical* screen
-       * DPI. It seems the accepted way to handle this
-       * is to convert the DPI into a scaling factor
-       * based upon the Android default of 160 - so
-       * we divide reported DPI by 160, and multiply
-       * this by our target standard DPI of 96
-       * EDIT: It turns out that iOS devices (iPhone,
-       * iPad) have almost the same idiosyncrasies as
-       * Android when it comes to dealing with DPI,
-       * so we should be able to apply the same
-       * conversion factor */
-      dpi = (dpi / 160.0f) * 96.0f;
-   }
-#endif /* defined(ANDROID) || defined(HAVE_COCOATOUCH) */
-#else
-   /* TODO: Implement proper DPI scaling for desktop
-    * platforms */
-   dpi = sqrt((width * width) + (height * height)) / 14.3f;
+         /* Android/iOS devices tell complete lies when
+          * reporting DPI values. From the Android devices
+          * I've had access to, the DPI is generally
+          * overestimated by 17%. All we can do is apply
+          * a blind correction factor... */
+         dpi = dpi * 0.83f;
 #endif
 
-   return dpi;
+         /* Note: If we are running in windowed mode, this
+          * 'display size' is actually the window size - which
+          * kinda makes a mess of everything. Since we cannot
+          * get fullscreen resolution when running in windowed
+          * mode, there is nothing we can do about this. So just
+          * treat the window as a display, and hope for the best... */
+         display_size = diagonal_pixels / dpi;
+         dpi_scale    = dpi / REFERENCE_DPI;
+
+         /* Note: We have tried leveraging every possible metric
+          * (and numerous studies on TV/monitor/mobile device
+          * usage habits) to determine an appropriate auto scaling
+          * factor. *None of these 'smart'/technical methods work
+          * consistently in the real world* - there is simply too
+          * much variance.
+          * So instead we have implemented a very fuzzy/loose
+          * method which is crude as can be, but actually has
+          * some semblance of usability... */
+
+         if (display_size > 24.0f)
+         {
+            /* DPI scaling fails miserably when using large
+             * displays. Having a UI element that's 1 inch high
+             * on all screens might seem like a good idea - until
+             * you realise that a HTPC user is probably sitting
+             * several metres from their TV, which makes something
+             * 1 inch high virtually invisible.
+             * So we make some assumptions:
+             * - Normal size displays <= 24 inches are probably
+             *   PC monitors, with an eye-to-screen distance of
+             *   1 arm length. Under these conditions, fixed size
+             *   (DPI scaled) UI elements should be visible for most
+             *   users
+             * - Large displays > 24 inches start to encroach on
+             *   TV territory. Once we start working with TVs, we
+             *   have to consider users sitting on a couch - and
+             *   in this situation, we fall back to the age-old
+             *   standard of UI elements occupying a fixed fraction
+             *   of the display size (i.e. just look at the menu of
+             *   any console system for the past decade)
+             * - 24 -> 32 inches is a grey area, where the display
+             *   might be a monitor or a TV. Above 32 inches, a TV
+             *   is almost a certainty. So we simply lerp between
+             *   dpi scaling and pixel scaling as the display size
+             *   increases from 24 to 32 */
+            float fraction = (display_size > 32.0f) ? 32.0f : display_size;
+            fraction       = fraction - 24.0f;
+            fraction       = fraction / (32.0f - 24.0f);
+
+            scale = ((1.0f - fraction) * dpi_scale) + (fraction * pixel_scale);
+         }
+         else if (display_size < 12.0f)
+         {
+            /* DPI scaling also fails when using very small
+             * displays - i.e. mobile devices (tablets/phones).
+             * That 1 inch UI element is going to look pretty
+             * dumb on a 5 inch screen in landscape orientation...
+             * We're essentially in the opposite situation to the
+             * TV case above, and it turns out that a similar
+             * solution provides relief: as screen size reduces
+             * from 12 inches to zero, we lerp from dpi scaling
+             * to pixel scaling */
+            float fraction = display_size / 12.0f;
+
+            scale = ((1.0f - fraction) * pixel_scale) + (fraction * dpi_scale);
+         }
+         else
+            scale = dpi_scale;
+      }
+      /* If DPI retrieval is unsupported, all we can do
+       * is use the raw pixel scale */
+      else
+         scale = pixel_scale;
+
+      scale_cached = true;
+      last_width   = width;
+      last_height  = height;
+   }
+
+   /* Apply user scaling factor */
+   if (settings)
+      return scale * ((settings->floats.menu_scale_factor > 0.0001f) ?
+            settings->floats.menu_scale_factor : 1.0f);
+
+   return scale;
 }
 
 bool menu_display_driver_exists(const char *s)

menu/menu_driver.h

@@ -575,7 +575,8 @@ void menu_display_unset_viewport(unsigned width, unsigned height);
 bool menu_display_get_framebuffer_dirty_flag(void);
 void menu_display_set_framebuffer_dirty_flag(void);
 void menu_display_unset_framebuffer_dirty_flag(void);
-float menu_display_get_dpi(unsigned width, unsigned height);
+float menu_display_get_pixel_scale(unsigned width, unsigned height);
+float menu_display_get_dpi_scale(unsigned width, unsigned height);
 bool menu_display_init_first_driver(bool video_is_threaded);
 bool menu_display_restore_clear_color(void);
 void menu_display_clear_color(menu_display_ctx_clearcolor_t *color,

menu/menu_setting.c

@@ -3853,6 +3853,70 @@ static void setting_get_string_representation_uint_materialui_menu_color_theme(
                msg_hash_to_str(
                   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD), len);
          break;
+      case MATERIALUI_THEME_MATERIALUI:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI), len);
+         break;
+      case MATERIALUI_THEME_MATERIALUI_DARK:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI_DARK), len);
+         break;
+      case MATERIALUI_THEME_OZONE_DARK:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_OZONE_DARK), len);
+         break;
+      case MATERIALUI_THEME_NORD:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NORD), len);
+         break;
+      case MATERIALUI_THEME_GRUVBOX_DARK:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GRUVBOX_DARK), len);
+         break;
+      case MATERIALUI_THEME_SOLARIZED_DARK:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_SOLARIZED_DARK), len);
+         break;
+      default:
+         break;
+   }
+}
+
+static void setting_get_string_representation_uint_materialui_menu_transition_animation(
+      rarch_setting_t *setting,
+      char *s, size_t len)
+{
+   if (!setting)
+      return;
+
+   switch (*setting->value.target.unsigned_integer)
+   {
+      case MATERIALUI_TRANSITION_ANIM_AUTO:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_AUTO), len);
+         break;
+      case MATERIALUI_TRANSITION_ANIM_FADE:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_FADE), len);
+         break;
+      case MATERIALUI_TRANSITION_ANIM_SLIDE:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_SLIDE), len);
+         break;
+      case MATERIALUI_TRANSITION_ANIM_NONE:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_NONE), len);
+         break;
       default:
          break;
    }
@@ -6564,6 +6628,17 @@ static void bluetooth_enable_toggle_change_handler(void *data)
    systemd_service_toggle(LAKKA_BLUETOOTH_PATH, (char*)"bluetooth.service",
          enable);
 }
+
+static void localap_enable_toggle_change_handler(void *data)
+{
+   bool enable           = false;
+   settings_t *settings  = config_get_ptr();
+
+   if (settings && settings->bools.localap_enable)
+      enable = true;
+
+   driver_wifi_tether_start_stop(enable, LAKKA_LOCALAP_PATH);
+}
 #endif
 
 static bool setting_append_list_input_player_options(
@@ -7790,8 +7865,8 @@ static bool setting_append_list(
          break;
       case SETTINGS_LIST_CORE:
          {
-            unsigned i;
-            struct bool_entry bool_entries[5];
+            unsigned i, listing = 0;
+            struct bool_entry bool_entries[6];
 
             START_GROUP(list, list_info, &group_info,
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS), parent_group);
@@ -7804,35 +7879,47 @@ static bool setting_append_list(
             START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info,
                   parent_group);
 
-            bool_entries[0].target         = &settings->bools.video_shared_context;
-            bool_entries[0].name_enum_idx  = MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT;
-            bool_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT;
-            bool_entries[0].default_value  = DEFAULT_VIDEO_SHARED_CONTEXT;
-            bool_entries[0].flags          = SD_FLAG_ADVANCED;
+            bool_entries[listing].target         = &settings->bools.video_shared_context;
+            bool_entries[listing].name_enum_idx  = MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT;
+            bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT;
+            bool_entries[listing].default_value  = DEFAULT_VIDEO_SHARED_CONTEXT;
+            bool_entries[listing].flags          = SD_FLAG_ADVANCED;
+            listing++;
 
-            bool_entries[1].target         = &settings->bools.load_dummy_on_core_shutdown;
-            bool_entries[1].name_enum_idx  = MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN;
-            bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN;
-            bool_entries[1].default_value  = DEFAULT_LOAD_DUMMY_ON_CORE_SHUTDOWN;
-            bool_entries[1].flags          = SD_FLAG_ADVANCED;
+            bool_entries[listing].target         = &settings->bools.driver_switch_enable;
+            bool_entries[listing].name_enum_idx  = MENU_ENUM_LABEL_DRIVER_SWITCH_ENABLE;
+            bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_DRIVER_SWITCH_ENABLE;
+            bool_entries[listing].default_value  = DEFAULT_DRIVER_SWITCH_ENABLE;
+            bool_entries[listing].flags          = SD_FLAG_ADVANCED;
+            listing++;
 
-            bool_entries[2].target         = &settings->bools.set_supports_no_game_enable;
-            bool_entries[2].name_enum_idx  = MENU_ENUM_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE;
-            bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE;
-            bool_entries[2].default_value  = true;
-            bool_entries[2].flags          = SD_FLAG_ADVANCED;
+            bool_entries[listing].target         = &settings->bools.load_dummy_on_core_shutdown;
+            bool_entries[listing].name_enum_idx  = MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN;
+            bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN;
+            bool_entries[listing].default_value  = DEFAULT_LOAD_DUMMY_ON_CORE_SHUTDOWN;
+            bool_entries[listing].flags          = SD_FLAG_ADVANCED;
+            listing++;
 
-            bool_entries[3].target         = &settings->bools.check_firmware_before_loading;
-            bool_entries[3].name_enum_idx  = MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE;
-            bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE;
-            bool_entries[3].default_value  = true;
-            bool_entries[3].flags          = SD_FLAG_ADVANCED;
+            bool_entries[listing].target         = &settings->bools.set_supports_no_game_enable;
+            bool_entries[listing].name_enum_idx  = MENU_ENUM_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE;
+            bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE;
+            bool_entries[listing].default_value  = true;
+            bool_entries[listing].flags          = SD_FLAG_ADVANCED;
+            listing++;
 
-            bool_entries[4].target         = &settings->bools.video_allow_rotate;
-            bool_entries[4].name_enum_idx  = MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE;
-            bool_entries[4].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE;
-            bool_entries[4].default_value  = DEFAULT_ALLOW_ROTATE;
-            bool_entries[4].flags          = SD_FLAG_ADVANCED;
+            bool_entries[listing].target         = &settings->bools.check_firmware_before_loading;
+            bool_entries[listing].name_enum_idx  = MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE;
+            bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE;
+            bool_entries[listing].default_value  = true;
+            bool_entries[listing].flags          = SD_FLAG_ADVANCED;
+            listing++;
+
+            bool_entries[listing].target         = &settings->bools.video_allow_rotate;
+            bool_entries[listing].name_enum_idx  = MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE;
+            bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE;
+            bool_entries[listing].default_value  = DEFAULT_ALLOW_ROTATE;
+            bool_entries[listing].flags          = SD_FLAG_ADVANCED;
+            listing++;
 
             for (i = 0; i < ARRAY_SIZE(bool_entries); i++)
             {
@@ -9574,55 +9661,48 @@ static bool setting_append_list(
             SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
             SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
-            if (video_driver_test_all_flags(GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES))
-            {
-               CONFIG_UINT(
-                     list, list_info,
-                     &settings->uints.video_max_swapchain_images,
-                     MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
-                     MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
-                     DEFAULT_MAX_SWAPCHAIN_IMAGES,
-                     &group_info,
-                     &subgroup_info,
-                     parent_group,
-                     general_write_handler,
-                     general_read_handler);
-               menu_settings_list_current_add_range(list, list_info, 1, 4, 1, true, true);
-               SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
-            }
+            CONFIG_UINT(
+                  list, list_info,
+                  &settings->uints.video_max_swapchain_images,
+                  MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
+                  DEFAULT_MAX_SWAPCHAIN_IMAGES,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            menu_settings_list_current_add_range(list, list_info, 1, 4, 1, true, true);
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
 
-            if (video_driver_test_all_flags(GFX_CTX_FLAGS_HARD_SYNC))
-            {
-               CONFIG_BOOL(
-                     list, list_info,
-                     &settings->bools.video_hard_sync,
-                     MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
-                     MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
-                     DEFAULT_HARD_SYNC,
-                     MENU_ENUM_LABEL_VALUE_OFF,
-                     MENU_ENUM_LABEL_VALUE_ON,
-                     &group_info,
-                     &subgroup_info,
-                     parent_group,
-                     general_write_handler,
-                     general_read_handler,
-                     SD_FLAG_NONE
-                     );
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.video_hard_sync,
+                  MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
+                  DEFAULT_HARD_SYNC,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_NONE);
         
-               CONFIG_UINT(
-                     list, list_info,
-                     &settings->uints.video_hard_sync_frames,
-                     MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,
-                     MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
-                     DEFAULT_HARD_SYNC_FRAMES,
-                     &group_info,
-                     &subgroup_info,
-                     parent_group,
-                     general_write_handler,
-                     general_read_handler);
-               (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
-               menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
-            }
+            CONFIG_UINT(
+                  list, list_info,
+                  &settings->uints.video_hard_sync_frames,
+                  MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
+                  DEFAULT_HARD_SYNC_FRAMES,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
+            menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
 
             if (video_driver_test_all_flags(GFX_CTX_FLAGS_ADAPTIVE_VSYNC))
             {
@@ -11974,7 +12054,7 @@ static bool setting_append_list(
                   &settings->bools.menu_horizontal_animation,
                   MENU_ENUM_LABEL_MENU_HORIZONTAL_ANIMATION,
                   MENU_ENUM_LABEL_VALUE_MENU_HORIZONTAL_ANIMATION,
-                  true,
+                  DEFAULT_MENU_HORIZONTAL_ANIMATION,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,
@@ -12200,40 +12280,23 @@ static bool setting_append_list(
 
          START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group);
 
-         if (string_is_equal(settings->arrays.menu_driver, "glui"))
-         {
-            /* only GLUI uses these values, don't show
-             * them on other drivers */
-            CONFIG_BOOL(
+         /* Only implemented for GLUI and XMB at present */
+         if (string_is_equal(settings->arrays.menu_driver, "glui") ||
+             string_is_equal(settings->arrays.menu_driver, "xmb"))
+            CONFIG_FLOAT(
                   list, list_info,
-                  &settings->bools.menu_dpi_override_enable,
-                  MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,
-                  MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-                  DEFAULT_MENU_DPI_OVERRIDE_ENABLE,
-                  MENU_ENUM_LABEL_VALUE_OFF,
-                  MENU_ENUM_LABEL_VALUE_ON,
-                  &group_info,
-                  &subgroup_info,
-                  parent_group,
-                  general_write_handler,
-                  general_read_handler,
-                  SD_FLAG_NONE);
-
-            CONFIG_UINT(
-                  list, list_info,
-                  &settings->uints.menu_dpi_override_value,
-                  MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,
-                  MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-                  DEFAULT_MENU_DPI_OVERRIDE_VALUE,
+                  &settings->floats.menu_scale_factor,
+                  MENU_ENUM_LABEL_MENU_SCALE_FACTOR,
+                  MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
+                  DEFAULT_MENU_SCALE_FACTOR,
+                  "%.2fx",
                   &group_info,
                   &subgroup_info,
                   parent_group,
                   general_write_handler,
                   general_read_handler);
             (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
-            (*list)[list_info->index - 1].offset_by = 72;
-            menu_settings_list_current_add_range(list, list_info, 72, 999, 1, true, true);
-         }
+            menu_settings_list_current_add_range(list, list_info, 0.2, 5.0, 0.01, true, true);
 
 #ifdef HAVE_XMB
          if (string_is_equal(settings->arrays.menu_driver, "xmb"))
@@ -12255,22 +12318,6 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0, 100, 1, true, true);
             SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
-            CONFIG_UINT(
-                  list, list_info,
-                  &settings->uints.menu_xmb_scale_factor,
-                  MENU_ENUM_LABEL_XMB_SCALE_FACTOR,
-                  MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
-                  xmb_scale_factor,
-                  &group_info,
-                  &subgroup_info,
-                  parent_group,
-                  general_write_handler,
-                  general_read_handler);
-            (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
-            (*list)[list_info->index - 1].offset_by = 20;
-            menu_settings_list_current_add_range(list, list_info, (*list)[list_info->index -1].offset_by, 200, 1, true, true);
-            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
-
             CONFIG_PATH(
                   list, list_info,
                   settings->paths.path_menu_xmb_font,
@@ -12866,7 +12913,7 @@ static bool setting_append_list(
                   &settings->uints.menu_materialui_color_theme,
                   MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,
                   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME,
-                  MATERIALUI_THEME_BLUE,
+                  DEFAULT_MATERIALUI_THEME,
                   &group_info,
                   &subgroup_info,
                   parent_group,
@@ -12878,6 +12925,55 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0, MATERIALUI_THEME_LAST-1, 1, true, true);
             (*list)[list_info->index - 1].ui_type   = ST_UI_TYPE_UINT_COMBOBOX;
 
+            CONFIG_UINT(
+                  list, list_info,
+                  &settings->uints.menu_materialui_transition_animation,
+                  MENU_ENUM_LABEL_MATERIALUI_MENU_TRANSITION_ANIMATION,
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIMATION,
+                  DEFAULT_MATERIALUI_TRANSITION_ANIM,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
+            (*list)[list_info->index - 1].get_string_representation =
+               &setting_get_string_representation_uint_materialui_menu_transition_animation;
+            menu_settings_list_current_add_range(list, list_info, 0, MATERIALUI_TRANSITION_ANIM_LAST-1, 1, true, true);
+            (*list)[list_info->index - 1].ui_type   = ST_UI_TYPE_UINT_COMBOBOX;
+
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.menu_materialui_optimize_landscape_layout,
+                  MENU_ENUM_LABEL_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,
+                  DEFAULT_MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_NONE);
+
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.menu_materialui_auto_rotate_nav_bar,
+                  MENU_ENUM_LABEL_MATERIALUI_AUTO_ROTATE_NAV_BAR,
+                  MENU_ENUM_LABEL_VALUE_MATERIALUI_AUTO_ROTATE_NAV_BAR,
+                  DEFAULT_MATERIALUI_AUTO_ROTATE_NAV_BAR,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_NONE);
+
+            /* TODO: These should be removed entirely, but just
+             * comment out for now in case users complain...
             CONFIG_FLOAT(
                   list, list_info,
                   &settings->floats.menu_header_opacity,
@@ -12909,6 +13005,7 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.010, true, true);
             (*list)[list_info->index - 1].ui_type   
                                   = ST_UI_TYPE_FLOAT_SLIDER_AND_SPINBOX;
+            */
          }
 #endif
 
@@ -13417,6 +13514,21 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_NONE);
 
+         CONFIG_BOOL(
+               list, list_info,
+               &settings->bools.ai_service_pause,
+               MENU_ENUM_LABEL_AI_SERVICE_PAUSE,
+               MENU_ENUM_LABEL_VALUE_AI_SERVICE_PAUSE,
+               DEFAULT_AI_SERVICE_PAUSE,
+               MENU_ENUM_LABEL_VALUE_OFF,
+               MENU_ENUM_LABEL_VALUE_ON,
+               &group_info,
+               &subgroup_info,
+               parent_group,
+               general_write_handler,
+               general_read_handler,
+               SD_FLAG_NONE);
+
          CONFIG_UINT(
                list, list_info,
                &settings->uints.ai_service_source_lang,
@@ -15211,6 +15323,22 @@ static bool setting_append_list(
                   SD_FLAG_NONE);
             (*list)[list_info->index - 1].change_handler = bluetooth_enable_toggle_change_handler;
 
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.localap_enable,
+                  MENU_ENUM_LABEL_LOCALAP_ENABLE,
+                  MENU_ENUM_LABEL_VALUE_LOCALAP_ENABLE,
+                  true,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_NONE);
+            (*list)[list_info->index - 1].change_handler = localap_enable_toggle_change_handler;
+
             END_SUB_GROUP(list, list_info, parent_group);
             END_GROUP(list, list_info, parent_group);
 #endif

msg_hash.h

@@ -447,6 +447,15 @@ enum msg_hash_enums
    MSG_RUNAHEAD_FAILED_TO_LOAD_STATE,
    MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE,
    MSG_MISSING_ASSETS,
+#ifdef HAVE_LAKKA
+   MSG_LOCALAP_SWITCHING_OFF,
+   MSG_WIFI_DISCONNECT_FROM,
+   MSG_LOCALAP_ALREADY_RUNNING,
+   MSG_LOCALAP_NOT_RUNNING,
+   MSG_LOCALAP_STARTING,
+   MSG_LOCALAP_ERROR_CONFIG_CREATE,
+   MSG_LOCALAP_ERROR_CONFIG_PARSE,
+#endif
 
    MENU_LABEL(MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT),
    MENU_LABEL(MENU_XMB_ANIMATION_MOVE_UP_DOWN),
@@ -498,6 +507,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN,
    MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END   = MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + RARCH_BIND_LIST_END,
 
+   MENU_LABEL(MENU_SCALE_FACTOR),
    MENU_LABEL(MENU_WALLPAPER_OPACITY),
    MENU_LABEL(MENU_FRAMEBUFFER_OPACITY),
    MENU_LABEL(MENU_USE_PREFERRED_SYSTEM_COLOR_THEME),
@@ -507,6 +517,8 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_AUTO,
 
    MENU_LABEL(MATERIALUI_ICONS_ENABLE),
+   MENU_LABEL(MATERIALUI_OPTIMIZE_LANDSCAPE_LAYOUT),
+   MENU_LABEL(MATERIALUI_AUTO_ROTATE_NAV_BAR),
 
    MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_CUSTOM,
    MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_CLASSIC_RED,
@@ -589,6 +601,18 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD,
    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI_DARK,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_OZONE_DARK,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NORD,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GRUVBOX_DARK,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_SOLARIZED_DARK,
+
+   MENU_LABEL(MATERIALUI_MENU_TRANSITION_ANIMATION),
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_AUTO,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_FADE,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_SLIDE,
+   MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_TRANSITION_ANIM_NONE,
 
    MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
    MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,
@@ -853,6 +877,7 @@ enum msg_hash_enums
    MENU_LABEL(VIDEO_GAMMA),
    MENU_LABEL(VIDEO_ALLOW_ROTATE),
    MENU_LABEL(VIDEO_SHARED_CONTEXT),
+   MENU_LABEL(DRIVER_SWITCH_ENABLE),
    MENU_LABEL(VIDEO_THREADED),
 
    MENU_LABEL(VIDEO_SWAP_INTERVAL),
@@ -918,7 +943,6 @@ enum msg_hash_enums
    MENU_LABEL(SHOW_ADVANCED_SETTINGS),
    MENU_LABEL(THREADED_DATA_RUNLOOP_ENABLE),
    MENU_LABEL(XMB_ALPHA_FACTOR),
-   MENU_LABEL(XMB_SCALE_FACTOR),
    MENU_LABEL(MENU_FONT_COLOR_RED),
    MENU_LABEL(MENU_FONT_COLOR_GREEN),
    MENU_LABEL(MENU_FONT_COLOR_BLUE),
@@ -1508,8 +1532,6 @@ enum msg_hash_enums
    MENU_LABEL(SAVESTATE_THUMBNAIL_ENABLE),
 
    MENU_LABEL(SUSPEND_SCREENSAVER_ENABLE),
-   MENU_LABEL(DPI_OVERRIDE_ENABLE),
-   MENU_LABEL(DPI_OVERRIDE_VALUE),
    MENU_ENUM_LABEL_VOLUME_UP,
    MENU_ENUM_LABEL_VOLUME_DOWN,
 
@@ -1520,9 +1542,12 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_OVERLAY_NEXT,
 
    MENU_LABEL(NETPLAY_ENABLE),
+#ifdef HAVE_LAKKA
    MENU_LABEL(SSH_ENABLE),
    MENU_LABEL(SAMBA_ENABLE),
    MENU_LABEL(BLUETOOTH_ENABLE),
+   MENU_LABEL(LOCALAP_ENABLE),
+#endif
    MENU_LABEL(NETPLAY_DELAY_FRAMES),
    MENU_LABEL(NETPLAY_PUBLIC_ANNOUNCE),
    MENU_LABEL(NETPLAY_START_AS_SPECTATOR),
@@ -1706,6 +1731,7 @@ enum msg_hash_enums
    MENU_LABEL(AI_SERVICE_SOURCE_LANG),
    MENU_LABEL(AI_SERVICE_URL),
    MENU_LABEL(AI_SERVICE_ENABLE),
+   MENU_LABEL(AI_SERVICE_PAUSE),
 
    MENU_LABEL(ON),
    MENU_LABEL(OFF),
@@ -2275,7 +2301,9 @@ enum msg_hash_enums
    MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE,
    MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME,
    MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
+#ifdef HAVE_LAKKA
    MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
+#endif
 
    MENU_LABEL(MENU_WIDGETS_ENABLE),
    MENU_LABEL(SELECT_FILE),
@@ -2599,7 +2627,6 @@ enum msg_hash_enums
    MSG_DISC_DUMP_FAILED_TO_READ_FROM_DRIVE,
    MSG_DISC_DUMP_FAILED_TO_WRITE_TO_DISK,
    MSG_NO_DISC_INSERTED,
-   MSG_INCOMPATIBLE_CORE_FOR_VIDEO_DRIVER,
    MENU_LABEL(DELETE_PLAYLIST),
 
    MSG_LAST

pkg/android/phoenix-common/jni/Android.mk

@@ -75,7 +75,7 @@ else
 endif
 
 #DEFINES += -DHAVE_VIDEO_LAYOUT
-DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL -DHAVE_EASTEREGG -DHAVE_AUDIOMIXER
+DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL -DHAVE_EASTEREGG -DHAVE_AUDIOMIXER
 DEFINES += -DWANT_IFADDRS
 DEFINES += -DHAVE_TRANSLATE
 

pkg/android/phoenix-legacy/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <!-- <!DOCTYPE manifest [ <!ENTITY % versionDTD SYSTEM "../../../version.dtd"> %versionDTD; ]> !-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.retroarch.legacy"
-    android:versionCode="1556806344"
+    android:versionCode="1556806345"
     android:versionName="1.7.9"
     android:installLocation="internalOnly">
     <uses-feature android:glEsVersion="0x00020000" />

pkg/android/phoenix/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
     package="com.retroarch"
-    android:versionCode="1556806345"
+    android:versionCode="1556806346"
     android:versionName="1.7.9"
     android:installLocation="internalOnly">
     <uses-feature android:glEsVersion="0x00020000" />

pkg/apple/BaseConfig.xcconfig

@@ -4,7 +4,7 @@
 //
 //  Created by Stuart Carnie on 5/10/18.
 //
-OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_MENU_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE
+OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_MENU_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE -DHAVE_VIDEO_LAYOUT
 
 SRCBASE  = $(SRCROOT)/../..
 DEPS_DIR = $(SRCBASE)/deps

pkg/apple/RetroArch.xcodeproj/project.pbxproj

@@ -538,6 +538,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_NO_BUILTINZLIB",
 					"-DHAVE_RPNG",
@@ -608,6 +609,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_NO_BUILTINZLIB",
 					"-DHAVE_RPNG",

pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj

@@ -311,6 +311,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -390,6 +391,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj

@@ -508,6 +508,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -600,6 +601,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -657,6 +659,7 @@
 					"-DHAVE_DYNAMIC",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -749,6 +752,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -823,6 +827,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj

@@ -515,6 +515,7 @@
 					"-DRARCH_MOBILE",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -606,6 +607,7 @@
 					"-DRARCH_MOBILE",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -663,6 +665,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -753,6 +756,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -825,6 +829,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj

@@ -612,6 +612,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				CURRENT_PROJECT_VERSION = 1.7.9;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -628,6 +629,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_NO_PIE = YES;
 				LIBRARY_SEARCH_PATHS = "";
+				MARKETING_VERSION = 1.7.9;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
@@ -664,6 +666,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -683,7 +686,7 @@
 					"-DHAVE_BTSTACK",
 					"-DHAVE_KEYMAPPER",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.dist.RetroArchiOS11;
+				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.dist.RetroArch;
 				PRODUCT_NAME = RetroArch;
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = "armv7 arm64";
@@ -701,6 +704,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				CURRENT_PROJECT_VERSION = 1.7.9;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -717,6 +721,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_NO_PIE = YES;
 				LIBRARY_SEARCH_PATHS = "";
+				MARKETING_VERSION = 1.7.9;
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
@@ -755,6 +760,7 @@
 					"-DHAVE_DYNAMIC",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -774,7 +780,7 @@
 					"-DHAVE_BTSTACK",
 					"-DHAVE_KEYMAPPER",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.dist.RetroArchiOS11;
+				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.dist.RetroArch;
 				PRODUCT_NAME = RetroArch;
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = "armv7 arm64";
@@ -814,6 +820,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1.7.9;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -835,6 +842,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.7.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -873,6 +881,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -931,8 +940,9 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1.7.9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = BJ7B9HU3GU;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -952,6 +962,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.7.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
@@ -991,6 +1002,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -1044,7 +1056,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
@@ -1083,6 +1095,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -1117,7 +1130,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
@@ -1157,6 +1170,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj

@@ -515,6 +515,7 @@
 					"-DRARCH_MOBILE",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -606,6 +607,7 @@
 					"-DRARCH_MOBILE",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -663,6 +665,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -753,6 +756,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -825,6 +829,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj

@@ -516,6 +516,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -603,6 +604,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -657,6 +659,7 @@
 					"-DHAVE_DYNAMIC",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -744,6 +747,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -817,6 +821,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj

@@ -523,6 +523,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -596,6 +597,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -674,6 +676,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -764,6 +767,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -820,6 +824,7 @@
 					"-DHAVE_DYNAMIC",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj

@@ -538,6 +538,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -628,6 +629,7 @@
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_DYNAMIC",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -684,6 +686,7 @@
 					"-DHAVE_DYNAMIC",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -775,6 +778,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",
@@ -848,6 +852,7 @@
 					"-std=gnu99",
 					"-DHAVE_COREAUDIO",
 					"-DHAVE_OVERLAY",
+					"-DHAVE_VIDEO_LAYOUT",
 					"-DHAVE_ZLIB",
 					"-DHAVE_RPNG",
 					"-DHAVE_RJPEG",

pkg/apple/iOS/Info.plist

@@ -33,11 +33,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.8</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.8</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>

pkg/apple/tvOS/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.8</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.8</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIRequiredDeviceCapabilities</key>

playlist.c

@@ -2130,8 +2130,8 @@ json_cleanup:
       char metadata_line[1024];
       char default_core_path[1024];
       char default_core_name[1024];
-      char metadata_char;
-      size_t metadata_counter;
+      char metadata_char               = 0;
+      size_t metadata_counter          = 0;
 
       for (i = 0; i < PLAYLIST_ENTRIES; i++)
          buf[i][0] = '\0';
@@ -2139,8 +2139,6 @@ json_cleanup:
       metadata_line[0]     = '\0';
       default_core_path[0] = '\0';
       default_core_name[0] = '\0';
-      metadata_char        = 0;
-      metadata_counter     = 0;
 
       /* Attempt to read metadata lines at end of file */
       filestream_seek(file, -1, SEEK_END);

qb/config.libs.sh

@@ -182,6 +182,7 @@ check_enabled NETWORKING DISCORD discord 'Networking is' false
 check_enabled NETWORKING MINIUPNPC miniupnpc 'Networking is' false
 check_enabled NETWORKING SSL ssl 'Networking is' false
 check_enabled NETWORKING TRANSLATE OCR 'Networking is' false
+check_enabled NETWORKING HAVE_NETPLAYDISCOVERY 'Netplay discovery' 'Networking is' false
 
 check_enabled NETWORKING NETWORKGAMEPAD 'the networked game pad' 'Networking is' true
 check_enabled MINIUPNPC BUILTINMINIUPNPC 'builtin miniupnpc' 'miniupnpc is' true

qb/config.params.sh

@@ -28,7 +28,7 @@ HAVE_BUILTINMBEDTLS=auto   # Bake in the mbedtls library
 C89_BUILTINMBEDTLS=no
 CXX_BUILTINMBEDTLS=no
 HAVE_OVERLAY=yes           # Overlay support
-HAVE_VIDEO_LAYOUT=no       # Layout support
+HAVE_VIDEO_LAYOUT=yes      # Layout support
 HAVE_DYNAMIC=yes           # Dynamic loading of libretro library
 HAVE_SDL=auto              # SDL support
 C89_SDL=no

qb/qb.init.sh

@@ -7,11 +7,12 @@
 die()
 {	ret="$1"
 	shift 1
-	printf %s\\n "$@" >&2
 	case "$ret" in
-		: ) return 0 ;;
-		* ) exit "$ret" ;;
+		: ) printf %s\\n "$@" >&2; return 0 ;;
+		0 ) printf %s\\n "$@" ;;
+		* ) printf %s\\n "$@" >&2 ;;
 	esac
+	exit "$ret"
 }
 
 # exists:

retroarch.h

@@ -856,7 +856,8 @@ enum display_metric_types
 
 enum display_flags
 {
-   GFX_CTX_FLAGS_GL_CORE_CONTEXT = 0,
+   GFX_CTX_FLAGS_NONE            = 0,
+   GFX_CTX_FLAGS_GL_CORE_CONTEXT,
    GFX_CTX_FLAGS_MULTISAMPLING,
    GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES,
    GFX_CTX_FLAGS_HARD_SYNC,