Merge branch 'master' of gitorious.org:mana/mana

Conflicts:
	mana.desktop
	mana.menu

9 files changed, 18 insertions, 20 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/INSTALL b/INSTALL
index 8fc5d135..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
@@ -45,7 +45,7 @@ you to figure this out.
 
 
 2. Compiling And Installing Mana
-==========================================
+================================
 
 1) Go to the directory you have extracted the source to.
 2) If you've cloned the Git repository, run "autoreconf -i" to generate
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 5a45e288..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
@@ -109,17 +109,17 @@ AC_ARG_WITH(
     AS_HELP_STRING(
         [--with-server=ARG],
         [which server to use [[ARG=manaserv,eathena]]
-        [(default=eathena)]]
+        [(default=manaserv)]]
     ),
     [if test "$withval" = "yes"; then
-        # default is eathena
-        with_server="eathena"
+        # default is manaserv
+        with_server="manaserv"
      elif test "$withval" = "no"; then
         AC_MSG_ERROR([$PACKAGE_NAME cannot run without a server.])
      else
          with_server="$withval"
      fi],
-    [with_server="eathena"]
+    [with_server="manaserv"]
 )
 
 if test "$with_server" = "manaserv"; then
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/mana.desktop b/mana.desktop
index a046ea2d..bdc5c14b 100644
--- a/mana.desktop
+++ b/mana.desktop
@@ -2,9 +2,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Mana
-Name[fr]=Le Monde de Mana
-Name[sv]=Manavärlden
-Comment=An on-line fantasy role playing game
+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
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