Merge branch 'master' into master

2024-12-22 22:45:46 +00:00 · 2024-12-17 15:13:05 +01:00 · 2024-12-17 15:13:05 +01:00 · a0a7ca6e52
commit a0a7ca6e52
parent f491bda91a 8e00cb5232
21 changed files with 139 additions and 0 deletions
--- a/src/Ryujinx/Assets/Locales/ar_SA.json
+++ b/src/Ryujinx/Assets/Locales/ar_SA.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_مساعدة",
  "MenuBarHelpCheckForUpdates": "تحقق من التحديثات",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "حول",
  "MenuSearch": "بحث...",
  "GameListHeaderFavorite": "مفضلة",
--- a/src/Ryujinx/Assets/Locales/de_DE.json
+++ b/src/Ryujinx/Assets/Locales/de_DE.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Hilfe",
  "MenuBarHelpCheckForUpdates": "Nach Updates suchen",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Über Ryujinx",
  "MenuSearch": "Suchen...",
  "GameListHeaderFavorite": "Favorit",
--- a/src/Ryujinx/Assets/Locales/el_GR.json
+++ b/src/Ryujinx/Assets/Locales/el_GR.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Βοήθεια",
  "MenuBarHelpCheckForUpdates": "Έλεγχος για Ενημερώσεις",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Σχετικά με",
  "MenuSearch": "Αναζήτηση...",
  "GameListHeaderFavorite": "Αγαπημένο",
--- a/src/Ryujinx/Assets/Locales/en_US.json
+++ b/src/Ryujinx/Assets/Locales/en_US.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Help",
  "MenuBarHelpCheckForUpdates": "Check for Updates",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "About",
  "MenuSearch": "Search...",
  "GameListHeaderFavorite": "Fav",
--- a/src/Ryujinx/Assets/Locales/es_ES.json
+++ b/src/Ryujinx/Assets/Locales/es_ES.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Ayuda",
  "MenuBarHelpCheckForUpdates": "Buscar actualizaciones",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Acerca de",
  "MenuSearch": "Buscar...",
  "GameListHeaderFavorite": "Favoritos",
--- a/src/Ryujinx/Assets/Locales/fr_FR.json
+++ b/src/Ryujinx/Assets/Locales/fr_FR.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Aide",
  "MenuBarHelpCheckForUpdates": "Vérifier les mises à jour",
+  "MenuBarHelpFaq": "Page de FAQ et de dépannage",
+  "MenuBarHelpFaqTooltip": "Ouvre la page de FAQ et de dépannage sur le wiki officiel de Ryujinx",
+  "MenuBarHelpSetup": "Guide d'Installation et de Configuration",
+  "MenuBarHelpSetupTooltip": "Ouvre le guide d'installation et de configuration sur le wiki officiel de Ryujinx",
+  "MenuBarHelpMultiplayer": "Guide Multijoueur (LDN/LAN)",
+  "MenuBarHelpMultiplayerTooltip": "Ouvre le guide de Multijoueur sur le wiki officiel de Ryujinx",
  "MenuBarHelpAbout": "À propos",
  "MenuSearch": "Rechercher...",
  "GameListHeaderFavorite": "Favoris",
--- a/src/Ryujinx/Assets/Locales/he_IL.json
+++ b/src/Ryujinx/Assets/Locales/he_IL.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_עזרה",
  "MenuBarHelpCheckForUpdates": "חפש עדכונים",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "אודות",
  "MenuSearch": "חפש...",
  "GameListHeaderFavorite": "אהוב",
--- a/src/Ryujinx/Assets/Locales/it_IT.json
+++ b/src/Ryujinx/Assets/Locales/it_IT.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Aiuto",
  "MenuBarHelpCheckForUpdates": "Controlla aggiornamenti",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Informazioni",
  "MenuSearch": "Cerca...",
  "GameListHeaderFavorite": "Preferito",
--- a/src/Ryujinx/Assets/Locales/ja_JP.json
+++ b/src/Ryujinx/Assets/Locales/ja_JP.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "ヘルプ(_H)",
  "MenuBarHelpCheckForUpdates": "アップデートを確認",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Ryujinx について",
  "MenuSearch": "検索...",
  "GameListHeaderFavorite": "お気に入り",
--- a/src/Ryujinx/Assets/Locales/ko_KR.json
+++ b/src/Ryujinx/Assets/Locales/ko_KR.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "도움말(_H)",
  "MenuBarHelpCheckForUpdates": "업데이트 확인",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "정보",
  "MenuSearch": "찾기...",
  "GameListHeaderFavorite": "즐겨찾기",
