From de4ce8248cc30ef310c6902ee83563aedc9d2be2 Mon Sep 17 00:00:00 2001
From: goaaats <goatsdev@protonmail.com>
Date: Fri, 15 Apr 2022 11:56:21 +0200
Subject: [PATCH] chore: changelog, various loc tweaks

---
 Dalamud/Interface/Internal/DalamudInterface.cs |  2 +-
 .../Internal/Windows/ChangelogWindow.cs        | 18 +++++-------------
 .../Internal/Windows/SettingsWindow.cs         |  4 +++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index ee56e749f..9db0a3b5e 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -674,7 +674,7 @@ namespace Dalamud.Interface.Internal
                             configuration.Save();
                         }
 
-                        if (ImGui.MenuItem("Load banned plugins", null, configuration.LoadBannedPlugins))
+                        if (ImGui.MenuItem("Load blacklisted plugins", null, configuration.LoadBannedPlugins))
                         {
                             configuration.LoadBannedPlugins = !configuration.LoadBannedPlugins;
                             configuration.Save();
diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
index 47763e315..448397f62 100644
--- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
@@ -22,17 +22,9 @@ namespace Dalamud.Interface.Internal.Windows
         public const string WarrantsChangelogForMajorMinor = "6.4.";
 
         private const string ChangeLog =
-            @"• Added a new menu to the title screen which allows you to access the plugin installer and various other plugins before logging in.
-    => You can disable this menu in the settings under ""Look & Feel"".
-• Added a way for plugins to add information to the game's server info bar (e.g. current song, ping, etc).
-    => You can disable and reorder this information in the settings, if any plugin provides it.
-• Switched the plugin download server to a self-hosted solution instead of GitHub, to circumvent API limits, country blocks and bad ISP routing.
-    => Please see the ""Are plugins safe to use"" part of the XIVLauncher FAQ(goatcorp.github.io/faq) or reach out on Discord if you have concerns about security or want details on how this is set up and ran.
-    => Changelogs in-game/the plugin installer should now also be more common, as the new service takes changelogs from the developer pull request descriptions.
-• The ""Available Plugins"" list in the plugin installer now also shows installed plugins to make the split less confusing. A new filter mode that filters installed plugins has been added.
-• A ""Changelog"" category has been added in the plugin installer which will list all recent changes to your plugins, and recent changes to Dalamud.
+            @"• Updated Dalamud for compatibility with Patch 6.1.
 
-If you note any issues or need help, please make sure to ask on our discord server.
+If you note any issues or need help, please check the FAQ, and reach out on our Discord if you need help
 Thanks and have fun!";
 
         private const string UpdatePluginsInfo =
@@ -49,7 +41,7 @@ Thanks and have fun!";
         /// Initializes a new instance of the <see cref="ChangelogWindow"/> class.
         /// </summary>
         public ChangelogWindow()
-            : base("What's new in XIVLauncher?", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize)
+            : base("What's new in Dalamud?", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize)
         {
             this.Namespace = "DalamudChangelogWindow";
 
@@ -86,9 +78,9 @@ Thanks and have fun!";
 
             ImGuiHelpers.ScaledDummy(10);
 
-            ImGui.Text("Thank you for using our tools!");
+            // ImGui.Text("Thank you for using our tools!");
 
-            ImGuiHelpers.ScaledDummy(10);
+            // ImGuiHelpers.ScaledDummy(10);
 
             ImGui.PushFont(UiBuilder.IconFont);
 
diff --git a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
index 7d088c75d..80d8d0a31 100644
--- a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
@@ -603,7 +603,9 @@ namespace Dalamud.Interface.Internal.Windows
             }
 
             ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingCustomRepoHint", "Add custom plugin repositories."));
-            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning", "We cannot take any responsibility for third-party plugins and repositories.\nTake care when installing third-party plugins from untrusted sources."));
+            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning", "We cannot take any responsibility for third-party plugins and repositories."));
+            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning2", "Plugins have full control over your PC, like any other program, and may cause harm or crashes."));
+            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning3", "Please make absolutely sure that you only install third-party plugins from developers you trust."));
 
             ImGuiHelpers.ScaledDummy(5);