summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt.legacy6
-rw-r--r--INSTALL4
-rw-r--r--Makefile.am8
-rw-r--r--PKGBUILD.in2
-rwxr-xr-xbuild/update-creator.sh2
-rwxr-xr-xconfigure.ac2
-rw-r--r--data/help/about.txt6
-rw-r--r--data/help/download.txt2
-rw-r--r--data/help/footer.txt2
-rw-r--r--data/help/support.txt6
-rw-r--r--data/help/team.txt2
-rw-r--r--data/help/tips/10.txt2
-rw-r--r--data/help/tips/16.txt2
-rw-r--r--data/help/tips/8.txt2
-rw-r--r--data/icons/CMakeLists.txt4
-rw-r--r--data/icons/Makefile.am12
-rw-r--r--data/test/serverlistplus.xml6
-rw-r--r--data/themes/golden-delicious/CHANGELOG.txt4
-rw-r--r--data/tmw/tmw.manaplus4
-rw-r--r--data/translations/help/ca.po12
-rw-r--r--data/translations/help/cs.po12
-rw-r--r--data/translations/help/de.po12
-rw-r--r--data/translations/help/es.po12
-rw-r--r--data/translations/help/fr.po12
-rw-r--r--data/translations/help/id.po6
-rw-r--r--data/translations/help/it.po6
-rw-r--r--data/translations/help/ja.po6
-rw-r--r--data/translations/help/nl.po6
-rw-r--r--data/translations/help/nl_BE.po6
-rw-r--r--data/translations/help/pl.po12
-rw-r--r--data/translations/help/pt_BR.po12
-rw-r--r--data/translations/help/ru.po12
-rw-r--r--data/translations/help/sr.po6
-rw-r--r--data/translations/help/sv_SE.po6
-rw-r--r--data/translations/help/tr.po6
-rw-r--r--data/translations/help/uk.po12
-rw-r--r--data/translations/help/zh_CN.po6
-rw-r--r--data/translations/help/zh_HK.po6
-rw-r--r--data/translations/help/zh_TW.po6
-rw-r--r--docs/FAQ.txt4
-rw-r--r--docs/Makefile.am2
-rw-r--r--docs/manaplustest.62
-rw-r--r--manaplus.appdata.xml12
-rw-r--r--manaplus.desktop25
-rw-r--r--packaging/debian/control2
-rw-r--r--packaging/nacl/ports/manaplus/pkg_info2
-rw-r--r--packaging/windows/evol.nsi38
-rw-r--r--packaging/windows/setup.nsi42
-rw-r--r--po/CMakeLists.txt4
-rw-r--r--po/ca.po6
-rw-r--r--po/cs.po2
-rw-r--r--po/de.po4
-rw-r--r--po/eo.po4
-rw-r--r--po/es.po6
-rw-r--r--po/fi.po2
-rw-r--r--po/fr.po6
-rw-r--r--po/id.po2
-rw-r--r--po/it.po2
-rw-r--r--po/ja.po2
-rw-r--r--po/manaplus.pot2
-rw-r--r--po/nl.po2
-rw-r--r--po/nl_BE.po2
-rw-r--r--po/pl.po4
-rw-r--r--po/pt.po4
-rw-r--r--po/pt_BR.po4
-rw-r--r--po/ru.po4
-rw-r--r--po/sr.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/sv_SE.po2
-rw-r--r--po/tr.po2
-rw-r--r--po/uk.po2
-rw-r--r--po/zh_CN.po2
-rw-r--r--po/zh_HK.po2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am8
-rw-r--r--src/fs/paths.cpp4
-rw-r--r--src/gui/widgets/desktop.cpp2
-rw-r--r--src/gui/windows/serverdialog.cpp2
-rw-r--r--src/manaplus.rc2
-rw-r--r--src/net/ea/loginrecv.cpp2
-rw-r--r--src/net/eathena/loginrecv.cpp2
-rw-r--r--src/progs/dyecmd/client.cpp2
-rw-r--r--src/progs/manaplus/client.cpp2
-rw-r--r--src/render/mobileopengl2graphics.cpp2
-rw-r--r--src/render/modernopenglgraphics.cpp2
-rwxr-xr-xtools/ci/jobs/mplint.sh2
-rwxr-xr-xtools/ci/scripts/clonesrc.sh2
87 files changed, 235 insertions, 260 deletions
diff --git a/CMakeLists.txt.legacy b/CMakeLists.txt.legacy
index e27809fda..cd62b68dc 100644
--- a/CMakeLists.txt.legacy
+++ b/CMakeLists.txt.legacy
@@ -54,10 +54,10 @@ IF (GETTEXT_FOUND AND ENABLE_NLS)
ENDIF()
If(UNIX)
- INSTALL(FILES manaverse.desktop DESTINATION share/applications)
+ INSTALL(FILES manaplus.desktop DESTINATION share/applications)
INSTALL(FILES manaversetest.desktop DESTINATION share/applications)
- INSTALL(FILES manaverse.appdata.xml DESTINATION share/appdata)
+ INSTALL(FILES manaplus.appdata.xml DESTINATION share/appdata)
ENDIF()
SET(CPACK_PACKAGE_NAME "manaverse")
@@ -73,6 +73,6 @@ IF(WIN32)
SET(CPACK_NSIS_DISPLAY_NAME "ManaVerse")
SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico")
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp")
- SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.org")
+ SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.germantmw.de")
ENDIF()
INCLUDE(CPack)
diff --git a/INSTALL b/INSTALL
index 95fd32da6..938ec6d24 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
How to compile and run ManaVerse on your GNU/Linux Box
=================================================
-Homepage: http://manaplus.org/
-IRC: irc.freenode.net / #manaverse
+Homepage: http://manaplus.germantmw.de/
+IRC: irc.libera.chat / #manaverse
1) Requirements
2) Compiling And Installing ManaVerse
diff --git a/Makefile.am b/Makefile.am
index a4fd4097b..d082fe8dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,12 +3,12 @@ SUBDIRS = data docs po src
desktopdir = $(datarootdir)/applications
-desktop_DATA = manaverse.desktop \
+desktop_DATA = manaplus.desktop \
manaversetest.desktop
appdatadir = $(datarootdir)/appdata
-appdata_DATA = manaverse.appdata.xml
+appdata_DATA = manaplus.appdata.xml
# Extra files to include
EXTRA_DIST = $(desktop_DATA) \
@@ -19,8 +19,8 @@ EXTRA_DIST = $(desktop_DATA) \
CMake/Modules/FindLibIntl.cmake \
CMake/Modules/FindSDL_gfx.cmake \
Android.mk \
- manaverse.menu \
- manaverse.spec \
+ manaplus.menu \
+ manaplus.spec \
AUTHORS \
ChangeLog \
INSTALL \
diff --git a/PKGBUILD.in b/PKGBUILD.in
index e80e36f9f..34261cb4a 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -5,7 +5,7 @@ pkgver=@PACKAGE_VERSION@
pkgrel=1
pkgdesc="ManaVerse is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tAthena) also for other forks like Evol. More info here: http://manaplus.germantmw.de"
arch=('i686' 'x86_64')
-url="http://manaplus.org"
+url="http://manaplus.germantmw.de"
depends=('libxml2' 'sdl_image' 'sdl_mixer' 'sdl_net' 'sdl_ttf' 'sdl_gfx')
license=('GPL2')
diff --git a/build/update-creator.sh b/build/update-creator.sh
index 37e8af733..f3fc9e28c 100755
--- a/build/update-creator.sh
+++ b/build/update-creator.sh
@@ -8,4 +8,4 @@ find -name \*.cpp \
-o -name \*.txt \
-o -name \*.xml \
-o -name \*.manaplus \
- | sort > manaverse.files
+ | sort > manaplus.files
diff --git a/configure.ac b/configure.ac
index ef7000ff1..adaa12561 100755
--- a/configure.ac
+++ b/configure.ac
@@ -888,7 +888,7 @@ AC_CHECK_HEADERS([execinfo.h],
AM_CONDITIONAL(HAVE_EXECINFO, test x$have_execinfo = xyes)
AC_CONFIG_FILES([
-manaverse.spec
+manaplus.spec
Makefile
PKGBUILD
src/Makefile
diff --git a/data/help/about.txt b/data/help/about.txt
index e2dc51e26..61c39f654 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -1,7 +1,7 @@
<- @@index|<<Back to Index>>@@
-##3 === <<ABOUT MANAPLUS>> ===
+##3 === <<ABOUT MANA VERSE>> ===
<<##2ManaVerse##9 is extended client based on old code from ##2Mana##9 client.
Added many features, improved perfomance, stability, security and more.>>
@@ -11,9 +11,9 @@
sure this game can't ever run away from you.>>
##9 Copyright (C) 2012-2017 The ManaPlus Developers
- -> @@team|<<Manaverse Developers>>, http://manaplus.org@@
+ -> @@team|<<Manaverse Developers>>, http://manaplus.germantmw.de@@
-##9 Copyright (C) 2004-2017 The Mana World Development Team
+##9 Copyright (C) 2004-2021 The Mana World Development Team
-> @@about-tmw|<<About The Mana World>>@@
-> @@about-server|<<About current server>>@@
diff --git a/data/help/download.txt b/data/help/download.txt
index 01ad5348b..a1becc936 100644
--- a/data/help/download.txt
+++ b/data/help/download.txt
@@ -6,6 +6,6 @@
##2Android: @@http://download.germantmw.de/manaplus/download/manaplus.apk|apk@@, @@http://www.amazon.com/gp/product/B00FINPCWA|Amazon@@, @@https://play.google.com/store/apps/details?id=org.evolonline.beta.manaplus|Google Play@@
##2Chrome: @@https://chrome.google.com/webstore/detail/manaplus/fgdcjlfkdeadkbplfhkbjjccagjepodj|<<Chrome store>>@@
##2MacOSX: @@http://download.germantmw.de/manaplus/macosx/manaplus-lion-1.3.9.15.dmg|Lion@@, @@http://download.germantmw.de/manaplus/macosx/manaplus-snowleopard.dmg|Snow leopard@@
- ##2Windows: @@http://download.germantmw.de/manaplus/download/manaplus-win32.exe|<<Download>>@@, @@http://manaplus.org/windowsinstaller|<<Instructions>>@@
+ ##2Windows: @@http://download.germantmw.de/manaplus/download/manaplus-win32.exe|<<Download>>@@, @@http://manaplus.germantmw.de/windowsinstaller|<<Instructions>>@@
##2<<Sources:>> @@http://download.germantmw.de/manaplus/download/manaplus.tar.xz|<<Download>>@@
##2<<Other linux:>> @@http://download.germantmw.de/manaplus/download/manaplus-linux.tar.bz2|<<Download>>@@
diff --git a/data/help/footer.txt b/data/help/footer.txt
index be8738115..2762020b1 100644
--- a/data/help/footer.txt
+++ b/data/help/footer.txt
@@ -1,3 +1,3 @@
-##2 <<Website: @@http://manaplus.org/|http://manaplus.org/@@>>
+##2 <<Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@>>
diff --git a/data/help/support.txt b/data/help/support.txt
index 7823933bf..85ce23f83 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -13,19 +13,19 @@
<<For Evol Online support:>>
<<Visit IRC channel:>>
-##2 #evolonline ##9@##2 irc.freenode.net
+##2 #evolonline ##9@##2 irc.libera.chat
<<For ManaVerse Online support:>>
<<Visit IRC channel:>>
-##2 #manaverse #evolonline ##9@##2 irc.freenode.net
+##2 #manaverse #evolonline ##9@##2 irc.libera.chat
<<For TMW support:>>
##2 @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@
<<or come visit us on our IRC channel:>>
-##2 #themanaworld ##9@##2 irc.freenode.net
+##2 #themanaworld ##9@##2 irc.libera.chat
<<Otherwise see the @@team|Development Team@@ section to have a list of
developers and how to contact them.>>
diff --git a/data/help/team.txt b/data/help/team.txt
index 6e6a7417a..432d3ac6a 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -1,6 +1,6 @@
.<- @@index|<<Back to Index>>@@
-@@http://manaplus.org/|<<Official site:>> http://manaplus.org@@
+@@http://manaplus.germantmw.de/|<<Official site:>> http://manaplus.germantmw.de@@
##3---------------------------
##3-- <<ManaVerse Contributors>> --
diff --git a/data/help/tips/10.txt b/data/help/tips/10.txt
index fdea2e3d1..6888c2aed 100644
--- a/data/help/tips/10.txt
+++ b/data/help/tips/10.txt
@@ -1,2 +1,2 @@
<<If client working very slow, you can improve speed
-by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@>>
+by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@>>
diff --git a/data/help/tips/16.txt b/data/help/tips/16.txt
index 0e8c9f681..d3961c694 100644
--- a/data/help/tips/16.txt
+++ b/data/help/tips/16.txt
@@ -1,3 +1,3 @@
<<Look this page for help and downloads:>>
-@@http://manaplus.org/|http://manaplus.org/@@
+@@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@
diff --git a/data/help/tips/8.txt b/data/help/tips/8.txt
index 9caff898a..58bacb0ed 100644
--- a/data/help/tips/8.txt
+++ b/data/help/tips/8.txt
@@ -1,2 +1,2 @@
<<About yellow bar you can read here:
-@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@>>
+@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@>>
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 0106dc8ef..2d5a0a899 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -1,7 +1,7 @@
SET(FILES
- manaverse.svg
+ manaplus.svg
)
INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
-INSTALL(FILES "manaverse.svg" DESTINATION share/icons/hicolor/scalable/apps)
+INSTALL(FILES "manaplus.svg" DESTINATION share/icons/hicolor/scalable/apps)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index ef55da5dc..37eb702fd 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,12 +1,12 @@
iconsdir = $(pkgdatadir)/data/icons
-icons_DATA = manaverse.png \
- manaverse.svg \
- manaverse.icns \
- manaverse.ico \
- manaverse.hqx \
- manaverse.xpm
+icons_DATA = manaplus.png \
+ manaplus.svg \
+ manaplus.icns \
+ manaplus.ico \
+ manaplus.hqx \
+ manaplus.xpm
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
diff --git a/data/test/serverlistplus.xml b/data/test/serverlistplus.xml
index 1cf0ede0d..064592516 100644
--- a/data/test/serverlistplus.xml
+++ b/data/test/serverlistplus.xml
@@ -136,10 +136,10 @@
</server>
<server name="Hercules preview server" type="eathena">
- <connection hostname="hercules.manaplus.org" althostname="212.85.158.133" port="6900" protocol="TCP" packetVersion="20150000"/>
+ <connection hostname="hercules.manaplus.germantmw.de" althostname="212.85.158.133" port="6900" protocol="TCP" packetVersion="20150000"/>
<state>DEVELOPMENT</state>
- <site>http://manaplus.org/</site>
- <support>http://manaplus.org/</support>
+ <site>http://manaplus.germantmw.de/</site>
+ <support>http://manaplus.germantmw.de/</support>
<updateMirror>http://download.germantmw.de/manaplus/hercules/data</updateMirror>
<description>Server for testing ManaVerse features.</description>
</server>
diff --git a/data/themes/golden-delicious/CHANGELOG.txt b/data/themes/golden-delicious/CHANGELOG.txt
index 00201303a..fbe09d5b2 100644
--- a/data/themes/golden-delicious/CHANGELOG.txt
+++ b/data/themes/golden-delicious/CHANGELOG.txt
@@ -48,7 +48,7 @@ Changes:
[!] Fixed black-on-black color issue in help window. Thanks to 4144!
Caveat: new manaverse haves another idea about this as it
has been bug. Anyway, help should be readable on both "old"
- and "new" manaverse.
+ and "new" manaplus.
[!] Reduced artefacts caused by window bitmap texture due to tiling.
[!] Fixed color of item protection background in shop windows.
[!] Fixed keyboard icon coloring.
@@ -67,7 +67,7 @@ Changes:
[*] Same for chat tabs.
[*] Some small changes reducing overall theme contrast a bit.
[*] Tweaked padding of shortcuts bar, looks better as 1-column window.
- Note: maybe only works well with recent manaverse.
+ Note: maybe only works well with recent manaplus.
[*] Some messing with padding of windows and buttons to make
theme a bit more compact overall.
[*] Improved cursor selection in items dialog so it no longer overlaps
diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus
index c4b66237e..a44f49b07 100644
--- a/data/tmw/tmw.manaplus
+++ b/data/tmw/tmw.manaplus
@@ -5,8 +5,8 @@
<option name="appIcon" value="tmw/icons/tmw.png"/>
<option name="screenshots" value="TheManaWorld"/>
<option name="loginMusic" value="Magick - Real.ogg"/>
- <option name="onlineServerList" value="http://manaplus.org/serverlist.xml"/>
- <option name="onlineServerList2" value="http://www.manaplus.org/serverlist.xml"/>
+ <option name="onlineServerList" value="http://manaplus.germantmw.de/serverlist.xml"/>
+ <option name="onlineServerList2" value="http://www.manaplus.germantmw.de/serverlist.xml"/>
<option name="defaultServer" value="server.themanaworld.org"/>
<option name="defaultPort" value="6901"/>
<option name="defaultServerType" value="tmwathena"/>
diff --git a/data/translations/help/ca.po b/data/translations/help/ca.po
index 008483712..acc702a1e 100644
--- a/data/translations/help/ca.po
+++ b/data/translations/help/ca.po
@@ -105,8 +105,8 @@ msgstr "/dumpe - buida variables d'entorn al xat."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Si el client està funcionant lentament, podeu millorar la velocitat llegint això: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Si el client està funcionant lentament, podeu millorar la velocitat llegint això: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Activa/Desactiva intercanvis\""
@@ -1036,8 +1036,8 @@ msgstr "Portabilitat MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Podeu informar-vos sobre la barra groga:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Podeu informar-vos sobre la barra groga:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - llença N objectes des de la ranura 0."
@@ -1139,8 +1139,8 @@ msgstr "\"Mou a la localització casa\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname NOM - estableix nom de l'homuncle."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Lloc web: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Lloc web: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Finestra d'habilitat\""
diff --git a/data/translations/help/cs.po b/data/translations/help/cs.po
index 5bd50de7e..c9eb98bec 100644
--- a/data/translations/help/cs.po
+++ b/data/translations/help/cs.po
@@ -106,8 +106,8 @@ msgstr "/dumpe - vypíše proměnné prostředí do chatu."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Pokud je klient zpomalený, můžete jej zrychlit \npomocí toho návodu: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Pokud je klient zpomalený, můžete jej zrychlit \npomocí toho návodu: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Zakázet/Povolit obchodování\""
@@ -1037,8 +1037,8 @@ msgstr "Portování na MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Více informací o žluté liště najdete zde:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Více informací o žluté liště najdete zde:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - upustí N předmětů z místa 0."
@@ -1140,8 +1140,8 @@ msgstr "\"Přejít na domácí místo\""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Webová stránka: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Webová stránka: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Okno dovedností\""
diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 0df3baa5c..565a7f0b4 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -119,8 +119,8 @@ msgstr "/dumpe - Umgebungsvariablen im Chat ausgeben."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Wenn der Klient sehr langsam läuft kannst du die Geschwindigkeit verbessern,\nindem du folgendes liest: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Wenn der Klient sehr langsam läuft kannst du die Geschwindigkeit verbessern,\nindem du folgendes liest: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Handel aktivieren/deaktivieren\""
@@ -1050,8 +1050,8 @@ msgstr "MacOSX Portierung"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Du kannst hier Informationen über die gelbe Leiste lesen:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Du kannst hier Informationen über die gelbe Leiste lesen:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - N Gegenstände von Slot 0 wegwerfen."
@@ -1153,8 +1153,8 @@ msgstr "\"Zum Stammplatz bewegen\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname NAME - Homunkulus einen Namen geben."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Internetseite: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Internetseite: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Fertigkeitsfenster\""
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index ca533c78a..afdeca6fc 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -112,8 +112,8 @@ msgstr "/dumpe - Vacía las variables de entorno en el chat."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Si el cliente está funcionando muy lento, puedes mejorar la velocidad aplicando \n los siguientes consejos: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Si el cliente está funcionando muy lento, puedes mejorar la velocidad aplicando \n los siguientes consejos: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Habilitar/deshabilitar intercambios\""
@@ -1043,8 +1043,8 @@ msgstr "Portabilidad MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Puedes leer acerca de la barra amarilla aquí:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Puedes leer acerca de la barra amarilla aquí:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - Tirar N artículos desde la ranura 0."
@@ -1146,8 +1146,8 @@ msgstr "\"Mover a la posición home\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname NOMBRE - establecer el nombre de humúnculo."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Sitio web: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Sitio web: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Ventana de habilidades\""
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index aa0e8344d..29af7d152 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -113,8 +113,8 @@ msgstr "/dumpe - copie les variables d'environnement dans la conversation."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Si le client fonctionne très lentement, tu peux peut-être améliorer sa vitesse\naprès avoir lu ceci: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Si le client fonctionne très lentement, tu peux peut-être améliorer sa vitesse\naprès avoir lu ceci: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Activer / Désactiver les échanges\""
@@ -1044,8 +1044,8 @@ msgstr "Portage MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "À propos de la barre jaune, tu peux lire cette page:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "À propos de la barre jaune, tu peux lire cette page:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - abandonne N objets depuis la case 0."
@@ -1147,8 +1147,8 @@ msgstr "\"Aller à la position maison\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname NAME - change le nom de l'homoncule."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Site Web: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Site Web: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Fenêtre des compétences\""
diff --git a/data/translations/help/id.po b/data/translations/help/id.po
index 72bf06c93..fe2370f60 100644
--- a/data/translations/help/id.po
+++ b/data/translations/help/id.po
@@ -107,7 +107,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1038,7 +1038,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1141,7 +1141,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/it.po b/data/translations/help/it.po
index 96e3fe9e5..d37c580fb 100644
--- a/data/translations/help/it.po
+++ b/data/translations/help/it.po
@@ -110,7 +110,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1041,7 +1041,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1144,7 +1144,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/ja.po b/data/translations/help/ja.po
index 4b561a4e6..f7712b9a2 100644
--- a/data/translations/help/ja.po
+++ b/data/translations/help/ja.po
@@ -104,7 +104,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1035,7 +1035,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/nl.po b/data/translations/help/nl.po
index 4fd5800ce..154bf69f0 100644
--- a/data/translations/help/nl.po
+++ b/data/translations/help/nl.po
@@ -107,7 +107,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1038,7 +1038,7 @@ msgstr "MacOSX porting"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1141,7 +1141,7 @@ msgstr "\"Verplaats naar thuislokatie\""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/nl_BE.po b/data/translations/help/nl_BE.po
index 4fd5800ce..154bf69f0 100644
--- a/data/translations/help/nl_BE.po
+++ b/data/translations/help/nl_BE.po
@@ -107,7 +107,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1038,7 +1038,7 @@ msgstr "MacOSX porting"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1141,7 +1141,7 @@ msgstr "\"Verplaats naar thuislokatie\""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 4bca9faae..e0a492b3e 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -110,8 +110,8 @@ msgstr "/dumpe - zrzuć zmienne środowiska do czatu."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Jeśli klient działa zbyt wolno, możesz poprawić prędkość czytając to: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Jeśli klient działa zbyt wolno, możesz poprawić prędkość czytając to: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Aktywuj/Deaktywuj Handlowanie\""
@@ -1041,8 +1041,8 @@ msgstr "Portowanie na MaxOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Na temat żółtego paska możesz przeczytać tutaj:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Na temat żółtego paska możesz przeczytać tutaj:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - upuść N przedmiotów ze slotu 0."
@@ -1144,8 +1144,8 @@ msgstr "\"Podejdź do lokacji domowej\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname NAME - ustaw imię homunkulusa."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Strona: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Strona: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Okno Umiejętności\""
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index bd94ea719..c70a7db27 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -115,8 +115,8 @@ msgstr "/dumpe - Exibe variáveis de ambiente no chat."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Se o cliente está funcionando muito lentamente, você pode melhorar a velocidade\nlendo isso: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Se o cliente está funcionando muito lentamente, você pode melhorar a velocidade\nlendo isso: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Habilitar/desabilitar negociação\""
@@ -1046,8 +1046,8 @@ msgstr "versão para MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Sobre a barra amarela você pode ler aqui:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Sobre a barra amarela você pode ler aqui:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - Descarta N itens do slot 0."
@@ -1149,8 +1149,8 @@ msgstr "\"Mover para posição inicial\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname NOME - configura o nome do homúnculo."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Janela de habilidade\""
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 19547eea5..c83dbaae4 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -120,8 +120,8 @@ msgstr "/dumpe - выгрузить переменные окружения в
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Если клиент работает очень медленно, вы можете увеличить скорость\nпрочитав материал по ссылке: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Если клиент работает очень медленно, вы можете увеличить скорость\nпрочитав материал по ссылке: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Разрешение/Запрет торговли\""
@@ -1051,8 +1051,8 @@ msgstr "Портирование на MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Все о желтой панели вы можете прочесть здесь:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Все о желтой панели вы можете прочесть здесь:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - бросить N предметов из слота 0."
@@ -1154,8 +1154,8 @@ msgstr "\"Переход к Домашней локации\""
msgid "/sethomunname NAME - set homunculus name."
msgstr "/sethomunname ИМЯ - установить имя гомункула."
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Интернет сайт: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Интернет сайт: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Окно навыков\""
diff --git a/data/translations/help/sr.po b/data/translations/help/sr.po
index 7d1123159..5a5147a8b 100644
--- a/data/translations/help/sr.po
+++ b/data/translations/help/sr.po
@@ -106,7 +106,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1037,7 +1037,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1140,7 +1140,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/sv_SE.po b/data/translations/help/sv_SE.po
index 1578873a6..722fb5d5d 100644
--- a/data/translations/help/sv_SE.po
+++ b/data/translations/help/sv_SE.po
@@ -104,7 +104,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1035,7 +1035,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/tr.po b/data/translations/help/tr.po
index 50446e333..88687b03d 100644
--- a/data/translations/help/tr.po
+++ b/data/translations/help/tr.po
@@ -106,7 +106,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1037,7 +1037,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1140,7 +1140,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/uk.po b/data/translations/help/uk.po
index b798b2758..84f59ca71 100644
--- a/data/translations/help/uk.po
+++ b/data/translations/help/uk.po
@@ -104,8 +104,8 @@ msgstr "/dumpe - показати змінні середовища в чаті.
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
-msgstr "Якщо клієнт працює надто повільно, ознайомтеся з матеріалами за посиланням:\n@@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
+msgstr "Якщо клієнт працює надто повільно, ознайомтеся з матеріалами за посиланням:\n@@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgid "\"Enable/disable trading\""
msgstr "\"Дозвіл/заборона торгівлі\""
@@ -1035,8 +1035,8 @@ msgstr "Перенесення на MacOSX"
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
-msgstr "Повне пояснення щодо Жовтого рядка можно прочитати тут:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
+msgstr "Повне пояснення щодо Жовтого рядка можно прочитати тут:\n@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgid "/drop - drop N items from 0 slot."
msgstr "/drop - кинути N (відповідно значенню лічильника) предметів з комірця 0."
@@ -1138,8 +1138,8 @@ msgstr "\"Рухатись до домашньої локації\""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr "Інтернет сайт: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
+msgstr "Інтернет сайт: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgid "\"Skill window\""
msgstr "\"Вікно вмінь\""
diff --git a/data/translations/help/zh_CN.po b/data/translations/help/zh_CN.po
index f998d68e7..c66a99697 100644
--- a/data/translations/help/zh_CN.po
+++ b/data/translations/help/zh_CN.po
@@ -110,7 +110,7 @@ msgstr "/dumpe - 查看环境变量."
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1041,7 +1041,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1144,7 +1144,7 @@ msgstr "\"回家\""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/zh_HK.po b/data/translations/help/zh_HK.po
index 526164830..b80742d84 100644
--- a/data/translations/help/zh_HK.po
+++ b/data/translations/help/zh_HK.po
@@ -104,7 +104,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1035,7 +1035,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/data/translations/help/zh_TW.po b/data/translations/help/zh_TW.po
index b31736a35..5446177d2 100644
--- a/data/translations/help/zh_TW.po
+++ b/data/translations/help/zh_TW.po
@@ -104,7 +104,7 @@ msgstr ""
msgid ""
"If client working very slow, you can improve speed\n"
-"by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@"
+"by reading this: @@http://manaplus.germantmw.de/slowpc|http://manaplus.germantmw.de/slowpc@@"
msgstr ""
msgid "\"Enable/disable trading\""
@@ -1035,7 +1035,7 @@ msgstr ""
msgid ""
"About yellow bar you can read here:\n"
-"@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@"
+"@@http://manaplus.germantmw.de/yellowbar|http://manaplus.germantmw.de/yellowbar@@"
msgstr ""
msgid "/drop - drop N items from 0 slot."
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "/sethomunname NAME - set homunculus name."
msgstr ""
-msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
+msgid "Website: @@http://manaplus.germantmw.de/|http://manaplus.germantmw.de/@@"
msgstr ""
msgid "\"Skill window\""
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index b21211289..d5d26a1f1 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -8,7 +8,7 @@ Q: How to get help?
A: The fastest way is to come on our IRC channel. There you can find a lot of
nice people that will help you until you solve your problem.
- Server: irc.freenode.net Channel: #manaverse.
+ Server: irc.libera.chat Channel: #manaplus.
DEVELOPMENT
@@ -19,4 +19,4 @@ A: There are a lot of ways:
- If you're a programmer, an artist or just willing to help in any way, you
can become part of the development team. Join our irc channel:
- #manaverse @ irc.freenode.net.
+ #manaverse @ irc.libera.chat.
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a86a6b11e..353df2ab6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,4 @@
-man6_MANS = manaverse.6 \
+man6_MANS = manaplus.6 \
manaversetest.6
EXTRA_DIST = $(man6_MANS) \
diff --git a/docs/manaplustest.6 b/docs/manaplustest.6
index 803f9c983..8ab7f7068 100644
--- a/docs/manaplustest.6
+++ b/docs/manaplustest.6
@@ -4,7 +4,7 @@ manaversetest \- ManaVerseTest: test tool for manaverse
.SH "SYNOPSIS"
\fBmanaversetest\fR
.SH "DESCRIPTION"
-Graphics and configuration tool for manaverse.
+Graphics and configuration tool for manaplus.
.SH "AUTHOR"
This manual page was written by Andrei Karas <akaras@inbox.ru>
diff --git a/manaplus.appdata.xml b/manaplus.appdata.xml
index fb9793097..1584a009f 100644
--- a/manaplus.appdata.xml
+++ b/manaplus.appdata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
- <id type="desktop">manaverse.desktop</id>
+ <id type="desktop">manaplus.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0</project_license>
- <name>The Mana Plus Client</name>
+ <name>The Mana Verse Client</name>
<summary>Extended client for The Mana World and similar servers</summary>
<description>
<p>
@@ -18,11 +18,11 @@
interactive world.
</p>
</description>
- <url type="homepage">http://manaplus.org/</url>
+ <url type="homepage">http://manaplus.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>
- <screenshot>http://manaplus.org/_media/manaplus_screenshot_15.png</screenshot>
+ <screenshot type="default">http://manaplus.germantmw.de/_media/manaplus_screenshot_8.png</screenshot>
+ <screenshot>http://manaplus.germantmw.de/_media/manaplus_screenshot_11.png</screenshot>
+ <screenshot>http://manaplus.germantmw.de/_media/manaplus_screenshot_15.png</screenshot>
</screenshots>
<content_rating type="oars-1.1">
<content_attribute id="violence-cartoon">mild</content_attribute>
diff --git a/manaplus.desktop b/manaplus.desktop
deleted file mode 100644
index d8aa56e55..000000000
--- a/manaplus.desktop
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[Desktop Entry]
-Version=1.0
-Name=ManaVerse
-Comment=A 2D MMORPG client
-Exec=manaverse
-StartupNotify=false
-Terminal=false
-Type=Application
-Icon=manaverse
-Categories=Game;AdventureGame;
-Keywords=MMORPG;game;RPG;adventure;multiplayer;online;
-
-# Translations
-Comment[vls]=Nen 2D MMORPG client
-Comment[ru]=Клиент к 2D MMORPG игре
-Comment[it]=Un gioco fantasy online
-Comment[ja]=2DのMMORPGクライアント
-Comment[cs]=2D MMORPG klient
-Comment[nl_BE]=Een 2D MMORPG client
-Comment[de]=ein 2D MMORG Client
-Comment[sv_SE]=Ett fantasyrollspel online
-Comment[es]=Un cliente MMORPG 2D
-Comment[fr]=Un jeu en ligne dans un univers fantastique
-Comment[nl]=Een online role playing game
diff --git a/packaging/debian/control b/packaging/debian/control
index db0f97bb4..72cc50d2b 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,7 +1,7 @@
Source: manaverse
Section: games
Priority: optional
-Homepage: http://manaplus.org/
+Homepage: http://manaplus.germantmw.de/
Maintainer: Andrei Karas <akaras@inbox.ru>
Uploaders: Patrick Matthäi <pmatthaei@debian.org>
Standards-Version: 3.9.7
diff --git a/packaging/nacl/ports/manaplus/pkg_info b/packaging/nacl/ports/manaplus/pkg_info
index 4772aa305..1c805b0c4 100644
--- a/packaging/nacl/ports/manaplus/pkg_info
+++ b/packaging/nacl/ports/manaplus/pkg_info
@@ -1,6 +1,6 @@
NAME=manaverse
VERSION=1
-#URL=https://gitlab.com/manaplus/manaplus.git@master
+#URL=https://gitlab.com/themanaworld/manaplus/manaplus.git@master
LICENSE=GPL
DEPENDS=(sdl sdl-gfx sdl-mixer sdl-ttf sdl-image sdl-net curl libxml2 libwebp zlib)
SHA1=4178d0c709b34b811d1781fc6dc183ea4979c2b5
diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index ccf3aade4..6e1d5a447 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -3,8 +3,8 @@
; like the old install script.
;
; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaverse.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
+; EXEDIR - directory containing manaplus.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
; PRODUCT_VERSION - software version
; UPX - upx binary name
;
@@ -46,7 +46,7 @@ RequestExecutionLevel admin
!endif
;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
!define MULTIUSER_INSTALLMODE_COMMANDLINE
!define MULTIUSER_EXECUTIONLEVEL "admin"
@@ -59,7 +59,7 @@ RequestExecutionLevel admin
!endif
!define PRODUCT_PUBLISHER "Evol Online Delopment Team"
!define PRODUCT_WEB_SITE "http://www.germantmw.de/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
+!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"
@@ -107,7 +107,7 @@ RequestExecutionLevel admin
Function RunEvol
SetOutPath $INSTDIR
-Exec "$INSTDIR\manaverse.exe $INSTDIR\evol.manaplus"
+Exec "$INSTDIR\manaplus.exe $INSTDIR\evol.manaplus"
FunctionEnd
Function changeFinishImage
@@ -262,7 +262,7 @@ Section "Core files (required)" SecCore
SetOverwrite ifnewer
SetOutPath "$INSTDIR"
- File "${EXEDIR}\manaverse.exe"
+ File "${EXEDIR}\manaplus.exe"
File "${DLLDIR}\SDL.dll"
File "${DLLDIR}\SDL_image.dll"
; File "${DLLDIR}\SDL_mixer.dll"
@@ -344,7 +344,7 @@ Section "Core files (required)" SecCore
SetOutPath "$INSTDIR\data\help\idx"
File "${SRCDIR}\data\help\idx\*.idx"
SetOutPath "$INSTDIR\data\icons\"
- File "${SRCDIR}\data\icons\manaverse.ico"
+ File "${SRCDIR}\data\icons\manaplus.ico"
SetOutPath "$INSTDIR\data\music\"
File "${SRCDIR}\data\music\*.ogg"
SetOutPath "$INSTDIR\data\perserver\default\"
@@ -364,14 +364,14 @@ Section "Create Shortcuts" SecShortcuts
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
CreateDirectory "$SMPROGRAMS\EvolOnline"
- CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaverse.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaverse.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaverse.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaverse.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-
- ${registerExtension} "$INSTDIR\manaverse.exe" ".manaplus" "ManaVerse brandings"
+ CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaplus.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaplus.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+
+ ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaVerse brandings"
SectionEnd
Section /o "Portable" SecPortable
@@ -398,8 +398,8 @@ Section /o "Profiler" SecProfiler
File "${EXEDIR}\manaversep.exe"
${If} ${SectionIsSelected} ${SecShortcuts}
- CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+ CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
${EndIf}
SectionEnd
@@ -437,10 +437,10 @@ SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
+ WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 8148e8df7..283c1cbe9 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,8 +3,8 @@
; like the old install script.
;
; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaverse.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
+; EXEDIR - directory containing manaplus.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
; PRODUCT_VERSION - software version
; UPX - upx binary name
;
@@ -46,7 +46,7 @@ RequestExecutionLevel admin
!endif
;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
!define MULTIUSER_INSTALLMODE_COMMANDLINE
!define MULTIUSER_EXECUTIONLEVEL "admin"
@@ -59,7 +59,7 @@ RequestExecutionLevel admin
!endif
!define PRODUCT_PUBLISHER "ManaPlus Development Team"
!define PRODUCT_WEB_SITE "http://manaplus.germantmw.de/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
+!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"
@@ -71,9 +71,9 @@ RequestExecutionLevel admin
; MUI Settings
!define MUI_ABORTWARNING
;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\icons\manaverse.ico"
+!define MUI_ICON "${SRCDIR}\data\icons\manaplus.ico"
;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${SRCDIR}\data\icons\manaverse.ico"
+!define MUI_UNICON "${SRCDIR}\data\icons\manaplus.ico"
;Language Selection Dialog Settings
;Remember the installer language
@@ -107,7 +107,7 @@ RequestExecutionLevel admin
Function RunMana
SetOutPath $INSTDIR
-Exec "$INSTDIR\manaverse.exe"
+Exec "$INSTDIR\manaplus.exe"
FunctionEnd
Function changeFinishImage
@@ -259,7 +259,7 @@ Section "Core files (required)" SecCore
SetOverwrite ifnewer
SetOutPath "$INSTDIR"
- File "${EXEDIR}\manaverse.exe"
+ File "${EXEDIR}\manaplus.exe"
File "${DLLDIR}\SDL.dll"
File "${DLLDIR}\SDL_image.dll"
; File "${DLLDIR}\SDL_mixer.dll"
@@ -341,7 +341,7 @@ Section "Core files (required)" SecCore
SetOutPath "$INSTDIR\data\help\idx"
File "${SRCDIR}\data\help\idx\*.idx"
SetOutPath "$INSTDIR\data\icons\"
- File "${SRCDIR}\data\icons\manaverse.ico"
+ File "${SRCDIR}\data\icons\manaplus.ico"
SetOutPath "$INSTDIR\data\music"
File "${SRCDIR}\data\music\*.ogg"
SetOutPath "$INSTDIR\data\perserver\default\"
@@ -355,14 +355,14 @@ Section "Create Shortcuts" SecShortcuts
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
CreateDirectory "$SMPROGRAMS\Mana"
- CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
- CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaverse.exe" --no-opengl
- CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaverse.exe" --safemode
- CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
- CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
- CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
-
- ${registerExtension} "$INSTDIR\manaverse.exe" ".manaplus" "ManaVerse brandings"
+ CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaplus.exe"
+ CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl
+ CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode
+ CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaplus.exe" --tests
+ CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaplus.exe"
+ CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaplus.exe" --tests
+
+ ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaVerse brandings"
SectionEnd
Section /o "Portable" SecPortable
@@ -411,8 +411,8 @@ Section "Evol Online shortcuts" SecEvol
SetOutPath "$INSTDIR\data\evol\icons"
File "${SRCDIR}\data\evol\icons\*.ico"
- CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
- CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+ CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
SectionEnd
Section "Translations" SecTrans
@@ -443,10 +443,10 @@ SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
+ WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index d238178d1..45b9d32d2 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -78,5 +78,5 @@ ENDFOREACH()
ADD_CUSTOM_TARGET(update-po)
-MANAPLUS_GETTEXT_CREATE_TRANSLATIONS(manaverse.pot ALL ${POFILES})
-MANAPLUS_GETTEXT_UPDATE_PO(manaverse.pot "${languages}")
+MANAPLUS_GETTEXT_CREATE_TRANSLATIONS(manaplus.pot ALL ${POFILES})
+MANAPLUS_GETTEXT_UPDATE_PO(manaplus.pot "${languages}")
diff --git a/po/ca.po b/po/ca.po
index fbd481e56..32206f9f4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -218,7 +218,7 @@ msgstr ""
#. TRANSLATORS: command line help
#: src/commandline.cpp:53
msgid " to the manaverse client."
-msgstr " pel client de manaverse."
+msgstr " pel client de manaplus."
#. TRANSLATORS: command line help
#: src/commandline.cpp:56
@@ -9291,10 +9291,10 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"El client és molt antic o el tipus de servidor és incorrecte. Actualitzeu el "
-"client a http://manaplus.org"
+"client a http://manaplus.germantmw.de"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/cs.po b/po/cs.po
index 70ab449b5..07376e67b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9157,7 +9157,7 @@ msgstr "Byl jste trvale vyloučen ze hry. Prosím kontaktujte GM team."
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/de.po b/po/de.po
index 0c3b2b7af..352530a6b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9337,10 +9337,10 @@ msgstr "Du wurdest für immer vom Spiel gebannt. Bitte kontaktiere das GM-Team."
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"Client ist zu alt, oder falscher Servertyp.\n"
-"Bitte aktualisere den Client unter http://manaplus.org"
+"Bitte aktualisere den Client unter http://manaplus.germantmw.de"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/eo.po b/po/eo.po
index 2f4fe2ec3..f2a5cd727 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9263,10 +9263,10 @@ msgstr "Vi estis daŭre forbarita de la ludo. Bonvolu kontakti la LG teamon."
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"Tro malnova kliento aŭ malĝusta tipo de servilo.\n"
-"Bonvolu ĝisdatigi klienton ĉe http://manaplus.org"
+"Bonvolu ĝisdatigi klienton ĉe http://manaplus.germantmw.de"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/es.po b/po/es.po
index e3fac2ac1..276e51856 100644
--- a/po/es.po
+++ b/po/es.po
@@ -236,7 +236,7 @@ msgstr " usado para establecer parámetros personalizados"
#. TRANSLATORS: command line help
#: src/commandline.cpp:53
msgid " to the manaverse client."
-msgstr " al cliente manaverse."
+msgstr " al cliente manaplus."
#. TRANSLATORS: command line help
#: src/commandline.cpp:56
@@ -9324,10 +9324,10 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"El cliente es muy viejo o el tipo de servidor es incorrecto.\n"
-"Por favor, actualiza en cliente en http://manaplus.org/es"
+"Por favor, actualiza en cliente en http://manaplus.germantmw.de/es"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/fi.po b/po/fi.po
index 5092a4d48..65f561f16 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9132,7 +9132,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/fr.po b/po/fr.po
index dee5ba8f6..a1181d7db 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -238,7 +238,7 @@ msgstr " utilisé pour définir des paramètres personnalisés"
#. TRANSLATORS: command line help
#: src/commandline.cpp:53
msgid " to the manaverse client."
-msgstr " pour le client manaverse."
+msgstr " pour le client manaplus."
#. TRANSLATORS: command line help
#: src/commandline.cpp:56
@@ -9346,10 +9346,10 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"Le client est trop ancien où le type de serveur n'est pas bon.\n"
-"Tu peux mettre à jour le client sur http://manaplus.org"
+"Tu peux mettre à jour le client sur http://manaplus.germantmw.de"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/id.po b/po/id.po
index 530aef438..0dbf02d6d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9129,7 +9129,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/it.po b/po/it.po
index ccdcbe05c..d8098ad36 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9155,7 +9155,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/ja.po b/po/ja.po
index e9f222650..d7e494620 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9138,7 +9138,7 @@ msgstr "ゲームから永久追放されました。詳細はGMチームへ連
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 4c3c1c5f2..5740f43aa 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -9125,7 +9125,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/nl.po b/po/nl.po
index c7c9b6a4b..8b921a5e0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9141,7 +9141,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/nl_BE.po b/po/nl_BE.po
index c7c9b6a4b..8b921a5e0 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9141,7 +9141,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/pl.po b/po/pl.po
index 8997b7f3e..9d9d32614 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -225,7 +225,7 @@ msgstr " używane do wprowadzania własnych parametrów"
#. TRANSLATORS: command line help
#: src/commandline.cpp:53
msgid " to the manaverse client."
-msgstr " do klienta manaverse."
+msgstr " do klienta manaplus."
#. TRANSLATORS: command line help
#: src/commandline.cpp:56
@@ -9154,7 +9154,7 @@ msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów.
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/pt.po b/po/pt.po
index 0d4e39a72..a1e08c382 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -220,7 +220,7 @@ msgstr " usado para definir parâmetros customizados"
#. TRANSLATORS: command line help
#: src/commandline.cpp:53
msgid " to the manaverse client."
-msgstr " para o cliente manaverse."
+msgstr " para o cliente manaplus."
#. TRANSLATORS: command line help
#: src/commandline.cpp:56
@@ -9149,7 +9149,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 74418c69b..41845b05f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9306,10 +9306,10 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"Cliente muito antigo ou tipo de servidor incorreto.\n"
-"Por favor atualize o cliente em http://manaplus.org"
+"Por favor atualize o cliente em http://manaplus.germantmw.de"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/ru.po b/po/ru.po
index 44e22f568..466f26a35 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9236,10 +9236,10 @@ msgstr "Вас навсегда забанили. Пожалуйста, свяж
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
"Клиент слишком старый.\n"
-"Пожалуйста обновите клиент на сайте http://manaplus.org"
+"Пожалуйста обновите клиент на сайте http://manaplus.germantmw.de"
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:96
diff --git a/po/sr.po b/po/sr.po
index 6a5461d4a..e22fbde0e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9133,7 +9133,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/sv.po b/po/sv.po
index b59875f5a..fc07f9d67 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9143,7 +9143,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/sv_SE.po b/po/sv_SE.po
index b59875f5a..fc07f9d67 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -9143,7 +9143,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/tr.po b/po/tr.po
index 159b8eaf1..84c1545f9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9137,7 +9137,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/uk.po b/po/uk.po
index 105ea53c7..ab4f609b2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9148,7 +9148,7 @@ msgstr "Вас було навіки забанено. Пишіть листи
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eae92b41b..94cf42a7f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9130,7 +9130,7 @@ msgstr "您已被永久禁止进入游戏。请联系GM团队."
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/po/zh_HK.po b/po/zh_HK.po
index e956422ae..4f016973a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9124,7 +9124,7 @@ msgstr ""
#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:91
msgid ""
"Client too old or wrong server type.\n"
-"Please update client on http://manaplus.org"
+"Please update client on http://manaplus.germantmw.de"
msgstr ""
#. TRANSLATORS: error message
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2eab0c34..d7ce3f445 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2184,13 +2184,13 @@ IF (WIN32)
${SRCS}
fs/specialfolder.cpp
fs/specialfolder.h
- manaverse.rc
+ manaplus.rc
)
SET(DYE_CMD_SRCS
${DYE_CMD_SRCS}
fs/specialfolder.cpp
fs/specialfolder.h
- manaverse.rc
+ manaplus.rc
)
ENDIF ()
diff --git a/src/Makefile.am b/src/Makefile.am
index adb75da54..3ef184ddc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,8 +170,8 @@ dyecmd_SOURCES += debug/mse/msemsevector.h \
endif
if MINGW
-manaplus_SOURCES += manaverse.rc
-dyecmd_SOURCES += manaverse.rc
+manaplus_SOURCES += manaplus.rc
+dyecmd_SOURCES += manaplus.rc
endif
dyecmd_CXXFLAGS += -DDYECMD
@@ -2192,7 +2192,7 @@ manaversetests_SOURCES += \
endif
if MINGW
-manaversetests_SOURCES += manaverse.rc
+manaversetests_SOURCES += manaplus.rc
manaversetests_LDFLAGS += -mconsole
endif
@@ -2253,7 +2253,7 @@ endif
EXTRA_DIST = CMakeLists.txt \
winver.h.in \
- manaverse.rc \
+ manaplus.rc \
SDLMain.m
# set the include path found by configure
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index cc5092c69..93ead2200 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -171,13 +171,13 @@ std::string removeLast(const std::string &str)
#ifdef WIN32
std::string getSelfName()
{
- return "manaverse.exe";
+ return "manaplus.exe";
}
#elif defined(__APPLE__)
std::string getSelfName()
{
- return "manaverse.exe";
+ return "manaplus.exe";
}
#elif defined __linux__ || defined __linux
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 9d2e2219c..fe33b89c2 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -88,7 +88,7 @@ Desktop::Desktop(const Widget2 *const widget) :
false);
}
mVersionLabel->addRow("copyright",
- "(C) ManaVerse developers, http://manaplus.org");
+ "(C) ManaVerse developers, http://manaplus.germantmw.de");
mVersionLabel->setLinkHandler(this);
mVersionLabel->updateHeight();
}
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 26c522e0e..6e8f6dbce 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -467,7 +467,7 @@ void ServerDialog::downloadServerList()
// Fall back to manaplus.germantmw.de when neither branding
// nor config set it
if (listFile.empty())
- listFile = "http://manaplus.org/serverlist.xml";
+ listFile = "http://manaplus.germantmw.de/serverlist.xml";
if (mDownload != nullptr)
{
diff --git a/src/manaplus.rc b/src/manaplus.rc
index 5a56dcc0e..6ec5642ff 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -17,7 +17,7 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
VALUE "FileVersion", PACKAGE_VERSION "4144"
VALUE "FileDescription", "ManaVerse"
VALUE "LegalCopyright", "2004-2014 (C)"
- VALUE "OriginalFilename", "manaverse.exe"
+ VALUE "OriginalFilename", "manaplus.exe"
VALUE "ProductName", "ManaVerse MMORPG Client"
VALUE "ProductVersion", PACKAGE_VERSION "4144"
}
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index 6e434ae8c..9760b09a6 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -96,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 http://manaplus.org");
+ "Please update client on http://manaplus.germantmw.de");
break;
case 6:
// TRANSLATORS: error message
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 61983556b..ce7c0dcd9 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -89,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 http://manaplus.org");
+ "Please update client on http://manaplus.germantmw.de");
break;
case 6:
// TRANSLATORS: error message
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index d43f6eb98..b0c4cabb3 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -193,7 +193,7 @@ void Client::gameInit()
else
{
settings.logFileName = pathJoin(settings.localDataDir,
- "manaverse.log");
+ "manaplus.log");
}
logger->setLogFile(settings.logFileName);
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 355a91602..70f31448a 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -311,7 +311,7 @@ void Client::gameInit()
else
{
settings.logFileName = pathJoin(settings.localDataDir,
- "manaverse.log");
+ "manaplus.log");
}
logger->log("Log file: " + settings.logFileName);
logger->setLogFile(settings.logFileName);
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 8e1f31252..7d1442a75 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -169,7 +169,7 @@ void MobileOpenGL2Graphics::postInit() restrict2
if (mProgram == nullptr)
{
graphicsManager.logError();
- logger->safeError("Shader creation error. See manaverse.log.");
+ logger->safeError("Shader creation error. See manaplus.log.");
}
mProgramId = mProgram->getProgramId();
if (mProgramId == 0U)
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index 17c05aec3..de250ab34 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -174,7 +174,7 @@ void ModernOpenGLGraphics::postInit() restrict2
if (mProgram == nullptr)
{
graphicsManager.logError();
- logger->safeError("Shader creation error. See manaverse.log.");
+ logger->safeError("Shader creation error. See manaplus.log.");
}
mProgramId = mProgram->getProgramId();
if (mProgramId == 0U)
diff --git a/tools/ci/jobs/mplint.sh b/tools/ci/jobs/mplint.sh
index 66a056dba..70b11c6a5 100755
--- a/tools/ci/jobs/mplint.sh
+++ b/tools/ci/jobs/mplint.sh
@@ -19,7 +19,7 @@ export CXXFLAGS="-std=gnu++11"
do_init
rm -rf mplint || true
-gitclone https://gitlab.com/manaplus mplint.git
+gitclone https://gitlab.com/themanaworld/manaplus mplint.git
cd mplint
run_configure_simple
run_make
diff --git a/tools/ci/scripts/clonesrc.sh b/tools/ci/scripts/clonesrc.sh
index 120d4f56b..3e2a12c08 100755
--- a/tools/ci/scripts/clonesrc.sh
+++ b/tools/ci/scripts/clonesrc.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
rm -rf manaverse || true
-./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaverse" || exit 1
+./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/themanaworld/manaplus/manaplus.git manaverse" || exit 1
mkdir manaplus/logs || exit 1