Merge bd75758dff into 30fef8e96e

src/Ryujinx/AppHost.cs

@@ -1041,7 +1041,6 @@ namespace Ryujinx.Ava
                 if (_viewModel.StartGamesInFullscreen)
                 {
                     _viewModel.WindowState = WindowState.FullScreen;
-                    _viewModel.Window.TitleBar.ExtendsContentIntoTitleBar = true;
                 }
 
                 if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)

src/Ryujinx/Assets/locales.json

@@ -3368,7 +3368,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "检查更新",
         "zh_TW": ""
       }
     },
@@ -3393,7 +3393,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "关闭",
         "zh_TW": ""
       }
     },
@@ -3418,7 +3418,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "提示",
         "zh_TW": ""
       }
     },
@@ -3443,7 +3443,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "背景",
         "zh_TW": ""
       }
     },
@@ -4468,7 +4468,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "瑞典语",
         "zh_TW": ""
       }
     },
@@ -4493,7 +4493,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "挪威语",
         "zh_TW": ""
       }
     },
@@ -5843,7 +5843,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "启用 UI 日志",
         "zh_TW": ""
       }
     },
@@ -16843,7 +16843,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "在控制台显示 Avalonia (UI) 的日志信息",
         "zh_TW": ""
       }
     },
@@ -17768,7 +17768,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "有可用的更新！",
         "zh_TW": ""
       }
     },
@@ -23898,4 +23898,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/UI/Windows/AboutWindow.axaml

@@ -125,7 +125,7 @@
                         Background="Transparent"
                         Click="Button_OnClick"
                         CornerRadius="15"
-                        Tag="https://discord.gg/PEuzjrFXUA"
+                        Tag="https://discord.gg/dHPrkBkkyA"
                         ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}">
                         <Image Source="{Binding DiscordLogo}" />
                     </Button>

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Ava.Utilities
             if (string.IsNullOrEmpty(contentPath)) 
                 goto BadData;
 
-            appData = new() { Name = Name, Id = ProgramId, Path = contentPath };
+            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;