More rebranding changes

20 files changed, 28 insertions, 30 deletions

diff --git a/AUTHORS b/AUTHORS
index c9b69509..fdcd58be 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
----------------------------------
--- The Mana World Contributors --
----------------------------------
+-----------------------
+-- Mana Contributors --
+-----------------------
 
  This file lists all contributors up to the current release. Check the wiki
  for the currently active development team.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11d20a0a..5013a0dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ IF (WIN32)
     SET(PKG_BINDIR ".")
     SET(LOCALEDIR ".")
 ELSE (WIN32)
-    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw)
+    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana)
     SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
     SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
 ENDIF (WIN32)
@@ -29,4 +29,4 @@ IF (GETTEXT_FOUND AND ENABLE_NLS)
     ADD_SUBDIRECTORY(po)
 ENDIF()
 
-INSTALL(FILES tmw.desktop DESTINATION share/applications)
+INSTALL(FILES mana.desktop DESTINATION share/applications)
diff --git a/INSTALL b/INSTALL
index 3a332cdc..f9e03884 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-How to compile and run TMW on your GNU/Linux Box
-================================================
+How to compile and run Mana on your GNU/Linux Box
+=================================================
 
 Homepage:  http://manasource.org/
 IRC:       irc.freenode.net / #manasource
diff --git a/The Mana World.icns b/Mana.icns
index 7230a099..7230a099 100644
--- a/The Mana World.icns
+++ b/Mana.icns
diff --git a/ManaWorld.vcproj b/Mana.vcproj
index 478a345c..478a345c 100644
--- a/ManaWorld.vcproj
+++ b/Mana.vcproj
diff --git a/configure.ac b/configure.ac
index 53f6d489..9622d8aa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([The Mana World], [0.0.29.1], [themanaworld-devel@lists.sourceforge.net], [tmw])
+AC_INIT([Mana], [1.0.0], [themanaworld-devel@lists.sourceforge.net], [mana])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
@@ -100,7 +100,7 @@ else
     with_opengl=yes
     AC_CHECK_LIB([GL], [glBegin], ,
     AC_MSG_ERROR([ *** Unable to find OpenGL library]))
-    AC_DEFINE(USE_OPENGL, 1, [Defines if tmw should use an OpenGL display])
+    AC_DEFINE(USE_OPENGL, 1, [Defines if Mana should have OpenGL support])
 fi
 
 # Enable either Manaserv or eAthena
diff --git a/data/branding.xml b/data/branding.xml
index fd5779f6..fb709ac1 100644
--- a/data/branding.xml
+++ b/data/branding.xml
@@ -10,12 +10,12 @@ writing a branding.xml for their forks.
 -->
 
 <configuration>
- <option name="appName" value="The Mana World"/>
- <option name="appShort" value="tmw"/>
- <option name="appIcon" value="icons/tmw.png"/>
+ <option name="appName" value="Mana Client"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/mana.png"/>
  <option name="loginMusic" value="Magick - Real.ogg"/>
- <option name="defaultServer" value="server.themanaworld.org"/>
- <option name="defaultPort" value="6901"/>
+ <option name="defaultServer" value="testing.manasource.org"/>
+ <option name="defaultPort" value="9601"/>
  <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/>
  <option name="font" value="fonts/dejavusans.ttf" />
  <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index e50c7ab9..59ffe676 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(FILES
-    tmw.png
+    mana.png
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
 
-INSTALL(FILES "tmw.png" DESTINATION share/pixmaps)
+INSTALL(FILES "mana.png" DESTINATION share/pixmaps)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 71442a50..ec9b438d 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,15 +1,15 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA = tmw.png \
-	     tmw.xpm
+icons_DATA = mana.png \
+	     mana.xpm
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datarootdir)/pixmaps
-	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datarootdir)/pixmaps/tmw.png
+	$(INSTALL) $(srcdir)/mana.png $(DESTDIR)$(datarootdir)/pixmaps/mana.png
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datarootdir)/pixmaps/tmw.png
+	rm -f $(DESTDIR)$(datarootdir)/pixmaps/mana.png
 
 EXTRA_DIST =		\
 	$(icons_DATA)
diff --git a/data/icons/The Mana World.icns b/data/icons/Mana.icns
index 7230a099..7230a099 100644
--- a/data/icons/The Mana World.icns
+++ b/data/icons/Mana.icns
diff --git a/data/icons/tmw.ico b/data/icons/mana.ico
index 61d559a3..61d559a3 100644
--- a/data/icons/tmw.ico
+++ b/data/icons/mana.ico
diff --git a/data/icons/tmw.png b/data/icons/mana.png
index 93e6c9ae..93e6c9ae 100644
--- a/data/icons/tmw.png
+++ b/data/icons/mana.png
diff --git a/data/icons/tmw.xpm b/data/icons/mana.xpm
index 06ec2865..06ec2865 100644
--- a/data/icons/tmw.xpm
+++ b/data/icons/mana.xpm
diff --git a/tmw.cbp b/mana.cbp
index 9715343c..9715343c 100644
--- a/tmw.cbp
+++ b/mana.cbp
diff --git a/tmw.desktop b/mana.desktop
index 49d8a59a..9a2e0546 100644
--- a/tmw.desktop
+++ b/mana.desktop
@@ -1,17 +1,15 @@
 [Desktop Entry]
 Version=1.0
-Name=The Mana World
-Name[fr]=Le Monde de Mana
-Name[sv]=Manavärlden
-Comment=An on-line fantasy role playing game
+Name=Mana
+Comment=A 2D MMORPG client
 Comment[fr]=Un jeu en ligne dans un univers fantastique
 Comment[de]=ein Online Fantasy Spiel
 Comment[it]=Un gioco fantasy online
 Comment[nl]=Een online role playing game
 Comment[sv]=Ett fantasyrollspel online
-Exec=tmw
+Exec=mana
 StartupNotify=false
 Terminal=false
 Type=Application
-Icon=tmw
+Icon=mana
 Categories=Application;Game;
diff --git a/mana.menu b/mana.menu
new file mode 100644
index 00000000..4931b7d8
--- /dev/null
+++ b/mana.menu
@@ -0,0 +1,4 @@
+?package(tmw):needs="X11" section="Games/Adventure"\
+ title="Mana"\
+ description="Mana is a 2D MMORPG client."\
+ command="/usr/games/mana" icon="/usr/share/pixmaps/mana.xpm"
diff --git a/themanaworld.xcodeproj/garfield.mode1 b/mana.xcodeproj/garfield.mode1
index debfe473..debfe473 100644
--- a/themanaworld.xcodeproj/garfield.mode1
+++ b/mana.xcodeproj/garfield.mode1
diff --git a/themanaworld.xcodeproj/garfield.mode1v3 b/mana.xcodeproj/garfield.mode1v3
index 6a9a1334..6a9a1334 100644
--- a/themanaworld.xcodeproj/garfield.mode1v3
+++ b/mana.xcodeproj/garfield.mode1v3
diff --git a/themanaworld.xcodeproj/project.pbxproj b/mana.xcodeproj/project.pbxproj
index 6db8a569..6db8a569 100644
--- a/themanaworld.xcodeproj/project.pbxproj
+++ b/mana.xcodeproj/project.pbxproj
diff --git a/tmw.menu b/tmw.menu
deleted file mode 100644
index 4af5ad0a..00000000
--- a/tmw.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(tmw):needs="X11" section="Games/Adventure"\
- title="The Mana World"\
- description="The Mana World is an Online Fantasy adventure game."\
- command="/usr/games/tmw" icon="/usr/share/pixmaps/tmw.xpm"