Merge pull request #9556 from ToKe79/lakka_wifi_ap

[Lakka] Wi-Fi Access Point in RetroArch Settings
2025-03-28 08:37:41 +00:00 · 2019-10-12 14:52:12 +02:00 · 2019-10-12 14:52:12 +02:00 · 92272fe01e
commit 92272fe01e
parent 52c73e6382 7b4c4efd11
32 changed files with 1195 additions and 14 deletions
--- a/configuration.c
+++ b/configuration.c
@ -2123,6 +2123,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
--- a/configuration.h
+++ b/configuration.h
@ -349,6 +349,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;
--- a/intl/msg_hash_ar.h
+++ b/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"
@ -960,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,
@ -1427,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,
@ -1505,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,
@ -1997,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,
@ -2027,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,
@ -4112,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
--- a/intl/msg_hash_chs.h
+++ b/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"
@ -950,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,
@ -1461,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,
@ -1537,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,
@ -2066,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,
@ -2099,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,
@ -5130,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
--- a/intl/msg_hash_cht.h
+++ b/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"
@ -890,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,
@ -1319,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,
@ -1389,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,
@ -1851,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,
@ -1881,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,
@ -3888,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
--- a/intl/msg_hash_de.h
+++ b/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"
@ -927,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,
@ -1378,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,
@ -1456,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,
@ -1940,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,
@ -1970,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,
@ -4017,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
--- a/intl/msg_hash_el.h
+++ b/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"
@ -1406,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,
    "Κινέζικα (Απλοποιημένα)"
@ -2358,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,
    "Αρχείο Αποθήκευσης"
@ -2534,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,
    "Έναρξη Πυρήνα"
@ -3596,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,
    "Αποθήκευση αλλαγών στο αρχείο διαμόρφωσης κατά την έξοδο."
@ -3660,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."
@ -3668,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,
    "Αποτρέπει την προφύλαξη οθόνης του συστήματος από το να ενεργοποιηθεί."
@ -8083,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
--- a/intl/msg_hash_eo.h
+++ b/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"
@ -811,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,
@ -1231,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,
@ -1299,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,
@ -1765,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,
@ -1793,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,
@ -3776,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
--- a/intl/msg_hash_es.h
+++ b/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"
@ -1460,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)"
@ -2426,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"
@ -2602,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"
@ -3669,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"
@ -3741,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"
@ -3749,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"
@ -8237,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
--- a/intl/msg_hash_fr.h
+++ b/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 "
@ -1497,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é)"
@ -2499,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 "
@ -2675,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"
@ -4086,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."
@ -4158,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."
@ -4166,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."
@ -9025,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
--- a/intl/msg_hash_it.h
+++ b/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"
@ -929,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,
@ -1380,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,
@ -1458,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,
@ -1940,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,
@ -1970,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,
@ -3997,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
--- a/intl/msg_hash_ja.h
+++ b/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"
@ -1529,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,
   "中国語 (簡体)"
@ -2653,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,
   "セーブファイル"
@ -2829,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,
   "コアをスタート"
@ -4331,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,
   "終了時に設定を自動的に保存します。"
@ -4403,6 +4413,7 @@ MSG_HASH(
   MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
   "RetroArch用のアドオン, コンポーネント, コンテンツをダウンロードします。"
 )
 #ifdef HAVE_LAKKA
 MSG_HASH(
   MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
   "フォルダのネットワーク共有を有効します。"
@ -4411,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,
   "システムのスクリーンセーバが起動するのを抑制します。"
@ -9727,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
--- a/intl/msg_hash_ko.h
+++ b/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"
@ -1520,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,
    "중국어 (간체)"
@ -2634,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,
    "세이브파일"
@ -2810,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,
    "코어 실행"
@ -4315,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,
    "종료 시 변경된 설정을 저장합니다."
@ -4387,6 +4397,7 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
    "RetroArch용 애드온, 구성요소 및 컨텐츠를 다운로드합니다."
    )
 #ifdef HAVE_LAKKA
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
    "네트워크 폴더 공유를 설정합니다."
@ -4395,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,
    "시스템 화면보호기의 동작을 방지합니다."
