UI: Rearrange help menu item & merge wiki page link buttons into a "category" button.

src/Ryujinx.Horizon.Kernel.Generators/SyscallGenerator.cs

@@ -34,14 +34,14 @@ namespace Ryujinx.Horizon.Kernel.Generators
         private const string TypeResult = NamespaceHorizonCommon + "." + TypeResultName;
         private const string TypeExecutionContext = "IExecutionContext";
 
-        private static readonly string[] _expectedResults = new string[]
-        {
+        private static readonly string[] _expectedResults =
+        [
             $"{TypeResultName}.Success",
             $"{TypeKernelResultName}.TimedOut",
             $"{TypeKernelResultName}.Cancelled",
             $"{TypeKernelResultName}.PortRemoteClosed",
             $"{TypeKernelResultName}.InvalidState",
-        };
+        ];
 
         private readonly struct OutParameter
         {

src/Ryujinx/Assets/locales.json

@@ -1125,6 +1125,30 @@
         "zh_TW": "檢查更新"
       }
     },
+    {
+      "ID": "MenuBarHelpFaqAndGuides",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "FAQ & Guides",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "MenuBarHelpFaq",
       "Translations": {
@@ -21574,4 +21598,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -290,6 +290,11 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
+                <MenuItem
+                    Click="OpenAboutWindow"
+                    Header="{ext:Locale MenuBarHelpAbout}"
+                    Icon="{ext:Icon fa-solid fa-circle-info}"
+                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
                 <MenuItem
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
@@ -298,30 +303,26 @@
                     Icon="{ext:Icon mdi-update}"
                     ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <Separator />
-                <MenuItem
-                    Click="MenuItem_OnClick"
-                    Header="{ext:Locale MenuBarHelpFaq}"
-                    Icon="{ext:Icon fa-github}"
-                    Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
-                    ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
-                <MenuItem
-                    Click="MenuItem_OnClick"
-                    Header="{ext:Locale MenuBarHelpSetup}"
-                    Icon="{ext:Icon fa-github}"
-                    Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
-                    ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
-                <MenuItem
-                    Click="MenuItem_OnClick"
-                    Header="{ext:Locale MenuBarHelpMultiplayer}"
-                    Icon="{ext:Icon fa-github}"
-                    Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
-                    ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
-                <Separator />
-                <MenuItem
-                    Click="OpenAboutWindow"
-                    Header="{ext:Locale MenuBarHelpAbout}"
-                    Icon="{ext:Icon fa-solid fa-circle-info}"
-                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
+                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
+                    <MenuItem
+                        Click="MenuItem_OnClick"
+                        Header="{ext:Locale MenuBarHelpFaq}"
+                        Icon="{ext:Icon fa-github}"
+                        Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                        ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
+                    <MenuItem
+                        Click="MenuItem_OnClick"
+                        Header="{ext:Locale MenuBarHelpSetup}"
+                        Icon="{ext:Icon fa-github}"
+                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                        ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
+                    <MenuItem
+                        Click="MenuItem_OnClick"
+                        Header="{ext:Locale MenuBarHelpMultiplayer}"
+                        Icon="{ext:Icon fa-github}"
+                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                        ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
+                </MenuItem>
             </MenuItem>
         </Menu>
     </DockPanel>