--- a/src/Ryujinx/Assets/Locales/no_NO.json
+++ b/src/Ryujinx/Assets/Locales/no_NO.json
@ -37,6 +37,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Hjelp",
  "MenuBarHelpCheckForUpdates": "Se etter oppdateringer",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Om",
  "MenuSearch": "Søk ...",
  "GameListHeaderFavorite": "Fav",
--- a/src/Ryujinx/Assets/Locales/pl_PL.json
+++ b/src/Ryujinx/Assets/Locales/pl_PL.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Pomoc",
  "MenuBarHelpCheckForUpdates": "Sprawdź aktualizacje",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "O programie",
  "MenuSearch": "Wyszukaj...",
  "GameListHeaderFavorite": "Ulubione",
--- a/src/Ryujinx/Assets/Locales/pt_BR.json
+++ b/src/Ryujinx/Assets/Locales/pt_BR.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Ajuda",
  "MenuBarHelpCheckForUpdates": "_Verificar se há atualizações",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "_Sobre",
  "MenuSearch": "Buscar...",
  "GameListHeaderFavorite": "Favorito",
--- a/src/Ryujinx/Assets/Locales/ru_RU.json
+++ b/src/Ryujinx/Assets/Locales/ru_RU.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Помощь",
  "MenuBarHelpCheckForUpdates": "Проверить наличие обновлений",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "О программе",
  "MenuSearch": "Поиск...",
  "GameListHeaderFavorite": "Избранное",
--- a/src/Ryujinx/Assets/Locales/th_TH.json
+++ b/src/Ryujinx/Assets/Locales/th_TH.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_ช่วยเหลือ",
  "MenuBarHelpCheckForUpdates": "ตรวจสอบอัปเดต",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "เกี่ยวกับ",
  "MenuSearch": "กำลังค้นหา...",
  "GameListHeaderFavorite": "ชื่นชอบ",
--- a/src/Ryujinx/Assets/Locales/tr_TR.json
+++ b/src/Ryujinx/Assets/Locales/tr_TR.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Yardım",
  "MenuBarHelpCheckForUpdates": "Güncellemeleri Denetle",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Hakkında",
  "MenuSearch": "Ara...",
  "GameListHeaderFavorite": "Favori",
--- a/src/Ryujinx/Assets/Locales/uk_UA.json
+++ b/src/Ryujinx/Assets/Locales/uk_UA.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "_Допомога",
  "MenuBarHelpCheckForUpdates": "Перевірити оновлення",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "Про застосунок",
  "MenuSearch": "Пошук...",
  "GameListHeaderFavorite": "Обране",
--- a/src/Ryujinx/Assets/Locales/zh_CN.json
+++ b/src/Ryujinx/Assets/Locales/zh_CN.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "帮助(_H)",
  "MenuBarHelpCheckForUpdates": "检查更新",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "关于",
  "MenuSearch": "搜索…",
  "GameListHeaderFavorite": "收藏",
--- a/src/Ryujinx/Assets/Locales/zh_TW.json
+++ b/src/Ryujinx/Assets/Locales/zh_TW.json
@ -44,6 +44,12 @@
  "MenuBarViewWindow1080": "1080p",
  "MenuBarHelp": "說明(_H)",
  "MenuBarHelpCheckForUpdates": "檢查更新",
+  "MenuBarHelpFaq": "FAQ & Troubleshooting Page",
+  "MenuBarHelpFaqTooltip": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
+  "MenuBarHelpSetup": "Setup & Configuration Guide",
+  "MenuBarHelpSetupTooltip": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
+  "MenuBarHelpMultiplayer": "Multiplayer (LDN/LAN) Guide",
+  "MenuBarHelpMultiplayerTooltip": "Opens the Multiplayer guide on the official Ryujinx wiki",
  "MenuBarHelpAbout": "關於",
  "MenuSearch": "搜尋...",
  "GameListHeaderFavorite": "我的最愛",
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@ -290,6 +290,25 @@
                    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}"
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@ -222,6 +222,12 @@ namespace Ryujinx.Ava.UI.Views.Main
                await Updater.BeginUpdateAsync(true);
        }

+        private void MenuItem_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem { Tag: string url })
+                OpenHelper.OpenUrl(url);
+        }
+
        public async void OpenXCITrimmerWindow(object sender, RoutedEventArgs e) => await XCITrimmerWindow.Show(ViewModel);

        public async void OpenAboutWindow(object sender, RoutedEventArgs e) => await AboutWindow.Show();