@ -9584,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
--- a/intl/msg_hash_lbl.h
+++ b/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,
@ -1127,8 +1129,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,
@ -1207,8 +1211,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,
@ -2083,3 +2089,7 @@ 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
--- a/intl/msg_hash_nl.h
+++ b/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"
@ -810,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,
@ -1233,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,
@ -1301,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,
@ -1767,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,
@ -1795,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,
@ -3770,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
--- a/intl/msg_hash_pl.h
+++ b/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"
@ -961,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,
@ -1436,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,
@ -1524,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,
@ -2032,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,
@ -2062,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,
@ -4617,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
--- a/intl/msg_hash_pt_br.h
+++ b/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"
@ -1520,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)"
@ -2634,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"
@ -2810,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"
@ -4315,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."
@ -4387,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."
@ -4395,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."
@ -9588,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
--- a/intl/msg_hash_pt_pt.h
+++ b/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"
@ -875,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,
@ -1310,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,
@ -1380,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,
@ -1846,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,
@ -1876,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,
@ -3842,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
--- a/intl/msg_hash_ru.h
+++ b/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"
@ -893,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,
@ -1336,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,
@ -1406,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,
@ -1886,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,
@ -1916,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,
@ -4040,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
--- a/intl/msg_hash_tr.h
+++ b/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"
@ -1512,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ş)"
@ -2590,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ı"
@ -2766,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"
@ -4142,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."
@ -4214,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."
@ -4222,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."
@ -9037,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
--- a/intl/msg_hash_us.h
+++ b/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"
@ -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)"
@ -2652,10 +2656,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 +2834,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"
@ -4353,10 +4361,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."
@ -4425,6 +4435,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."
@ -4433,14 +4444,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."
@ -9683,3 +9697,23 @@ 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
--- a/intl/msg_hash_vn.h
+++ b/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"
@ -896,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,
@ -1339,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,
@ -1409,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,
@ -1883,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,
@ -1913,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,
@ -3934,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
--- a/lakka.h
+++ b/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"
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@ -178,10 +178,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)
@ -2765,6 +2768,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;
@ -2777,6 +2781,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;
--- a/menu/cbs/menu_cbs_title.c
+++ b/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)
@ -746,11 +748,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);
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@ -4612,12 +4612,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 +4631,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[] = {
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@ -6564,6 +6564,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(
@ -15171,6 +15182,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
--- a/msg_hash.h
+++ b/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),
@ -1518,9 +1527,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),
@ -2273,7 +2285,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),
--- a/retroarch.c
+++ b/retroarch.c
@ -9386,6 +9386,11 @@ bool driver_wifi_connect_ssid(unsigned i, const char* passphrase)
   return wifi_driver->connect_ssid(i, passphrase);
 }
 void driver_wifi_tether_start_stop(bool start, char* configfile)
 {
   wifi_driver->tether_start_stop(start, configfile);
 }
 bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data)
 {
--- a/wifi/drivers/connmanctl.c
+++ b/wifi/drivers/connmanctl.c
@ -17,6 +17,8 @@
 #include <file/file_path.h>
 #include <string/stdstring.h>
 #include <retro_miscellaneous.h>
 #include <configuration.h>
 #include <verbosity.h>
 #include "../wifi_driver.h"
 #include "../../retroarch.h"
@ -28,6 +30,7 @@
 static bool connman_cache[256]   = {0};
 static unsigned connman_counter  = 0;
 static struct string_list* lines = NULL;
 static char command[256]         = {0};
 static void *connmanctl_init(void)
 {
@ -50,22 +53,123 @@ static void connmanctl_stop(void *data)
   (void)data;
 }
 static bool connmanctl_tether_status(void)
 {
   /* Returns true if the tethering is active
    * false when tethering is not active
    */
   FILE *command_file = NULL;
   char ln[3]         = {0};
   /* Following command lists 'technologies' of connman,
    * greps the wifi + 10 following lines, then first
    * occurance of 'Tethering', then 'True' and counts
    * the matching lines.
    * Expected result is either 1 (active) or 0 (not active)
    */
   snprintf(command, sizeof(command), "\
         connmanctl technologies | \
         grep \"/net/connman/technology/wifi\" -A 10 | \
         grep \"^  Tethering =\" -m 1 | \
         grep \"True\" | \
         wc -l");
   command_file = popen(command, "r");
   fgets(ln, sizeof(ln), command_file);
   if (ln[strlen(ln)-1] == '\n')
      ln[strlen(ln)-1] = '\0';
   RARCH_LOG("[CONNMANCTL] Tether Status: command: \"%s\", output: \"%s\"\n",
         command, ln);
   pclose(command_file);
   if (ln == NULL)
      return false;
   else if (ln[0] == '0')
      return false;
   else if (ln[0] == '1')
      return true;
   else
      return false;
 }
 static void connmanctl_tether_toggle(bool switch_on, char* apname, char* passkey)
 {
   /* Starts / stops the tethering service on wi-fi device */
   char output[256]     = {0};
   FILE *command_file   = NULL;
   settings_t *settings = config_get_ptr();
   snprintf(command, sizeof(command), "\
         connmanctl tether wifi %s %s %s",
         switch_on ? "on" : "off", apname, passkey);
   command_file = popen(command, "r");
   RARCH_LOG("[CONNMANCTL] Tether toggle: command: \"%s\"\n",
         command);
   while (fgets(output, sizeof(output), command_file) != NULL)
   {
      if (output[strlen(output)-1] == '\n')
         output[strlen(output)-1] = '\0';
      RARCH_LOG("[CONNMANCTL] Tether toggle: output: \"%s\"\n",
            output);
 #ifdef HAVE_MENU_WIDGETS
      if (!menu_widgets_ready())
 #endif
         runloop_msg_queue_push(output, 1, 180, true,
               NULL, MESSAGE_QUEUE_ICON_DEFAULT,
               MESSAGE_QUEUE_CATEGORY_INFO);
   }
   pclose(command_file);
   RARCH_LOG("[CONNMANCTL] Tether toggle: command finished\n");
   if (switch_on)
   {
      if (!connmanctl_tether_status())
          settings->bools.localap_enable = false;
   }
   else
   {
      if (connmanctl_tether_status())
         settings->bools.localap_enable = true;
   }
 }
 static void connmanctl_scan(void)
 {
   char line[512];
   union string_list_elem_attr attr;
   FILE *serv_file                  = NULL;
   settings_t *settings             = config_get_ptr();
   attr.i = RARCH_FILETYPE_UNSET;
   if (lines)
      free(lines);
   lines = string_list_new();
   if (connmanctl_tether_status())
   {
      runloop_msg_queue_push(msg_hash_to_str(MSG_LOCALAP_SWITCHING_OFF),
            1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
            MESSAGE_QUEUE_CATEGORY_INFO);
      settings->bools.localap_enable = false;
      connmanctl_tether_toggle(false, "", "");
   }
   pclose(popen("connmanctl enable wifi", "r"));
   pclose(popen("connmanctl scan wifi", "r"));
-   runloop_msg_queue_push("Wi-Fi scan complete.",
+   runloop_msg_queue_push(msg_hash_to_str(MSG_WIFI_SCAN_COMPLETE),
         1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
         MESSAGE_QUEUE_CATEGORY_INFO);
@ -104,7 +208,6 @@ static bool connmanctl_ssid_is_online(unsigned i)
 {
   char ln[512]       = {0};
   char service[128]  = {0};
   char command[256]  = {0};
   const char *line   = lines->elems[i].data;
   FILE *command_file = NULL;
@ -125,12 +228,9 @@ static bool connmanctl_ssid_is_online(unsigned i)
      strlcpy(service, list->elems[list->size-1].data, sizeof(service));
      string_list_free(list);
-      strlcat(command, "connmanctl services ",
+      snprintf(command, sizeof(command), "\
-            sizeof(command));
+            connmanctl services %s | grep 'State = \\(online\\|ready\\)'",
-      strlcat(command, service,
+            service);
            sizeof(command));
      strlcat(command, " | grep 'State = \\(online\\|ready\\)'",
            sizeof(command));
      command_file = popen(command, "r");
@ -156,12 +256,12 @@ static bool connmanctl_connect_ssid(unsigned i, const char* passphrase)
   char ln[512]                        = {0};
   char name[64]                       = {0};
   char service[128]                   = {0};
   char command[256]                   = {0};
   char settings_dir[PATH_MAX_LENGTH]  = {0};
   char settings_path[PATH_MAX_LENGTH] = {0};
   FILE *command_file                  = NULL;
   FILE *settings_file                 = NULL;
   const char *line                    = lines->elems[i].data;
   settings_t *settings                = config_get_ptr();
   static struct string_list* list     = NULL;
   /* connmanctl services outputs a 4 character prefixed lines,
@ -212,15 +312,24 @@ static bool connmanctl_connect_ssid(unsigned i, const char* passphrase)
   fprintf(settings_file, "IPv4.method=%s\n", "dhcp");
   fclose(settings_file);
   if (connmanctl_tether_status())
   {
      runloop_msg_queue_push(msg_hash_to_str(MSG_LOCALAP_SWITCHING_OFF),
            1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
            MESSAGE_QUEUE_CATEGORY_INFO);
      settings->bools.localap_enable = false;
      connmanctl_tether_toggle(false, "", "");
   }
   pclose(popen("systemctl restart connman", "r"));
-   strlcat(command, "connmanctl connect ", sizeof(command));
+   snprintf(command, sizeof(command), "\
-   strlcat(command, service, sizeof(command));
+         connmanctl connect %s 2>&1",
-   strlcat(command, " 2>&1", sizeof(command));
+         service);
   command_file = popen(command, "r");
-   while (fgets (ln, 512, command_file) != NULL)
+   while (fgets (ln, sizeof(ln), command_file) != NULL)
   {
 #ifdef HAVE_MENU_WIDGETS
      if (!menu_widgets_ready())
@ -234,6 +343,349 @@ static bool connmanctl_connect_ssid(unsigned i, const char* passphrase)
   return true;
 }
 static void connmanctl_get_connected_ssid(char* ssid, size_t buffersize)
 {
   /* Stores the SSID of the currently connected Wi-Fi
    * network in ssid
    */
   FILE *command_file = NULL;
   if (buffersize < 1)
      return;
   /* Following command lists all connman services, greps
    * only 'wifi_' services, then greps the one with
    * 'R' (Ready) or 'O' (Online) flag and cuts out the ssid
    */
   snprintf(command, sizeof(command), "\
         connmanctl services | \
         grep wifi_ | \
         grep \"^..\\(R\\|O\\)\" | \
         cut -d' ' -f 2");
   command_file = popen(command, "r");
   fgets(ssid, buffersize, command_file);
   pclose(command_file);
   if (strlen(ssid) > 0)
      if (ssid[strlen(ssid)-1] == '\n')
         ssid[strlen(ssid)-1] = '\0';
   RARCH_LOG("[CONNMANCTL] Get Connected SSID: command: \"%s\", output: \"%s\"\n",
         command, strlen(ssid) ? ssid : "<nothing_found>");
 }
 static void connmanctl_get_connected_servicename(char* servicename, size_t buffersize)
 {
   /* Stores the service name of currently connected Wi-Fi
    * network in servicename
    */
   FILE *command_file = NULL;
   FILE *service_file = NULL;
   char ln[3]         = {0};
   char *temp;
   if (buffersize < 1)
      return;
   temp = (char*)malloc(sizeof(char) * buffersize);
   /* Following command lists all stored services in
    * connman settings folder, which are then used in
    * the next while loop for parsing if the service
    * is currently online/ready
    */
   snprintf(command, sizeof(command), "\
         for serv in %s/wifi_*/ ; do \
            if [ -d $serv ] ; then \
               basename $serv ; \
            fi ; \
         done",
         LAKKA_CONNMAN_DIR);
   command_file = popen(command, "r");
   RARCH_LOG("[CONNMANCTL] Testing configured services for activity: command: \"%s\"\n",
         command);
   while (fgets(temp, buffersize, command_file) != NULL)
   {
      if (strlen(temp) > 0)
         if (temp[strlen(temp)-1] == '\n')
            temp[strlen(temp)-1] = '\0';
      if (strlen(temp) == 0)
      {
         RARCH_WARN("[CONNMANCTL] Service name empty.\n");
         continue;
      }
      /* Here we test the found service for online | ready
       * status and count the lines. Expected results are
       * 0 = is not active, 1 = is active
       */
      snprintf(command, sizeof(command), "\
            connmanctl services %s | \
            grep \"^  State = \\(online\\|ready\\)\" | \
            wc -l",
            temp);
      service_file = popen(command, "r");
      fgets(ln, sizeof(ln), service_file);
      if (ln[strlen(ln)-1] == '\n')
         ln[strlen(ln)-1] = '\0';
      pclose(service_file);
      RARCH_LOG("[CONNMANCTL] Service: \"%s\", status: \"%s\"\n",
            temp, ln);
      if (ln[0] == '1')
      {
         pclose(command_file);
         strlcpy(servicename, temp, buffersize);
         free(temp);
         RARCH_LOG("[CONNMANCTL] Service \"%s\" considered as currently online\n",
               servicename);
         return;
      }
   }
   pclose(command_file);
 }
 static void connmanctl_tether_start_stop(bool start, char* configfile)
 {
   /* Start / stop wrapper for the tethering service
    * It also checks, if we are currently connected
    * to a wi-fi network, which needs to be disconnected
    * before starting the tethering service, or if the
    * tethering service is already running / not running
    * before performing the desired action
    */
   FILE *command_file = NULL;
   char apname[64]    = {0};
   char passkey[256]  = {0};
   char ln[512]       = {0};
   char ssid[64]      = {0};
   char service[256]  = {0};
   RARCH_LOG("[CONNMANCTL] Tether start stop: begin\n");
   if (start) /* we want to start tethering */
   {
      RARCH_LOG("[CONNMANCTL] Tether start stop: request to start access point\n");
      if (connmanctl_tether_status()) /* check if already tethering and bail out if so */
      {
         RARCH_LOG("[CONNMANCTL] Tether start stop: AP already running\n");
         runloop_msg_queue_push(msg_hash_to_str(MSG_LOCALAP_ALREADY_RUNNING),
               1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
               MESSAGE_QUEUE_CATEGORY_INFO);
         return;
      }
      /* check if there is a config file, if not, create one, if yes, parse it */
      if (!(command_file = fopen(configfile, "r")))
      {
         RARCH_WARN("[CONNMANCTL] Tether start stop: config \"%s\" does not exist\n",
               configfile);
         if (!(command_file = fopen(configfile, "w")))
         {
            RARCH_ERR("[CONNMANCTL] Tether start stop: cannot create config file \"%s\"\n",
                  configfile);
            runloop_msg_queue_push(msg_hash_to_str(MSG_LOCALAP_ERROR_CONFIG_CREATE),
                  1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
                  MESSAGE_QUEUE_CATEGORY_ERROR);
            return;
         }
         RARCH_LOG("[CONNMANCTL] Tether start stop: creating new config \"%s\"\n",
               configfile);
         snprintf(apname, sizeof(apname), "LakkaAccessPoint");
         snprintf(passkey, sizeof(passkey), "RetroArch");
         fprintf(command_file, "APNAME=%s\nPASSWORD=%s", apname, passkey);
         fclose(command_file);
         RARCH_LOG("[CONNMANCTL] Tether start stop: new config \"%s\" created\n",
               configfile);
      }
      else
      {
         fclose(command_file);
         RARCH_LOG("[CONNMANCTL] Tether start stop: config \"%s\" exists, reading it\n",
               configfile);
         snprintf(command, sizeof(command), "\
               grep -m 1 \"^APNAME=\" %s | cut -d '=' -f 2- && \
               grep -m 1 \"^PASSWORD=\" %s | cut -d '=' -f 2-",
               configfile, configfile);
         command_file = popen(command, "r");
         int i = 0;
         RARCH_LOG("[CONNMANCTL] Tether start stop: parsing command: \"%s\"\n",
               command);
         while (fgets(ln, sizeof(ln), command_file) != NULL)
         {
            i++;
            if (strlen(ln) > 1)
            {
               if (ln[strlen(ln)-1] == '\n')
                  ln[strlen(ln)-1] = '\0';
               if (i == 1)
               {
                  strlcpy(apname, ln, sizeof(apname));
                  RARCH_LOG("[CONNMANCTL] Tether start stop: found APNAME: \"%s\"\n",
                        apname);
                  continue;
               }
               if (i == 2)
               {
                  strlcpy(passkey, ln, sizeof(passkey));
                  RARCH_LOG("[CONNMANCTL] Tether start stop: found PASSWORD: \"%s\"\n",
                        passkey);
                  continue;
               }
               if (i > 2)
               {
                  RARCH_WARN("[CONNMANCTL] Tether start stop: you should not get here...\n");
                  break;
               }
            }
         }
         pclose(command_file);
      }
      if (apname == NULL || passkey == NULL)
      {
         RARCH_ERR("[CONNMANCTL] Tether start stop: APNAME or PASSWORD missing\n");
         snprintf(ln, sizeof(ln),
               msg_hash_to_str(MSG_LOCALAP_ERROR_CONFIG_PARSE),
               configfile);
         runloop_msg_queue_push(ln,
               1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
               MESSAGE_QUEUE_CATEGORY_ERROR);
         return;
      }
      /* check if connected to a wi-fi network */
      RARCH_LOG("[CONNMANCTL] Tether start stop: checking if not connected to a wi-fi network...\n");
      connmanctl_get_connected_ssid(ssid, sizeof(ssid));
      if (strlen(ssid) != 0)
      {
         connmanctl_get_connected_servicename(service, sizeof(service));
         if (strlen(service) != 0)
         {
            /* disconnect from wi-fi network */
            RARCH_LOG("[CONNMANCTL] Tether start stop: connected to SSID \"%s\", service \"%s\"\n",
                  ssid, service);
            snprintf(ln, sizeof(ln),
                  msg_hash_to_str(MSG_WIFI_DISCONNECT_FROM),
                  ssid);
            runloop_msg_queue_push(ln, 1, 180, true,
                  NULL, MESSAGE_QUEUE_ICON_DEFAULT,
                  MESSAGE_QUEUE_CATEGORY_INFO);
            snprintf(command, sizeof(command), "\
                  connmanctl disconnect %s",
                  service);
            command_file = popen(command, "r");
            RARCH_LOG("[CONNMANCTL] Tether start stop: disconnecting from service \"%s\", command: \"%s\"\n",
                  service, command);
            while (fgets(ln, sizeof(ln), command_file) != NULL)
            {
               if (ln[strlen(ln)-1] == '\n')
                  ln[strlen(ln)-1] = '\0';
               RARCH_LOG("[CONNMANCTL] Tether start stop: output: \"%s\"\n",
                     ln);
 #ifdef HAVE_MENU_WIDGETS
               if (!menu_widgets_ready())
 #endif
                  runloop_msg_queue_push(ln, 1, 180, true,
                        NULL, MESSAGE_QUEUE_ICON_DEFAULT,
                        MESSAGE_QUEUE_CATEGORY_INFO);
            }
            pclose(command_file);
            RARCH_LOG("[CONNMANCTL] Tether start stop: disconnect end\n");
         }
      }
      snprintf(command, sizeof(command),
            msg_hash_to_str(MSG_LOCALAP_STARTING),
            apname, passkey);
      runloop_msg_queue_push(command,
            1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
            MESSAGE_QUEUE_CATEGORY_INFO);
   }
   else /* we want to stop tethering */
   {
      RARCH_LOG("[CONNMANCTL] Tether start stop: request to stop access point\n");
      if (!connmanctl_tether_status()) /* check if not tethering and when not, bail out */
      {
         RARCH_LOG("[CONNMANCTL] Tether start stop: access point is not running\n");
         runloop_msg_queue_push(msg_hash_to_str(MSG_LOCALAP_NOT_RUNNING),
               1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
               MESSAGE_QUEUE_CATEGORY_INFO);
         return;
      }
      runloop_msg_queue_push(msg_hash_to_str(MSG_LOCALAP_SWITCHING_OFF),
            1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
            MESSAGE_QUEUE_CATEGORY_INFO);
   }
   RARCH_LOG("[CONNMANCTL] Tether start stop: calling tether_toggle()\n");
   /* call the tether toggle function */
   connmanctl_tether_toggle(start, apname, passkey);
   RARCH_LOG("[CONNMANCTL] Tether start stop: end\n");
 }
 wifi_driver_t wifi_connmanctl = {
   connmanctl_init,
   connmanctl_free,
@ -243,5 +695,6 @@ wifi_driver_t wifi_connmanctl = {
   connmanctl_get_ssids,
   connmanctl_ssid_is_online,
   connmanctl_connect_ssid,
   connmanctl_tether_start_stop,
   "connmanctl",
 };
--- a/wifi/drivers/nullwifi.c
+++ b/wifi/drivers/nullwifi.c
@ -54,6 +54,10 @@ static bool nullwifi_connect_ssid(unsigned i, const char* passphrase)
   return false;
 }
 static void nullwifi_tether_start_stop(bool start, char* configfile)
 {
 }
 wifi_driver_t wifi_null = {
   nullwifi_init,
   nullwifi_free,
@ -63,5 +67,6 @@ wifi_driver_t wifi_null = {
   nullwifi_get_ssids,
   nullwifi_ssid_is_online,
   nullwifi_connect_ssid,
   nullwifi_tether_start_stop,
   "null",
 };
--- a/wifi/wifi_driver.h
+++ b/wifi/wifi_driver.h
@ -54,6 +54,7 @@ typedef struct wifi_driver
   void (*get_ssids)(struct string_list *list);
   bool (*ssid_is_online)(unsigned i);
   bool (*connect_ssid)(unsigned i, const char* passphrase);
   void (*tether_start_stop)(bool start, char* configfile);
   const char *ident;
 } wifi_driver_t;
@ -102,6 +103,8 @@ bool driver_wifi_ssid_is_online(unsigned i);
 bool driver_wifi_connect_ssid(unsigned i, const char* passphrase);
 void driver_wifi_tether_start_stop(bool start, char* configfile);
 bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data);
 RETRO_END_DECLS