summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--manaplus.metainfo.xml2
-rw-r--r--packaging/debian/copyright4
-rw-r--r--packaging/openSUSE Build Service/manaplus.spec4
-rwxr-xr-xpackaging/windows/make-translations.sh2
-rw-r--r--packaging/windows/setup.nsi8
-rw-r--r--po/CMakeLists.txt10
-rw-r--r--po/Makevars4
-rw-r--r--po/manaverse.pot (renamed from po/manaplus.pot)0
-rw-r--r--src/commandline.cpp2
-rw-r--r--src/fs/files.cpp2
-rw-r--r--src/gui/windows/maileditwindow.cpp2
-rw-r--r--src/gui/windows/mailwindow.cpp3
-rw-r--r--src/utils/gettexthelper.cpp6
-rwxr-xr-xtools/ci/scripts/runtest.sh4
15 files changed, 27 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac
index 293919d38..e0d53b324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -367,7 +367,7 @@ if test "x$with_internalsdlgfx" = "xno"; then
AC_CHECK_HEADERS(SDL2_rotozoom.h, ,)
else
with_internalsdlgfx=yes
- AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaPlus should use internal sdlgfx2])
+ AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaVerse should use internal sdlgfx2])
fi
AM_CONDITIONAL(USE_INTERNALSDLGFX, test "x$with_internalsdlgfx" = xyes)
diff --git a/manaplus.metainfo.xml b/manaplus.metainfo.xml
index 1e5f5eead..54836cd97 100644
--- a/manaplus.metainfo.xml
+++ b/manaplus.metainfo.xml
@@ -18,7 +18,7 @@
interactive world.
</p>
</description>
- <url type="homepage">http://manaplus.org/</url>
+ <url type="homepage">https://manaverse.germantmw.de/</url>
<screenshots>
<screenshot type="default">http://manaplus.org/_media/manaplus_screenshot_8.png</screenshot>
<screenshot>http://manaplus.org/_media/manaplus_screenshot_11.png</screenshot>
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index 9ba604638..c9348f49b 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: manaplus
-Source: http://download.evolonline.org/manaplus/download/
+Upstream-Name: manaverse
+Source: https://manaverse.germantmw.de/
Files: *
Copyright: 2004-2009 The Mana World Development Team
diff --git a/packaging/openSUSE Build Service/manaplus.spec b/packaging/openSUSE Build Service/manaplus.spec
index 852f6422c..434f43a45 100644
--- a/packaging/openSUSE Build Service/manaplus.spec
+++ b/packaging/openSUSE Build Service/manaplus.spec
@@ -4,8 +4,8 @@ Release: 1
Summary: A client for Evol Online and The Mana World: 2D MMORPG
Group: Games/Other
License: GPLv2+
-Url: http://manaplus.evolonline.org/
-Source0: http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2
+Url: https://manaverse.germantmw.de/
+Source0: https://git.themanaworld.org/mana/plus/-/tree/v%{version}/
BuildRoot: %{_topdir}/%{name}-%{version}-root
BuildRequires: gcc-c++
diff --git a/packaging/windows/make-translations.sh b/packaging/windows/make-translations.sh
index 1d4132397..de8fff283 100755
--- a/packaging/windows/make-translations.sh
+++ b/packaging/windows/make-translations.sh
@@ -2,5 +2,5 @@
for i in `grep -v ^# ../../po/LINGUAS`; do
mkdir -p ../../translations/$i/LC_MESSAGES
- msgfmt -c -o ../../translations/$i/LC_MESSAGES/manaplus.mo ../../po/$i.po
+ msgfmt -c -o ../../translations/$i/LC_MESSAGES/manaverse.mo ../../po/$i.po
done
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 28f782193..9eaf66346 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -57,8 +57,8 @@ RequestExecutionLevel admin
!ifndef PRODUCT_VERSION
!define PRODUCT_VERSION "1.1"
!endif
-!define PRODUCT_PUBLISHER "ManaPlus Development Team"
-!define PRODUCT_WEB_SITE "http://manaplus.evolonline.org/"
+!define PRODUCT_PUBLISHER "ManaVerse Development Team"
+!define PRODUCT_WEB_SITE "http://manaverse.germantmw.de"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "SHCTX"
@@ -101,8 +101,8 @@ RequestExecutionLevel admin
!define MUI_FINISHPAGE_RUN_FUNCTION RunMana
!define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
-!define MUI_FINISHPAGE_LINK "Visit ManaPlus website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://manaplus.evolonline.org/"
+!define MUI_FINISHPAGE_LINK "Visit ManaVerse website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://manaverse.germantmw.de/"
!insertmacro MUI_PAGE_FINISH
Function RunMana
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 068757ac1..ef28b5be6 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -4,7 +4,7 @@ FIND_PACKAGE(Gettext REQUIRED)
# we need our own version because the upstream one contains
# a call to msgmerge (updating po files) which can't be
# disabled
-MACRO(MANAPLUS_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
+MACRO(MANAVERSE_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
# make it a real variable, so we can modify it here
SET(_firstPoFile "${_firstPoFileArg}")
@@ -38,12 +38,12 @@ MACRO(MANAPLUS_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
ENDMACRO()
-MACRO(MANAPLUS_GETTEXT_UPDATE_PO _potFile _languages)
+MACRO(MANAVERSE_GETTEXT_UPDATE_PO _potFile _languages)
GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
ADD_CUSTOM_TARGET(
update-pot
- COMMAND xgettext --files-from=translatable-files --directory=. --output=${_potFile} -d manaplus --keyword=_ --keyword=N_
+ COMMAND xgettext --files-from=translatable-files --directory=. --output=${_potFile} -d manaverse --keyword=_ --keyword=N_
)
ADD_CUSTOM_TARGET(
@@ -78,5 +78,5 @@ ENDFOREACH()
ADD_CUSTOM_TARGET(update-po)
-MANAPLUS_GETTEXT_CREATE_TRANSLATIONS(manaplus.pot ALL ${POFILES})
-MANAPLUS_GETTEXT_UPDATE_PO(manaplus.pot "${languages}")
+MANAVERSE_GETTEXT_CREATE_TRANSLATIONS(manaverse.pot ALL ${POFILES})
+MANAVERSE_GETTEXT_UPDATE_PO(manaverse.pot "${languages}")
diff --git a/po/Makevars b/po/Makevars
index 2cd1a43b5..588deb93f 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
-DOMAIN = manaplus
+DOMAIN = manaverse
# These two variables depend on the location of this directory.
subdir = po
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-COPYRIGHT_HOLDER = The ManaPlus Developers
+COPYRIGHT_HOLDER = The ManaVerse Developers
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
diff --git a/po/manaplus.pot b/po/manaverse.pot
index f319337d3..f319337d3 100644
--- a/po/manaplus.pot
+++ b/po/manaverse.pot
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 4270d6322..2d8d48254 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -51,7 +51,7 @@ static void printHelp()
_(" used to set custom parameters") <<
std::endl <<
// TRANSLATORS: command line help
- _(" to the manaplus client.") <<
+ _(" to the manaverse client.") <<
std::endl << std::endl <<
// TRANSLATORS: command line help
_("Options:") <<
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index 59fd31f11..5134520ce 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -60,7 +60,7 @@ void Files::extractLocale()
const std::string dir = pathJoin("locale", *i);
if (VirtFs::isDirectory(dir))
{
- const std::string moFile = dir + "/LC_MESSAGES/manaplus.mo";
+ const std::string moFile = dir + "/LC_MESSAGES/manaverse.mo";
if (VirtFs::exists((moFile)))
{
const std::string localFile = pathJoin(localDir, moFile);
diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp
index e7fad6aab..bd47710dc 100644
--- a/src/gui/windows/maileditwindow.cpp
+++ b/src/gui/windows/maileditwindow.cpp
@@ -67,7 +67,7 @@ MailEditWindow::MailEditWindow() :
// TRANSLATORS: mail edit window label
mMoneyLabel(new Label(this, _("Money:"))),
// TRANSLATORS: mail edit window label
- mItemLabel(new Label(this, _("Item:"))),
+ mItemLabel(new Label(this, _("Items:"))),
// TRANSLATORS: mail edit window label
mMessageLabel(new Label(this, _("Message:"))),
mToField(new TextField(this, std::string(), LoseFocusOnTab_true,
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 2879f592b..cd3c8c6cf 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -92,8 +92,6 @@ MailWindow::MailWindow() :
if (setupWindow != nullptr)
setupWindow->registerWindowForReset(this);
- center();
-
// use line wrapping of mail subjects, instead.
mListScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
// set reasonable minimum width for calculations below
@@ -125,6 +123,7 @@ MailWindow::MailWindow() :
setMinWidth(getWidth());
setMinHeight(getHeight());
setDefaultSize(getWidth(), getHeight(), ImagePosition::CENTER, 0, 0);
+ center();
loadWindowState();
enableVisibleSound(true);
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 08934a944..84a6e8602 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -124,8 +124,8 @@ void GettextHelper::initLang()
else
logger->log("locale empty");
}
- bind_textdomain_codeset("manaplus", "UTF-8");
- textdomain("manaplus");
+ bind_textdomain_codeset("manaverse", "UTF-8");
+ textdomain("manaverse");
#elif defined(ENABLE_CUSTOMNLS)
mainTranslator = new PoDict("en");
setLangEnv();
@@ -135,7 +135,7 @@ void GettextHelper::initLang()
#ifdef ENABLE_NLS
void GettextHelper::bindTextDomain(const char *const path)
{
- const char *const dir = bindtextdomain("manaplus", path);
+ const char *const dir = bindtextdomain("manaverse", path);
if (dir)
logger->log("bindtextdomain: %s", dir);
else
diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh
index 622e04da0..7b522b88a 100755
--- a/tools/ci/scripts/runtest.sh
+++ b/tools/ci/scripts/runtest.sh
@@ -52,7 +52,7 @@ function wait_for_servers_list {
function run {
./src/manaplus --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 &
export PID=$!
- echo "manaplus PID: ${PID}"
+ echo "manaverse PID: ${PID}"
sleep 15
echo "pause after run"
wait_for_servers_list
@@ -233,7 +233,7 @@ imagesdiff new_server.png about.png
send_command "/sendmousekey 500 20 1"
send_command "/screenshot about.png"
-# open about manaplus page
+# open about manaverse page
send_command "/sendmousekey 300 ${ABOUTYOFFSET} 1"
send_command "/screenshot about2.png"
imagesdiff about.png about2.png
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-12 07:32:02 +0000