diff options
| author | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2024-02-16 16:40:35 +0000 |
|---|---|---|
| committer | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2024-02-16 16:40:35 +0000 |
| commit | 775392e472933be8d1d76619894efc0671f0c02d (patch) | |
| tree | cacf9d24264315d12c7983ae3b176ad7c67bdddf /src/gui/windows | |
| parent | 0144ab308fed93b96b3a819dfe7d9940ee9eedb9 (diff) | |
| download | plus-775392e472933be8d1d76619894efc0671f0c02d.tar.gz plus-775392e472933be8d1d76619894efc0671f0c02d.tar.bz2 plus-775392e472933be8d1d76619894efc0671f0c02d.tar.xz plus-775392e472933be8d1d76619894efc0671f0c02d.zip | |
Client rebranding: Partly import changes from !28
Co-Authored-By: jak1 <jak1@themanaworld.org>
Co-Authored-By: jesusalva <jesusalva@themanaworld.org>
Co-Authored-By: Fedja Beader <fedja@protonmail.ch>
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 6 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 0d52dad14..a3b777655 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -2,7 +2,8 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2019 The ManaPlus Developers + * Copyright (C) 2011-2020 The ManaPlus Developers + * Copyright (C) 2020-2023 The ManaVerse Developers * * This file is part of The ManaPlus Client. * @@ -1662,11 +1663,14 @@ 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 283df5ecf..948ce5a17 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -2,7 +2,8 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2019 The ManaPlus Developers + * Copyright (C) 2011-2020 The ManaPlus Developers + * Copyright (C) 2020-2023 The ManaVerse Developers * * This file is part of The ManaPlus Client. * @@ -460,7 +461,7 @@ void UpdaterWindow::loadPatch() if (line != nullptr) { mBrowserBox->addRow(strprintf("##9 Latest client version: " - "##6ManaPlus %s##0", line), true); + "##6ManaVerse %s##0", line), true); } } if (version > CHECK_VERSION) @@ -482,11 +483,11 @@ void UpdaterWindow::loadPatch() branding.getStringValue(url)).append("|").append( branding.getStringValue(text)).append("@@]"), true); mBrowserBox->addRow("##1You can download it from", true); - mBrowserBox->addRow("##1ManaPlus updated.", true); + mBrowserBox->addRow("##1ManaVerse updated.", true); } else { - mBrowserBox->addRow("You have latest client version.", true); + mBrowserBox->addRow("You have the latest client version.", true); } } |