Revert "Client rebranding: Partly import changes from !28"

This reverts commit 775392e472933be8d1d76619894efc0671f0c02d.
[skip ci]

10 files changed, 24 insertions, 36 deletions

diff --git a/src/commandline.cpp b/src/commandline.cpp
index 982078635..507cc91f6 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -2,8 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -134,7 +133,7 @@ static void printHelp()
 static void printVersion()
 {
     std::cout <<
-        strprintf("ManaVerse client %s", FULL_VERSION) <<
+        strprintf("ManaPlus client %s", FULL_VERSION) <<
         std::endl;
 }
 
diff --git a/src/commandline.h b/src/commandline.h
index 1f7c1e63a..af8e6b9fd 100644
--- a/src/commandline.h
+++ b/src/commandline.h
@@ -2,8 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 3c663309f..68c14bc5b 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -1,8 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -529,9 +528,10 @@ void setBrandingDefaults(Configuration &cfg)
     AddDEF("androidDownloadUrl", "https://play.google.com/store/apps/details"
         "?id=org.evolonline.beta.manaplus");
     AddDEF("androidDownloadText", "Google Play");
-    AddDEF("otherDownloadUrl", "https://manaverse.germantmw.de/");
-    AddDEF("otherDownloadText", "https://manaverse.germantmw.de/");
-    AddDEF("windowsDownloadUrl", "https://updates.tmw2.org/mana/windows/");
+    AddDEF("otherDownloadUrl", "https://manaplus.germantmw.de/");
+    AddDEF("otherDownloadText", "https://manaplus.germantmw.de/");
+    AddDEF("windowsDownloadUrl", "https://manaplus.germantmw.de/"
+        "manaplus/package/windows32/");
     AddDEF("windowsDownloadText", "download here");
     AddDEF("updateMirror1", "https://manaplus.germantmw.de/manaplus/updates/");
     AddDEF("updateMirror2", "");
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index e43f701b3..0209e1eb8 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -1,7 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2012-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -623,7 +622,7 @@ SDL_Window *GraphicsManager::createWindow(const int w, const int h,
                                           const int bpp A_UNUSED,
                                           const int flags)
 {
-    return SDL_CreateWindow("ManaVerse", SDL_WINDOWPOS_UNDEFINED,
+    return SDL_CreateWindow("ManaPlus", SDL_WINDOWPOS_UNDEFINED,
         SDL_WINDOWPOS_UNDEFINED, w, h, flags);
 }
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6fe317353..e8a728327 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -1,8 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2009-2010  The Mana World Development Team
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -89,7 +88,7 @@ Desktop::Desktop(const Widget2 *const widget) :
             false);
     }
     mVersionLabel->addRow("copyright",
-        "(C) ManaVerse developers, https://manaverse.germantmw.de");
+        "(C) ManaPlus developers, http://manaplus.org");
     mVersionLabel->setLinkHandler(this);
     mVersionLabel->updateHeight();
 }
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index a3b777655..0d52dad14 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -2,8 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -1663,14 +1662,11 @@ bool ChatWindow::resortChatLog(std::string line,
         {
             replaceAll(tmpNick, "#", "_");
             replaceAll(tmpNick, "%", "_");
-            // we dont care!
-/*
             if (Net::getNetworkType() == ServerType::TMWATHENA)
             {
                 // TRANSLATORS: error message
                 line = _("Broken nick detected: ") + line;
             }
-*/
             own = ChatMsgType::BY_SERVER;
         }
         const size_t idx = line.find(": \302\202");
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 948ce5a17..283df5ecf 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -2,8 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -461,7 +460,7 @@ void UpdaterWindow::loadPatch()
             if (line != nullptr)
             {
                 mBrowserBox->addRow(strprintf("##9 Latest client version: "
-                    "##6ManaVerse %s##0", line), true);
+                    "##6ManaPlus %s##0", line), true);
             }
         }
         if (version > CHECK_VERSION)
@@ -483,11 +482,11 @@ void UpdaterWindow::loadPatch()
                 branding.getStringValue(url)).append("|").append(
                 branding.getStringValue(text)).append("@@]"), true);
             mBrowserBox->addRow("##1You can download it from", true);
-            mBrowserBox->addRow("##1ManaVerse updated.", true);
+            mBrowserBox->addRow("##1ManaPlus updated.", true);
         }
         else
         {
-            mBrowserBox->addRow("You have the latest client version.", true);
+            mBrowserBox->addRow("You have latest client version.", true);
         }
     }
 
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index bc620e57f..4e22f6f9a 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -4,8 +4,7 @@
  *  All code listed below is in the public domain and can be used, shared or
  *  modified freely
  *
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  */
 
 #ifdef USE_MUMBLE
@@ -147,8 +146,8 @@ void MumbleManager::init()
 
 #endif  // WIN32
 
-    wcsncpy(mLinkedMemCache.name, L"ManaVerse", 256);
-    wcsncpy(mLinkedMemCache.description, L"ManaVerse Plugin", 2048);
+    wcsncpy(mLinkedMemCache.name, L"ManaPlus", 256);
+    wcsncpy(mLinkedMemCache.description, L"ManaPlus Plugin", 2048);
     mLinkedMemCache.uiVersion = 2;
 
     // Left handed coordinate system.
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index 574f80faa..d11fbcf9e 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -2,8 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -97,7 +96,7 @@ void LoginRecv::processLoginError(Net::MessageIn &msg)
         case 5:
             // TRANSLATORS: error message
             errorMessage = _("Client too old or wrong server type.\n"
-                "Please update client on https://manaverse.germantmw.de");
+                "Please update client on http://manaplus.org");
             break;
         case 6:
             // TRANSLATORS: error message
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index c387bd0c0..31c394156 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -2,8 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2020  The ManaPlus Developers
- *  Copyright (C) 2020-2023  The ManaVerse Developers
+ *  Copyright (C) 2011-2019  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -90,7 +89,7 @@ void LoginRecv::processLoginError2(Net::MessageIn &msg)
         case 5:
             // TRANSLATORS: error message
             errorMessage = _("Client too old or wrong server type.\n"
-                "Please update client on https://manaverse.germantmw.de");
+                "Please update client on http://manaplus.org");
             break;
         case 6:
             // TRANSLATORS: error message