Merge remote-tracking branch 'origin/master'

src_assets/common/assets/web/public/assets/locale/en.json

@@ -164,7 +164,6 @@
     "file_apps_desc": "The file where current apps of Apollo are stored.",
     "file_state": "State File",
     "file_state_desc": "The file where current state of Apollo is stored",
-    "fps": "Advertised FPS",
     "gamepad": "Emulated Gamepad Type",
     "gamepad_auto": "Automatic selection options",
     "gamepad_desc": "Choose which type of gamepad to emulate on the host",
@@ -285,8 +284,6 @@
     "qsv_preset_veryfast": "fastest (lowest quality)",
     "qsv_slow_hevc": "Allow Slow HEVC Encoding",
     "qsv_slow_hevc_desc": "This can enable HEVC encoding on older Intel GPUs, at the cost of higher GPU usage and worse performance.",
-    "res_fps_desc": "The display modes advertised by Apollo. Some versions of Moonlight, such as Moonlight-nx (Switch), rely on these lists to ensure that the requested resolutions and fps are supported. This setting does not change how the screen stream is sent to Moonlight.",
-    "resolutions": "Advertised Resolutions",
     "restart_note": "Apollo is restarting to apply changes.",
     "sunshine_name": "Apollo Name",
     "sunshine_name_desc": "The name displayed by Moonlight. If not specified, the PC's hostname is used",